1985 files changed, 7465 insertions, 7365 deletions
diff --git a/AUTHORS b/AUTHORS
index b2a4a628..7706729d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -45,7 +45,7 @@ SplashScreens:
   Marion Klein <MarionKlein@wanadoo.fr>
   Ram� Lamana Villar <ramon@alumnos.upm.es>
 
-KDevTabBar, bug fixes, Gideon Release:
+TDevTabBar, bug fixes, Gideon Release:
   Caleb Tennis <caleb@aei-tech.com>
 
 PartExplorer, (bugs for) CvsPart:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 254c6ba4..442ab2ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ option( WITH_VCS_SUBVERSION "Enable subversion support" ${WITH_VCS_ALL} )
 ##### components ################################
 
 option( BUILD_ALL "Build all components" OFF )
-option( BUILD_KDEVDESIGNER "Build kdevdesigner" ${BUILD_ALL} )
+option( BUILD_TDEVDESIGNER "Build tdevdesigner" ${BUILD_ALL} )
 option( BUILD_VISUALBOYADVANCE "Build embedded/visualboyadvance" ${BUILD_ALL} )
 option( BUILD_DOC "Build doc" ${BUILD_ALL} )
 
@@ -150,11 +150,13 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
 ##### install data ##############################
 
 install( FILES
-    tdevelop.desktop kdevassistant.desktop tdevelop_ruby.desktop
-    tdevelop_c_cpp.desktop tdevelop_kde_cpp.desktop
+    tdevelop.desktop tdevassistant.desktop tdevelop_ruby.desktop
+    tdevelop_c_cpp.desktop tdevelop_tde_cpp.desktop
     tdevelop_scripting.desktop
   DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
+install( FILES tde_app_devel.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden )
+
 install( FILES
     tde-development-tdevelop.directory
   DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} )
@@ -164,7 +166,7 @@ install( FILES
   DESTINATION ${MIME_INSTALL_DIR}/application )
 
 install( PROGRAMS
-    kdevprj2tdevelop
+    tdevprj2tdevelop
   DESTINATION ${BIN_INSTALL_DIR} )
 
 
@@ -180,7 +182,7 @@ add_subdirectory( mimetypes )
 add_subdirectory( pics )
 add_subdirectory( vcs )
 add_subdirectory( embedded )
-tde_conditional_add_subdirectory( BUILD_KDEVDESIGNER kdevdesigner )
+tde_conditional_add_subdirectory( BUILD_TDEVDESIGNER tdevdesigner )
 tde_conditional_add_subdirectory( BUILD_DOC doc )
 
 
diff --git a/Doxyfile b/Doxyfile
index 8e293249..5abfb6b9 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -124,7 +124,7 @@ EXCLUDE_PATTERNS       = *.moc.* \
                          *face_skel.cpp \
                          *.ui.h
 EXAMPLE_PATH           = languages/cpp/app_templates/khello \
-                         languages/cpp/app_templates/kdevpart
+                         languages/cpp/app_templates/tdevpart
 EXAMPLE_PATTERNS       = 
 EXAMPLE_RECURSIVE      = NO
 IMAGE_PATH             = ./doc/api
diff --git a/Makefile.am b/Makefile.am
index 25b1050d..b3bf5d78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,16 +2,19 @@ COMPILE_FIRST = lib src parts
 
 EXTRA_DIST = AUTHORS COPYING COPYING.LIB NEWS ChangeLog INSTALL README TODO HACKING HACKING.language admin configure.in.bot
 
-xdg_apps_DATA = tdevelop.desktop kdevassistant.desktop tdevelop_ruby.desktop \
-	tdevelop_c_cpp.desktop  tdevelop_kde_cpp.desktop  tdevelop_scripting.desktop
+xdg_apps_DATA = tdevelop.desktop tdevassistant.desktop tdevelop_ruby.desktop \
+	tdevelop_c_cpp.desktop  tdevelop_tde_cpp.desktop  tdevelop_scripting.desktop
 #appsdir = $(kde_appsdir)/Development
 
+app_DATA = tde_app_devel.desktop
+appdir = $(kde_appsdir)/.hidden
+
 xdg_directory_DATA = tde-development-tdevelop.directory
 
 mime_DATA = x-tdevelop.desktop
 mimedir = $(kde_mimedir)/application
 
-kde_bin_SCRIPTS = kdevprj2tdevelop
+kde_bin_SCRIPTS = tdevprj2tdevelop
 
 $(top_srcdir)/acinclude.m4: $(top_srcdir)/tdevelop.m4.in
 
@@ -48,7 +51,7 @@ include admin/deps.am
 
 DOXYGEN_SEARCHENGINE = YES
 DOXYGEN_EMPTY = YES
-DOXYGEN_PROJECTNAME = KDevelop Platform API
+DOXYGEN_PROJECTNAME = TDevelop Platform API
 include Doxyfile.am
 SUBDIRS=$(TOPSUBDIRS)
-#tdevelop: lib src parts buildtools doc editors embedded kdevdesigner languages mimetypes pics vcs
+#tdevelop: lib src parts buildtools doc editors embedded tdevdesigner languages mimetypes pics vcs
diff --git a/buildtools/ada/CMakeLists.txt b/buildtools/ada/CMakeLists.txt
index 8d0fd4ae..0cf08117 100644
--- a/buildtools/ada/CMakeLists.txt
+++ b/buildtools/ada/CMakeLists.txt
@@ -28,17 +28,17 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevadaproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevadaproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevadaproject )
+install( FILES tdevadaproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevadaproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevadaproject )
 
 
-##### libkdevadaproject (module) ################
+##### libtdevadaproject (module) ################
 
-tde_add_kpart( libkdevadaproject AUTOMOC
+tde_add_kpart( libtdevadaproject AUTOMOC
   SOURCES
     adaproject_part.cpp adaproject_widget.cpp
     adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp
     adaglobaloptionsdlg.cpp service.cpp
-  LINK kdevbuildbase-shared
+  LINK tdevbuildbase-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/ada/Makefile.am b/buildtools/ada/Makefile.am
index 2b2614ec..7997b18c 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 = 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
+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
 
-libkdevadaproject_la_SOURCES = adaproject_part.cpp adaproject_widget.cpp adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp adaglobaloptionsdlg.cpp service.cpp
+libtdevadaproject_la_SOURCES = adaproject_part.cpp adaproject_widget.cpp adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp adaglobaloptionsdlg.cpp service.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevadaproject.desktop
+service_DATA = tdevadaproject.desktop
 
-rcdir = $(kde_datadir)/kdevadaproject
-rc_DATA = kdevadaproject.rc
+rcdir = $(kde_datadir)/tdevadaproject
+rc_DATA = tdevadaproject.rc
diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp
index cea68bdc..791c23ae 100644
--- a/buildtools/ada/adaglobaloptionsdlg.cpp
+++ b/buildtools/ada/adaglobaloptionsdlg.cpp
@@ -15,7 +15,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 
-#include "kdevcompileroptions.h"
+#include "tdevcompileroptions.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);
-    KDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
+    TDevCompilerOptions *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 32833dfd..195e2889 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -28,29 +28,29 @@
 #include <tdeconfig.h>
 
 #include "domutil.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 "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 "adaproject_widget.h"
 #include "adaprojectoptionsdlg.h"
 #include "adaglobaloptionsdlg.h"
 
-typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory;
-static const KDevPluginInfo data("kdevadaproject");
-K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) )
+typedef TDevGenericFactory<AdaProjectPart> AdaProjectFactory;
+static const TDevPluginInfo data("tdevadaproject");
+K_EXPORT_COMPONENT_FACTORY( libtdevadaproject, AdaProjectFactory( data ) )
 
 AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& )
-    :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" )
+    :TDevBuildTool(&data, parent, name ? name : "AdaProjectPart" )
 {
     setInstance(AdaProjectFactory::instance());
-    setXMLFile("kdevadaproject.rc");
+    setXMLFile("tdevadaproject.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 kdevcore.h
+  // now you decide what should happen to the widget. Take a look at tdevcore.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, "/kdevadaproject/run/directoryradio") == "" ) {
-        DomUtil::writeEntry(dom, "/kdevadaproject/run/directoryradio", "executable");
+    if (DomUtil::readEntry(dom, "/tdevadaproject/run/directoryradio") == "" ) {
+        DomUtil::writeEntry(dom, "/tdevadaproject/run/directoryradio", "executable");
     }
 
     loadProjectConfig();
@@ -165,7 +165,7 @@ void AdaProjectPart::openProject(const TQString &dirName, const TQString &projec
         }
     } while (!s.isEmpty());
 
-    KDevProject::openProject( dirName, projectName );
+    TDevProject::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(), "/kdevadaproject/run/envvars", "envvar", "name", "value");
+    return DomUtil::readPairListEntry(*projectDom(), "/tdevadaproject/run/envvars", "envvar", "name", "value");
 }
 
 
@@ -190,7 +190,7 @@ DomUtil::PairList AdaProjectPart::runEnvironmentVars() const
   */
 TQString AdaProjectPart::runDirectory() const
 {
-    TQString cwd = defaultRunDirectory("kdevadaproject");
+    TQString cwd = defaultRunDirectory("tdevadaproject");
     if (cwd.isEmpty())
       cwd = buildDirectory();
     return cwd;
@@ -212,7 +212,7 @@ TQString AdaProjectPart::mainProgram() const
 
     if ( !dom ) return TQString();
 
-    TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevadaproject/run/mainprogram");
+    TQString DomMainProgram = DomUtil::readEntry( *dom, "/tdevadaproject/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(), "/kdevadaproject/run/globaldebugarguments");
+    return DomUtil::readEntry(*projectDom(), "/tdevadaproject/run/globaldebugarguments");
 }
 
 
 /** Retuns a TQString with the run command line arguments */
 TQString AdaProjectPart::runArguments() const
 {
-    return DomUtil::readEntry(*projectDom(), "/kdevadaproject/run/programargs");
+    return DomUtil::readEntry(*projectDom(), "/tdevadaproject/run/programargs");
 }
 
 TQString AdaProjectPart::mainSource() const
@@ -361,12 +361,12 @@ void AdaProjectPart::slotExecute()
 
 void AdaProjectPart::changedFiles( const TQStringList & fileList )
 {
-    KDevProject::changedFiles(fileList);
+    TDevProject::changedFiles(fileList);
 }
 
 void AdaProjectPart::changedFile( const TQString & fileName )
 {
-    KDevProject::changedFile(fileName);
+    TDevProject::changedFile(fileName);
 }
 
 void AdaProjectPart::projectConfigWidget( KDialogBase * dlg )
@@ -382,10 +382,10 @@ void AdaProjectPart::loadProjectConfig( )
 {
     TQDomDocument &dom = *(projectDom());
 
-    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"));
+    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"));
 
     if (m_compilerExec.isEmpty())
     {
@@ -408,7 +408,7 @@ void AdaProjectPart::configWidget( KDialogBase * dlg )
     connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 }
 
-KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
+TDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
 {
     KService::Ptr service = KService::serviceByDesktopName(name);
     if (!service) {
@@ -430,13 +430,13 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
         args = TQStringList::split(" ", prop.toString());
 
     TQObject *obj = factory->create(this, service->name().latin1(),
-                                   "KDevCompilerOptions", args);
+                                   "TDevCompilerOptions", args);
 
-    if (!obj->inherits("KDevCompilerOptions")) {
-        kdDebug() << "AdaProjectPart::createCompilerOptions: component does not inherit KDevCompilerOptions" << endl;
+    if (!obj->inherits("TDevCompilerOptions")) {
+        kdDebug() << "AdaProjectPart::createCompilerOptions: component does not inherit TDevCompilerOptions" << endl;
         return 0;
     }
-    KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
+    TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
 
     return dlg;
 }
diff --git a/buildtools/ada/adaproject_part.h b/buildtools/ada/adaproject_part.h
index 5511da78..46b328c4 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 __KDEVPART_ADAPROJECT_H__
-#define __KDEVPART_ADAPROJECT_H__
+#ifndef __TDEVPART_ADAPROJECT_H__
+#define __TDEVPART_ADAPROJECT_H__
 
 #include <tqguardedptr.h>
 
-#include "kdevbuildtool.h"
+#include "tdevbuildtool.h"
 
 class AdaProjectWidget;
 class KDialogBase;
-class KDevCompilerOptions;
+class TDevCompilerOptions;
 
-class AdaProjectPart : public KDevBuildTool
+class AdaProjectPart : public TDevBuildTool
 {
     Q_OBJECT
   
@@ -59,7 +59,7 @@ public:
     virtual void changedFiles( const TQStringList & fileList );
     virtual void changedFile( const TQString & fileName );
 
-    KDevCompilerOptions *createCompilerOptions(const TQString &name);
+    TDevCompilerOptions *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 f5016e8c..3eaba244 100644
--- a/buildtools/ada/adaproject_widget.cpp
+++ b/buildtools/ada/adaproject_widget.cpp
@@ -3,7 +3,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-#include <kdevcore.h>
+#include <tdevcore.h>
 
 #include "adaproject_part.h"
 #include "adaproject_widget.h"
diff --git a/buildtools/ada/adaproject_widget.h b/buildtools/ada/adaproject_widget.h
index 6bbab369..c89fc511 100644
--- a/buildtools/ada/adaproject_widget.h
+++ b/buildtools/ada/adaproject_widget.h
@@ -4,7 +4,7 @@
 #include <tqwidget.h>
 #include <tqstring.h>
 
-class KDevProject;
+class TDevProject;
 class AdaProjectPart;
 
 class AdaProjectWidget : public TQWidget
diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp
index 28549efc..6cced020 100644
--- a/buildtools/ada/adaprojectoptionsdlg.cpp
+++ b/buildtools/ada/adaprojectoptionsdlg.cpp
@@ -18,7 +18,7 @@
 #include <tqvalidator.h>
 
 #include "domutil.h"
-#include "kdevcompileroptions.h"
+#include "tdevcompileroptions.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, "/kdevadaproject/general/useconfiguration", "default"));
+    configChanged(DomUtil::readEntry(dom, "/tdevadaproject/general/useconfiguration", "default"));
 }
 
 AdaProjectOptionsDlg::~AdaProjectOptionsDlg()
@@ -57,7 +57,7 @@ TQStringList AdaProjectOptionsDlg::allBuildConfigs()
     TQStringList allConfigs;
     allConfigs.append("default");
 
-    TQDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("tdevadaproject").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(), "/kdevadaproject/general/useconfiguration", currentConfig);
+    DomUtil::writeEntry(*m_part->projectDom(), "/tdevadaproject/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 = "/kdevadaproject/configurations/" + config + "/";
+    TQString prefix = "/tdevadaproject/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 = "/kdevadaproject/configurations/" + config + "/";
+    TQString prefix = "/tdevadaproject/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("kdevadaproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("tdevadaproject").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);
-    KDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
+    TDevCompilerOptions *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 569f06c9..0f6c0262 100644
--- a/buildtools/ada/adaprojectoptionsdlg.h
+++ b/buildtools/ada/adaprojectoptionsdlg.h
@@ -14,7 +14,7 @@
 #include "adaproject_optionsdlgbase.h"
 
 class AdaProjectPart;
-class KDevCompilerOptions;
+class TDevCompilerOptions;
 
 class AdaProjectOptionsDlg : public AdaProjectOptionsDlgBase
 {
diff --git a/buildtools/ada/kdevadaproject.desktop b/buildtools/ada/tdevadaproject.desktop
index 882b0f64..91206fd4 100644
--- a/buildtools/ada/kdevadaproject.desktop
+++ b/buildtools/ada/tdevadaproject.desktop
@@ -95,6 +95,6 @@ GenericName[uz@cyrillic]=Ada лойиҳаси
 GenericName[zh_CN]=Ada 工程
 GenericName[zh_TW]=Ada 專案
 ServiceTypes=TDevelop/Project
-X-TDE-Library=libkdevadaproject
+X-TDE-Library=libtdevadaproject
 X-TDevelop-Version=5
 X-TDevelop-Language=Ada
diff --git a/buildtools/ada/kdevadaproject.rc b/buildtools/ada/tdevadaproject.rc
index d7f260e1..d7f260e1 100644
--- a/buildtools/ada/kdevadaproject.rc
+++ b/buildtools/ada/tdevadaproject.rc
diff --git a/buildtools/ant/CMakeLists.txt b/buildtools/ant/CMakeLists.txt
index 1b7cfd98..48858d7f 100644
--- a/buildtools/ant/CMakeLists.txt
+++ b/buildtools/ant/CMakeLists.txt
@@ -26,15 +26,15 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevantproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevantproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevantproject )
+install( FILES tdevantproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevantproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevantproject )
 
 
-##### libkdevantproject (module) ################
+##### libtdevantproject (module) ################
 
-tde_add_kpart( libkdevantproject AUTOMOC
+tde_add_kpart( libtdevantproject AUTOMOC
   SOURCES
     antprojectpart.cpp antoptionswidget.ui classpathwidget.ui
-  LINK kdevbuildbase-shared
+  LINK tdevbuildbase-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/ant/Makefile.am b/buildtools/ant/Makefile.am
index 30f314b8..6f3e23e6 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 = 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
+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
 
-libkdevantproject_la_SOURCES = antprojectpart.cpp antoptionswidget.ui classpathwidget.ui
+libtdevantproject_la_SOURCES = antprojectpart.cpp antoptionswidget.ui classpathwidget.ui
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevantproject.desktop
+service_DATA = tdevantproject.desktop
 
-rcdir = $(kde_datadir)/kdevantproject
-rc_DATA = kdevantproject.rc
+rcdir = $(kde_datadir)/tdevantproject
+rc_DATA = tdevantproject.rc
diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp
index 902055ec..fcbdd630 100644
--- a/buildtools/ant/antprojectpart.cpp
+++ b/buildtools/ant/antprojectpart.cpp
@@ -11,7 +11,7 @@
 #include <tqdir.h>
 
 
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
@@ -21,10 +21,10 @@
 #include <keditlistbox.h>
 #include <kurlrequester.h>
 
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
-#include <kdevcore.h>
-#include <kdevmakefrontend.h>
+#include <tdevcore.h>
+#include <tdevmakefrontend.h>
 #include <urlutil.h>
 
 
@@ -34,9 +34,9 @@
 
 
 
-typedef KDevGenericFactory<AntProjectPart> AntProjectFactory;
-static const KDevPluginInfo data("kdevantproject");
-K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( data ))
+typedef TDevGenericFactory<AntProjectPart> AntProjectFactory;
+static const TDevPluginInfo data("tdevantproject");
+K_EXPORT_COMPONENT_FACTORY(libtdevantproject, AntProjectFactory( data ))
 
 
 AntOptions::AntOptions()
@@ -46,11 +46,11 @@ AntOptions::AntOptions()
 
 
 AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevBuildTool(&data, parent, name ? name : "AntProjectPart")
+  : TDevBuildTool(&data, parent, name ? name : "AntProjectPart")
 {
   setInstance(AntProjectFactory::instance());
 
-  setXMLFile("kdevantproject.rc");
+  setXMLFile("tdevantproject.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();
 
-  KDevProject::openProject( dirName, projectName );
+  TDevProject::openProject( dirName, projectName );
 }
 
 
diff --git a/buildtools/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h
index e3b325d2..f6203c55 100644
--- a/buildtools/ant/antprojectpart.h
+++ b/buildtools/ant/antprojectpart.h
@@ -16,7 +16,7 @@ class Context;
 class ClassPathWidget;
 
 
-#include "kdevbuildtool.h"
+#include "tdevbuildtool.h"
 
 
 class AntOptionsWidget;
@@ -40,7 +40,7 @@ public:
 };
 
 
-class AntProjectPart : public KDevBuildTool
+class AntProjectPart : public TDevBuildTool
 {
   Q_OBJECT
   
diff --git a/buildtools/ant/kdevantproject.desktop b/buildtools/ant/tdevantproject.desktop
index e2880101..bbca6555 100644
--- a/buildtools/ant/kdevantproject.desktop
+++ b/buildtools/ant/tdevantproject.desktop
@@ -91,6 +91,6 @@ GenericName[uz@cyrillic]=Ant лойиҳаси
 GenericName[zh_CN]=Ant 工程
 GenericName[zh_TW]=Ant 專案
 ServiceTypes=TDevelop/Project
-X-TDE-Library=libkdevantproject
+X-TDE-Library=libtdevantproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/ant/kdevantproject.rc b/buildtools/ant/tdevantproject.rc
index df892b3c..df892b3c 100644
--- a/buildtools/ant/kdevantproject.rc
+++ b/buildtools/ant/tdevantproject.rc
diff --git a/buildtools/autotools/CMakeLists.txt b/buildtools/autotools/CMakeLists.txt
index f7af5bc6..e33d897c 100644
--- a/buildtools/autotools/CMakeLists.txt
+++ b/buildtools/autotools/CMakeLists.txt
@@ -32,13 +32,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevautoproject.desktop kdevtdeautoproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevautoproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevautoproject )
+install( FILES tdevautoproject.desktop tdevtdeautoproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevautoproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevautoproject )
 
 
-##### libkdevautoproject (module) ###############
+##### libtdevautoproject (module) ###############
 
-tde_add_kpart( libkdevautoproject AUTOMOC
+tde_add_kpart( libtdevautoproject AUTOMOC
   SOURCES
     autoprojectpart.cpp autoprojectwidget.cpp
     configureoptionswidget.cpp configureoptionswidgetbase.ui
@@ -60,6 +60,6 @@ tde_add_kpart( libkdevautoproject AUTOMOC
     autolistviewitems.cpp managecustomcommandsbase.ui
     managecustomcommand.cpp autoprojectviewbase.ui
     autotoolsaction.cpp makefilehandler.cpp
-  LINK kdevautotoolsparser-static kdevbuildbase-shared kdevbuildtoolswidgets-shared
+  LINK tdevautotoolsparser-static tdevbuildbase-shared tdevbuildtoolswidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/autotools/Makefile.am b/buildtools/autotools/Makefile.am
index 98f3ad51..a704eb29 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 = 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
+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
 
-libkdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \
+libtdevautoproject_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 @@ libkdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevautoproject.desktop kdevtdeautoproject.desktop
+service_DATA = tdevautoproject.desktop tdevtdeautoproject.desktop
 
-rcdir = $(kde_datadir)/kdevautoproject
-rc_DATA = kdevautoproject.rc
+rcdir = $(kde_datadir)/tdevautoproject
+rc_DATA = tdevautoproject.rc
 
 noinst_HEADERS = managecustomcommand.h autotoolsaction.h makefilehandler.h
diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp
index d3f71637..18bf87a8 100644
--- a/buildtools/autotools/addfiledlg.cpp
+++ b/buildtools/autotools/addfiledlg.cpp
@@ -36,7 +36,7 @@
 #include "autoprojectpart.h"
 #include "autoprojectwidget.h"
 
-#include "kdevpartcontroller.h"
+#include "tdevpartcontroller.h"
 
 AddFileDialog::AddFileDialog(AutoProjectPart *part, AutoProjectWidget *widget,
 							SubprojectItem *spitem, TargetItem *item,
diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp
index 59cebc53..fa64c506 100644
--- a/buildtools/autotools/addsubprojectdlg.cpp
+++ b/buildtools/autotools/addsubprojectdlg.cpp
@@ -25,7 +25,7 @@
 
 #include "autolistviewitems.h"
 
-#include "kdevmakefrontend.h"
+#include "tdevmakefrontend.h"
 #include "misc.h"
 #include "autoprojectpart.h"
 #include "autosubprojectview.h"
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index 91b6d75c..34060b61 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -32,13 +32,13 @@
 #include <tdepopupmenu.h>
 
 /** KDevelop */
-#include "kdevappfrontend.h"
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
-#include "kdevpartcontroller.h"
-#include "kdevcreatefile.h"
-#include "kdevlanguagesupport.h"
-#include "kdevmakefrontend.h"
+#include "tdevappfrontend.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
+#include "tdevpartcontroller.h"
+#include "tdevcreatefile.h"
+#include "tdevlanguagesupport.h"
+#include "tdevmakefrontend.h"
 #include "urlutil.h"
 
 #include "domutil.h"
@@ -294,13 +294,13 @@ void AutoDetailsView::slotAddNewFile()
 	if ( !titem )
 		return;
 
-	KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>("TDevelop/CreateFile");
+	TDevCreateFile * createFileSupport = m_part->extension<TDevCreateFile>("TDevelop/CreateFile");
 	if (createFileSupport)
 	{
-		KDevCreateFile::CreatedFile crFile =
+		TDevCreateFile::CreatedFile crFile =
 			createFileSupport->createNewFile(TQString(),
 			                                 m_widget->selectedSubproject()->path);
-/*		if (crFile.status == KDevCreateFile::CreatedFile::STATUS_OK)
+/*		if (crFile.status == TDevCreateFile::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 6b408bd0..ae5453bc 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -45,34 +45,34 @@
 #include <kprocess.h>
 
 #include <domutil.h>
-#include <kdevcore.h>
-#include <kdevmakefrontend.h>
-#include <kdevappfrontend.h>
-#include <kdevmainwindow.h>
-#include <kdevpartcontroller.h>
+#include <tdevcore.h>
+#include <tdevmakefrontend.h>
+#include <tdevappfrontend.h>
+#include <tdevmainwindow.h>
+#include <tdevpartcontroller.h>
 #include <makeoptionswidget.h>
 #include <runoptionswidget.h>
 #include <envvartools.h>
 
 #include <configwidgetproxy.h>
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 #include <urlutil.h>
 
 #define CONFIGURE_OPTIONS 1
 #define RUN_OPTIONS 2
 #define MAKE_OPTIONS 3
 
-static const KDevPluginInfo data("kdevautoproject");
+static const TDevPluginInfo data("tdevautoproject");
 
-K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) )
+K_EXPORT_COMPONENT_FACTORY( libtdevautoproject, AutoProjectFactory( data ) )
 
 AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args)
-    : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart")
+    : TDevBuildTool(&data, parent, name ? name : "AutoProjectPart")
     , m_lastCompilationFailed(false)
 {
     setInstance(AutoProjectFactory::instance());
 
-    setXMLFile("kdevautoproject.rc");
+    setXMLFile("tdevautoproject.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");
     }
 
-    KDevProject::openProject( dirName, projectName );
+    TDevProject::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("kdevautoproject");
+        cwd = defaultRunDirectory("tdevautoproject");
     }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("kdevautoproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("tdevautoproject").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") + "kdevappwizard/template-common/");
+    dirs.addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "tdevappwizard/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;
 }
 
-KDevProject::Options AutoProjectPart::options() const
+TDevProject::Options AutoProjectPart::options() const
 {
     return UsesAutotoolsBuildSystem;
 }
diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h
index 83066c3c..08d83719 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 <kdevgenericfactory.h>
-#include "kdevbuildtool.h"
+#include <tdevgenericfactory.h>
+#include "tdevbuildtool.h"
 
 class TQDomElement;
 class TQStringList;
@@ -31,7 +31,7 @@ class TDESelectAction;
 class TargetItem;
 class ConfigWidgetProxy;
 
-class AutoProjectPart : public KDevBuildTool
+class AutoProjectPart : public TDevBuildTool
 {
 	Q_OBJECT
   
@@ -41,7 +41,7 @@ public:
 	virtual ~AutoProjectPart();
 
 	/**
-	 * Implementation of the KDevProject interface.
+	 * Implementation of the TDevProject interface.
 	 */
 	virtual TQString projectDirectory() const;
 	virtual TQString projectName() const;
@@ -61,7 +61,7 @@ public:
 	virtual Options options() const;
 
 	/**
-	 * Implementation of the KDevPlugin interface.
+	 * Implementation of the TDevPlugin interface.
 	 */
 	virtual void restorePartialProjectSession ( const TQDomElement* el );
 	virtual void savePartialProjectSession ( TQDomElement* el );
@@ -85,7 +85,7 @@ public:
 
 protected:
 	/**
-	 * Reimplemented from KDevProject. These methods are only
+	 * Reimplemented from TDevProject. 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 KDevGenericFactory<AutoProjectPart> AutoProjectFactory;
+typedef TDevGenericFactory<AutoProjectPart> AutoProjectFactory;
 
 #endif
 // kate: indent-mode csands; tab-width 4;
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index a558a593..c41a60dc 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -42,7 +42,7 @@
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
 
-#include "kdevcore.h"
+#include "tdevcore.h"
 #include "domutil.h"
 #include "misc.h"
 #include "choosetargetdialog.h"
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 8353e2ea..0eecfe4b 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -34,10 +34,10 @@
 #include <tdelistview.h>
 
 /** KDevelop */
-#include <kdevmainwindow.h>
-#include <kdevmakefrontend.h>
-#include <kdevappfrontend.h>
-#include <kdevcore.h>
+#include <tdevmainwindow.h>
+#include <tdevmakefrontend.h>
+#include <tdevappfrontend.h>
+#include <tdevcore.h>
 #include <urlutil.h>
 
 /** AutoProject */
diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp
index 8b59545f..fad399f3 100644
--- a/buildtools/autotools/choosetargetdialog.cpp
+++ b/buildtools/autotools/choosetargetdialog.cpp
@@ -43,7 +43,7 @@
 #include "autoprojectwidget.h"
 #include "autoprojectpart.h"
 
-#include "kdevpartcontroller.h"
+#include "tdevpartcontroller.h"
 
 class ChooseTargetDialog::Private
 {
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index cc39aa07..c991d15d 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -29,7 +29,7 @@
 #include <kservice.h>
 #include <ktrader.h>
 
-#include "kdevcompileroptions.h"
+#include "tdevcompileroptions.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("kdevautoproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("tdevautoproject").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);
-    KDevCompilerOptions *plugin = createCompilerOptions(name);
+    TDevCompilerOptions *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);
-    KDevCompilerOptions *plugin = createCompilerOptions(name);
+    TDevCompilerOptions *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);
-    KDevCompilerOptions *plugin = createCompilerOptions(name);
+    TDevCompilerOptions *plugin = createCompilerOptions(name);
 
     if (plugin) {
         TQString flags = plugin->exec(this, f77flags_edit->text());
@@ -384,7 +384,7 @@ void ConfigureOptionsWidget::f77flagsClicked()
 }
 
 
-KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQString &name)
+TDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQString &name)
 {
     KService::Ptr service = KService::serviceByDesktopName(name);
     if (!service) {
@@ -406,13 +406,13 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin
         args = TQStringList::split(" ", prop.toString());
 
     TQObject *obj = factory->create(TQT_TQOBJECT(this), service->name().latin1(),
-                                   "KDevCompilerOptions", args);
+                                   "TDevCompilerOptions", args);
 
-    if (!obj->inherits("KDevCompilerOptions")) {
-        kdDebug(9020) << "Component does not inherit KDevCompilerOptions" << endl;
+    if (!obj->inherits("TDevCompilerOptions")) {
+        kdDebug(9020) << "Component does not inherit TDevCompilerOptions" << endl;
         return 0;
     }
-    KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
+    TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
 
     return dlg;
 }
diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h
index e40874de..dfab95cc 100644
--- a/buildtools/autotools/configureoptionswidget.h
+++ b/buildtools/autotools/configureoptionswidget.h
@@ -18,7 +18,7 @@
 #include "domutil.h"
 
 
-class KDevCompilerOptions;
+class TDevCompilerOptions;
 class AutoProjectPart;
 class EnvironmentVariablesWidget;
 
@@ -53,7 +53,7 @@ private:
 	void readSettings( const TQString &config );
 	void saveSettings( const TQString &config );
 
-	KDevCompilerOptions *createCompilerOptions( const TQString &lang );
+	TDevCompilerOptions *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 c10db050..afd09d4b 100644
--- a/buildtools/autotools/fileselectorwidget.cpp
+++ b/buildtools/autotools/fileselectorwidget.cpp
@@ -43,7 +43,7 @@
 
 #include "autoprojectwidget.h"
 #include "autoprojectpart.h"
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.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("kdevfileview").toElement();
+    TQDomElement fileviewEl = docEl.namedItem("tdevfileview").toElement();
     TQDomElement groupsEl = fileviewEl.namedItem("groups").toElement();
     TQDomElement groupEl = groupsEl.firstChild().toElement();
 
diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp
index ec58b54c..f1174b21 100644
--- a/buildtools/autotools/misc.cpp
+++ b/buildtools/autotools/misc.cpp
@@ -21,10 +21,10 @@
 
 #include "misc.h"
 
-#include "kdevcompileroptions.h"
+#include "tdevcompileroptions.h"
 
 
-static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent )
+static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent )
 {
 	KService::Ptr service = KService::serviceByDesktopName( name );
 	if ( !service )
@@ -48,13 +48,13 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
         args = TQStringList::split(" ", prop.toString());
 
     TQObject *obj = factory->create(parent, service->name().latin1(),
-                                   "KDevCompilerOptions", args);
+                                   "TDevCompilerOptions", args);
 
-    if (!obj->inherits("KDevCompilerOptions")) {
-        kdDebug(9020) << "Component does not inherit KDevCompilerOptions" << endl;
+    if (!obj->inherits("TDevCompilerOptions")) {
+        kdDebug(9020) << "Component does not inherit TDevCompilerOptions" << endl;
         return 0;
     }
-    KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
+    TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
 
     return dlg;
 
@@ -65,14 +65,14 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
 		args = TQStringList::split( " ", prop.toString() );
 
 	return KParts::ComponentFactory
-	       ::createInstanceFromService<KDevCompilerOptions>( service, parent,
+	       ::createInstanceFromService<TDevCompilerOptions>( service, parent,
 	                                                         service->name().latin1(), args );*/
 }
 
 
 TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent )
 {
-	KDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) );
+	TDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) );
 
 	if ( plugin )
 	{
diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp
index e265a969..6508d126 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("kdevautoproject");
+	TQDomNode el2 = el.namedItem("tdevautoproject");
 	TQDomNode el3 = el2.namedItem("subclassing");
 
 	TQDomNode n = el3.firstChild();
diff --git a/buildtools/autotools/kdevautoproject.desktop b/buildtools/autotools/tdevautoproject.desktop
index a149c870..ad164259 100644
--- a/buildtools/autotools/kdevautoproject.desktop
+++ b/buildtools/autotools/tdevautoproject.desktop
@@ -92,6 +92,6 @@ GenericName[zh_CN]=Automake 工程
 GenericName[zh_TW]=Automake 專案
 ServiceTypes=TDevelop/Project
 Icon=make
-X-TDE-Library=libkdevautoproject
+X-TDE-Library=libtdevautoproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/autotools/kdevautoproject.rc b/buildtools/autotools/tdevautoproject.rc
index 5d213e3e..5d213e3e 100644
--- a/buildtools/autotools/kdevautoproject.rc
+++ b/buildtools/autotools/tdevautoproject.rc
diff --git a/buildtools/autotools/kdevtdeautoproject.desktop b/buildtools/autotools/tdevtdeautoproject.desktop
index b9b6abd8..5ed348d1 100644
--- a/buildtools/autotools/kdevtdeautoproject.desktop
+++ b/buildtools/autotools/tdevtdeautoproject.desktop
@@ -87,6 +87,6 @@ GenericName[zh_CN]=TDE Automake 工程
 GenericName[zh_TW]=TDE Automake 專案
 ServiceTypes=TDevelop/Project
 Icon=make
-X-TDE-Library=libkdevautoproject
+X-TDE-Library=libtdevautoproject
 X-TDevelop-Version=5
 X-TDevelop-Args=kde
diff --git a/buildtools/custommakefiles/CMakeLists.txt b/buildtools/custommakefiles/CMakeLists.txt
index 55036324..8327a38d 100644
--- a/buildtools/custommakefiles/CMakeLists.txt
+++ b/buildtools/custommakefiles/CMakeLists.txt
@@ -30,15 +30,15 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevcustomproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevcustomproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevcustomproject )
+install( FILES tdevcustomproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevcustomproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevcustomproject )
 
 
-##### libkdevcustomproject (module) #############
+##### libtdevcustomproject (module) #############
 
 
 
-tde_add_kpart( libkdevcustomproject AUTOMOC
+tde_add_kpart( libtdevcustomproject AUTOMOC
   SOURCES
     selectnewfilesdialog.cpp
     selectnewfilesdialogbase.ui custombuildoptionswidget.cpp
@@ -46,6 +46,6 @@ tde_add_kpart( libkdevcustomproject AUTOMOC
     custommakeconfigwidgetbase.ui custommanagerwidget.cpp
     custommanagerwidgetbase.ui customotherconfigwidget.cpp
     customotherconfigwidgetbase.ui customprojectpart.cpp
-  LINK kdevbuildbase-shared kdevbuildtoolswidgets-shared
+  LINK tdevbuildbase-shared tdevbuildtoolswidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/custommakefiles/Makefile.am b/buildtools/custommakefiles/Makefile.am
index 087ab001..618f8794 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 = 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
+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
 
-libkdevcustomproject_la_SOURCES = selectnewfilesdialog.cpp selectnewfilesdialogbase.ui \
+libtdevcustomproject_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 @@ libkdevcustomproject_la_SOURCES = selectnewfilesdialog.cpp selectnewfilesdialogb
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevcustomproject.desktop
+service_DATA = tdevcustomproject.desktop
 
-rcdir = $(kde_datadir)/kdevcustomproject
-rc_DATA = kdevcustomproject.rc
+rcdir = $(kde_datadir)/tdevcustomproject
+rc_DATA = tdevcustomproject.rc
 noinst_HEADERS = selectnewfilesdialog.h custommanagerwidget.h \
 	customotherconfigwidget.h
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index 5b41080e..c9cc482d 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 <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdemainwindow.h>
@@ -42,11 +42,11 @@
 #include <kprocess.h>
 
 #include "domutil.h"
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
-#include "kdevmakefrontend.h"
-#include "kdevappfrontend.h"
-#include "kdevpartcontroller.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
+#include "tdevmakefrontend.h"
+#include "tdevappfrontend.h"
+#include "tdevpartcontroller.h"
 #include "runoptionswidget.h"
 #include "makeoptionswidget.h"
 #include "custombuildoptionswidget.h"
@@ -59,18 +59,18 @@
 
 #include "selectnewfilesdialog.h"
 
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
-typedef KDevGenericFactory<CustomProjectPart> CustomProjectFactory;
-static const KDevPluginInfo data( "kdevcustomproject" );
-K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) )
+typedef TDevGenericFactory<CustomProjectPart> CustomProjectFactory;
+static const TDevPluginInfo data( "tdevcustomproject" );
+K_EXPORT_COMPONENT_FACTORY( libtdevcustomproject, CustomProjectFactory( data ) )
 
 CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & )
-        : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" )
+        : TDevBuildTool( &data, parent, name ? name : "CustomProjectPart" )
         , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false )
 {
     setInstance( CustomProjectFactory::instance() );
-    setXMLFile( "kdevcustomproject.rc" );
+    setXMLFile( "tdevcustomproject.rc" );
 
     m_executeAfterBuild = false;
 
@@ -477,7 +477,7 @@ void CustomProjectPart::openProject( const TQString &dirName, const TQString &pr
         el.setTagName( "default" );
         envs.appendChild( el );
     }
-    KDevProject::openProject( dirName, projectName );
+    TDevProject::openProject( dirName, projectName );
 }
 
 
@@ -632,7 +632,7 @@ DomUtil::PairList CustomProjectPart::runEnvironmentVars() const
   */
 TQString CustomProjectPart::runDirectory() const
 {
-    TQString cwd = defaultRunDirectory( "kdevcustomproject" );
+    TQString cwd = defaultRunDirectory( "tdevcustomproject" );
     if ( cwd.isEmpty() )
         cwd = buildDirectory();
     return cwd;
diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h
index 67223e92..db46d576 100644
--- a/buildtools/custommakefiles/customprojectpart.h
+++ b/buildtools/custommakefiles/customprojectpart.h
@@ -20,7 +20,7 @@
 #include <tqdatetime.h>
 #include <tqvaluestack.h>
 
-#include <kdevbuildtool.h>
+#include <tdevbuildtool.h>
 
 class TQListViewItem;
 class TQPopupMenu;
@@ -30,7 +30,7 @@ class CustomProjectWidget;
 class Context;
 class TDESelectAction;
 
-class CustomProjectPart : public KDevBuildTool
+class CustomProjectPart : public TDevBuildTool
 {
     Q_OBJECT
   
diff --git a/buildtools/custommakefiles/kdevcustomproject.desktop b/buildtools/custommakefiles/tdevcustomproject.desktop
index 9f81a3d6..0ea2c3bc 100644
--- a/buildtools/custommakefiles/kdevcustomproject.desktop
+++ b/buildtools/custommakefiles/tdevcustomproject.desktop
@@ -38,7 +38,7 @@ Comment[tg]=Лоиҳаи оддӣ
 Comment[tr]=Özel Proje
 Comment[zh_CN]=自定义工程
 Comment[zh_TW]=自訂專案
-Name=KDevCustomProject
+Name=TDevCustomProject
 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=libkdevcustomproject
+X-TDE-Library=libtdevcustomproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/custommakefiles/kdevcustomproject.rc b/buildtools/custommakefiles/tdevcustomproject.rc
index c744b4be..08079774 100644
--- a/buildtools/custommakefiles/kdevcustomproject.rc
+++ b/buildtools/custommakefiles/tdevcustomproject.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KDevCustomProject" version="7">
+<kpartgui name="TDevCustomProject" 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 f3585669..a429be6c 100644
--- a/buildtools/lib/base/CMakeLists.txt
+++ b/buildtools/lib/base/CMakeLists.txt
@@ -26,14 +26,14 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kdevbuildtool.h
+    tdevbuildtool.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/base )
 
 
-##### kdevbuildbase (shared) ####################
+##### tdevbuildbase (shared) ####################
 
-tde_add_library( kdevbuildbase SHARED AUTOMOC
-  SOURCES kdevbuildtool.cpp
+tde_add_library( tdevbuildbase SHARED AUTOMOC
+  SOURCES tdevbuildtool.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 3e16d2d8..8a85d338 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 KDevBuildTool compat class which can be used
-as drop-in replacement of KDevProject class for buildtool support plugins 
+This library is created to provide TDevBuildTool compat class which can be used
+as drop-in replacement of TDevProject 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 7e1083ef..6532398d 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 = 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
+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
 tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/base
-tdevelopbuildtoolsinclude_HEADERS = kdevbuildtool.h
+tdevelopbuildtoolsinclude_HEADERS = tdevbuildtool.h
 
-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
+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
 include ../../../Doxyfile.am
diff --git a/buildtools/lib/base/kdevbuildtool.cpp b/buildtools/lib/base/tdevbuildtool.cpp
index 618f02d9..aa901bb7 100644
--- a/buildtools/lib/base/kdevbuildtool.cpp
+++ b/buildtools/lib/base/tdevbuildtool.cpp
@@ -16,23 +16,23 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevbuildtool.h"
+#include "tdevbuildtool.h"
 
-#include <kdevmakefrontend.h>
-#include <kdevappfrontend.h>
+#include <tdevmakefrontend.h>
+#include <tdevappfrontend.h>
 
-KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name)
-    :KDevProject(info, parent, name)
+TDevBuildTool::TDevBuildTool(const TDevPluginInfo* info, TQObject* parent, const char* name)
+    :TDevProject(info, parent, name)
 {
 }
 
-KDevMakeFrontend * KDevBuildTool::makeFrontend()
+TDevMakeFrontend * TDevBuildTool::makeFrontend()
 {
-    return extension<KDevMakeFrontend>("TDevelop/MakeFrontend");
+    return extension<TDevMakeFrontend>("TDevelop/MakeFrontend");
 }
 
-KDevAppFrontend * KDevBuildTool::appFrontend()
+TDevAppFrontend * TDevBuildTool::appFrontend()
 {
-    return extension<KDevAppFrontend>("TDevelop/AppFrontend");
+    return extension<TDevAppFrontend>("TDevelop/AppFrontend");
 }
 
diff --git a/buildtools/lib/base/kdevbuildtool.h b/buildtools/lib/base/tdevbuildtool.h
index ff1abcc0..b6899f9b 100644
--- a/buildtools/lib/base/kdevbuildtool.h
+++ b/buildtools/lib/base/tdevbuildtool.h
@@ -17,24 +17,24 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVBUILDTOOL_H
-#define KDEVBUILDTOOL_H
+#ifndef TDEVBUILDTOOL_H
+#define TDEVBUILDTOOL_H
 
-#include <kdevproject.h>
+#include <tdevproject.h>
 
-class KDevMakeFrontend;
-class KDevAppFrontend;
+class TDevMakeFrontend;
+class TDevAppFrontend;
 
 /**Base class for KDevelop build tool support plugins.*/
-class KDevBuildTool: public KDevProject
+class TDevBuildTool: public TDevProject
 {
 public:
-    KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name);
+    TDevBuildTool(const TDevPluginInfo* info, TQObject* parent, const char* name);
 
     /**@return The make frontend.*/
-    KDevMakeFrontend *makeFrontend();
+    TDevMakeFrontend *makeFrontend();
     /**@return The application frontend.*/
-    KDevAppFrontend *appFrontend();
+    TDevAppFrontend *appFrontend();
 
 };
 
diff --git a/buildtools/lib/parsers/autotools/CMakeLists.txt b/buildtools/lib/parsers/autotools/CMakeLists.txt
index 8226e963..5bc97247 100644
--- a/buildtools/lib/parsers/autotools/CMakeLists.txt
+++ b/buildtools/lib/parsers/autotools/CMakeLists.txt
@@ -16,9 +16,9 @@ include_directories(
 )
 
 
-##### kdevautotoolsparser (static) ##############
+##### tdevautotoolsparser (static) ##############
 
-tde_add_library( kdevautotoolsparser STATIC_PIC
+tde_add_library( tdevautotoolsparser 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 340d0e38..47234583 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 = libkdevautotoolsparser.la
-libkdevautotoolsparser_la_LDFLAGS = $(all_libraries) $(LIB_TDEIO)
-libkdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp
+noinst_LTLIBRARIES = libtdevautotoolsparser.la
+libtdevautotoolsparser_la_LDFLAGS = $(all_libraries) $(LIB_TDEIO)
+libtdevautotoolsparser_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 = KDevelop AutoTools Parser
-DOXYGEN_DOCDIRPREFIX = kdevparser
+DOXYGEN_PROJECTNAME = TDevelop AutoTools Parser
+DOXYGEN_DOCDIRPREFIX = tdevparser
 include ../../../../Doxyfile.am
diff --git a/buildtools/lib/parsers/autotools/tests/Makefile.am b/buildtools/lib/parsers/autotools/tests/Makefile.am
index 30c67288..00c2baba 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/libkdevautotoolsparser.la
+runner_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la
 runner_SOURCES = runner.cpp
 
 viewer_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH)
-viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la
+viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.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 b8328a84..6ffebfa6 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 )
 
 
-##### kdevqmakeparser (shared) ##################
+##### tdevqmakeparser (shared) ##################
 
-tde_add_library( kdevqmakeparser SHARED
+tde_add_library( tdevqmakeparser 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 ff3f175b..9e14382a 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 = libkdevqmakeparser.la
-libkdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_TDEIO)
-libkdevqmakeparser_la_SOURCES = qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp \
+lib_LTLIBRARIES = libtdevqmakeparser.la
+libtdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_TDEIO)
+libtdevqmakeparser_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 = KDevelop QMake parser
-DOXYGEN_DOCDIRPREFIX = kdevparser
+DOXYGEN_PROJECTNAME = TDevelop QMake parser
+DOXYGEN_DOCDIRPREFIX = tdevparser
 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 e1932f7e..74935269 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/libkdevqmakeparser.la
+runner_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la
 runner_SOURCES = runner.cpp
 
 viewer_LDFLAGS = --no-undefined $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH)
-viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la
+viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.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 d86d0c66..0349f6d3 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 )
 
 
-##### kdevbuildtoolswidgets (shared) ############
+##### tdevbuildtoolswidgets (shared) ############
 
-tde_add_library( kdevbuildtoolswidgets SHARED AUTOMOC
+tde_add_library( tdevbuildtoolswidgets SHARED AUTOMOC
   SOURCES
     addenvvardlg.cpp addfilesdialog.cpp
     environmentdisplaydialog.cpp
diff --git a/buildtools/lib/widgets/Makefile.am b/buildtools/lib/widgets/Makefile.am
index 6042ea06..718bbb04 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 = libkdevbuildtoolswidgets.la
-libkdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries)
-libkdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \
+lib_LTLIBRARIES = libtdevbuildtoolswidgets.la
+libtdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries)
+libtdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la \
 	$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdetexteditor
-libkdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \
+libtdevbuildtoolswidgets_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 kdevutil kdevinterfaces kdevutil
-DOXYGEN_PROJECTNAME = KDevelop Buildtool Widgets Library
-DOXYGEN_DOCDIRPREFIX = kdevbt
+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
 include ../../../Doxyfile.am
 noinst_HEADERS = environmentdisplaydialog.h
diff --git a/buildtools/pascal/CMakeLists.txt b/buildtools/pascal/CMakeLists.txt
index b10a6bec..f43f27b2 100644
--- a/buildtools/pascal/CMakeLists.txt
+++ b/buildtools/pascal/CMakeLists.txt
@@ -30,17 +30,17 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevpascalproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpascalproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpascalproject )
+install( FILES tdevpascalproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpascalproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpascalproject )
 
 
-##### libkdevpascalproject (module) #############
+##### libtdevpascalproject (module) #############
 
-tde_add_kpart( libkdevpascalproject AUTOMOC
+tde_add_kpart( libtdevpascalproject AUTOMOC
   SOURCES
     pascalproject_part.cpp pascalproject_widget.cpp
     pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp
     pascalglobaloptionsdlg.cpp service.cpp
-  LINK kdevbuildbase-shared kdevbuildtoolswidgets-shared
+  LINK tdevbuildbase-shared tdevbuildtoolswidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/pascal/Makefile.am b/buildtools/pascal/Makefile.am
index 9bf4fc90..f822bd6d 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 = 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
+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
 
-libkdevpascalproject_la_SOURCES = pascalproject_part.cpp pascalproject_widget.cpp pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp pascalglobaloptionsdlg.cpp service.cpp
+libtdevpascalproject_la_SOURCES = pascalproject_part.cpp pascalproject_widget.cpp pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp pascalglobaloptionsdlg.cpp service.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevpascalproject.desktop
+service_DATA = tdevpascalproject.desktop
 
-rcdir = $(kde_datadir)/kdevpascalproject
-rc_DATA = kdevpascalproject.rc
+rcdir = $(kde_datadir)/tdevpascalproject
+rc_DATA = tdevpascalproject.rc
 
 
 
diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp
index ccbf8dc1..b55ae62f 100644
--- a/buildtools/pascal/pascalglobaloptionsdlg.cpp
+++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp
@@ -17,7 +17,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 
-#include "kdevcompileroptions.h"
+#include "tdevcompileroptions.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);
-    KDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
+    TDevCompilerOptions *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 01b0734a..42864e23 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 <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <tdemessagebox.h>
@@ -32,13 +32,13 @@
 #include <kprocess.h>
 
 #include "domutil.h"
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
-#include "kdevmakefrontend.h"
-#include "kdevappfrontend.h"
-#include "kdevpartcontroller.h"
-#include "kdevlanguagesupport.h"
-#include "kdevcompileroptions.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
+#include "tdevmakefrontend.h"
+#include "tdevappfrontend.h"
+#include "tdevpartcontroller.h"
+#include "tdevlanguagesupport.h"
+#include "tdevcompileroptions.h"
 #include "runoptionswidget.h"
 #include "envvartools.h"
 
@@ -46,17 +46,17 @@
 #include "pascalprojectoptionsdlg.h"
 #include "pascalglobaloptionsdlg.h"
 
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
-typedef KDevGenericFactory<PascalProjectPart> PascalProjectFactory;
-static const KDevPluginInfo data("kdevpascalproject");
-K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) )
+typedef TDevGenericFactory<PascalProjectPart> PascalProjectFactory;
+static const TDevPluginInfo data("tdevpascalproject");
+K_EXPORT_COMPONENT_FACTORY( libtdevpascalproject, PascalProjectFactory( data ) )
 
 PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& )
-    :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" )
+    :TDevBuildTool(&data, parent, name ? name : "PascalProjectPart" )
 {
     setInstance(PascalProjectFactory::instance());
-    setXMLFile("kdevpascalproject.rc");
+    setXMLFile("tdevpascalproject.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 kdevcore.h
+  // now you decide what should happen to the widget. Take a look at tdevcore.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());
 
-    KDevProject::openProject( dirName, projectName );
+    TDevProject::openProject( dirName, projectName );
 }
 
 void PascalProjectPart::closeProject()
@@ -197,7 +197,7 @@ DomUtil::PairList PascalProjectPart::runEnvironmentVars() const
   */
 TQString PascalProjectPart::runDirectory() const
 {
-    TQString cwd = defaultRunDirectory("kdevpascalproject");
+    TQString cwd = defaultRunDirectory("tdevpascalproject");
     if (cwd.isEmpty())
       cwd = buildDirectory();
     return cwd;
@@ -384,12 +384,12 @@ void PascalProjectPart::slotExecute()
 
 void PascalProjectPart::changedFiles( const TQStringList & fileList )
 {
-    KDevProject::changedFiles(fileList);
+    TDevProject::changedFiles(fileList);
 }
 
 void PascalProjectPart::changedFile( const TQString & fileName )
 {
-    KDevProject::changedFile(fileName);
+    TDevProject::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()) );
 }
 
-KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name)
+TDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name)
 {
     KService::Ptr service = KService::serviceByDesktopName(name);
     if (!service) {
@@ -458,13 +458,13 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na
         args = TQStringList::split(" ", prop.toString());
 
     TQObject *obj = factory->create(this, service->name().latin1(),
-                                   "KDevCompilerOptions", args);
+                                   "TDevCompilerOptions", args);
 
-    if (!obj->inherits("KDevCompilerOptions")) {
-        kdDebug() << "Component does not inherit KDevCompilerOptions" << endl;
+    if (!obj->inherits("TDevCompilerOptions")) {
+        kdDebug() << "Component does not inherit TDevCompilerOptions" << endl;
         return 0;
     }
-    KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
+    TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
 
     return dlg;
 }
diff --git a/buildtools/pascal/pascalproject_part.h b/buildtools/pascal/pascalproject_part.h
index 54d09b2e..8f46817b 100644
--- a/buildtools/pascal/pascalproject_part.h
+++ b/buildtools/pascal/pascalproject_part.h
@@ -8,18 +8,18 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef __KDEVPART_PASCALPROJECT_H__
-#define __KDEVPART_PASCALPROJECT_H__
+#ifndef __TDEVPART_PASCALPROJECT_H__
+#define __TDEVPART_PASCALPROJECT_H__
 
 #include <tqguardedptr.h>
 
-#include "kdevbuildtool.h"
+#include "tdevbuildtool.h"
 
 class PascalProjectWidget;
 class KDialogBase;
-class KDevCompilerOptions;
+class TDevCompilerOptions;
 
-class PascalProjectPart : public KDevBuildTool
+class PascalProjectPart : public TDevBuildTool
 {
     Q_OBJECT
   
@@ -61,7 +61,7 @@ public:
     virtual void changedFiles( const TQStringList & fileList );
     virtual void changedFile( const TQString & fileName );
 
-    KDevCompilerOptions *createCompilerOptions(const TQString &name);
+    TDevCompilerOptions *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 a8671023..9ce95c47 100644
--- a/buildtools/pascal/pascalproject_widget.cpp
+++ b/buildtools/pascal/pascalproject_widget.cpp
@@ -4,7 +4,7 @@
 #include <kdebug.h>
 
 
-#include <kdevcore.h>
+#include <tdevcore.h>
 
 
 #include "pascalproject_part.h"
diff --git a/buildtools/pascal/pascalproject_widget.h b/buildtools/pascal/pascalproject_widget.h
index 252c7500..5e104856 100644
--- a/buildtools/pascal/pascalproject_widget.h
+++ b/buildtools/pascal/pascalproject_widget.h
@@ -6,7 +6,7 @@
 #include <tqstring.h>
 
 
-class KDevProject;
+class TDevProject;
 class PascalProjectPart;
 
 
diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp
index 9c7c2518..1593656a 100644
--- a/buildtools/pascal/pascalprojectoptionsdlg.cpp
+++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp
@@ -20,7 +20,7 @@
 #include <tqvalidator.h>
 
 #include "domutil.h"
-#include "kdevcompileroptions.h"
+#include "tdevcompileroptions.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("kdevpascalproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("tdevpascalproject").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("kdevpascalproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("tdevpascalproject").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);
-    KDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
+    TDevCompilerOptions *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 acedb14d..c641faf3 100644
--- a/buildtools/pascal/pascalprojectoptionsdlg.h
+++ b/buildtools/pascal/pascalprojectoptionsdlg.h
@@ -16,7 +16,7 @@
 #include "pascalproject_optionsdlgbase.h"
 
 class PascalProjectPart;
-class KDevCompilerOptions;
+class TDevCompilerOptions;
 
 class PascalProjectOptionsDlg : public PascalProjectOptionsDlgBase
 {
diff --git a/buildtools/pascal/kdevpascalproject.desktop b/buildtools/pascal/tdevpascalproject.desktop
index cde3c21d..36143f24 100644
--- a/buildtools/pascal/kdevpascalproject.desktop
+++ b/buildtools/pascal/tdevpascalproject.desktop
@@ -89,5 +89,5 @@ GenericName[uz@cyrillic]=Pascal лойиҳаси
 GenericName[zh_CN]=Pascal 工程
 GenericName[zh_TW]=Pascal 專案
 ServiceTypes=TDevelop/Project
-X-TDE-Library=libkdevpascalproject
+X-TDE-Library=libtdevpascalproject
 X-TDevelop-Version=5
diff --git a/buildtools/pascal/kdevpascalproject.rc b/buildtools/pascal/tdevpascalproject.rc
index 9e7f46fd..9e7f46fd 100644
--- a/buildtools/pascal/kdevpascalproject.rc
+++ b/buildtools/pascal/tdevpascalproject.rc
diff --git a/buildtools/qmake/CMakeLists.txt b/buildtools/qmake/CMakeLists.txt
index fa281096..e2b877f5 100644
--- a/buildtools/qmake/CMakeLists.txt
+++ b/buildtools/qmake/CMakeLists.txt
@@ -31,13 +31,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevtrollproject.desktop kdevtmakeproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevtrollproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevtrollproject )
+install( FILES tdevtrollproject.desktop tdevtmakeproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevtrollproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevtrollproject )
 
 
-##### libkdevtrollproject (module) ##############
+##### libtdevtrollproject (module) ##############
 
-tde_add_kpart( libkdevtrollproject AUTOMOC
+tde_add_kpart( libtdevtrollproject AUTOMOC
   SOURCES
     choosesubprojectdlg.cpp choosesubprojectdlgbase.ui
     createscopedlg.cpp createscopedlgbase.ui
@@ -48,6 +48,6 @@ tde_add_kpart( libkdevtrollproject AUTOMOC
     qmakeoptionswidgetbase.ui qmakescopeitem.cpp
     scope.cpp trolllistview.cpp trollprojectpart.cpp
     trollprojectwidget.cpp
-  LINK kdevqmakeparser-shared kdevbuildbase-shared kdevbuildtoolswidgets-shared
+  LINK tdevqmakeparser-shared tdevbuildbase-shared tdevbuildtoolswidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/qmake/Makefile.am b/buildtools/qmake/Makefile.am
index b50fc775..68adba76 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 = 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 \
+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 \
 	choosesubprojectdlgbase.ui createscopedlg.cpp createscopedlgbase.ui disablesubprojectdlg.cpp \
 	disablesubprojectdlgbase.ui newwidgetdlg.cpp newwidgetdlgbase.ui \
 	projectconfigurationdlg.cpp projectconfigurationdlgbase.ui qmakedefaultopts.cpp \
@@ -26,9 +26,9 @@ libkdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevtrollproject.desktop kdevtmakeproject.desktop
+service_DATA = tdevtrollproject.desktop tdevtmakeproject.desktop
 
-rcdir = $(kde_datadir)/kdevtrollproject
-rc_DATA = kdevtrollproject.rc
+rcdir = $(kde_datadir)/tdevtrollproject
+rc_DATA = tdevtrollproject.rc
 noinst_HEADERS = createscopedlg.h disablesubprojectdlg.h qmakedefaultopts.h \
 	qmakeoptionswidget.h qmakescopeitem.h trolllistview.h
diff --git a/buildtools/qmake/kdevtmakeproject.desktop b/buildtools/qmake/tdevtmakeproject.desktop
index 97b4b528..a5b729d5 100644
--- a/buildtools/qmake/kdevtmakeproject.desktop
+++ b/buildtools/qmake/tdevtmakeproject.desktop
@@ -85,7 +85,7 @@ GenericName[tr]=TMake Projesi
 GenericName[zh_CN]=TMake 工程
 GenericName[zh_TW]=TMake 專案
 ServiceTypes=TDevelop/Project
-X-TDE-Library=libkdevtrollproject
+X-TDE-Library=libtdevtrollproject
 X-TDevelop-Version=5
 X-TDevelop-Args=TMake
 
diff --git a/buildtools/qmake/kdevtrollproject.desktop b/buildtools/qmake/tdevtrollproject.desktop
index bf118c56..24ef620e 100644
--- a/buildtools/qmake/kdevtrollproject.desktop
+++ b/buildtools/qmake/tdevtrollproject.desktop
@@ -90,6 +90,6 @@ GenericName[uz@cyrillic]=QMake лойиҳаси
 GenericName[zh_CN]=QMake 工程
 GenericName[zh_TW]=QMake 專案
 ServiceTypes=TDevelop/Project
-X-TDE-Library=libkdevtrollproject
+X-TDE-Library=libtdevtrollproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/qmake/kdevtrollproject.rc b/buildtools/qmake/tdevtrollproject.rc
index 8f6e0048..8f6e0048 100644
--- a/buildtools/qmake/kdevtrollproject.rc
+++ b/buildtools/qmake/tdevtrollproject.rc
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index c71afc30..738e2534 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 <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kprocess.h>
@@ -41,11 +41,11 @@
 
 
 #include "domutil.h"
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
-#include "kdevmakefrontend.h"
-#include "kdevappfrontend.h"
-#include "kdevpartcontroller.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
+#include "tdevmakefrontend.h"
+#include "tdevappfrontend.h"
+#include "tdevpartcontroller.h"
 #include "trollprojectwidget.h"
 #include "runoptionswidget.h"
 #include "config.h"
@@ -53,15 +53,15 @@
 #include "qmakeoptionswidget.h"
 #include "scope.h"
 
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 #include <urlutil.h>
 
-typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory;
-static const KDevPluginInfo data("kdevtrollproject");
-K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) )
+typedef TDevGenericFactory<TrollProjectPart> TrollProjectFactory;
+static const TDevPluginInfo data("tdevtrollproject");
+K_EXPORT_COMPONENT_FACTORY( libtdevtrollproject, TrollProjectFactory( data ) )
 
 TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args )
-    : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart")
+    : TDevBuildTool(&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("kdevtrollproject.rc");
+    setXMLFile("tdevtrollproject.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");
     }
 
-    KDevProject::openProject( dirName, projectName );
+    TDevProject::openProject( dirName, projectName );
 }
 
 
@@ -475,7 +475,7 @@ TQString TrollProjectPart::runDirectory() const
     TQString cwd;
     if( DomUtil::readBoolEntry(dom, "/kdevtrollproject/run/useglobalprogram", true) )
     {
-        cwd = defaultRunDirectory("kdevtrollproject");
+        cwd = defaultRunDirectory("tdevtrollproject");
     }else
     {
         TQString name = m_widget->getCurrentOutputFilename();
@@ -788,7 +788,7 @@ bool TrollProjectPart::isDirty()
     return false;
 }
 
-KDevProject::Options TrollProjectPart::options( ) const
+TDevProject::Options TrollProjectPart::options( ) const
 {
     return UsesTQMakeBuildSystem;
 }
diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h
index e36ef202..2b673b59 100644
--- a/buildtools/qmake/trollprojectpart.h
+++ b/buildtools/qmake/trollprojectpart.h
@@ -21,14 +21,14 @@
 #include <tqmap.h>
 #include <tqdatetime.h>
 
-#include "kdevbuildtool.h"
+#include "tdevbuildtool.h"
 
 class KDialogBase;
 class TrollProjectWidget;
 class KDirWatch;
 class TQMakeDefaultOpts;
 
-class TrollProjectPart : public KDevBuildTool
+class TrollProjectPart : public TDevBuildTool
 {
     Q_OBJECT
   
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 68dfad8e..12d814a5 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -60,14 +60,14 @@
 #include <tdeio/netaccess.h>
 #include <kurlcompletion.h>
 
-#include "kdevcore.h"
-#include "kdevpartcontroller.h"
-#include "kdevmainwindow.h"
+#include "tdevcore.h"
+#include "tdevpartcontroller.h"
+#include "tdevmainwindow.h"
 #include "trollprojectpart.h"
-#include "kdevappfrontend.h"
-#include "kdevmakefrontend.h"
-#include "kdevlanguagesupport.h"
-#include "kdevcreatefile.h"
+#include "tdevappfrontend.h"
+#include "tdevmakefrontend.h"
+#include "tdevlanguagesupport.h"
+#include "tdevcreatefile.h"
 #include "subclassesdlg.h"
 #include "addfilesdialog.h"
 #include "urlutil.h"
@@ -1403,7 +1403,7 @@ void TrollProjectWidget::slotNewFile()
             return ;
         }
     }
-    KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "TDevelop/CreateFile" );
+    TDevCreateFile * createFileSupport = m_part->extension<TDevCreateFile>( "TDevelop/CreateFile" );
     TQString fcext;
     if( gitem )
     {
@@ -1437,7 +1437,7 @@ void TrollProjectWidget::slotNewFile()
                 fcext = TQString();
         }
     }
-    KDevCreateFile::CreatedFile crFile =
+    TDevCreateFile::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 )
         {
-            KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "TDevelop/CreateFile" );
+            TDevCreateFile * createFileSupport = m_part->extension<TDevCreateFile>( "TDevelop/CreateFile" );
             TQString fcext;
             switch ( titem->groupType )
             {
@@ -1714,7 +1714,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem *
                 default:
                     fcext = TQString();
             }
-            KDevCreateFile::CreatedFile crFile =
+            TDevCreateFile::CreatedFile crFile =
                 createFileSupport->createNewFile( fcext, cleanSubprojectPath );
 
         }
diff --git a/buildtools/script/CMakeLists.txt b/buildtools/script/CMakeLists.txt
index d3f97540..c30a403d 100644
--- a/buildtools/script/CMakeLists.txt
+++ b/buildtools/script/CMakeLists.txt
@@ -27,16 +27,16 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevscriptproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevscriptproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevscriptproject )
+install( FILES tdevscriptproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevscriptproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevscriptproject )
 
 
-##### libkdevscriptproject (module) #############
+##### libtdevscriptproject (module) #############
 
-tde_add_kpart( libkdevscriptproject AUTOMOC
+tde_add_kpart( libtdevscriptproject AUTOMOC
   SOURCES
     scriptprojectpart.cpp scriptoptionswidget.cpp
     scriptoptionswidgetbase.ui scriptnewfiledlg.cpp
-  LINK kdevbuildbase-shared
+  LINK tdevbuildbase-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/script/Makefile.am b/buildtools/script/Makefile.am
index 542b1a69..a3d7652a 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 = 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
+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
 
-libkdevscriptproject_la_SOURCES = scriptprojectpart.cpp scriptoptionswidget.cpp scriptoptionswidgetbase.ui scriptnewfiledlg.cpp
+libtdevscriptproject_la_SOURCES = scriptprojectpart.cpp scriptoptionswidget.cpp scriptoptionswidgetbase.ui scriptnewfiledlg.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevscriptproject.desktop
+service_DATA = tdevscriptproject.desktop
 
-rcdir = $(kde_datadir)/kdevscriptproject
-rc_DATA = kdevscriptproject.rc
+rcdir = $(kde_datadir)/tdevscriptproject
+rc_DATA = tdevscriptproject.rc
diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp
index 9308792a..f254680e 100644
--- a/buildtools/script/scriptnewfiledlg.cpp
+++ b/buildtools/script/scriptnewfiledlg.cpp
@@ -81,7 +81,7 @@ void ScriptNewFileDialog::accept()
         return;
     }
 
-    KDevProject *project = m_part->project();
+    TDevProject *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 d80cd501..13049699 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 "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 
 
-ScriptOptionsWidget::ScriptOptionsWidget(KDevPlugin *part,
+ScriptOptionsWidget::ScriptOptionsWidget(TDevPlugin *part,
                                          TQWidget *parent, const char *name)
     : ScriptOptionsWidgetBase(parent, name)
 {
diff --git a/buildtools/script/scriptoptionswidget.h b/buildtools/script/scriptoptionswidget.h
index 8f136d75..086186cc 100644
--- a/buildtools/script/scriptoptionswidget.h
+++ b/buildtools/script/scriptoptionswidget.h
@@ -14,7 +14,7 @@
 
 #include "scriptoptionswidgetbase.h"
 
-class KDevPlugin;
+class TDevPlugin;
 
 
 class ScriptOptionsWidget : public ScriptOptionsWidgetBase
@@ -23,14 +23,14 @@ class ScriptOptionsWidget : public ScriptOptionsWidgetBase
   
     
 public:
-    ScriptOptionsWidget( KDevPlugin *part, TQWidget *parent=0, const char *name=0 );
+    ScriptOptionsWidget( TDevPlugin *part, TQWidget *parent=0, const char *name=0 );
     ~ScriptOptionsWidget();
 
 public slots:
     void accept();
 
 private:
-    KDevPlugin *m_part;
+    TDevPlugin *m_part;
 };
 
 #endif
diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp
index 8f6b5fb4..ef4fb16f 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 <kdevgenericfactory.h>
-#include <kdevcreatefile.h>
+#include <tdevgenericfactory.h>
+#include <tdevcreatefile.h>
 #include <kdirwatch.h>
 
 #include "domutil.h"
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
-#include "kdevpartcontroller.h"
-#include "kdevlanguagesupport.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
+#include "tdevpartcontroller.h"
+#include "tdevlanguagesupport.h"
 #include "scriptoptionswidget.h"
 #include "scriptnewfiledlg.h"
-#include "kdevplugininfo.h"
+#include "tdevplugininfo.h"
 
-typedef KDevGenericFactory<ScriptProjectPart> ScriptProjectFactory;
-static const KDevPluginInfo data("kdevscriptproject");
-K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) )
+typedef TDevGenericFactory<ScriptProjectPart> ScriptProjectFactory;
+static const TDevPluginInfo data("tdevscriptproject");
+K_EXPORT_COMPONENT_FACTORY( libtdevscriptproject, ScriptProjectFactory( data ) )
 
 ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart")
+    : TDevBuildTool(&data, parent, name ? name : "ScriptProjectPart")
 {
     setInstance(ScriptProjectFactory::instance());
 
-    setXMLFile("kdevscriptproject.rc");
+    setXMLFile("tdevscriptproject.rc");
 
     // only create new file action if file creation part not available
-    if (!extension<KDevCreateFile>("TDevelop/CreateFile")) {
+    if (!extension<TDevCreateFile>("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());
 
-    KDevProject::openProject( dirName, projectName );
+    TDevProject::openProject( dirName, projectName );
 }
 
 
@@ -192,7 +192,7 @@ DomUtil::PairList ScriptProjectPart::runEnvironmentVars() const
   */
 TQString ScriptProjectPart::runDirectory() const
 {
-    TQString cwd = defaultRunDirectory("kdevscriptproject");
+    TQString cwd = defaultRunDirectory("tdevscriptproject");
     if (cwd.isEmpty())
       cwd = buildDirectory();
     return cwd;
diff --git a/buildtools/script/scriptprojectpart.h b/buildtools/script/scriptprojectpart.h
index 92087991..2c3023ad 100644
--- a/buildtools/script/scriptprojectpart.h
+++ b/buildtools/script/scriptprojectpart.h
@@ -15,14 +15,14 @@
 #include <tqdict.h>
 #include <tqguardedptr.h>
 
-#include "kdevbuildtool.h"
+#include "tdevbuildtool.h"
 
 class TQListViewItem;
 class TQStringList;
 class KDialogBase;
 class ScriptProjectWidget;
 
-class ScriptProjectPart : public KDevBuildTool
+class ScriptProjectPart : public TDevBuildTool
 {
     Q_OBJECT
   
diff --git a/buildtools/script/kdevscriptproject.desktop b/buildtools/script/tdevscriptproject.desktop
index 6e135c16..9ba87c9f 100644
--- a/buildtools/script/kdevscriptproject.desktop
+++ b/buildtools/script/tdevscriptproject.desktop
@@ -83,5 +83,5 @@ GenericName[zh_CN]=脚本语言工程
 GenericName[zh_TW]=文稿語言專案
 ServiceTypes=TDevelop/Project
 Icon=tdevelop
-X-TDE-Library=libkdevscriptproject
+X-TDE-Library=libtdevscriptproject
 X-TDevelop-Version=5
diff --git a/buildtools/script/kdevscriptproject.rc b/buildtools/script/tdevscriptproject.rc
index 651b10b4..d15c3dc2 100644
--- a/buildtools/script/kdevscriptproject.rc
+++ b/buildtools/script/tdevscriptproject.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KDevCustomProject" version="2">
+<kpartgui name="TDevCustomProject" version="2">
 <MenuBar>
   <Menu name="file" >
     <Action name="file_newfile" />
diff --git a/configure.in.bot b/configure.in.bot
index 9b006e9e..6ee60dff 100644
--- a/configure.in.bot
+++ b/configure.in.bot
@@ -1,7 +1,7 @@
 if test "$DOT_FOUND" = "no"; then
   echo ""
   echo "You're missing the dot program."
-  echo "It is still possible to run and use KDevelop without it, but you will "
+  echo "It is still possible to run and use TDevelop without it, but you will "
   echo "not be able to use the new graphical classbrowser. In order to get "
   echo "a dot copy, go to www.graphviz.org and download the graphviz package."
 fi
@@ -18,7 +18,7 @@ fi
 if test -n "$VCSCOMPAT" -a -z "$SVN_SUBDIR"; then
   echo ""
   echo "You're missing Subversion libraries (1.x)"
-  echo "KDevelop subversion support will not work without it,"
+  echo "TDevelop subversion support will not work without it,"
   echo "consider installing it."
   echo ""
 fi
diff --git a/configure.in.in b/configure.in.in
index 0e9fa12a..769baa0c 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -124,4 +124,4 @@ esac
 
 dnl AC_CHECK_FILE([$qt_includes/qassistantclient.h], [],[AC_MSG_ERROR([The qassistantclient.h header from Qt3 is needed to build tdevelop, on some systems this header is in a separate package called qt3-apps-dev])])
 
-KDE_INIT_DOXYGEN([KDevelop], [Version $VERSION])
+KDE_INIT_DOXYGEN([TDevelop], [Version $VERSION])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8275eb30..440f3684 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = tdevelop std extras kde_app_devel kdevdesigner
+SUBDIRS = tdevelop std extras tde_app_devel tdevdesigner
 
diff --git a/doc/api/Architecture.dox b/doc/api/Architecture.dox
index ae4ef73d..52c1447a 100644
--- a/doc/api/Architecture.dox
+++ b/doc/api/Architecture.dox
@@ -40,7 +40,7 @@ parts to distinguish, mainly:
 
   - src            = The core part of KDevelop
   - lib/interfaces = Plugin handler interface classes
-  - parts          = The various parts using the KParts framework ( KDevPlugin children )
+  - parts          = The various parts using the KParts framework ( TDevPlugin children )
   - languages      = \ref language-parts
   - buildtools     = \ref buildtool-parts
   - vcs            = \ref vcs-parts
@@ -67,12 +67,12 @@ There are two types of possible main window objects:
    pre-arranged access tabs around user areas.
  .
 
-Both main window classes inherit from the KDevMainWindow class which provides
+Both main window classes inherit from the TDevMainWindow class which provides
 access to common window features.
 
 \subsubsection toplevel The TopLevel Object
 
-There is only one toplevel object of class KDevMainWindow in KDevelop. It can
+There is only one toplevel object of class TDevMainWindow in KDevelop. It can
 be accessed through the static function TopLevel::getInstance() (see the
 TopLevel class).
 
@@ -83,7 +83,7 @@ be viewed according to their functionalities as follows.
 
 \subsubsection language-parts Programming Language Support Parts
 
-These parts implement a KDevLanguageSupport Class interface.
+These parts implement a TDevLanguageSupport Class interface.
 To add support for a new programming language check the \ref howToAddProgrammingLanguages page (doc/api/HowToAddProgrammingLanguages.dox file).
 Take a look at \ref LangSupportStatus (doc/api/LangSupportStatus.dox file) to see the current status/features of the programming languages currently supported by KDevelop.
 
@@ -135,7 +135,7 @@ Take a look at \ref LangSupportStatus (doc/api/LangSupportStatus.dox file) to se
 
 \subsubsection buildtool-parts Build tools Parts
 
-These parts implement a KDevProject Class interface.
+These parts implement a TDevProject Class interface.
 
   - buildtools/ada = Ada build tool
     - (see AdaProjectPart)
@@ -166,7 +166,7 @@ These parts implement a KDevProject Class interface.
 
 \subsubsection vcs-parts VCS (Version Control System) Parts
 
-These parts implement a KDevVersionControl Class interface.
+These parts implement a TDevVersionControl Class interface.
 
   - vcs/cervisia = Cervisia Support
     - (see CervisiaPlugin)
@@ -211,7 +211,7 @@ Take a look at \ref EditorsSupportStatus (doc/api/EditorsSupportStatus.dox file)
 Some of the parts are considered global - that is, they effect the entire
 operation of KDevelop.
 
-These parts implement a KDevPlugin Class interface.
+These parts implement a TDevPlugin Class interface.
 
   - parts/appwizard = New Project Wizard
     - see AppWizardPart
@@ -264,7 +264,7 @@ These parts implement a KDevPlugin Class interface.
 
 \subsubsection project-specific-parts Project Specific Parts
 
-These parts implement a KDevPlugin Class interface.
+These parts implement a TDevPlugin Class interface.
 
   - parts/astyle = Source code formatter
     - (see AStylePart)
diff --git a/doc/api/FutureTasks.dox b/doc/api/FutureTasks.dox
index 1d7f7f26..763537f3 100644
--- a/doc/api/FutureTasks.dox
+++ b/doc/api/FutureTasks.dox
@@ -129,7 +129,7 @@
       the same border as other items (impossible)
     - Browser tool bar should truncate long menu entries so it doesn't
       take so much space (already implemented?)
-    - Extend KDevPlugin-API in order to have a preferred border for at
+    - Extend TDevPlugin-API in order to have a preferred border for at
       least the selection parts (Automake Manager, Class Browser, File
       Groups, etc...)
 
diff --git a/doc/api/HighPriTasks.dox b/doc/api/HighPriTasks.dox
index 062b3b06..7bcbaf1f 100644
--- a/doc/api/HighPriTasks.dox
+++ b/doc/api/HighPriTasks.dox
@@ -12,7 +12,7 @@
     This way the .tdevelop file can be shared in teams of developers.
 
 
-\section KDevelop2compat KDevelop 2 compatibility
+\section TDevelop2compat KDevelop 2 compatibility
 (These are things that must be accomplished before we can say that KDevelop 3
 &gt;= tdevelop 2.x UI-wise and functionality-wise!)
 
diff --git a/doc/api/HowToAddApplicationTemplates.dox b/doc/api/HowToAddApplicationTemplates.dox
index f53ce4f8..1da5a3e5 100644
--- a/doc/api/HowToAddApplicationTemplates.dox
+++ b/doc/api/HowToAddApplicationTemplates.dox
@@ -27,7 +27,7 @@ applications like kedit as well as plugins for example for tdevelop or noatun.\n
 
 \section templates_1 I. Example: How To Create a Simple KDE Application Template "KHello"
 
-You can find this template in <code>$TDEDIR/share/apps/kdevappwizard/template-khello</code>.
+You can find this template in <code>$TDEDIR/share/apps/tdevappwizard/template-khello</code>.
 
 \subsection templates_1_1 I.1. Step 1: Basic Skeleton
 
@@ -64,7 +64,7 @@ wizard will replace:
     - \%{YEAR} ........ by the year
     .
 </pre></code>
-All this can be found in <code>$TDEDIR/share/apps/kdevappwizard/template-common/tdevelop.pm</code>.
+All this can be found in <code>$TDEDIR/share/apps/tdevappwizard/template-common/tdevelop.pm</code>.
 \subsubsection templates_1_2a I.2.1. The Source Files
 
 The files <code>template-khello/app.cpp, template-khello/app.h</code> and
@@ -135,22 +135,22 @@ if  [ `id -u` = 0 ]; then
   # we are root so install the template into the global kde directory
   kde_dir=`tde-config --prefix`
 else
-  # we are a user so install it into $HOME/.trinity/share/apps/kdevappwizard directory
+  # we are a user so install it into $HOME/.trinity/share/apps/tdevappwizard directory
   kde_dir=`tde-config --localprefix`
   echo "Note: It would be better to install as root. Press CTRL+C to abort"
 fi
 
 # use usual path or another one?
-echo "Install dir [${kde_dir}/share/apps/kdevappwizard]:"
+echo "Install dir [${kde_dir}/share/apps/tdevappwizard]:"
 read newdir
 
-if [ "$newdir"a = a ]; then newdir="${kde_dir}/share/apps/kdevappwizard/"; fi
+if [ "$newdir"a = a ]; then newdir="${kde_dir}/share/apps/tdevappwizard/"; fi
 
 # make sure the directories exist
 if [ ! -e "${newdir}/template-khello" ]; then mkdir -p "${newdir}/template-khello" ; fi;
 if [ ! -e "${newdir}/templates" ]; then mkdir -p "${newdir}/templates" ; fi;
 if [ ! -e "${newdir}" ]; then mkdir -p "$newdir" ; fi;
-if [ ! -e "${newdir}/template-common" ]; then ln -s "${kde_prefix}/share/apps/kdevappwizard/template-common" "${newdir}/template-common" ; fi;
+if [ ! -e "${newdir}/template-common" ]; then ln -s "${kde_prefix}/share/apps/tdevappwizard/template-common" "${newdir}/template-common" ; fi;
 
 # install now
 cp -R --target-directory "$newdir" template-khello
diff --git a/doc/api/HowToAddGenericBuildTools.dox b/doc/api/HowToAddGenericBuildTools.dox
index b073cf0f..d713082a 100644
--- a/doc/api/HowToAddGenericBuildTools.dox
+++ b/doc/api/HowToAddGenericBuildTools.dox
@@ -6,7 +6,7 @@
 
 This part offers build tool facilities using project files in xml format (dtd is located in buildtools/generic/kdevxmlproject.dtd).
 Those xml files can be converted into makefiles, ant xml files or simply shell scripts using build system plugins.
-Build system plugin is an object that implements KDevBuildSystem interface.
+Build system plugin is an object that implements TDevBuildSystem interface.
 Build system plugins are located in buildtools/generic/buildsystem.
 
 \section sectionStep1 Step 1: Make your plugin loadable
diff --git a/doc/api/HowToAddPlugins.dox b/doc/api/HowToAddPlugins.dox
index fa7f74e2..b0b282db 100644
--- a/doc/api/HowToAddPlugins.dox
+++ b/doc/api/HowToAddPlugins.dox
@@ -8,7 +8,7 @@
 
 For a plugin <code>foo</code>, create a file <code>foo.desktop</code> which contains KDevelop/Part in its list of ServiceTypes.
 
-  - See <code>parts/doctreeview/kdevdoctreeview.desktop</code> for an example.
+  - See <code>parts/doctreeview/tdevdoctreeview.desktop</code> for an example.
   .
 
 If you install this file into <code>\$(kde_servicesdir)</code>, your plugin will automatically be loaded.
@@ -80,9 +80,9 @@ See <code>parts/doctreeview/doctreeviewfactory.cpp</code> for an example.
 
 \section implementPart Step 3: Implement your part.
 
-Your part must be derived from <code>KDevPlugin</code>.
+Your part must be derived from <code>TDevPlugin</code>.
 
-  - KDevPlugin takes two arguments:
+  - TDevPlugin takes two arguments:
     - 1) A <i>parent</i> argument. This also comes from
 	  <code>createPartObject()</code>.
 	- 2) A <i>name</i>, which in turn is given to the <code>QObject</code>
@@ -93,7 +93,7 @@ Your part must be derived from <code>KDevPlugin</code>.
 \subsection accessIDE How to access other IDE components
 
 A part can access other components of the IDE via some accessors
-of <code>KDevPlugin</code>:
+of <code>TDevPlugin</code>:
 
   - The <i>application core</i> via <code>core()</code>,
   - the <i>build tools</i> via <code>project()</code>,
@@ -155,7 +155,7 @@ to write it back.
 
 \subsection sessionAccess Project session file (*.kdevses)
 
-The base class of all TDevelop plugins is KDevPlugin. It provides two virtual methods 
+The base class of all TDevelop plugins is TDevPlugin. It provides two virtual methods 
 restorePartialProjectSession(..) and savePartialProjectSession(..)
 that you should reimplement in your special plugin to attach to session loading and saving.
 
diff --git a/doc/api/HowToAddProgrammingLanguages.dox b/doc/api/HowToAddProgrammingLanguages.dox
index a5840885..5dd44fda 100644
--- a/doc/api/HowToAddProgrammingLanguages.dox
+++ b/doc/api/HowToAddProgrammingLanguages.dox
@@ -6,7 +6,7 @@
 
 \section LSupport List of things to have "complete" support of a given language in KDevelop
 
-  - Implement interface KDevLanguageSupport
+  - Implement interface TDevLanguageSupport
   - \ref sectionClassWizard
   - \ref sectionAttributeMethodWizard
   - \ref sectionQtUiSubclassing - (if the language has Qt bindings)
@@ -43,7 +43,7 @@ Take a look at \ref LangSupportStatus (doc/api/LangSupportStatus.dox file) to se
 \section sectionLanguageSupport Language Support
 
 Any language support should be written as a tdevelop part and implement
-KDevLanguageSupport interface (<code>lib/interfaces/kdevlanguagesupport.h</code>).
+TDevLanguageSupport interface (<code>lib/interfaces/tdevlanguagesupport.h</code>).
 
 Implementing methods:
  - <code>virtual Features features();</code>
@@ -54,7 +54,7 @@ Should be enough for a language support to start working.
 
 KDevelop ships with KDevLang project template. It is a simple language support prototype that can be used when developing language support plugins with KDevelop.
 To use it, start a New Project and select: <code>C++->KDevelop->KDevelop Language Support Plugin</code> in the application wizard.
-The template is located in <code>languages/cpp/app_templates/kdevlang</code>, you can change it there if you need.
+The template is located in <code>languages/cpp/app_templates/tdevlang</code>, you can change it there if you need.
 
 
 You should look at <code>languages/ruby</code> for a simple language support
@@ -177,7 +177,7 @@ write a <b>Debugger </b>. KDevelop already provides GDB support
 \subsection sectionCompilerPlugins Compiler plugins
 
 There is an ability to create compiler plugin for KDevelop. Compiler plugin provides the compiler configuration dialog which implements command line compiler options.
-Compiler plugins must implement KDevCompilerOptions interface.
+Compiler plugins must implement TDevCompilerOptions interface.
 
 
 \section MiscInf Other Info
@@ -226,7 +226,7 @@ currently provides several build tools. They are:
     - see GenericProjectPart at <code>buildtools/generic</code>
     - Offers build tool facilities using project files in xml format (dtd is located in <code>buildtools/generic/kdevxmlproject.dtd</code>).
       Those xml files can be converted into makefiles, ant xml files or simply shell scripts using build system plugins.
-      Build system plugin is an object that implements KDevBuildSystem interface. Build system plugins are located in <code>buildtools/generic/buildsystem</code>.
+      Build system plugin is an object that implements TDevBuildSystem interface. Build system plugins are located in <code>buildtools/generic/buildsystem</code>.
     .
   - QMake build tool
     - see TrollProjectPart at <code>buildtools/qmake</code>
diff --git a/doc/api/HowToDocument.dox b/doc/api/HowToDocument.dox
index d606a8bf..65cd7c31 100644
--- a/doc/api/HowToDocument.dox
+++ b/doc/api/HowToDocument.dox
@@ -3,7 +3,7 @@
   */
 /** \page howToDocument How to document KDevelop parts
 
-You should add a README and a README.dox file to your part (KDevPlugin).
+You should add a README and a README.dox file to your part (TDevPlugin).
 
 On the README file put this text:
 \verbatim
@@ -31,7 +31,7 @@ implements your part.
 
 On the area marked with <code>...</code> you can add optional informations. Here is an example of that:
 
-\verbinclude languages/cpp/app_templates/kdevpart/README.dox
+\verbinclude languages/cpp/app_templates/tdevpart/README.dox
 
 All these infos are optional and you should only add the link to the bugzilla database if YOUR_COMPONENT_NAME
 has been defined in that database.
diff --git a/doc/extras/CMakeLists.txt b/doc/extras/CMakeLists.txt
index dd7c977f..a358cf07 100644
--- a/doc/extras/CMakeLists.txt
+++ b/doc/extras/CMakeLists.txt
@@ -14,5 +14,5 @@ add_subdirectory( w3c )
 install(
   FILES
     sdl.toc opengl.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs
 )
diff --git a/doc/extras/Makefile.am b/doc/extras/Makefile.am
index 0e7893c4..deb28a1a 100644
--- a/doc/extras/Makefile.am
+++ b/doc/extras/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=w3c
 
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = sdl.toc opengl.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/doc/extras/w3c/CMakeLists.txt b/doc/extras/w3c/CMakeLists.txt
index 7424e5fd..9681021f 100644
--- a/doc/extras/w3c/CMakeLists.txt
+++ b/doc/extras/w3c/CMakeLists.txt
@@ -12,5 +12,5 @@
 install(
   FILES
     w3c-dom-level2-html.toc w3c-svg.toc w3c-uaag10.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs
 )
diff --git a/doc/extras/w3c/Makefile.am b/doc/extras/w3c/Makefile.am
index 19518e8d..68a489f8 100644
--- a/doc/extras/w3c/Makefile.am
+++ b/doc/extras/w3c/Makefile.am
@@ -1,3 +1,3 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = w3c-dom-level2-html.toc w3c-svg.toc w3c-uaag10.toc
 
diff --git a/doc/platform/Mainpage.dox b/doc/platform/Mainpage.dox
index 29f6deb0..ae377ddf 100644
--- a/doc/platform/Mainpage.dox
+++ b/doc/platform/Mainpage.dox
@@ -81,11 +81,11 @@ KDevelop Technotes</a>.
 
 \section langapi Programming Language Support API
 
-- <a href="kdevlanginterfaces/html/index.html"><b>Language Support Interfaces Library</b></a>
-   (<a href="kdevlanginterfaces/html/classes.html">classes</a>)\n
+- <a href="tdevlanginterfaces/html/index.html"><b>Language Support Interfaces Library</b></a>
+   (<a href="tdevlanginterfaces/html/classes.html">classes</a>)\n
    <i>Interfaces for KDevelop language support facilities.</i>
-- <a href="kdevlangdebugger/html/index.html"><b>Debugger Support Library</b></a>
-   (<a href="kdevlangdebugger/html/classes.html">classes</a>)\n
+- <a href="tdevlangdebugger/html/index.html"><b>Debugger Support Library</b></a>
+   (<a href="tdevlangdebugger/html/classes.html">classes</a>)\n
    <i>Classes to implement debugger support for a programming language.</i>
 .
 
@@ -110,8 +110,8 @@ KDevelop Technotes</a>.
 
 \section shellapi Shell API
 
-- <a href="kdevshellsrc/html/index.html"><b>Generic Shell</b></a>
-   (<a href="kdevshellsrc/html/classes.html">classes</a>)\n
+- <a href="tdevshellsrc/html/index.html"><b>Generic Shell</b></a>
+   (<a href="tdevshellsrc/html/classes.html">classes</a>)\n
    <i>The Shell - a profile-based implementation of TDevelop plugin architecture.</i>
 - <a href="kdevprofileslib/html/index.html"><b>Shell Profiles Library</b></a>
    (<a href="kdevprofileslib/html/classes.html">classes</a>)\n
diff --git a/doc/std/CMakeLists.txt b/doc/std/CMakeLists.txt
index 3c034ee5..edb0d2a8 100644
--- a/doc/std/CMakeLists.txt
+++ b/doc/std/CMakeLists.txt
@@ -11,6 +11,6 @@
 
 install(
   FILES
-    kdev3api.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs
+    tdev3api.toc
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs
 )
diff --git a/doc/std/Makefile.am b/doc/std/Makefile.am
index 07f12cde..7b636e47 100644
--- a/doc/std/Makefile.am
+++ b/doc/std/Makefile.am
@@ -1,5 +1,5 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
-toc_DATA = kdev3api.toc
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
+toc_DATA = tdev3api.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
 #index_DATA = 
diff --git a/doc/std/kdev3api.toc b/doc/std/tdev3api.toc
index ef1c82dc..ef1c82dc 100644
--- a/doc/std/kdev3api.toc
+++ b/doc/std/tdev3api.toc
diff --git a/doc/kde_app_devel/CMakeLists.txt b/doc/tde_app_devel/CMakeLists.txt
index 243887d5..83e96ce9 100644
--- a/doc/kde_app_devel/CMakeLists.txt
+++ b/doc/tde_app_devel/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kde_app_devel )
+tde_create_handbook( DESTINATION tde_app_devel )
diff --git a/doc/kdearch/Makefile.am b/doc/tde_app_devel/Makefile.am
index 171f575c..171f575c 100644
--- a/doc/kdearch/Makefile.am
+++ b/doc/tde_app_devel/Makefile.am
diff --git a/doc/kde_app_devel/appwizard.png b/doc/tde_app_devel/appwizard.png
index adbadb35..adbadb35 100644
--- a/doc/kde_app_devel/appwizard.png
+++ b/doc/tde_app_devel/appwizard.png
diff --git a/doc/kde_app_devel/index.docbook b/doc/tde_app_devel/index.docbook
index 2d913c0b..e212e4e6 100644
--- a/doc/kde_app_devel/index.docbook
+++ b/doc/tde_app_devel/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY tdevelop "<application>KDevelop</application>">
+  <!ENTITY tdevelop "<application>TDevelop</application>">
   <!ENTITY kappname "&tdevelop;">
   <!ENTITY % addindex "INCLUDE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -47,7 +47,7 @@ the &tdevelop; IDE</para>
 
 <keywordset>
 <keyword>KDE</keyword>
-<keyword>KDevelop</keyword>
+<keyword>TDevelop</keyword>
 <keyword>IDE</keyword>
 <keyword>development</keyword>
 <keyword>programming</keyword>
@@ -85,7 +85,7 @@ review of the functionality provided by the IDE.
 <title>About this Handbook</title>
 <para>
 This handbook has been written to give developers an introduction into KDE application development by 
-using the KDevelop Integrated Development Environment. 
+using the TDevelop Integrated Development Environment. 
 </para>
 <para>
 The following chapters therefore give an introduction on how to create projects, explains the sourcecode 
@@ -135,7 +135,7 @@ You will learn how to:
 Additional information about Qt/KDE programming is available by various sources:
 <itemizedlist>
 <listitem><para>Programming with Qt by Matthias Kalle Dalheimer</para></listitem>
-<listitem><para><ulink url="www.kdevelop.org">The User Manual to KDevelop, provided with the TDevelop IDE</ulink></para></listitem>
+<listitem><para><ulink url="www.kdevelop.org">The User Manual to TDevelop, provided with the TDevelop IDE</ulink></para></listitem>
 <listitem><para><ulink url="doc.trolltech.com">The Online Reference to the Qt library</ulink></para></listitem>
 <listitem><para><ulink url="developer.kde.org">The KDE Developer web site</ulink></para></listitem>
 </itemizedlist>
@@ -147,7 +147,7 @@ Unix Systems as well as about the C and C++ programming language.
 </para>
 <para>
 For obtaining help about the TDevelop IDE, you should send requests to our mailinglist at 
-<email>kdevelop@kdevelop.org</email>. Mind that the KDevelop team is dedicated to provide the means to enable you to 
+<email>kdevelop@kdevelop.org</email>. Mind that the TDevelop team is dedicated to provide the means to enable you to 
 program applications and therefore is not intended as a technical support team in cases where the 
 applications you're developing don't work due to implementation errors or misconfigurations of your 
 operating system. By this, we ask all users to take advantage of the mailinglist in any case you're running 
@@ -697,7 +697,7 @@ what in later steps.
 </para>
 <para>
 This chapter makes the assumption that you understand the basic navigation of &tdevelop;.  Consult the
-KDevelop User Manual for information if you need it.
+TDevelop User Manual for information if you need it.
 </para>
 <para>
 The Automake manager shows the project files as follows:
diff --git a/doc/kde_app_devel/kscribblefiles.png b/doc/tde_app_devel/kscribblefiles.png
index 1591b3cf..1591b3cf 100644
--- a/doc/kde_app_devel/kscribblefiles.png
+++ b/doc/tde_app_devel/kscribblefiles.png
diff --git a/doc/tdearch/Makefile.am b/doc/tdearch/Makefile.am
new file mode 100644
index 00000000..171f575c
--- /dev/null
+++ b/doc/tdearch/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = AUTO
diff --git a/doc/kdearch/affine-general.png b/doc/tdearch/affine-general.png
index 8e59d5e5..8e59d5e5 100644
--- a/doc/kdearch/affine-general.png
+++ b/doc/tdearch/affine-general.png
diff --git a/doc/kdearch/affine-rotate.png b/doc/tdearch/affine-rotate.png
index 7192ed9c..7192ed9c 100644
--- a/doc/kdearch/affine-rotate.png
+++ b/doc/tdearch/affine-rotate.png
diff --git a/doc/kdearch/affine-scale.png b/doc/tdearch/affine-scale.png
index 0b52fd4c..0b52fd4c 100644
--- a/doc/kdearch/affine-scale.png
+++ b/doc/tdearch/affine-scale.png
diff --git a/doc/kdearch/affine-shear.png b/doc/tdearch/affine-shear.png
index 1ed5fbd8..1ed5fbd8 100644
--- a/doc/kdearch/affine-shear.png
+++ b/doc/tdearch/affine-shear.png
diff --git a/doc/kdearch/affine-translate.png b/doc/tdearch/affine-translate.png
index 87265e30..87265e30 100644
--- a/doc/kdearch/affine-translate.png
+++ b/doc/tdearch/affine-translate.png
diff --git a/doc/kdearch/brushstyles.png b/doc/tdearch/brushstyles.png
index b6df50ca..b6df50ca 100644
--- a/doc/kdearch/brushstyles.png
+++ b/doc/tdearch/brushstyles.png
diff --git a/doc/kdearch/canvas.png b/doc/tdearch/canvas.png
index dd83dae9..dd83dae9 100644
--- a/doc/kdearch/canvas.png
+++ b/doc/tdearch/canvas.png
diff --git a/doc/kdearch/capflat.png b/doc/tdearch/capflat.png
index 5e1c92ce..5e1c92ce 100644
--- a/doc/kdearch/capflat.png
+++ b/doc/tdearch/capflat.png
diff --git a/doc/kdearch/capround.png b/doc/tdearch/capround.png
index 0e66eaac..0e66eaac 100644
--- a/doc/kdearch/capround.png
+++ b/doc/tdearch/capround.png
diff --git a/doc/kdearch/capsquare.png b/doc/tdearch/capsquare.png
index 35724a72..35724a72 100644
--- a/doc/kdearch/capsquare.png
+++ b/doc/tdearch/capsquare.png
diff --git a/doc/kdearch/index.docbook b/doc/tdearch/index.docbook
index 97dee33d..3bc09158 100644
--- a/doc/kdearch/index.docbook
+++ b/doc/tdearch/index.docbook
@@ -1965,7 +1965,7 @@ EXTRA_DIST = $(kde_servicesdir_DATA)
 
 <para>
 The content of the following example file
-<filename>kdevdoxygen.desktop</filename> defines the
+<filename>tdevdoxygen.desktop</filename> defines the
 <literal>KDevDoxygen</literal> plugin with the service type
 <literal>TDevelop/Part</literal>:
 </para>
@@ -1976,7 +1976,7 @@ Type=Service
 Comment=Doxygen
 Name=KDevDoxygen
 ServiceTypes=TDevelop/Part
-X-TDE-Library=libkdevdoxygen
+X-TDE-Library=libtdevdoxygen
 X-TDevelop-ProgrammingLanguages=C,C++,Java
 X-TDevelop-Scope=Project
 </programlisting>
@@ -1992,7 +1992,7 @@ the library must contain the following function:
 
 <programlisting>
 extern "C" {
-    void *init_libkdevdoxygen()
+    void *init_libtdevdoxygen()
     {
         return new DoxygenFactory;
     }
diff --git a/doc/kdearch/joinbevel.png b/doc/tdearch/joinbevel.png
index 584b6bd4..584b6bd4 100644
--- a/doc/kdearch/joinbevel.png
+++ b/doc/tdearch/joinbevel.png
diff --git a/doc/kdearch/joinmiter.png b/doc/tdearch/joinmiter.png
index e5d94b13..e5d94b13 100644
--- a/doc/kdearch/joinmiter.png
+++ b/doc/tdearch/joinmiter.png
diff --git a/doc/kdearch/joinround.png b/doc/tdearch/joinround.png
index 9a8bbe93..9a8bbe93 100644
--- a/doc/kdearch/joinround.png
+++ b/doc/tdearch/joinround.png
diff --git a/doc/kdearch/konqi-mirrored.png b/doc/tdearch/konqi-mirrored.png
index 5145c0ee..5145c0ee 100644
--- a/doc/kdearch/konqi-mirrored.png
+++ b/doc/tdearch/konqi-mirrored.png
diff --git a/doc/kdearch/konqi-normal.png b/doc/tdearch/konqi-normal.png
index c16e1475..c16e1475 100644
--- a/doc/kdearch/konqi-normal.png
+++ b/doc/tdearch/konqi-normal.png
diff --git a/doc/kdearch/konqi-rotated.png b/doc/tdearch/konqi-rotated.png
index 157e82dd..157e82dd 100644
--- a/doc/kdearch/konqi-rotated.png
+++ b/doc/tdearch/konqi-rotated.png
diff --git a/doc/kdearch/konqi-sheared.png b/doc/tdearch/konqi-sheared.png
index ee645f87..ee645f87 100644
--- a/doc/kdearch/konqi-sheared.png
+++ b/doc/tdearch/konqi-sheared.png
diff --git a/doc/kdearch/kview-menu.png b/doc/tdearch/kview-menu.png
index 0e57e721..0e57e721 100644
--- a/doc/kdearch/kview-menu.png
+++ b/doc/tdearch/kview-menu.png
diff --git a/doc/kdearch/opengl.png b/doc/tdearch/opengl.png
index 2489777d..2489777d 100644
--- a/doc/kdearch/opengl.png
+++ b/doc/tdearch/opengl.png
diff --git a/doc/kdearch/penstyles.png b/doc/tdearch/penstyles.png
index 7e976bcd..7e976bcd 100644
--- a/doc/kdearch/penstyles.png
+++ b/doc/tdearch/penstyles.png
diff --git a/doc/kdearch/whatsthis.png b/doc/tdearch/whatsthis.png
index 4bdba093..4bdba093 100644
--- a/doc/kdearch/whatsthis.png
+++ b/doc/tdearch/whatsthis.png
diff --git a/doc/tdevassistant/CMakeLists.txt b/doc/tdevassistant/CMakeLists.txt
new file mode 100644
index 00000000..caa4d7b8
--- /dev/null
+++ b/doc/tdevassistant/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdevassistant )
diff --git a/doc/kde_app_devel/Makefile.am b/doc/tdevassistant/Makefile.am
index 41691557..41691557 100644
--- a/doc/kde_app_devel/Makefile.am
+++ b/doc/tdevassistant/Makefile.am
diff --git a/doc/tdevassistant/index.docbook b/doc/tdevassistant/index.docbook
new file mode 100644
index 00000000..065276f9
--- /dev/null
+++ b/doc/tdevassistant/index.docbook
@@ -0,0 +1,65 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY tdevassistant "<application>TDevAssistant</application>">
+  <!ENTITY kappname "&tdevassistant;">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<!-- Note: When updating this empty handbook, remember that usually most handbooks -->
+<!-- use the book model rather than article. Feel free to use article if the new handbook -->
+<!-- remains really short. -->
+
+<article lang="&language;">
+<title>The &tdevassistant; Handbook</title>
+
+<articleinfo>
+<title>The &tdevassistant; Handbook</title>
+
+<authorgroup>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<!-- <legalnotice>&FDLNotice;</legalnotice> -->
+
+<abstract>
+<para>
+&tdevassistant; is a development documentation viewer for &tde;.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="apologies">
+<title>We Apologize</title>
+<para>No documentation has yet been written for &tdevassistant;.</para>
+
+<para>If you need help, please check <ulink url="http://www.trinitydesktop.org">The &tde;
+web site</ulink>, submit questions to the <ulink url="http://www.trinitydesktop.org/mailinglist.php">
+&tde; mail lists</ulink>, or file a bug report at the <ulink url="http://bugs.trinitydesktop.org/">
+&tde; bug tracker</ulink>.</para>
+
+<para>If you are interested in helping, please consider writing the help file.
+Submitting a basic text file is acceptable as the &tde-team; will convert the text.</para>
+
+<para>Thank you for helping and thank you for your patience.</para>
+
+&underFDL;
+
+</sect1>
+
+&documentation.index; 
+</article>
diff --git a/doc/kdevdesigner/CMakeLists.txt b/doc/tdevdesigner/CMakeLists.txt
index db314d97..d8d93cbb 100644
--- a/doc/kdevdesigner/CMakeLists.txt
+++ b/doc/tdevdesigner/CMakeLists.txt
@@ -6,4 +6,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kdevdesigner )
+tde_create_handbook( DESTINATION tdevdesigner )
diff --git a/doc/kdevdesigner/Makefile.am b/doc/tdevdesigner/Makefile.am
index 41691557..41691557 100644
--- a/doc/kdevdesigner/Makefile.am
+++ b/doc/tdevdesigner/Makefile.am
diff --git a/doc/kdevdesigner/index.docbook b/doc/tdevdesigner/index.docbook
index c903aa65..3bfdf384 100644
--- a/doc/kdevdesigner/index.docbook
+++ b/doc/tdevdesigner/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kdevdesigner "<application>KDevDesigner</application>">
-  <!ENTITY kappname "&kdevdesigner;">
+  <!ENTITY tdevdesigner "<application>TDevDesigner</application>">
+  <!ENTITY kappname "&tdevdesigner;">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
 ]>
@@ -11,10 +11,10 @@
 <!-- remains really short. -->
 
 <article lang="&language;">
-<title>The &kdevdesigner; Handbook</title>
+<title>The &tdevdesigner; Handbook</title>
 
 <articleinfo>
-<title>The &kdevdesigner; Handbook</title>
+<title>The &tdevdesigner; Handbook</title>
 
 <authorgroup>
 <author>&tde-authors;</author>
@@ -33,7 +33,7 @@
 
 <abstract>
 <para>
-&kdevdesigner; is a GUI designer environment for &tde;.
+&tdevdesigner; is a GUI designer environment for &tde;.
 </para>
 </abstract>
 
@@ -45,7 +45,7 @@
 
 <sect1 id="apologies">
 <title>We Apologize</title>
-<para>No documentation has yet been written for &kdevdesigner;.</para>
+<para>No documentation has yet been written for &tdevdesigner;.</para>
 
 <para>If you need help, please check <ulink url="http://www.trinitydesktop.org">The &tde;
 web site</ulink>, submit questions to the <ulink url="http://www.trinitydesktop.org/mailinglist.php">
diff --git a/doc/tdevelop/app-files.docbook b/doc/tdevelop/app-files.docbook
index 547010ec..736baf16 100644
--- a/doc/tdevelop/app-files.docbook
+++ b/doc/tdevelop/app-files.docbook
@@ -56,7 +56,7 @@ Most &tdevelop; features are provided by KParts. These are basically application
 </para>
 
 <para>
-There are quite a lot of default configuration subdirectories in <filename class="directory">$<envar>TDEDIR</envar>/share/apps/</filename> whose names all start with a <filename>kdev</filename> sequence. Most of them are for &tdevelop; internal use only. They might be deliberately grouped for readability as:
+There are quite a lot of default configuration subdirectories in <filename class="directory">$<envar>TDEDIR</envar>/share/apps/</filename> whose names all start with a <filename>tdev</filename> sequence. Most of them are for &tdevelop; internal use only. They might be deliberately grouped for readability as:
 <simplelist>
   <member><link linkend="app-files-default-apps-stdalone">Stand-alone Applications</link></member>
   <member><link linkend="app-files-default-apps-task">Task Specific Parts</link></member>
@@ -76,25 +76,25 @@ There are quite a lot of default configuration subdirectories in <filename class
         <listitem><para><filename class="directory">profiles/</filename> &mdash; contains default plugin profile settings. (Currently there is only a <filename>tiny</filename> profile provided which defines a minimum set of active &tdevelop; plugins.)</para></listitem>
         <listitem><para><filename>eventsrc</filename> &mdash; holds a lot of <quote>Process successful</quote> localization strings.</para></listitem>
         <listitem><para><filename>tdevelopui.rc</filename> &mdash; provides the basic menu and tool bar entries &tdevelop; uses.</para></listitem>
-        <listitem><para><filename>kdevhtml_partui.rc</filename> &mdash; provides a <guimenuitem>Print...</guimenuitem> entry in the <guimenu>File</guimenu> menu, a <guimenuitem>Copy</guimenuitem> entry in the <guimenu>Edit</guimenu> menu, and <guilabel>Back</guilabel> and <guilabel>Forward</guilabel> arrows in the <guilabel>Browser Toolbar</guilabel> in case a &HTML; file is browsed from the <guilabel>Documentation</guilabel> plugin.</para></listitem>
+        <listitem><para><filename>tdevhtml_partui.rc</filename> &mdash; provides a <guimenuitem>Print...</guimenuitem> entry in the <guimenu>File</guimenu> menu, a <guimenuitem>Copy</guimenuitem> entry in the <guimenu>Edit</guimenu> menu, and <guilabel>Back</guilabel> and <guilabel>Forward</guilabel> arrows in the <guilabel>Browser Toolbar</guilabel> in case a &HTML; file is browsed from the <guilabel>Documentation</guilabel> plugin.</para></listitem>
       </itemizedlist>
     </listitem>
-    <listitem><para><filename class="directory">kdevassistant/</filename> &mdash; provides the menu and tool bars of the stand-alone &tdevelop; Assistant documentation browser.</para></listitem>
-    <listitem><para><filename class="directory">kdevdesigner/</filename> and <filename class="directory">kdevdesignerpart/</filename> &mdash; provide menu bar and tool bars of the stand-alone &tdevelop; user interface designer.</para></listitem>
+    <listitem><para><filename class="directory">tdevassistant/</filename> &mdash; provides the menu and tool bars of the stand-alone &tdevelop; Assistant documentation browser.</para></listitem>
+    <listitem><para><filename class="directory">tdevdesigner/</filename> and <filename class="directory">tdevdesignerpart/</filename> &mdash; provide menu bar and tool bars of the stand-alone &tdevelop; user interface designer.</para></listitem>
   </itemizedlist></listitem>
 
   <listitem><itemizedlist id="app-files-default-apps-task">
     <title>Task Specific Parts</title>
     <listitem id="app-files-default-abbrev">
-      <para><filename class="directory">kdevabbrev/</filename> &mdash; contains files used by the <guilabel>Abbreviation Expansion</guilabel> plugin:</para>
+      <para><filename class="directory">tdevabbrev/</filename> &mdash; contains files used by the <guilabel>Abbreviation Expansion</guilabel> plugin:</para>
       <itemizedlist>
         <listitem><para><filename class="directory">sources/</filename> &mdash; contains keyword definition files used by the <guilabel>Expand Text</guilabel> command.</para></listitem>
         <listitem><para><filename class="directory">templates/</filename> &mdash; contains template definition files used by the <guilabel>Expand Abbreviation</guilabel> command.</para></listitem>
-        <listitem><para><filename>kdevabbrev.rc</filename> &mdash; provides the <guimenuitem>Expand Text</guimenuitem> and <guimenuitem>Expand Abbreviation</guimenuitem> entries in the <guimenu>Edit</guimenu> menu.</para></listitem>
+        <listitem><para><filename>tdevabbrev.rc</filename> &mdash; provides the <guimenuitem>Expand Text</guimenuitem> and <guimenuitem>Expand Abbreviation</guimenuitem> entries in the <guimenu>Edit</guimenu> menu.</para></listitem>
 </itemizedlist>
     </listitem>
     <listitem id="app-files-default-appwizard">
-      <para><filename class="directory">kdevappwizard/</filename> &mdash; contains files used by the &appwizard; part:</para>
+      <para><filename class="directory">tdevappwizard/</filename> &mdash; contains files used by the &appwizard; part:</para>
       <itemizedlist>
         <listitem><para><filename class="directory">importfiles/</filename> &mdash; contains <filename>.tdevelop</filename> project files which control the initialization of a new project.</para></listitem>
         <listitem><para><filename class="directory">imports/</filename> &mdash; contains templates to set up project specific <filename>.desktop</filename> files.</para></listitem>
@@ -104,89 +104,89 @@ There are quite a lot of default configuration subdirectories in <filename class
         <listitem><para><filename>*.tar.gz</filename> &mdash; tarballs containing the source files to be included in a new generated project directory.</para></listitem>
       </itemizedlist>
     </listitem>
-    <listitem><para><filename class="directory">kdevastyle/</filename> &mdash; provides the <guimenuitem>Reformat Source</guimenuitem> entry in the <guimenu>Edit</guimenu> menu.</para></listitem>
-    <listitem><para><filename class="directory">kdevautoproject/</filename> &mdash; provides most of the entries in the <guimenu>Build</guimenu> menu and the <guilabel>Build Toolbar (&tdevelop;)</guilabel> toolbar.</para></listitem>
+    <listitem><para><filename class="directory">tdevastyle/</filename> &mdash; provides the <guimenuitem>Reformat Source</guimenuitem> entry in the <guimenu>Edit</guimenu> menu.</para></listitem>
+    <listitem><para><filename class="directory">tdevautoproject/</filename> &mdash; provides most of the entries in the <guimenu>Build</guimenu> menu and the <guilabel>Build Toolbar (&tdevelop;)</guilabel> toolbar.</para></listitem>
     <listitem>
-      <para><filename class="directory">kdevclassview/</filename> &mdash; contains files used by the <guilabel>Class View</guilabel> project plugin:</para>
+      <para><filename class="directory">tdevclassview/</filename> &mdash; contains files used by the <guilabel>Class View</guilabel> project plugin:</para>
       <itemizedlist>
         <listitem><para><filename class="directory">pics/</filename> &mdash; contains the icons used in the <guilabel>Classes</guilabel> classview tree.</para></listitem>
-        <listitem><para><filename>kdevclassview.tc</filename> &mdash; provides the <guimenuitem>Class Inheritance Diagram</guimenuitem> entry in the <guimenu>Projects</guimenu> menu as well as the classes navigation combo box in the <guilabel>Browser Toolbar</guilabel>.</para></listitem>
+        <listitem><para><filename>tdevclassview.tc</filename> &mdash; provides the <guimenuitem>Class Inheritance Diagram</guimenuitem> entry in the <guimenu>Projects</guimenu> menu as well as the classes navigation combo box in the <guilabel>Browser Toolbar</guilabel>.</para></listitem>
       </itemizedlist>
     </listitem>
-    <listitem><para><filename class="directory">kdevcloser/</filename> &mdash; provides the <guimenu>Windows</guimenu> menu close entries.</para></listitem>
-    <listitem><para><filename class="directory">kdevctags/</filename> &mdash; provides the <guimenuitem>CTags</guimenuitem> entry in the <guimenu>Tools</guimenu> menu for the <guilabel>CTags Frontend</guilabel> project plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevcvsservice/</filename> &mdash; provides the icon used by the <guilabel>CvsService</guilabel> tab and a short shell script used to add a new entry to the &cvs; repository, both used by the <guilabel>CVS Integration</guilabel> project plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevdebugger/</filename> &mdash; provides the <guimenu>Debug</guimenu> menu entries for the <guilabel>Debugger Frontend</guilabel> project plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevdiff/</filename> &mdash; provides the <guimenuitem>Difference Viewer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu.</para></listitem>
-    <listitem><para><filename class="directory">kdevdistpart/</filename> &mdash; provides the <guimenuitem>Distribution &amp; Publishing</guimenuitem> entry in the <guimenu>Project</guimenu> menu for the <guilabel>Final Packaging Support</guilabel> project plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevcloser/</filename> &mdash; provides the <guimenu>Windows</guimenu> menu close entries.</para></listitem>
+    <listitem><para><filename class="directory">tdevctags/</filename> &mdash; provides the <guimenuitem>CTags</guimenuitem> entry in the <guimenu>Tools</guimenu> menu for the <guilabel>CTags Frontend</guilabel> project plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevcvsservice/</filename> &mdash; provides the icon used by the <guilabel>CvsService</guilabel> tab and a short shell script used to add a new entry to the &cvs; repository, both used by the <guilabel>CVS Integration</guilabel> project plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevdebugger/</filename> &mdash; provides the <guimenu>Debug</guimenu> menu entries for the <guilabel>Debugger Frontend</guilabel> project plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevdiff/</filename> &mdash; provides the <guimenuitem>Difference Viewer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu.</para></listitem>
+    <listitem><para><filename class="directory">tdevdistpart/</filename> &mdash; provides the <guimenuitem>Distribution &amp; Publishing</guimenuitem> entry in the <guimenu>Project</guimenu> menu for the <guilabel>Final Packaging Support</guilabel> project plugin.</para></listitem>
     <listitem id="app-files-default-kdevdoc">
-      <para><filename class="directory">kdevdocumentation/</filename> &mdash; contains files used by the <guilabel>Documentation</guilabel> plugin:</para>
+      <para><filename class="directory">tdevdocumentation/</filename> &mdash; contains files used by the <guilabel>Documentation</guilabel> plugin:</para>
       <itemizedlist>
         <listitem><para><filename class="directory">en/</filename> and <filename class="directory">pics/</filename> &mdash; contain files used by the <application>htdig</application> search tool.</para></listitem>
         <listitem><para><filename class="directory">tocs/</filename> &mdash; contain the default &tdevelop; documentation content description files (see the description in <link linkend="toc-file-structure">Basic Structure of &tdevelop; TOC Files</link>).</para></listitem>
-        <listitem><para><filename>kdevpart_documentation.rc</filename> &mdash; provides the search related entries in the <guimenu>Help</guimenu> menu.</para></listitem>
+        <listitem><para><filename>tdevpart_documentation.rc</filename> &mdash; provides the search related entries in the <guimenu>Help</guimenu> menu.</para></listitem>
       </itemizedlist>
     </listitem>
-    <listitem><para><filename class="directory">kdevdoxygen/</filename> &mdash; provides the menu entries for the <guilabel>Doxygen Support</guilabel> project plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevdoxygen/</filename> &mdash; provides the menu entries for the <guilabel>Doxygen Support</guilabel> project plugin.</para></listitem>
     <listitem id="app-files-default-filecreate">
-      <para><filename class="directory">kdevfilecreate/</filename> &mdash; contains files used by the <guilabel>New File Wizard:</guilabel>
+      <para><filename class="directory">tdevfilecreate/</filename> &mdash; contains files used by the <guilabel>New File Wizard:</guilabel>
       <itemizedlist>
         <listitem><para><filename class="directory">file-templates/</filename> &mdash; provides the initial text contents to be put into the new source file of a given type.</para></listitem>
-        <listitem><para><filename>kdevpart_filecreate.rc</filename> &mdash; provides the <guimenuitem>New</guimenuitem> entry in the <guimenu>File</guimenu> menu.</para></listitem>
+        <listitem><para><filename>tdevpart_filecreate.rc</filename> &mdash; provides the <guimenuitem>New</guimenuitem> entry in the <guimenu>File</guimenu> menu.</para></listitem>
         <listitem><para><filename>template-info.xml</filename> &mdash; contains descriptions of the available file types to be displayed in the <guilabel>New File</guilabel> tool view.</para></listitem>
       </itemizedlist>
     </para></listitem>
-    <listitem><para><filename class="directory">kdevfilter/</filename> &mdash; provides the <guimenuitem>Execute Command...</guimenuitem> and <guimenuitem>Filter Selection Through Command...</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Shell Filtering and Insertion</guilabel> plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevfullscreen/</filename> &mdash; provides the <guimenuitem>Full Screen Mode</guimenuitem> entry in the <guimenu>View</guimenu> menu and the according tool bar icon.</para></listitem>
-    <listitem><para><filename class="directory">kdevgrepview/</filename> &mdash; provides the <guimenuitem>Find in Files...</guimenuitem>entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Grep Frontend</guilabel> plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevhistory/</filename> &mdash; provides the <guimenuitem>Back</guimenuitem> and <guimenuitem>Forward</guimenuitem> entries in the <guimenu>View</guimenu> menu.</para></listitem>
-    <listitem><para><filename class="directory">kdevjavadebugger/</filename> &mdash; provides a <guimenu>Java Debug</guimenu> menu in order to debug a &Java; application.</para></listitem>
-    <listitem><para><filename class="directory">kdevoutputviews/</filename> &mdash; provides the <guimenuitem>Next Error</guimenuitem> and <guimenuitem>Previous Error</guimenuitem> entries in the <guimenu>View</guimenu> menu.</para></listitem>
-    <listitem><para><filename class="directory">kdevpartexplorer/</filename> &mdash; provides the <guimenuitem>Part Explorer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Part Explorer Tool</guilabel> plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevquickopen/</filename> &mdash; provides the <guimenuitem>Quick Open File..</guimenuitem> entry in the <guimenu>File</guimenu> menu and the <guimenuitem>Quick Open Class...</guimenuitem> and <guimenuitem>Quick Open Method</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Quick Open</guilabel> project plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevregexptest/</filename> &mdash; provides the <guimenuitem>Debug Regular Expression...</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Regular Expression Tester</guilabel> plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevreplace/</filename> &mdash; provides the <guimenuitem>Find-Select-Replace...</guimenuitem> entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Replace Part</guilabel> plugin.</para></listitem>
-    <listitem id="app-files-default-tips"><para><filename class="directory">kdevtipofday/</filename> &mdash; provides the <guimenuitem>Tip of the Day</guimenuitem> entry in the <guimenu>Help</guimenu> menu as well as a HTML-File containing the available tips.</para></listitem>
-    <listitem><para><filename class="directory">kdevtools/</filename> &mdash; controls various menu entries ceated by <guimenu>Tools Menu</guimenu> and <guilabel>External Tools Menu</guilabel> settings provided by the <guilabel>Tools Menu Addition</guilabel> plugin.</para></listitem>
-    <listitem><para><filename class="directory">kdevvalgrind/</filename> &mdash; provides the <guimenuitem>Valgrind Memory Leak Check</guimenuitem> and <guimenuitem>Profile with KCachegrind</guimenuitem> entries in the <guimenu>Debug</guimenu> menu used by the <guilabel>Valgrind Frontend</guilabel> plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevfilter/</filename> &mdash; provides the <guimenuitem>Execute Command...</guimenuitem> and <guimenuitem>Filter Selection Through Command...</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Shell Filtering and Insertion</guilabel> plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevfullscreen/</filename> &mdash; provides the <guimenuitem>Full Screen Mode</guimenuitem> entry in the <guimenu>View</guimenu> menu and the according tool bar icon.</para></listitem>
+    <listitem><para><filename class="directory">tdevgrepview/</filename> &mdash; provides the <guimenuitem>Find in Files...</guimenuitem>entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Grep Frontend</guilabel> plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevhistory/</filename> &mdash; provides the <guimenuitem>Back</guimenuitem> and <guimenuitem>Forward</guimenuitem> entries in the <guimenu>View</guimenu> menu.</para></listitem>
+    <listitem><para><filename class="directory">tdevjavadebugger/</filename> &mdash; provides a <guimenu>Java Debug</guimenu> menu in order to debug a &Java; application.</para></listitem>
+    <listitem><para><filename class="directory">tdevoutputviews/</filename> &mdash; provides the <guimenuitem>Next Error</guimenuitem> and <guimenuitem>Previous Error</guimenuitem> entries in the <guimenu>View</guimenu> menu.</para></listitem>
+    <listitem><para><filename class="directory">tdevpartexplorer/</filename> &mdash; provides the <guimenuitem>Part Explorer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Part Explorer Tool</guilabel> plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevquickopen/</filename> &mdash; provides the <guimenuitem>Quick Open File..</guimenuitem> entry in the <guimenu>File</guimenu> menu and the <guimenuitem>Quick Open Class...</guimenuitem> and <guimenuitem>Quick Open Method</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Quick Open</guilabel> project plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevregexptest/</filename> &mdash; provides the <guimenuitem>Debug Regular Expression...</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Regular Expression Tester</guilabel> plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevreplace/</filename> &mdash; provides the <guimenuitem>Find-Select-Replace...</guimenuitem> entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Replace Part</guilabel> plugin.</para></listitem>
+    <listitem id="app-files-default-tips"><para><filename class="directory">tdevtipofday/</filename> &mdash; provides the <guimenuitem>Tip of the Day</guimenuitem> entry in the <guimenu>Help</guimenu> menu as well as a HTML-File containing the available tips.</para></listitem>
+    <listitem><para><filename class="directory">tdevtools/</filename> &mdash; controls various menu entries ceated by <guimenu>Tools Menu</guimenu> and <guilabel>External Tools Menu</guilabel> settings provided by the <guilabel>Tools Menu Addition</guilabel> plugin.</para></listitem>
+    <listitem><para><filename class="directory">tdevvalgrind/</filename> &mdash; provides the <guimenuitem>Valgrind Memory Leak Check</guimenuitem> and <guimenuitem>Profile with KCachegrind</guimenuitem> entries in the <guimenu>Debug</guimenu> menu used by the <guilabel>Valgrind Frontend</guilabel> plugin.</para></listitem>
   </itemizedlist></listitem>
 
   <listitem><itemizedlist id="app-files-default-apps-project">
     <title>Project Generation Parts</title>
-    <listitem><para><filename class="directory">kdevadaproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build an Ada application.</para></listitem>
-    <listitem><para><filename class="directory">kdevantproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu when the Ant project generator is used.</para></listitem>
-    <listitem><para><filename class="directory">kdevautoproject/</filename> &mdash;  provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons when working with the &GNU; Tools based &automake; project generator. Additionally provides the <guimenuitem>Add Translation</guimenuitem> and <guimenuitem>Build Configuration</guimenuitem> entries to the <guimenu>Project</guimenu> menu.</para></listitem>
-    <listitem><para><filename class="directory">kdevcustomproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons when the project is based on custom Makefils.</para></listitem>
-    <listitem><para><filename class="directory">kdevgenericproject/</filename> &mdash; contains menu definitions for an experimental generic project generator. Currently (version 3.1.0) unused.</para></listitem>
-    <listitem><para><filename class="directory">kdevhaskellproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build a Haskell application.</para></listitem>
-    <listitem><para><filename class="directory">kdevpascalproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build a Pascal application.</para></listitem>
-    <listitem><para><filename class="directory">kdevtrollproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build an application using the &Qt; QMake project manager.</para></listitem>
+    <listitem><para><filename class="directory">tdevadaproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build an Ada application.</para></listitem>
+    <listitem><para><filename class="directory">tdevantproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu when the Ant project generator is used.</para></listitem>
+    <listitem><para><filename class="directory">tdevautoproject/</filename> &mdash;  provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons when working with the &GNU; Tools based &automake; project generator. Additionally provides the <guimenuitem>Add Translation</guimenuitem> and <guimenuitem>Build Configuration</guimenuitem> entries to the <guimenu>Project</guimenu> menu.</para></listitem>
+    <listitem><para><filename class="directory">tdevcustomproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons when the project is based on custom Makefils.</para></listitem>
+    <listitem><para><filename class="directory">tdevgenericproject/</filename> &mdash; contains menu definitions for an experimental generic project generator. Currently (version 3.1.0) unused.</para></listitem>
+    <listitem><para><filename class="directory">tdevhaskellproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build a Haskell application.</para></listitem>
+    <listitem><para><filename class="directory">tdevpascalproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build a Pascal application.</para></listitem>
+    <listitem><para><filename class="directory">tdevtrollproject/</filename> &mdash; provides entries for the <guimenu>Build</guimenu> menu and according tool bar icons to build an application using the &Qt; QMake project manager.</para></listitem>
   </itemizedlist></listitem>
 
   <listitem><itemizedlist id="app-files-default-apps-lang">
     <title>Language Specific Parts</title>
-    <listitem><para><filename class="directory">kdevadasupport/</filename> &mdash; provides entries in the <guimenu>Tools</guimenu> menu and according tool bar icons needed to develop Ada applications.</para></listitem>
-    <listitem><para><filename class="directory">kdevbashsupport/</filename> &mdash; provides entries in the <guimenu>Build</guimenu> menu and according tool bar icons needed to develop Bash scripts.</para></listitem>
+    <listitem><para><filename class="directory">tdevadasupport/</filename> &mdash; provides entries in the <guimenu>Tools</guimenu> menu and according tool bar icons needed to develop Ada applications.</para></listitem>
+    <listitem><para><filename class="directory">tdevbashsupport/</filename> &mdash; provides entries in the <guimenu>Build</guimenu> menu and according tool bar icons needed to develop Bash scripts.</para></listitem>
     <listitem id="app-files-default-apps-lang-cpp">
-      <para><filename class="directory">kdevcppsupport/</filename> &mdash; contains files used by the &appwizard; to build C++ applications:</para>
+      <para><filename class="directory">tdevcppsupport/</filename> &mdash; contains files used by the &appwizard; to build C++ applications:</para>
       <itemizedlist>
         <listitem><para><filename class="directory">newclass/</filename> &mdash; contains header and source templates from which the &appwizard; builds the according source files.</para></listitem>
         <listitem><para><filename class="directory">subclassing/</filename> &mdash; contains templates which the &appwizard; uses to set up initial class declarations/definitions in the source files.</para></listitem>
         <listitem><para><filename class="directory">templates</filename> &mdash; contains templates from which the &appwizard; sets up the default header and source template files to be used by the &nfwizard;. </para></listitem>
         <listitem><para><filename>configuration</filename> &mdash; dummy template to add macros.</para></listitem>
-        <listitem><para><filename>kdevcppsupport.rc</filename> &mdash; provides the <guimenuitem>Complete Text</guimenuitem> and <guimenuitem>Make Member</guimenuitem> entries fo the <guimenu>Edit</guimenu> menu, the <guimenuitem>Switch Header/Implementation</guimenuitem> entry for the <guimenu>View</guimenu> menu, and the <guimenuitem>New Class</guimenuitem> entry for the <guimenu>Project</guimenu> menu as well as a <guiicon>New Class</guiicon> icon for the <guilabel>Browser Toolbar</guilabel>.</para></listitem>
+        <listitem><para><filename>tdevcppsupport.rc</filename> &mdash; provides the <guimenuitem>Complete Text</guimenuitem> and <guimenuitem>Make Member</guimenuitem> entries fo the <guimenu>Edit</guimenu> menu, the <guimenuitem>Switch Header/Implementation</guimenuitem> entry for the <guimenu>View</guimenu> menu, and the <guimenuitem>New Class</guimenuitem> entry for the <guimenu>Project</guimenu> menu as well as a <guiicon>New Class</guiicon> icon for the <guilabel>Browser Toolbar</guilabel>.</para></listitem>
       </itemizedlist>
     </listitem>
-    <listitem><para><filename class="directory">kdevfortransupport/</filename> &mdash; provides entries in the <guimenu>Build</guimenu> menu needed to develop Fortran applications.</para></listitem>
-    <listitem><para><filename class="directory">kdevhaskellsupport/</filename> &mdash; provides entries in the <guimenu>Build</guimenu> menu and according tool bar icons needed to develop Haskell applications.</para></listitem>
-     <listitem><para><filename class="directory">kdevjavasupport/</filename> &mdash; contains the UI definition needed to develop &Java; applications.</para></listitem>
-    <listitem><para><filename class="directory">kdevpascalsupport/</filename> &mdash;  contains the UI definition needed to develop Pascal applications.</para></listitem>
-    <listitem><para><filename class="directory">kdevperlsupport/</filename> &mdash; provides <guimenu>Project</guimenu> and <guimenu>Help</guimenu> menu entries needed to develop Perl scripts.</para></listitem>
-    <listitem><para><filename class="directory">kdevphpsupport/</filename> &mdash; contains UI and PHP function definition files needed to develop PHP scripts.</para></listitem>
-    <listitem><para><filename class="directory">kdevpythonsupport/</filename> &mdash; provides <guimenu>Build</guimenu> and <guimenu>Help</guimenu> menu entries and according tool bar icons needed to develop Python scripts.</para></listitem>
-    <listitem><para><filename class="directory">kdevrubysupport/</filename> &mdash; provides <guimenu>Build</guimenu> menu entries and according tool bar icons needed to develop Ruby scripts.</para></listitem>
-    <listitem><para><filename class="directory">kdevscriptproject/</filename> &mdash; provides th UI definitions needed to develop custom projects. Currently (version 3.1.0) unused.</para></listitem>
-    <listitem><para><filename class="directory">kdevsqlsupport/</filename> &mdash; provides th UI definitions needed to develop SQL projects. Currently (version 3.1.0) unused.</para></listitem>
+    <listitem><para><filename class="directory">tdevfortransupport/</filename> &mdash; provides entries in the <guimenu>Build</guimenu> menu needed to develop Fortran applications.</para></listitem>
+    <listitem><para><filename class="directory">tdevhaskellsupport/</filename> &mdash; provides entries in the <guimenu>Build</guimenu> menu and according tool bar icons needed to develop Haskell applications.</para></listitem>
+     <listitem><para><filename class="directory">tdevjavasupport/</filename> &mdash; contains the UI definition needed to develop &Java; applications.</para></listitem>
+    <listitem><para><filename class="directory">tdevpascalsupport/</filename> &mdash;  contains the UI definition needed to develop Pascal applications.</para></listitem>
+    <listitem><para><filename class="directory">tdevperlsupport/</filename> &mdash; provides <guimenu>Project</guimenu> and <guimenu>Help</guimenu> menu entries needed to develop Perl scripts.</para></listitem>
+    <listitem><para><filename class="directory">tdevphpsupport/</filename> &mdash; contains UI and PHP function definition files needed to develop PHP scripts.</para></listitem>
+    <listitem><para><filename class="directory">tdevpythonsupport/</filename> &mdash; provides <guimenu>Build</guimenu> and <guimenu>Help</guimenu> menu entries and according tool bar icons needed to develop Python scripts.</para></listitem>
+    <listitem><para><filename class="directory">tdevrubysupport/</filename> &mdash; provides <guimenu>Build</guimenu> menu entries and according tool bar icons needed to develop Ruby scripts.</para></listitem>
+    <listitem><para><filename class="directory">tdevscriptproject/</filename> &mdash; provides th UI definitions needed to develop custom projects. Currently (version 3.1.0) unused.</para></listitem>
+    <listitem><para><filename class="directory">tdevsqlsupport/</filename> &mdash; provides th UI definitions needed to develop SQL projects. Currently (version 3.1.0) unused.</para></listitem>
   </itemizedlist></listitem>
 
 </itemizedlist>
@@ -212,7 +212,7 @@ All information about user defined settings is kept in two subdirectories of <fi
 <title>Application Specific Configuration</title>
 
 <para>
-Any user changes to the <link linkend="app-files-default">&tdevelop; Default Configuration</link> settings as well as user specific settings which are not kept in any of the <link linkend="app-files-user-config">Resource Configuration Files</link> are found in <filename>kdev...</filename> subdirectories of the <filename class="directory">$<envar>TDEHOME</envar>/share/apps/</filename> directory.
+Any user changes to the <link linkend="app-files-default">&tdevelop; Default Configuration</link> settings as well as user specific settings which are not kept in any of the <link linkend="app-files-user-config">Resource Configuration Files</link> are found in <filename>tdev...</filename> subdirectories of the <filename class="directory">$<envar>TDEHOME</envar>/share/apps/</filename> directory.
 </para>
 <para>
 Most of these configuration files are however used by various &tdevelop; plugins in order to provide some specific menu and/or toolbar entries. Thus they are of interest only in case something went really wrong with the user interface.
@@ -223,30 +223,30 @@ In case the contents of these directories mirror those of the Default Configurat
 
 <itemizedlist>
   <listitem>
-    <para><filename class="directory">kdevabbrev/</filename> &mdash;  contains files used by the <guilabel>Abbreviation Expansion</guilabel> plugin:</para>
+    <para><filename class="directory">tdevabbrev/</filename> &mdash;  contains files used by the <guilabel>Abbreviation Expansion</guilabel> plugin:</para>
     <itemizedlist>
       <listitem><para><filename class="directory">sources/</filename> &mdash; currently empty; &tdevelop; uses the <link linkend="app-files-default-abbrev">default keyword definition</link> files for <guilabel>Expand Text</guilabel> commands.</para></listitem>
       <listitem><para><filename class="directory">templates/</filename> &mdash; contains the user modified template definition files used by the <guilabel>Expand Abbreviation</guilabel> command.</para></listitem>
-      <listitem><para><filename>kdevabbrev.rc</filename> &mdash; provides the <guimenuitem>Expand Text</guimenuitem> and <guimenuitem>Expand Abbreviation</guimenuitem> entries in the <guimenu>Edit</guimenu> menu.</para></listitem>
+      <listitem><para><filename>tdevabbrev.rc</filename> &mdash; provides the <guimenuitem>Expand Text</guimenuitem> and <guimenuitem>Expand Abbreviation</guimenuitem> entries in the <guimenu>Edit</guimenu> menu.</para></listitem>
     </itemizedlist>    
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevappwizard/</filename> &mdash; only provides the <guimenuitem>New Project...</guimenuitem> and <guimenuitem>Import Existing Project...</guimenuitem> entries in the <guimenu>Projects</guimenu> menu. The &appwizard; will use the <link linkend="app-files-default-appwizard">default configuration settings</link> for its actual works.</para>
+    <para><filename class="directory">tdevappwizard/</filename> &mdash; only provides the <guimenuitem>New Project...</guimenuitem> and <guimenuitem>Import Existing Project...</guimenuitem> entries in the <guimenu>Projects</guimenu> menu. The &appwizard; will use the <link linkend="app-files-default-appwizard">default configuration settings</link> for its actual works.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevastyle/</filename> &mdash; provides the actual <guimenuitem>Reformat Source</guimenuitem> entry in the <guimenu>Edit</guimenu> menu.</para>
+    <para><filename class="directory">tdevastyle/</filename> &mdash; provides the actual <guimenuitem>Reformat Source</guimenuitem> entry in the <guimenu>Edit</guimenu> menu.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevautoproject/</filename> &mdash; provides the actual entries in the <guimenu>Build</guimenu> menu and the <guilabel>Build Toolbar (KDevelop)</guilabel> toolbar.</para>
+    <para><filename class="directory">tdevautoproject/</filename> &mdash; provides the actual entries in the <guimenu>Build</guimenu> menu and the <guilabel>Build Toolbar (TDevelop)</guilabel> toolbar.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevclassview/</filename> &mdash; provides the <guimenuitem>Class Inheritance Diagram</guimenuitem> entry in the <guimenu>Project</guimenu> menu and the class browser combo box in the <guilabel>Browser Toolbar</guilabel> by the <guilabel>Class View</guilabel> project plugin.</para>
+    <para><filename class="directory">tdevclassview/</filename> &mdash; provides the <guimenuitem>Class Inheritance Diagram</guimenuitem> entry in the <guimenu>Project</guimenu> menu and the class browser combo box in the <guilabel>Browser Toolbar</guilabel> by the <guilabel>Class View</guilabel> project plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevcloser/</filename> &mdash; provides the <guimenuitem>Close Selected Windows...</guimenuitem> entry in the <guimenu>Windows</guimenu> menu.</para>
+    <para><filename class="directory">tdevcloser/</filename> &mdash; provides the <guimenuitem>Close Selected Windows...</guimenuitem> entry in the <guimenu>Windows</guimenu> menu.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevcppsupport/</filename> &mdash; holds the acual configuration used by the &appwizard; to build C++ applications. The &appwizard; however uses its main bulk of configuration information directly from the <link linkend="app-files-default-apps-lang-cpp">default configuration directory</link>. See there for more detail.</para>
+    <para><filename class="directory">tdevcppsupport/</filename> &mdash; holds the acual configuration used by the &appwizard; to build C++ applications. The &appwizard; however uses its main bulk of configuration information directly from the <link linkend="app-files-default-apps-lang-cpp">default configuration directory</link>. See there for more detail.</para>
     <itemizedlist>
       <listitem>
         <para><filename class="directory">newclass/</filename> &mdash; contains the actual header and source templates from which the &appwizard; builds the according source files.</para>
@@ -255,22 +255,22 @@ In case the contents of these directories mirror those of the Default Configurat
         <para><filename class="directory">pcs/</filename> &mdash; contains database files &tdevelop; uses build the actual Persistent Code Store (<filename>.pcs</filename>) file of a &kde; C++ project.</para>
       </listitem>
       <listitem>
-        <para><filename>kdevcppsupport.rc</filename> &mdash; provides the <guimenuitem>Complete Text</guimenuitem> and <guimenuitem>Make Member</guimenuitem> entries fo the <guimenu>Edit</guimenu> menu, the <guimenuitem>Switch Header/Implementation</guimenuitem> entry for the <guimenu>View</guimenu> menu, and the <guimenuitem>New Class</guimenuitem> entry for the <guimenu>Project</guimenu> menu as well as a <guiicon>New Class</guiicon> icon for the <guilabel>Browser Toolbar</guilabel>.</para>
+        <para><filename>tdevcppsupport.rc</filename> &mdash; provides the <guimenuitem>Complete Text</guimenuitem> and <guimenuitem>Make Member</guimenuitem> entries fo the <guimenu>Edit</guimenu> menu, the <guimenuitem>Switch Header/Implementation</guimenuitem> entry for the <guimenu>View</guimenu> menu, and the <guimenuitem>New Class</guimenuitem> entry for the <guimenu>Project</guimenu> menu as well as a <guiicon>New Class</guiicon> icon for the <guilabel>Browser Toolbar</guilabel>.</para>
       </listitem>
     </itemizedlist>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevctags/</filename> &mdash; provides the <guimenuitem>CTags</guimenuitem> entry in the <guimenu>Tools</guimenu> menu for the <guilabel>CTags Frontend</guilabel> project plugin.</para>
+    <para><filename class="directory">tdevctags/</filename> &mdash; provides the <guimenuitem>CTags</guimenuitem> entry in the <guimenu>Tools</guimenu> menu for the <guilabel>CTags Frontend</guilabel> project plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevdebugger/</filename> &mdash; provides the <guimenu>Debug</guimenu> menu entries for the <guilabel>Debugger Frontend</guilabel> project plugin.</para>
+    <para><filename class="directory">tdevdebugger/</filename> &mdash; provides the <guimenu>Debug</guimenu> menu entries for the <guilabel>Debugger Frontend</guilabel> project plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevdiff/</filename> &mdash; provides the <guimenuitem>Difference Viewer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu.</para>
+    <para><filename class="directory">tdevdiff/</filename> &mdash; provides the <guimenuitem>Difference Viewer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevdocumentation/</filename> &mdash; contains the actual files used by the <guilabel>Documentation</guilabel> plugin in addition to the <link linkend="app-files-default-kdevdoc"> default configuration files</link>. See there for more detail.</para>
-    <para>The directories in <filename class="directory">kdevdocumentation/</filename> mainly hold actual bookkeeping information. The actually set up documentation files are kept in <link linkend="app-files-user-config-doc"> <quote><filename>doc...pluginrc</filename></quote> files</link> in the <filename class="directory">$<envar>TDEHOME</envar>/share/config/</filename> directory.</para>
+    <para><filename class="directory">tdevdocumentation/</filename> &mdash; contains the actual files used by the <guilabel>Documentation</guilabel> plugin in addition to the <link linkend="app-files-default-kdevdoc"> default configuration files</link>. See there for more detail.</para>
+    <para>The directories in <filename class="directory">tdevdocumentation/</filename> mainly hold actual bookkeeping information. The actually set up documentation files are kept in <link linkend="app-files-user-config-doc"> <quote><filename>doc...pluginrc</filename></quote> files</link> in the <filename class="directory">$<envar>TDEHOME</envar>/share/config/</filename> directory.</para>
     <itemizedlist>
       <listitem>
         <para><filename class="directory">bookmarks/</filename> &mdash; maintains the entries in the <guilabel>Bookmarks</guilabel> tab of the &tdevelop; <guilabel>Documentation</guilabel> plugin.</para>
@@ -282,12 +282,12 @@ In case the contents of these directories mirror those of the Default Configurat
         <para><filename class="directory">search/</filename> &mdash; contains files used by the <application>htdig</application> search tool which serves search calls from the <guilabel>Search</guilabel> tab of the <guilabel>Documentation</guilabel> plugin.</para>
       </listitem>
       <listitem>
-        <para><filename>kdevpart_documentation.rc</filename> &mdash; provides the search related entries in the <guimenu>Help</guimenu> menu.</para>
+        <para><filename>tdevpart_documentation.rc</filename> &mdash; provides the search related entries in the <guimenu>Help</guimenu> menu.</para>
       </listitem>
     </itemizedlist>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevdoxygen/</filename> &mdash; provides the menu entries for the <guilabel>Doxygen Support</guilabel> project plugin.</para>
+    <para><filename class="directory">tdevdoxygen/</filename> &mdash; provides the menu entries for the <guilabel>Doxygen Support</guilabel> project plugin.</para>
   </listitem>
   <listitem>
     <para><filename class="directory">tdevelop/</filename> &mdash; contains some actual settings &tdevelop; uses for its basic setup:</para>
@@ -297,45 +297,45 @@ In case the contents of these directories mirror those of the Default Configurat
     </itemizedlist>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevfilecreate/</filename> &mdash; contains files used by the <guilabel>New File Wizard:</guilabel></para>
+    <para><filename class="directory">tdevfilecreate/</filename> &mdash; contains files used by the <guilabel>New File Wizard:</guilabel></para>
       <itemizedlist>
         <listitem><para><filename class="directory">file-templates/</filename> &mdash; provides the actually used text contents to be put into the new source file of a given type. More file templates are found in the <link linkend="app-files-default-filecreate">default configuration files</link> directory.</para></listitem>
-        <listitem><para><filename>kdevpart_filecreate.rc</filename> &mdash; provides the <guimenuitem>New</guimenuitem> entry in the <guimenu>File</guimenu> menu.</para></listitem>
+        <listitem><para><filename>tdevpart_filecreate.rc</filename> &mdash; provides the <guimenuitem>New</guimenuitem> entry in the <guimenu>File</guimenu> menu.</para></listitem>
         <listitem><para><filename>template-info.xml</filename> &mdash; contains descriptions of the available file types to be displayed in the <guilabel>New File</guilabel> tool view.</para></listitem>
       </itemizedlist>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevfilter/</filename> &mdash; provides the <guimenuitem>Execute Command...</guimenuitem> and <guimenuitem>Filter Selection Through Command...</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Shell Filtering and Insertion</guilabel> plugin.</para>
+    <para><filename class="directory">tdevfilter/</filename> &mdash; provides the <guimenuitem>Execute Command...</guimenuitem> and <guimenuitem>Filter Selection Through Command...</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Shell Filtering and Insertion</guilabel> plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevfullscreen/</filename> &mdash; provides the <guimenuitem>Full Screen Mode</guimenuitem> entry in the <guimenu>View</guimenu> menu and the according tool bar icon.</para>
+    <para><filename class="directory">tdevfullscreen/</filename> &mdash; provides the <guimenuitem>Full Screen Mode</guimenuitem> entry in the <guimenu>View</guimenu> menu and the according tool bar icon.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevgrepview/</filename> &mdash; provides the <guimenuitem>Find in Files...</guimenuitem>entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Grep Frontend</guilabel> plugin.</para>
+    <para><filename class="directory">tdevgrepview/</filename> &mdash; provides the <guimenuitem>Find in Files...</guimenuitem>entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Grep Frontend</guilabel> plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevoutputviews/</filename> &mdash; provides the <guimenuitem>Next Error</guimenuitem> and <guimenuitem>Previous Error</guimenuitem> entries in the <guimenu>View</guimenu> menu.</para>
+    <para><filename class="directory">tdevoutputviews/</filename> &mdash; provides the <guimenuitem>Next Error</guimenuitem> and <guimenuitem>Previous Error</guimenuitem> entries in the <guimenu>View</guimenu> menu.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevpartexplorer/</filename> &mdash; provides the <guimenuitem>Part Explorer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Part Explorer Tool</guilabel> plugin.</para>
+    <para><filename class="directory">tdevpartexplorer/</filename> &mdash; provides the <guimenuitem>Part Explorer</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Part Explorer Tool</guilabel> plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevquickopen/</filename> &mdash; provides the <guimenuitem>Quick Open File..</guimenuitem> entry in the <guimenu>File</guimenu> menu and the <guimenuitem>Quick Open Class...</guimenuitem> and <guimenuitem>Quick Open Method</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Quick Open</guilabel> project plugin.</para>
+    <para><filename class="directory">tdevquickopen/</filename> &mdash; provides the <guimenuitem>Quick Open File..</guimenuitem> entry in the <guimenu>File</guimenu> menu and the <guimenuitem>Quick Open Class...</guimenuitem> and <guimenuitem>Quick Open Method</guimenuitem> entries in the <guimenu>Tools</guimenu> menu used by the <guilabel>Quick Open</guilabel> project plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevregexptest/</filename> &mdash; provides the <guimenuitem>Debug Regular Expression...</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Regular Expression Tester</guilabel> plugin.</para>
+    <para><filename class="directory">tdevregexptest/</filename> &mdash; provides the <guimenuitem>Debug Regular Expression...</guimenuitem> entry in the <guimenu>Tools</guimenu> menu used by the <guilabel>Regular Expression Tester</guilabel> plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevreplace/</filename> &mdash; provides the <guimenuitem>Find-Select-Replace...</guimenuitem> entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Replace Part</guilabel> plugin.</para>
+    <para><filename class="directory">tdevreplace/</filename> &mdash; provides the <guimenuitem>Find-Select-Replace...</guimenuitem> entry in the <guimenu>Edit</guimenu> menu used by the <guilabel>Replace Part</guilabel> plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevtipofday/</filename> &mdash;provides the <guimenuitem>Tip of the Day</guimenuitem> entry in the <guimenu>Help</guimenu> menu. The HTML-File containing the available tips is provided as a <link linkend="app-files-default-tips">default configuration file</link> only.</para>
+    <para><filename class="directory">tdevtipofday/</filename> &mdash;provides the <guimenuitem>Tip of the Day</guimenuitem> entry in the <guimenu>Help</guimenu> menu. The HTML-File containing the available tips is provided as a <link linkend="app-files-default-tips">default configuration file</link> only.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevtools/</filename> &mdash; controls various menu entries ceated by <guimenu>Tools Menu</guimenu> and <guilabel>External Tools Menu</guilabel> settings provided by the <guilabel>Tools Menu Addition</guilabel> plugin.</para>
+    <para><filename class="directory">tdevtools/</filename> &mdash; controls various menu entries ceated by <guimenu>Tools Menu</guimenu> and <guilabel>External Tools Menu</guilabel> settings provided by the <guilabel>Tools Menu Addition</guilabel> plugin.</para>
   </listitem>
   <listitem>
-    <para><filename class="directory">kdevvalgrind/</filename> &mdash; provides the <guimenuitem>Valgrind Memory Leak Check</guimenuitem> and <guimenuitem>Profile with KCachegrind</guimenuitem> entries in the <guimenu>Debug</guimenu> menu used by the <guilabel>Valgrind Frontend</guilabel> plugin.</para>
+    <para><filename class="directory">tdevvalgrind/</filename> &mdash; provides the <guimenuitem>Valgrind Memory Leak Check</guimenuitem> and <guimenuitem>Profile with KCachegrind</guimenuitem> entries in the <guimenu>Debug</guimenu> menu used by the <guilabel>Valgrind Frontend</guilabel> plugin.</para>
   </listitem>
 </itemizedlist>
 
@@ -348,35 +348,35 @@ In case the contents of these directories mirror those of the Default Configurat
 There are two groups of &tdevelop; configuration files in the <filename class="directory">$<envar>TDEHOME</envar>/share/config/</filename> directory, distiguished by their surrounding character sequences:
 <simplelist>
   <member><quote><filename>doc...pluginrc</filename></quote> denotes <link linkend="app-files-user-config-doc">files used by the documentation plugin.</link></member>
-  <member><quote><filename>kdev...rc</filename></quote> denotes configuration <link linkend="app-files-user-config-kdev">files used by &tdevelop;</link> itself and its available plugins.</member>
+  <member><quote><filename>tdev...rc</filename></quote> denotes configuration <link linkend="app-files-user-config-kdev">files used by &tdevelop;</link> itself and its available plugins.</member>
 </simplelist>
 </para>
 
 <itemizedlist id="app-files-user-config-kdev">
 <title>Configuration Files Used by &tdevelop;</title>
   <listitem>
-    <para><filename>kdevabbrevrc</filename> &mdash; holds the current state of the <guilabel>Abbreviations</guilabel> configuration provided by the <guilabel>Abbreviation Expansion</guilabel> plugin.</para>
+    <para><filename>tdevabbrevrc</filename> &mdash; holds the current state of the <guilabel>Abbreviations</guilabel> configuration provided by the <guilabel>Abbreviation Expansion</guilabel> plugin.</para>
     <note><para>This only records whether the abbreviations will be used or not. The actual definitions of new abbreviations will go into the <filename>$<envar>TDEHOME</envar>/share/apps/kdevabbrev/templates/templates</filename> file.</para></note>
   </listitem>
   <listitem>
-    <para><filename>kdevassistantrc</filename> &mdash; holds some configuration states specific of the stand-alone  &tdevelop; Assistant documentation browser.</para>
+    <para><filename>tdevassistantrc</filename> &mdash; holds some configuration states specific of the stand-alone  &tdevelop; Assistant documentation browser.</para>
     <note><para>Most common configuration settings are shared with the &tdevelop; IDE <filename>tdeveloprc</filename> file.</para></note>
   </listitem>
-  <listitem><para><filename>kdevassistantuimode4rc</filename> &mdash; holds the current MDI configuration states (dock positions &etc;) of the stand-alone  &tdevelop; Assistant documentation browser.</para></listitem>
+  <listitem><para><filename>tdevassistantuimode4rc</filename> &mdash; holds the current MDI configuration states (dock positions &etc;) of the stand-alone  &tdevelop; Assistant documentation browser.</para></listitem>
   <listitem>
-    <para><filename>kdevclassviewrc</filename> &mdash; holds the <guilabel>View Mode</guilabel> setting of the <guilabel>Classes</guilabel> class browser tab provided by the <guilabel>Class View</guilabel> project plugin.</para>
+    <para><filename>tdevclassviewrc</filename> &mdash; holds the <guilabel>View Mode</guilabel> setting of the <guilabel>Classes</guilabel> class browser tab provided by the <guilabel>Class View</guilabel> project plugin.</para>
     <note><para>This is a global setting, although the <guilabel>Class View</guilabel> plugin may be disabled on a per project basis. Any change in this setting will be globally updated whenever the current project is closed and thus affect all subsequently loaded projects.</para></note>
   </listitem>
-  <listitem><para><filename>kdevcppsupportrc</filename> &mdash; holds some settings used to set up CPP source files. In particular you will find the settings made on the <guilabel>C++ Class Generator</guilabel> configuration dialog in here.</para></listitem>
-  <listitem><para><filename>kdevdocumentationrc</filename> &mdash; holds actual settings the <guilabel>Documentation</guilabel> plugin uses.</para></listitem>
+  <listitem><para><filename>tdevcppsupportrc</filename> &mdash; holds some settings used to set up CPP source files. In particular you will find the settings made on the <guilabel>C++ Class Generator</guilabel> configuration dialog in here.</para></listitem>
+  <listitem><para><filename>tdevdocumentationrc</filename> &mdash; holds actual settings the <guilabel>Documentation</guilabel> plugin uses.</para></listitem>
   <listitem><para><filename>tdeveloprc</filename> &mdash; holds the global settings the &tdevelop; IDE and the &tdevelop; Assistant stand-alone documentation browser will use.</para></listitem>
   <listitem><para><filename>tdevelopuimode4rc</filename> &mdash;  holds the current MDI configuration states (dock positions &etc;) of the  &tdevelop; IDE.</para></listitem>
-  <listitem><para><filename>kdevfileselectorrc</filename> &mdash; holds actual settings the <guilabel>File Selector</guilabel> plugin uses.</para></listitem>
-  <listitem><para><filename>kdevfileviewrc</filename> &mdash; holds the actual filename color settings the <guilabel>CVS Integration (Cervisia)</guilabel> project plugin uses for display.</para></listitem>
-  <listitem><para><filename>kdevfilterrc</filename> &mdash; holds actual settings the <guilabel>Shell Filtering and Insertion</guilabel> plugin uses.</para></listitem>
-  <listitem><para><filename>kdevgrepviewrc</filename> &mdash; holds actual settings the <guilabel>Grep Frontend</guilabel> plugin uses.</para></listitem>
-  <listitem><para><filename>kdevsnippetrc</filename> &mdash; holds actual settings the <guilabel>Code Snippets</guilabel> plugin uses.</para></listitem>
-  <listitem><para><filename>kdevtoolsrc</filename> &mdash; holds actual settings the <guilabel>Tools Menu Addition</guilabel> plugin uses.</para></listitem>
+  <listitem><para><filename>tdevfileselectorrc</filename> &mdash; holds actual settings the <guilabel>File Selector</guilabel> plugin uses.</para></listitem>
+  <listitem><para><filename>tdevfileviewrc</filename> &mdash; holds the actual filename color settings the <guilabel>CVS Integration (Cervisia)</guilabel> project plugin uses for display.</para></listitem>
+  <listitem><para><filename>tdevfilterrc</filename> &mdash; holds actual settings the <guilabel>Shell Filtering and Insertion</guilabel> plugin uses.</para></listitem>
+  <listitem><para><filename>tdevgrepviewrc</filename> &mdash; holds actual settings the <guilabel>Grep Frontend</guilabel> plugin uses.</para></listitem>
+  <listitem><para><filename>tdevsnippetrc</filename> &mdash; holds actual settings the <guilabel>Code Snippets</guilabel> plugin uses.</para></listitem>
+  <listitem><para><filename>tdevtoolsrc</filename> &mdash; holds actual settings the <guilabel>Tools Menu Addition</guilabel> plugin uses.</para></listitem>
 </itemizedlist>
 
 <itemizedlist id="app-files-user-config-doc">
@@ -385,7 +385,7 @@ There are two groups of &tdevelop; configuration files in the <filename class="d
   <listitem><para><filename>doccustompluginrc</filename> &mdash; holds information about any custom documentation file defined on the <guilabel>Custom Documentation Collection</guilabel> configuration page.</para></listitem>
   <listitem><para><filename>docdevhelppluginrc</filename> &mdash; holds information about the actual GNOME 2 DevHelp documentation files as defined on the <guilabel>Devhelp Documentation Collection</guilabel> configuration page.</para></listitem>
   <listitem><para><filename>docdoxygenpluginrc</filename> &mdash; holds information about the actual Doxygen generated API documentations as defined on the <guilabel>Doxygen Documentation Collection</guilabel> configuration page.</para></listitem>
-  <listitem><para><filename>dockdevtocpluginrc</filename> &mdash; holds information about the actual KDevelopTOC structured documentation files as defined on the <guilabel>KDevelopTOC Documentation Collection</guilabel> configuration page.</para></listitem>
+  <listitem><para><filename>doctdevtocpluginrc</filename> &mdash; holds information about the actual TDevelopTOC structured documentation files as defined on the <guilabel>TDevelopTOC Documentation Collection</guilabel> configuration page.</para></listitem>
   <listitem><para><filename>docqtpluginrc</filename> &mdash; holds information about the QT documentation files actually included on the <guilabel> Documentation Collection</guilabel>Qt configuration page.</para></listitem>
 </itemizedlist>
 
diff --git a/doc/tdevelop/commands.docbook b/doc/tdevelop/commands.docbook
index 31fff849..495da173 100644
--- a/doc/tdevelop/commands.docbook
+++ b/doc/tdevelop/commands.docbook
@@ -78,7 +78,7 @@ box.</para></listitem>
 <guimenuitem>Open Recent</guimenuitem>
 </menuchoice></term>
 <listitem><para>Displays a submenu showing the files recently opened.
-Selecting one of these will make KDevelop open that file.
+Selecting one of these will make TDevelop open that file.
 </para></listitem>
 </varlistentry>
 
@@ -229,7 +229,7 @@ and re-open the current one.
 <guimenu>File</guimenu>
 <guimenuitem>Quit</guimenuitem>
 </menuchoice></term>
-<listitem><para>Close KDevelop.</para></listitem>
+<listitem><para>Close TDevelop.</para></listitem>
 </varlistentry>
 
 </variablelist>
@@ -1666,7 +1666,7 @@ Execute Command...
 </menuchoice></term>
 <listitem><para>
 Filters selection through external command using 
-<link linkend="KDevFilter">the Filter plugin</link>.
+<link linkend="TDevFilter">the Filter plugin</link>.
 </para></listitem>
 </varlistentry>
 
@@ -1840,10 +1840,10 @@ Configure Editor...
 <varlistentry>
 <term><menuchoice>
 <guimenu>Settings</guimenu>
-<guimenuitem>Configure KDevelop...</guimenuitem>
+<guimenuitem>Configure TDevelop...</guimenuitem>
 </menuchoice></term>
 <listitem><para>
-Configure KDevelop...
+Configure TDevelop...
 </para></listitem>
 </varlistentry>
 
@@ -1866,7 +1866,7 @@ Configure KDevelop...
 <varlistentry>
 <term><menuchoice>
 <guimenu>Help</guimenu>
-<guimenuitem>KDevelop Handbook</guimenuitem>
+<guimenuitem>TDevelop Handbook</guimenuitem>
 </menuchoice></term>
 <listitem><para>View this document.</para></listitem>
 </varlistentry>
@@ -1960,10 +1960,10 @@ Info Page...
 <varlistentry>
 <term><menuchoice>
 <guimenu>Help</guimenu>
-<guimenuitem>About KDevelop...</guimenuitem>
+<guimenuitem>About TDevelop...</guimenuitem>
 </menuchoice></term>
 <listitem><para>Display some brief information about
-KDevelop's version number, authors and license agreement.</para></listitem>
+TDevelop's version number, authors and license agreement.</para></listitem>
 </varlistentry>
 
 <varlistentry>
diff --git a/doc/tdevelop/getting-started.docbook b/doc/tdevelop/getting-started.docbook
index a805f393..39d7c4de 100644
--- a/doc/tdevelop/getting-started.docbook
+++ b/doc/tdevelop/getting-started.docbook
@@ -77,7 +77,7 @@ already did switch to another user interface mode some items may not be there as
 described or will behave slightly different. If in doubt which user interface
 mode your &tdevelop; currently uses, check with the
 <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure
-KDevelop...</guimenuitem> <guimenuitem>User Interface</guimenuitem></menuchoice>
+TDevelop...</guimenuitem> <guimenuitem>User Interface</guimenuitem></menuchoice>
 dialog.</para>
 </note>
 
@@ -416,7 +416,7 @@ and plugged-in tools to extend the basic &IDE; capabilities. The
 <para>The upper set of <guimenu>Tools</guimenu> menu entries will be provided by
 the editor plugin which is in use. You may select your favorite editor via
 <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure
-KDevelop...</guimenuitem> <guilabel>Editor</guilabel></menuchoice>. Once an
+TDevelop...</guimenuitem> <guilabel>Editor</guilabel></menuchoice>. Once an
 editable document file is selected, the upper part of the 
 <guimenu>Tools</guimenu> menu will provide advanced editing commands specific to
 the editor part in use.</para>
@@ -452,10 +452,10 @@ Also, you can configure shortcuts, toolbars, notifications, the editor and
 <varlistentry>
 <term><guimenu>Help</guimenu></term>
 <listitem>
-<para>Here you can open this KDevelop manual, look up terms in various
+<para>Here you can open this TDevelop manual, look up terms in various
 documentation files, open man pages (the traditional UNIX manual format) and
 info pages (the GNU manual format). Furthermore you can report bugs here or get
-some info about your current KDevelop version and its authors.</para>
+some info about your current TDevelop version and its authors.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -497,7 +497,7 @@ different main purpose.</para>
 actual work. More tools to work on that project will be available then. The
 actual number of tool views depends on the <link linkend="plugin-tools">Plugin
 Tools</link> being currently available to &tdevelop;. You will find more on this
-topic in the <link linkend="setup">Configuring KDevelop</link> chapter.</para>
+topic in the <link linkend="setup">Configuring TDevelop</link> chapter.</para>
 
 <para>Currently, with no project open and the default number of plugin tools
 loaded, you will find the following tool views. Clicking on a tab will open
@@ -627,7 +627,7 @@ adjusted.</para>
 
 <note>
 <para>If you want to know more about &tdevelop; configuration, have a look at
-the <link linkend="setup">Configuring KDevelop</link> chapter.</para>
+the <link linkend="setup">Configuring TDevelop</link> chapter.</para>
 </note>
 
 <sect2 id="gettingstarted-configure-general">
@@ -635,8 +635,8 @@ the <link linkend="setup">Configuring KDevelop</link> chapter.</para>
 
 <para>To configure &tdevelop;, click the
 <menuchoice><guimenu>Settings</guimenu></menuchoice> menu and select
-<menuchoice><guimenuitem>Configure KDevelop...</guimenuitem></menuchoice>. The
-<guilabel>Configure KDevelop</guilabel> dialog will pop up, showing the
+<menuchoice><guimenuitem>Configure TDevelop...</guimenuitem></menuchoice>. The
+<guilabel>Configure TDevelop</guilabel> dialog will pop up, showing the
 following <guilabel>General</guilabel> settings page to the right.</para>
 
 <screenshot>
@@ -770,7 +770,7 @@ mandatory that the <emphasis>KDELibs Apidocs</emphasis> were present when
 perform the  <link linkend="gettingstarted-edit-defs">identifier lookup
 examples</link> later in this chapter, make sure that this documentation exists
 and is accessible to &tdevelop;. See <link linkend="tdevelop-install">Installing
-KDevelop</link> fore more detail.</para>
+TDevelop</link> fore more detail.</para>
 </listitem>
 </itemizedlist>
 </note>
@@ -1127,7 +1127,7 @@ and <filename>hello.kdevses</filename>.</para>
 
 <para>Of particular importance in each project is the
 <filename>xxx.tdevelop</filename> (where <quote>xxx</quote> denotes the project
-name) file. It is the main <emphasis>KDevelop 3 Project File</emphasis> and
+name) file. It is the main <emphasis>TDevelop 3 Project File</emphasis> and
 needed if you later want load this project into the &IDE;.</para>
 
 <warning>
@@ -1789,7 +1789,7 @@ this behavior.</para>
 <procedure>
 <step>
 <para>Select <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure
-KDevelop...</guimenuitem></menuchoice></para>
+TDevelop...</guimenuitem></menuchoice></para>
 </step>
 <step>
 <para>In the left hand icon bar on the dialog popup click the <guilabel>User
diff --git a/doc/tdevelop/index.docbook b/doc/tdevelop/index.docbook
index d412dc35..9e83802d 100644
--- a/doc/tdevelop/index.docbook
+++ b/doc/tdevelop/index.docbook
@@ -76,7 +76,7 @@ Entries which require special treatment are marked with comments starting with '
 <book lang="&language;">
 
 <bookinfo>
-  <title>&tdevelop; User Manual</title>
+  <title>&tdevelop; Handbook</title>
 
   <date>2006-06-19</date>
   <releaseinfo>&kdevrelease;</releaseinfo>
diff --git a/doc/tdevelop/nutshell.docbook b/doc/tdevelop/nutshell.docbook
index ca0a4276..93db1506 100644
--- a/doc/tdevelop/nutshell.docbook
+++ b/doc/tdevelop/nutshell.docbook
@@ -37,7 +37,7 @@ smaller tool view tabs in IDEAl Mode</link></term>
 <para>By default &tdevelop; starts with large text-based tool tip tabs
 around the work area. You may change this look to &eg; save space in the
 &tdevelop; configuration dialog (<menuchoice><guimenu>Settings</guimenu>
-<guimenuitem>Configure KDevelop...</guimenuitem> <guimenuitem>User
+<guimenuitem>Configure TDevelop...</guimenuitem> <guimenuitem>User
 Interface</guimenuitem></menuchoice>).</para>
 <para>If you use an older &tdevelop; 3 version, this configuration dialog
 may not be available. To change the toolview tabs display manually, place a
diff --git a/doc/tdevelop/plugin-tools.docbook b/doc/tdevelop/plugin-tools.docbook
index ad10fb16..174767e2 100644
--- a/doc/tdevelop/plugin-tools.docbook
+++ b/doc/tdevelop/plugin-tools.docbook
@@ -14,11 +14,11 @@ For example, in the file menu there is a Quick Open feature, but only if
 it's enabled in the Project - Project Options dialog.
 </para>
  
-<para>Technically, plugins are based on the KDevPlugin class defined in 
+<para>Technically, plugins are based on the TDevPlugin class defined in 
 lib/interfaces/kdevplugin.h. The following is taken from a comment from there.</para>
 
 <para> 
-KDevPlugin is the base class for all TDevelop plugins.
+TDevPlugin is the base class for all TDevelop plugins.
 A plugin is a component which is loaded into TDevelop shell at startup or by request.
 A plugin has a scope that can be either:
 <itemizedlist>
@@ -32,7 +32,7 @@ A plugin has a scope that can be either:
 are not selectable by user in plugin configuration pages.</para>
 
 <para>Global plugins are plugins which require only shell to be loaded and do not operate on 
-KDevProject interface and/or do not use project wide information.
+TDevProject interface and/or do not use project wide information.
 For example, the uimode plugin allows a developer to select which user interface they wish to use. 
 </para>
 
@@ -43,13 +43,13 @@ The Automake Manager, for example, only needs to be active when an Automake base
 
 <para>As stated above, core plugins cannot be disabled. Global plugins can be
 enabled/disabled in <menuchoice><guimenu>Settings</guimenu>
-<guimenuitem>Configure KDevelop...</guimenuitem></menuchoice>
+<guimenuitem>Configure TDevelop...</guimenuitem></menuchoice>
 under <guibutton>Plugins</guibutton>.
 Project plugins can be
 enabled/disabled in <menuchoice><guimenu>Project</guimenu>
 <guimenuitem>Project Options...</guimenuitem></menuchoice>
 under <guibutton>Plugins</guibutton>.
-Active plugins can have many effects on KDevelop. 
+Active plugins can have many effects on TDevelop. 
 Depending on their function, they may add extra menus, extra menu items, extra tool buttons, etc. 
 </para>
 
@@ -67,13 +67,13 @@ it is because the plugin authors made them this way.</para>
 
 <para>Scope: Core</para>
 <itemizedlist>
-<listitem><formalpara id="KDevAppWizard">
+<listitem><formalpara id="TDevAppWizard">
 <title>Application Wizard</title>
 <para>Application Wizard</para></formalpara></listitem>
-<listitem><formalpara id="KDevDiff">
+<listitem><formalpara id="TDevDiff">
 <title>Difference Viewer</title>
 <para>Difference Viewer</para></formalpara></listitem>
-<listitem><formalpara id="KDevFileCreate">
+<listitem><formalpara id="TDevFileCreate">
 <title>FileCreate</title>
 <para>FileCreate</para></formalpara></listitem>
 <listitem><formalpara id="KDevFullScreen">
@@ -85,7 +85,7 @@ it is because the plugin authors made them this way.</para>
 <listitem><formalpara id="KDevUIChooser">
 <title>User-Interface Selection</title>
 <para>Provides a dialog for UI-mode selection.</para></formalpara></listitem>
-<listitem><formalpara id="KDevVCSManager">
+<listitem><formalpara id="TDevVCSManager">
 <title>VCSManager</title>
 <para>Version Control System Manager </para></formalpara></listitem>
 </itemizedlist>
@@ -95,13 +95,13 @@ it is because the plugin authors made them this way.</para>
 <listitem><formalpara id="KDevAbbrev">
 <title>Abbreviation Expansion</title>
 <para>Provides support for customizable abbreviations - short words which expand into commonly needed code structures.</para></formalpara></listitem>
-<listitem><formalpara id="KDevDocumentation">
+<listitem><formalpara id="TDevDocumentation">
 <title>Documentation</title>
 <para>The Documentation plugin offers browsing and searching in local and online documentation with support for multiple documentation systems.</para></formalpara></listitem>
 <listitem><formalpara id="KDevfilelist">
 <title>FileList</title>
 <para>Provides a list of all currently open files. (Handy when the tab bar is not quite wide enough.)</para></formalpara></listitem>
-<listitem><formalpara id="KDevFileSelector">
+<listitem><formalpara id="TDevFileSelector">
 <title>File Selector</title>
 <para>Powerful network transparent file browser utility.</para></formalpara></listitem>
 <listitem><formalpara>
@@ -109,14 +109,14 @@ it is because the plugin authors made them this way.</para>
 <para>Provides a way of manipulating editor text using commandline tools. Appears in the Tools menu.</para></formalpara></listitem>
 <listitem><formalpara id="KDevGrepView">
 <title>Grep Frontend</title>
-<para>Integrates "find|grep" in KDevelop - allows fast searching of multiple files using patterns or regular expressions.</para></formalpara></listitem>
+<para>Integrates "find|grep" in TDevelop - allows fast searching of multiple files using patterns or regular expressions.</para></formalpara></listitem>
 <listitem><formalpara id="KDevKonsoleView">
 <title>Embedded Konsole</title>
-<para>This plugin gives KDevelop an embedded konsole for quick and easy command line access.</para></formalpara></listitem>
+<para>This plugin gives TDevelop an embedded konsole for quick and easy command line access.</para></formalpara></listitem>
 <listitem><formalpara id="KDevOpenWith">
 <title>"Open with" Menu Addon</title>
-<para>This plugin provides additional "open" alternatives for various context menus in KDevelop.</para></formalpara></listitem>
-<listitem><formalpara id="KDevPartExplorer">
+<para>This plugin provides additional "open" alternatives for various context menus in TDevelop.</para></formalpara></listitem>
+<listitem><formalpara id="TDevPartExplorer">
 <title>Part Explorer Tool</title>
 <para>A Graphical tool for performing TDETrader-like queries about registered services</para></formalpara></listitem>
 <listitem><formalpara id="KDevRegexpTest">
@@ -127,7 +127,7 @@ it is because the plugin authors made them this way.</para>
 <para>This plugin is an interactive projectwide "Search and Replace" tool. Search using string or regexp matching, and select the replacements to be made from a preview before the action is finalized. When loaded it appears in the Edit menu.</para></formalpara></listitem>
 <listitem><formalpara id="KDevscripting">
 <title>Scripting</title>
-<para>The Scripting plugin offers KScript based scripting of the KDevelop application</para></formalpara></listitem>
+<para>The Scripting plugin offers KScript based scripting of the TDevelop application</para></formalpara></listitem>
 <listitem><formalpara id="Code_Snippets">
 <title>Code Snippets</title>
 <para>This plugin allows you to store code snippets and add them to your code</para></formalpara></listitem>
@@ -242,13 +242,13 @@ templates than for &Java;.
 <para>
 The set of code templates is configurable. If the plugin is enabled, you can see
 which ones are available in the <menuchoice><guimenu>Settings</guimenu>
-<guimenuitem>Configure KDevelop...</guimenuitem></menuchoice>
+<guimenuitem>Configure TDevelop...</guimenuitem></menuchoice>
 dialog under <guibutton>Abbreviations</guibutton>.
 </para>
 </listitem>
 
 <listitem>
-<formalpara id="KDevFilter">
+<formalpara id="TDevFilter">
 <title>The <command>filter</command> Plugin</title>
 <indexterm zone="plugin-tools"><primary><command>filter</command></primary></indexterm>
 
diff --git a/doc/tdevelop/project-advanced.docbook b/doc/tdevelop/project-advanced.docbook
index a87b1658..81c0e4a6 100644
--- a/doc/tdevelop/project-advanced.docbook
+++ b/doc/tdevelop/project-advanced.docbook
@@ -42,10 +42,10 @@
 </sect2> <!-- loading-project -->
 
 <sect2 id="converting-projects">
-<title>Converting Old KDevelop Project Files</title>
+<title>Converting Old TDevelop Project Files</title>
 
 <para>
-&tdevelop; allows you to open old KDevelop 2.x project files and convert them to &tdevelop; files. To do so go to <guimenuitem>Open Project...</guimenuitem> and select <guilabel>KDevelop 2 project files</guilabel> in the <guilabel>Filter:</guilabel>. Then select project file you want to open. The project gets converted to &tdevelop; and saved as a <guilabel>&tdevelop; project file</guilabel>.
+&tdevelop; allows you to open old TDevelop 2.x project files and convert them to &tdevelop; files. To do so go to <guimenuitem>Open Project...</guimenuitem> and select <guilabel>TDevelop 2 project files</guilabel> in the <guilabel>Filter:</guilabel>. Then select project file you want to open. The project gets converted to &tdevelop; and saved as a <guilabel>&tdevelop; project file</guilabel>.
 </para>
 
 </sect2> <!-- converting-projects -->
diff --git a/doc/tdevelop/setup.docbook b/doc/tdevelop/setup.docbook
index 0c078a3b..2c448945 100644
--- a/doc/tdevelop/setup.docbook
+++ b/doc/tdevelop/setup.docbook
@@ -271,14 +271,14 @@ This let you choose the way you want <filename>.ui</filename> files to be displa
   </para><para>This uses &tdevelop; own designer embedded within &tdevelop;</para></listitem>
   <listitem><para>
   Run &tdevelop;'s designer as a separate application
-  </para><para>The KDevDesigner application will be run separately in its own window.</para>
+  </para><para>The TDevDesigner application will be run separately in its own window.</para>
 <screenshot>
   <mediaobject>
     <imageobject>
-      <imagedata fileref="kdevdesigner.png" format="PNG"/>
+      <imagedata fileref="tdevdesigner.png" format="PNG"/>
     </imageobject>
     <caption><para>
-   KDevDesigner in its own window
+   TDevDesigner in its own window
     </para></caption>
   </mediaobject>
 </screenshot>
@@ -294,7 +294,7 @@ Run Qt Designer
 <term id="terminal-emulation"><guilabel>Terminal Emulation</guilabel></term>
 <listitem>
 <para>
-You choose here which terminal you want to be integrated within KDevelop.
+You choose here which terminal you want to be integrated within TDevelop.
 </para>
 <itemizedlist>
   <listitem><para>
@@ -349,7 +349,7 @@ A typical example of this user interface mode is Borland Delphi 6.0.</para></lis
 </itemizedlist>
 
 <para>
-To switch the user interface mode select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;...</guimenuitem> </menuchoice> from the menus. The <guilabel>Customize KDevelop</guilabel> dialog will pop up, where you have to select <guilabel>User Interface</guilabel> in the left hand tree. This will display the following settings dialog to the right.</para>
+To switch the user interface mode select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;...</guimenuitem> </menuchoice> from the menus. The <guilabel>Customize TDevelop</guilabel> dialog will pop up, where you have to select <guilabel>User Interface</guilabel> in the left hand tree. This will display the following settings dialog to the right.</para>
 
 <screenshot>
   <mediaobject>
@@ -524,7 +524,7 @@ The active toolview window must be shown fixed (non-overlap mode), sharing the w
 <sect2 id="setup-editor">
 <title>Selecting an Editor</title>
 
-<para>&tdevelop; allows you to select your favorite text editor tool. Mark the <guilabel>Editor</guilabel> entry in the left hand side selections tree of the <guilabel>Configure KDevelop</guilabel> window. The following dialog will be displayed to the right.
+<para>&tdevelop; allows you to select your favorite text editor tool. Mark the <guilabel>Editor</guilabel> entry in the left hand side selections tree of the <guilabel>Configure TDevelop</guilabel> window. The following dialog will be displayed to the right.
 </para>
 
 <screenshot>
@@ -568,7 +568,7 @@ Changing the editor will not effect already open files. There are two possibilit
 </para></note>
 
 <important id="setup-editor-tdeparts"><para>
-KDevelop lets you use editor interfaces which have registered with &kde; and that provide a KatePart interface. If you miss one one of the selections shown above check your &kde; installation if the corresponding KPart was correctly installed.
+TDevelop lets you use editor interfaces which have registered with &kde; and that provide a KatePart interface. If you miss one one of the selections shown above check your &kde; installation if the corresponding KPart was correctly installed.
 </para></important>
 
 <para>What to do if the file has been changed externally:</para>
@@ -663,7 +663,7 @@ The reformat source feature is currently available for C, C++, and &Java; only.
 </para></note>
 
 <para>
-To set up a specific format style, select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the menubar. The <guilabel>Customize KDevelop</guilabel> dialog will pop up, where you have to select <guilabel>Source Formatter</guilabel> in the left hand tree. This will display a series of three settings dialog tabs to the right, namely a <link linkend="setup-format-general">General Formatting Setup</link>, a <link linkend="setup-format-indent">Indentation Style Setup</link>, and a <link linkend="setup-format-other">Other Formatting Setup</link>.
+To set up a specific format style, select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the menubar. The <guilabel>Customize TDevelop</guilabel> dialog will pop up, where you have to select <guilabel>Source Formatter</guilabel> in the left hand tree. This will display a series of three settings dialog tabs to the right, namely a <link linkend="setup-format-general">General Formatting Setup</link>, a <link linkend="setup-format-indent">Indentation Style Setup</link>, and a <link linkend="setup-format-other">Other Formatting Setup</link>.
 </para>
 
 <tip><para>
@@ -997,7 +997,7 @@ split a long line apart. For C/C++ code this can be controlled here.</para>
 <title>Setting Up the Code Snippets Tool</title>
 
 <para>
-When editing in &tdevelop; you can store often used parts of code as <link linkend="editing-snippets">Code Snippets</link>. To configure the capabilities of the code snippets part select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the menubar. The <guilabel>Customize KDevelop</guilabel> dialog will pop up, where you have to select <guilabel>Code Snippets</guilabel> in the left hand tree. This will show the following dialog in the right hand side.
+When editing in &tdevelop; you can store often used parts of code as <link linkend="editing-snippets">Code Snippets</link>. To configure the capabilities of the code snippets part select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the menubar. The <guilabel>Customize TDevelop</guilabel> dialog will pop up, where you have to select <guilabel>Code Snippets</guilabel> in the left hand tree. This will show the following dialog in the right hand side.
 </para>
 
 <screenshot>
@@ -1089,7 +1089,7 @@ system.
 <para>The behaviour of the <guilabel>File Selector</guilabel> can be highly
 configured. Select <menuchoice> <guimenu>Settings</guimenu>
 <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the
-menubar. The <guilabel>Customize KDevelop</guilabel> dialog will pop up,
+menubar. The <guilabel>Customize TDevelop</guilabel> dialog will pop up,
 where you have to select <guilabel>File Selector</guilabel> in the left hand
 tree. This will show the following dialog in the right hand side.</para>
 
@@ -1330,7 +1330,7 @@ If &tdevelop; was automatically restarted by the &kde; session manager the chang
 </para></note>
 
 <para>
-You may set up contents and behaviour of the various parts of this documentation window if you select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the menubar. The <guilabel>Customize KDevelop</guilabel> dialog will pop up, where you have to select <guilabel>Documentation</guilabel> in the left hand window.
+You may set up contents and behaviour of the various parts of this documentation window if you select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &tdevelop;..</guimenuitem> </menuchoice> from the menubar. The <guilabel>Customize TDevelop</guilabel> dialog will pop up, where you have to select <guilabel>Documentation</guilabel> in the left hand window.
 </para>
 
 <para>
@@ -1662,10 +1662,10 @@ You must put the &API; of your current project into this <guilabel>Doxygen Docum
 </sect3> <!-- setup-docu-general-dox -->
 
 <sect3 id="setup-docu-general-toc">
-<title>Handling Structured Documentation (KDevelopTOC Files)</title>
+<title>Handling Structured Documentation (TDevelopTOC Files)</title>
 
 <para>
-The main bulk of the &tdevelop; documentation facility provides immediate access to structured documentation, local as well as remote ones. You can configure this on the <guilabel>KDevelopTOC Documentation Collection</guilabel> page.
+The main bulk of the &tdevelop; documentation facility provides immediate access to structured documentation, local as well as remote ones. You can configure this on the <guilabel>TDevelopTOC Documentation Collection</guilabel> page.
 </para>
 
 <screenshot>
@@ -1674,17 +1674,17 @@ The main bulk of the &tdevelop; documentation facility provides immediate access
       <imagedata fileref="configure-docu-toc.png" format="PNG"/>
     </imageobject>
     <caption><para>
-    Providing KDevelopTOC structured documentation access
+    Providing TDevelopTOC structured documentation access
     </para></caption>
   </mediaobject>
 </screenshot>
 
 <para>
-&tdevelop; comes with a bunch of predefined KDevelopTOC files which are automatically entered in the table at installation time. To keep the display manageable only the most often used will initially be marked for display. If you want to see another documentation, mark the <guilabel>TOC</guilabel> check box in the <link linkend="setup-docu-columns">setup table</link>.
+&tdevelop; comes with a bunch of predefined TDevelopTOC files which are automatically entered in the table at installation time. To keep the display manageable only the most often used will initially be marked for display. If you want to see another documentation, mark the <guilabel>TOC</guilabel> check box in the <link linkend="setup-docu-columns">setup table</link>.
 </para>
 
 <para>
-KDevelopTOC files cannot be indexed to perform a full text search because they usually point to a remote location. On the other hand, such a <filename>.toc</filename> file can have an index manually defined, using the <computeroutput>&lt;index&gt;</computeroutput> tag. Thus the <guilabel>Index</guilabel> check box will be enabled ony when &tdevelop; finds an <computeroutput>&lt;index&gt;</computeroutput> tag in the <filename>.toc</filename> file. (For more detail see the description below in the <link linkend="setup-docu-general-toc-files">&tdevelop; TOC Files</link> section.)
+TDevelopTOC files cannot be indexed to perform a full text search because they usually point to a remote location. On the other hand, such a <filename>.toc</filename> file can have an index manually defined, using the <computeroutput>&lt;index&gt;</computeroutput> tag. Thus the <guilabel>Index</guilabel> check box will be enabled ony when &tdevelop; finds an <computeroutput>&lt;index&gt;</computeroutput> tag in the <filename>.toc</filename> file. (For more detail see the description below in the <link linkend="setup-docu-general-toc-files">&tdevelop; TOC Files</link> section.)
 </para>
 <para>
 The <guilabel>Search</guilabel> check box in the <link linkend="setup-docu-columns">setup table</link> will alway be disabled.
@@ -1720,7 +1720,7 @@ Such structured access is made possible through the use of special <quote>table
 <term>Standard Directory of &tdevelop; TOC Files</term>
 <listitem>
 <para>
-When &tdevelop; was installed usually a series of predefined <filename>.toc</filename> files has been put into the <filename class="directory">$TDEDIR/share/apps/kdevdocumentation/tocs</filename> directory. These are fairly simple, structured text files. You may look at them using a text editor or other text display facility.
+When &tdevelop; was installed usually a series of predefined <filename>.toc</filename> files has been put into the <filename class="directory">$TDEDIR/share/apps/tdevdocumentation/tocs</filename> directory. These are fairly simple, structured text files. You may look at them using a text editor or other text display facility.
 </para>
 </listitem>
 </varlistentry></variablelist>
diff --git a/doc/tdevelop/survey-manual.docbook b/doc/tdevelop/survey-manual.docbook
index 0bd59c8d..93c1fd63 100644
--- a/doc/tdevelop/survey-manual.docbook
+++ b/doc/tdevelop/survey-manual.docbook
@@ -198,7 +198,7 @@ necessary and why you need an &IDE;.</para>
   </para></listitem>
 -->
 <varlistentry><term>    
-<link linkend="app-uimodes-examples">KDevelop User Interface Mode Examples </link>
+<link linkend="app-uimodes-examples">TDevelop User Interface Mode Examples </link>
 </term><listitem><para>Shows user interface modes.
 </para></listitem></varlistentry>
   
diff --git a/doc/tdevelop/kdevdesigner.png b/doc/tdevelop/tdevdesigner.png
index 4fa74c68..4fa74c68 100644
--- a/doc/tdevelop/kdevdesigner.png
+++ b/doc/tdevelop/tdevdesigner.png
diff --git a/doc/tdevelop/tdevelop-install.docbook b/doc/tdevelop/tdevelop-install.docbook
index 14f7236b..663d9d08 100644
--- a/doc/tdevelop/tdevelop-install.docbook
+++ b/doc/tdevelop/tdevelop-install.docbook
@@ -699,7 +699,7 @@ The <command>tdebuildsycoca</command> command does not run from within the root.
 API is the short form of <quote>Application Program Interface</quote>. Actually such an API cotains a series of descriptions (&ie; calling conventions) by which an application program can access the operating system and other services. In our context, however, a broader definition was adopted. The API of a &kde; or &Qt; application is an abstract of the classes and methods interfaces, a synopsis to be used like a dictionary to navigate the sources.
 </para>
 <para>
-There is a version of the most current API available at the <ulink url="http://www.kdevelop.org/HEAD/doc/api/html/index.html">KDevelop-Home website</ulink>. It will be automatically updated every 24 hours so you can keep up.
+There is a version of the most current API available at the <ulink url="http://www.kdevelop.org/HEAD/doc/api/html/index.html">TDevelop-Home website</ulink>. It will be automatically updated every 24 hours so you can keep up.
 </para>
 <para>
 Alas, this version is best used read-only over the internet. If you do not always have internet access you may as well build your own API documentation from the &tdevelop; sources. To do so, you must tell the automake system where to find the KDELIBS API in your system. This is accomplished by the special option <option>--with-tdelibsdoxy-dir</option> in the <command>configure</command> command when you prepare to compile the &tdevelop; sources:
diff --git a/doc/tdevelop/tdevelop-scripting.docbook b/doc/tdevelop/tdevelop-scripting.docbook
index 1b722f2d..1cb8a294 100644
--- a/doc/tdevelop/tdevelop-scripting.docbook
+++ b/doc/tdevelop/tdevelop-scripting.docbook
@@ -7,12 +7,12 @@
   </authorgroup>
 </chapterinfo>
 
-<title>Using Scripts in KDevelop</title>
+<title>Using Scripts in TDevelop</title>
 
 <sect1 id="running-scripts">
 <title>Running Scripts</title>
 <para>
-  To access a script that is available to &tdevelop; use the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Scripts</guimenuitem></menuchoice> menu.  If there there is no such menu item then there are no installed scripts available to KDevelop.
+  To access a script that is available to &tdevelop; use the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Scripts</guimenuitem></menuchoice> menu.  If there there is no such menu item then there are no installed scripts available to TDevelop.
 </para>
 </sect1>
 
diff --git a/doc/tdevelop/tdevelop-survey.docbook b/doc/tdevelop/tdevelop-survey.docbook
index 0f117958..7aca28a9 100644
--- a/doc/tdevelop/tdevelop-survey.docbook
+++ b/doc/tdevelop/tdevelop-survey.docbook
@@ -145,7 +145,7 @@
   <primary>switch UI modes</primary></indexterm>
 
 <para>
-To switch the user interface mode select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure KDevelop...</guimenuitem> </menuchoice> from the menus. The <guilabel>Customize KDevelop</guilabel> dialog will pop up, where you have to select <guilabel>User Interface</guilabel> in the left hand tree. This will display the settings page shown below.
+To switch the user interface mode select <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure TDevelop...</guimenuitem> </menuchoice> from the menus. The <guilabel>Customize TDevelop</guilabel> dialog will pop up, where you have to select <guilabel>User Interface</guilabel> in the left hand tree. This will display the settings page shown below.
 </para>
 
 <screenshot>
diff --git a/editors/editor-chooser/CMakeLists.txt b/editors/editor-chooser/CMakeLists.txt
index 90d6d070..c3d37efb 100644
--- a/editors/editor-chooser/CMakeLists.txt
+++ b/editors/editor-chooser/CMakeLists.txt
@@ -24,12 +24,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdeveditorchooser.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdeveditorchooser.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdeveditorchooser (module) #############
+##### libtdeveditorchooser (module) #############
 
-tde_add_kpart( libkdeveditorchooser AUTOMOC
+tde_add_kpart( libtdeveditorchooser AUTOMOC
   SOURCES
     editorchooser_part.cpp editchooser.ui editorchooser_widget.cpp
   LINK tdevelop-shared
diff --git a/editors/editor-chooser/Makefile.am b/editors/editor-chooser/Makefile.am
index f95ca61c..7b12d2db 100644
--- a/editors/editor-chooser/Makefile.am
+++ b/editors/editor-chooser/Makefile.am
@@ -1,13 +1,13 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdeveditorchooser.la
-libkdeveditorchooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdeveditorchooser_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdeveditorchooser.la
+libtdeveditorchooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdeveditorchooser_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdeveditorchooser_la_SOURCES = editorchooser_part.cpp editchooser.ui editorchooser_widget.cpp
+libtdeveditorchooser_la_SOURCES = editorchooser_part.cpp editchooser.ui editorchooser_widget.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdeveditorchooser.desktop
+service_DATA = tdeveditorchooser.desktop
 
diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp
index a9a4339a..33f9cb0e 100644
--- a/editors/editor-chooser/editorchooser_part.cpp
+++ b/editors/editor-chooser/editorchooser_part.cpp
@@ -4,20 +4,20 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <kdialogbase.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 
-#include <kdevcore.h>
-#include <kdevplugininfo.h>
+#include <tdevcore.h>
+#include <tdevplugininfo.h>
 
 #include "editorchooser_part.h"
 #include "editorchooser_widget.h"
 
-typedef KDevGenericFactory<EditorChooserPart> EditorChooserFactory;
-static const KDevPluginInfo data("kdeveditorchooser");
-K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( data ) )
+typedef TDevGenericFactory<EditorChooserPart> EditorChooserFactory;
+static const TDevPluginInfo data("tdeveditorchooser");
+K_EXPORT_COMPONENT_FACTORY( libtdeveditorchooser, EditorChooserFactory( data ) )
 
 EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name ? name : "EditorChooserPart")
+  : TDevPlugin(&data, parent, name ? name : "EditorChooserPart")
 {
   setInstance(EditorChooserFactory::instance());
 
diff --git a/editors/editor-chooser/editorchooser_part.h b/editors/editor-chooser/editorchooser_part.h
index d7a9dbd1..ab892677 100644
--- a/editors/editor-chooser/editorchooser_part.h
+++ b/editors/editor-chooser/editorchooser_part.h
@@ -3,17 +3,17 @@
  */
  
 
-#ifndef __KDEVPART_EDITORCHOOSER_H__
-#define __KDEVPART_EDITORCHOOSER_H__
+#ifndef __TDEVPART_EDITORCHOOSER_H__
+#define __TDEVPART_EDITORCHOOSER_H__
 
 
 class KDialogBase;
 
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 
-class EditorChooserPart : public KDevPlugin
+class EditorChooserPart : public TDevPlugin
 {
   Q_OBJECT
   
diff --git a/editors/editor-chooser/kdeveditorchooser.desktop b/editors/editor-chooser/tdeveditorchooser.desktop
index 94f06903..f56f0416 100644
--- a/editors/editor-chooser/kdeveditorchooser.desktop
+++ b/editors/editor-chooser/tdeveditorchooser.desktop
@@ -37,14 +37,14 @@ Comment[tg]=Ба ихтиёр гузоштани гуфтугӯи интихоб
 Comment[tr]=Düzenleyici seçimi için bir pencere sağlar
 Comment[zh_CN]=提供编辑器选择对话框
 Comment[zh_TW]=提供對話框以編輯選擇。
-Name=KDevEditorChooser
+Name=TDevEditorChooser
 Name[da]=TDevelop Editorvælger
 Name[de]=Editor-Auswahl (TDevelop)
 Name[hi]=के-डेव-एडिटर-चूसर
 Name[nds]=TDevelop-Editorutwahl
 Name[ne]=केडीई विकास सम्पादक छनोटकर्ता
 Name[pl]=KDevWybórEdytora
-Name[sk]=KDevEditorVolič
+Name[sk]=TDevEditorVolič
 Name[sv]=TDevelop editorväljare
 Name[ta]=கெடெவ் தொகுப்பாளர் தேர்வாளர்
 Name[tg]=KDevМуҳаррирИнтихобкунанда
@@ -85,7 +85,7 @@ GenericName[zh_CN]=编辑器选择
 GenericName[zh_TW]=編輯器選擇
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdeveditorchooser
+X-TDE-Library=libtdeveditorchooser
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
 X-TDevelop-Properties=EditorChooser
diff --git a/embedded/visualboyadvance/CMakeLists.txt b/embedded/visualboyadvance/CMakeLists.txt
index be7cf42f..cd281f67 100644
--- a/embedded/visualboyadvance/CMakeLists.txt
+++ b/embedded/visualboyadvance/CMakeLists.txt
@@ -23,9 +23,9 @@ link_directories(
 )
 
 
-##### kdevvisualboyadvance (module) #############
+##### tdevvisualboyadvance (module) #############
 
-tde_add_kpart( libkdevvisualboyadvance AUTOMOC
+tde_add_kpart( libtdevvisualboyadvance AUTOMOC
   SOURCES
     visualboyadvance_part.cpp vbaconfigwidgetbase.ui vbaconfigwidget.cpp
   LINK tdevelop-shared
@@ -36,11 +36,11 @@ tde_add_kpart( libkdevvisualboyadvance AUTOMOC
 ##### other data ################################
 
 install(
-  FILES kdevvisualboyadvance.desktop
+  FILES tdevvisualboyadvance.desktop
   DESTINATION ${SERVICES_INSTALL_DIR}
 )
 
 install(
-  FILES kdevpart_visualboyadvance.rc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevvisualboyadvance
+  FILES tdevpart_visualboyadvance.rc
+  DESTINATION ${DATA_INSTALL_DIR}/tdevvisualboyadvance
 )
diff --git a/embedded/visualboyadvance/Makefile.am b/embedded/visualboyadvance/Makefile.am
index a866fd79..16fac82e 100644
--- a/embedded/visualboyadvance/Makefile.am
+++ b/embedded/visualboyadvance/Makefile.am
@@ -1,17 +1,17 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevvisualboyadvance.la
-libkdevvisualboyadvance_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevvisualboyadvance_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevvisualboyadvance.la
+libtdevvisualboyadvance_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevvisualboyadvance_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevvisualboyadvance_la_SOURCES = visualboyadvance_part.cpp vbaconfigwidgetbase.ui vbaconfigwidget.cpp
+libtdevvisualboyadvance_la_SOURCES = visualboyadvance_part.cpp vbaconfigwidgetbase.ui vbaconfigwidget.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevvisualboyadvance.desktop
+service_DATA = tdevvisualboyadvance.desktop
 
-rcdir = $(kde_datadir)/kdevvisualboyadvance
-rc_DATA = kdevpart_visualboyadvance.rc
+rcdir = $(kde_datadir)/tdevvisualboyadvance
+rc_DATA = tdevpart_visualboyadvance.rc
 
diff --git a/embedded/visualboyadvance/kdevpart_visualboyadvance.rc b/embedded/visualboyadvance/tdevpart_visualboyadvance.rc
index 674cd41f..674cd41f 100644
--- a/embedded/visualboyadvance/kdevpart_visualboyadvance.rc
+++ b/embedded/visualboyadvance/tdevpart_visualboyadvance.rc
diff --git a/embedded/visualboyadvance/kdevvisualboyadvance.desktop b/embedded/visualboyadvance/tdevvisualboyadvance.desktop
index 292fe6de..a50ec24f 100644
--- a/embedded/visualboyadvance/kdevvisualboyadvance.desktop
+++ b/embedded/visualboyadvance/tdevvisualboyadvance.desktop
@@ -79,7 +79,7 @@ GenericName[zh_CN]=VisualBoyAdvance 支持
 GenericName[zh_TW]=VisualBoyAdvance 支援
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevvisualboyadvance
+X-TDE-Library=libtdevvisualboyadvance
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 Keywords=GBA
diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp
index 873cd01d..a3b842f4 100644
--- a/embedded/visualboyadvance/visualboyadvance_part.cpp
+++ b/embedded/visualboyadvance/visualboyadvance_part.cpp
@@ -4,30 +4,30 @@
 #include <tqwhatsthis.h>
 
 #include <tdeaction.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevappfrontend.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevappfrontend.h"
 #include "domutil.h"
-#include "kdevplugininfo.h"
+#include "tdevplugininfo.h"
 
 #include "vbaconfigwidget.h"
 
 
 using namespace VisualBoyAdvance;
 
-typedef KDevGenericFactory<VisualBoyAdvancePart> VisualBoyAdvanceFactory;
-static const KDevPluginInfo data("kdevvisualboyadvance");
-K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( data ) )
+typedef TDevGenericFactory<VisualBoyAdvancePart> VisualBoyAdvanceFactory;
+static const TDevPluginInfo data("tdevvisualboyadvance");
+K_EXPORT_COMPONENT_FACTORY( libtdevvisualboyadvance, VisualBoyAdvanceFactory( data ) )
   
 VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name){
+  : TDevPlugin(&data, parent, name){
   setInstance(VisualBoyAdvanceFactory::instance());
 
-  setXMLFile("kdevpart_visualboyadvance.rc");
+  setXMLFile("tdevpart_visualboyadvance.rc");
   
   TDEAction *action;
   action = new TDEAction( i18n("Execute Program"), "exec",  Key_F9,
@@ -44,7 +44,7 @@ VisualBoyAdvancePart::~VisualBoyAdvancePart()
   
 }
 void VisualBoyAdvancePart::slotExecute(){
-  KDevProject* prj = project();
+  TDevProject* prj = project();
   TQDomDocument &doc = *projectDom();
   TQString binary = DomUtil::readEntry(doc, "/kdevvisualadvance/binary");
   TQString emulator = DomUtil::readEntry(doc, "/kdevvisualadvance/emulator");
@@ -62,7 +62,7 @@ void VisualBoyAdvancePart::slotExecute(){
 
   program += prj->projectDirectory() + "/" + binary;
 
-  if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
+  if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
       appFrontend->startAppCommand(TQString(), program, terminal);
 }
 
diff --git a/embedded/visualboyadvance/visualboyadvance_part.h b/embedded/visualboyadvance/visualboyadvance_part.h
index 941e0ff2..17a2ade8 100644
--- a/embedded/visualboyadvance/visualboyadvance_part.h
+++ b/embedded/visualboyadvance/visualboyadvance_part.h
@@ -3,15 +3,15 @@
  */
  
 
-#ifndef __KDEVPART_VISUALBOYADVANCE_H__
-#define __KDEVPART_VISUALBOYADVANCE_H__
+#ifndef __TDEVPART_VISUALBOYADVANCE_H__
+#define __TDEVPART_VISUALBOYADVANCE_H__
   
 #include <tqguardedptr.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include <kdialogbase.h>
 
 namespace VisualBoyAdvance {  
-  class VisualBoyAdvancePart : public KDevPlugin
+  class VisualBoyAdvancePart : public TDevPlugin
     {
       Q_OBJECT
   
diff --git a/kdevdesigner/plugins/Makefile.am b/kdevdesigner/plugins/Makefile.am
deleted file mode 100644
index defe80c4..00000000
--- a/kdevdesigner/plugins/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-INCLUDES = -I$(top_srcdir)/interfaces $(all_includes)
-METASOURCES = AUTO
-kdevdesignerdir = $(kde_moduledir)/plugins/kdevdesigner
-kdevdesigner_LTLIBRARIES =  libkdevdesigner_lang.la
-libkdevdesigner_lang_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-libkdevdesigner_lang_la_SOURCES = languageinterfaceimpl.cpp
-libkdevdesigner_lang_la_LIBADD = $(LIB_QT)
-
diff --git a/kdevdesigner/uilib/Makefile.am b/kdevdesigner/uilib/Makefile.am
deleted file mode 100644
index 0480cd50..00000000
--- a/kdevdesigner/uilib/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-KDE_CXXFLAGS=-UQT_NO_ASCII_CAST
-
-INCLUDES = -I$(top_srcdir)/kdevdesigner/shared $(all_includes)
-METASOURCES = AUTO
-
-noinst_LTLIBRARIES =  libkdevqui.la
-libkdevqui_la_SOURCES =  database.cpp qwidgetfactory.cpp
-
-libkdevqui_la_LDFLAGS = $(all_libraries)
diff --git a/languages/ada/CMakeLists.txt b/languages/ada/CMakeLists.txt
index e8d351b9..5b5d412b 100644
--- a/languages/ada/CMakeLists.txt
+++ b/languages/ada/CMakeLists.txt
@@ -33,13 +33,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevadasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevadasupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevadasupport )
+install( FILES tdevadasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevadasupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevadasupport )
 
 
-##### libkdevadasupport (module) ################
+##### libtdevadasupport (module) ################
 
-tde_add_kpart( libkdevadasupport AUTOMOC
+tde_add_kpart( libtdevadasupport AUTOMOC
   SOURCES
     adasupportpart.cpp problemreporter.cpp backgroundparser.cpp
     addclassdlg.ui addclass.cpp configproblemreporter.ui
diff --git a/languages/ada/Makefile.am b/languages/ada/Makefile.am
index d45a2add..61536e92 100644
--- a/languages/ada/Makefile.am
+++ b/languages/ada/Makefile.am
@@ -7,11 +7,11 @@ INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/interfaces \
 SUBDIRS = app_templates file_templates doc
 
 
-kde_module_LTLIBRARIES = libkdevadasupport.la
-libkdevadasupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN)
-libkdevadasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la 				$(top_builddir)/lib/antlr/src/libantlr.la
+kde_module_LTLIBRARIES = libtdevadasupport.la
+libtdevadasupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN)
+libtdevadasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la 				$(top_builddir)/lib/antlr/src/libantlr.la
 
-libkdevadasupport_la_SOURCES = adasupportpart.cpp problemreporter.cpp backgroundparser.cpp addclassdlg.ui addclass.cpp configproblemreporter.ui ada_utils.cpp adasupport.cpp AdaLexer.cpp AdaParser.cpp AdaTreeParserSuper.cpp AdaStoreWalker.cpp
+libtdevadasupport_la_SOURCES = adasupportpart.cpp problemreporter.cpp backgroundparser.cpp addclassdlg.ui addclass.cpp configproblemreporter.ui ada_utils.cpp adasupport.cpp AdaLexer.cpp AdaParser.cpp AdaTreeParserSuper.cpp AdaStoreWalker.cpp
 
 METASOURCES = AUTO
 
@@ -33,9 +33,9 @@ genparser:
 	antlr   ada.g && antlr   ada.tree.g && antlr -glib ada.tree.g  ada.store.g
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevadasupport.desktop
+service_DATA = tdevadasupport.desktop
 
-rcdir = $(kde_datadir)/kdevadasupport
-rc_DATA = kdevadasupport.rc
+rcdir = $(kde_datadir)/tdevadasupport
+rc_DATA = tdevadasupport.rc
 
 KDE_OPTIONS = nofinal
diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp
index aac02610..53c4af48 100644
--- a/languages/ada/adasupportpart.cpp
+++ b/languages/ada/adasupportpart.cpp
@@ -18,11 +18,11 @@
 #include <fstream>
 #include <sstream>
 
-#include "kdevgenericfactory.h"
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevmainwindow.h"
-#include "kdevpartcontroller.h"
+#include "tdevgenericfactory.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevmainwindow.h"
+#include "tdevpartcontroller.h"
 #include "codemodel.h"
 #include "adasupportpart.h"
 #include "problemreporter.h"
@@ -33,15 +33,15 @@
 #include "AdaStoreWalker.hpp"
 #include "AdaAST.hpp"
 
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
 enum { KDEV_DB_VERSION = 6 };
 enum { KDEV_PCS_VERSION = 6 };
 
-typedef KDevGenericFactory<AdaSupportPart> AdaSupportPartFactory;
+typedef TDevGenericFactory<AdaSupportPart> AdaSupportPartFactory;
 
-static const KDevPluginInfo data("kdevadasupport");
-K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (data))
+static const TDevPluginInfo data("tdevadasupport");
+K_EXPORT_COMPONENT_FACTORY (libtdevadasupport, AdaSupportPartFactory (data))
 
 
 struct AdaSupportPartData {
@@ -51,7 +51,7 @@ struct AdaSupportPartData {
 };
 
 AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
+    : TDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
 {
     setInstance (AdaSupportPartFactory::instance ());
 
@@ -93,9 +93,9 @@ AdaSupportPart::~AdaSupportPart ()
 }
 
 
-KDevLanguageSupport::Features AdaSupportPart::features ()
+TDevLanguageSupport::Features AdaSupportPart::features ()
 {
-    return KDevLanguageSupport::Features
+    return TDevLanguageSupport::Features
         (  // TBD: Classes |
 	 Functions | Namespaces);
 }
diff --git a/languages/ada/adasupportpart.h b/languages/ada/adasupportpart.h
index eb9e2630..32160b38 100644
--- a/languages/ada/adasupportpart.h
+++ b/languages/ada/adasupportpart.h
@@ -2,7 +2,7 @@
 #ifndef __ADASUPPORTPART_H__
 #define __ADASUPPORTPART_H__
 
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 
 #include <tqwaitcondition.h>
 
@@ -10,7 +10,7 @@ class AdaSupportPartData;
 class KDialogBase;
 class TQStringList;
 
-class AdaSupportPart : public KDevLanguageSupport
+class AdaSupportPart : public TDevLanguageSupport
 {
     Q_OBJECT
   
diff --git a/languages/ada/app_templates/adahello/CMakeLists.txt b/languages/ada/app_templates/adahello/CMakeLists.txt
index cbd00e6e..ba3a3eb5 100644
--- a/languages/ada/app_templates/adahello/CMakeLists.txt
+++ b/languages/ada/app_templates/adahello/CMakeLists.txt
@@ -15,8 +15,8 @@ add_custom_target( adahello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/adahello.tar.gz adahello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 install( FILES
-    adahello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    adahello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/ada/app_templates/adahello/Makefile.am b/languages/ada/app_templates/adahello/Makefile.am
index 5a970c91..5cc49953 100644
--- a/languages/ada/app_templates/adahello/Makefile.am
+++ b/languages/ada/app_templates/adahello/Makefile.am
@@ -1,10 +1,10 @@
 dataFiles = main.adb app.tdevelop ada-Makefile app.tdevelop.filelist
 
 ### no need to change below:
-template_DATA = adahello.kdevtemplate
+template_DATA = adahello.tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 adahello.tar.gz:
 	$(TAR) -cf adahello.tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 adahello.tar
diff --git a/languages/ada/app_templates/adahello/adahello.kdevtemplate b/languages/ada/app_templates/adahello/adahello.tdevtemplate
index 0cc09da2..810315a6 100644
--- a/languages/ada/app_templates/adahello/adahello.kdevtemplate
+++ b/languages/ada/app_templates/adahello/adahello.tdevtemplate
@@ -70,7 +70,7 @@ Archive=adahello.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/ada/app_templates/adahello/app.tdevelop b/languages/ada/app_templates/adahello/app.tdevelop
index a94f7e34..83815aa1 100644
--- a/languages/ada/app_templates/adahello/app.tdevelop
+++ b/languages/ada/app_templates/adahello/app.tdevelop
@@ -4,14 +4,14 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>KDevCustomProject</projectmanagement>
+  <projectmanagement>TDevCustomProject</projectmanagement>
   <primarylanguage>Ada</primarylanguage>
   <keywords>
    <keyword>Ada</keyword>
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevcustomproject>
+ <tdevcustomproject>
     <run>
       <directoryradio>build</directoryradio>
       <customdirectory>/</customdirectory>
@@ -25,8 +25,8 @@
       <buildtool>make</buildtool>
       <builddir/>
     </build> 
- </kdevcustomproject>
- <kdevdoctreeview>
+ </tdevcustomproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -73,12 +73,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="ads"/>
    <type ext="adb"/>
    <type ext="ada"/>
   </useglobaltypes>
- </kdevfilecreate>
+ </tdevfilecreate>
 </tdevelop>
diff --git a/languages/ada/doc/CMakeLists.txt b/languages/ada/doc/CMakeLists.txt
index 62b3ef26..32d4281c 100644
--- a/languages/ada/doc/CMakeLists.txt
+++ b/languages/ada/doc/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     ada.toc ada_bugs_gcc.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs )
diff --git a/languages/ada/doc/Makefile.am b/languages/ada/doc/Makefile.am
index ff5f8a32..da0655f6 100644
--- a/languages/ada/doc/Makefile.am
+++ b/languages/ada/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = ada.toc ada_bugs_gcc.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/ada/file_templates/CMakeLists.txt b/languages/ada/file_templates/CMakeLists.txt
index 21d16b69..7eb47fdc 100644
--- a/languages/ada/file_templates/CMakeLists.txt
+++ b/languages/ada/file_templates/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     adb ads
-  DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
diff --git a/languages/ada/file_templates/Makefile.am b/languages/ada/file_templates/Makefile.am
index 58bbd907..4635979e 100644
--- a/languages/ada/file_templates/Makefile.am
+++ b/languages/ada/file_templates/Makefile.am
@@ -1,3 +1,3 @@
-templatedir = $(kde_datadir)/kdevfilecreate/file-templates
+templatedir = $(kde_datadir)/tdevfilecreate/file-templates
 template_DATA = adb ads
 
diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp
index 6bac0253..cfd9acc7 100644
--- a/languages/ada/problemreporter.cpp
+++ b/languages/ada/problemreporter.cpp
@@ -19,8 +19,8 @@
 
 #include "problemreporter.h"
 #include "adasupportpart.h"
-#include "kdevpartcontroller.h"
-#include "kdevmainwindow.h"
+#include "tdevpartcontroller.h"
+#include "tdevmainwindow.h"
 #include "configproblemreporter.h"
 #include "backgroundparser.h"
 
diff --git a/languages/ada/kdevadasupport.desktop b/languages/ada/tdevadasupport.desktop
index f1ae3bf1..6bee2461 100644
--- a/languages/ada/kdevadasupport.desktop
+++ b/languages/ada/tdevadasupport.desktop
@@ -82,6 +82,6 @@ GenericName[tr]=Ada Dil Desteği
 GenericName[zh_CN]=Ada 语言支持
 GenericName[zh_TW]=Ada 語言支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libkdevadasupport
+X-TDE-Library=libtdevadasupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Ada
diff --git a/languages/ada/kdevadasupport.rc b/languages/ada/tdevadasupport.rc
index 23b705db..23b705db 100644
--- a/languages/ada/kdevadasupport.rc
+++ b/languages/ada/tdevadasupport.rc
diff --git a/languages/bash/CMakeLists.txt b/languages/bash/CMakeLists.txt
index 9998693d..eca8c096 100644
--- a/languages/bash/CMakeLists.txt
+++ b/languages/bash/CMakeLists.txt
@@ -29,13 +29,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevbashsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevbashsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevbashsupport )
+install( FILES tdevbashsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevbashsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevbashsupport )
 
 
-##### libkdevbashsupport (module) ###############
+##### libtdevbashsupport (module) ###############
 
-tde_add_kpart( libkdevbashsupport AUTOMOC
+tde_add_kpart( libtdevbashsupport AUTOMOC
   SOURCES bashsupport_part.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/languages/bash/Makefile.am b/languages/bash/Makefile.am
index 5916563a..2f750d63 100644
--- a/languages/bash/Makefile.am
+++ b/languages/bash/Makefile.am
@@ -5,16 +5,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	$(all_includes)
 SUBDIRS = app_templates doc
 
-kde_module_LTLIBRARIES = libkdevbashsupport.la
-libkdevbashsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevbashsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevbashsupport.la
+libtdevbashsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevbashsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevbashsupport_la_SOURCES = bashsupport_part.cpp
+libtdevbashsupport_la_SOURCES = bashsupport_part.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevbashsupport.desktop
+service_DATA = tdevbashsupport.desktop
 
-rcdir = $(kde_datadir)/kdevbashsupport
-rc_DATA = kdevbashsupport.rc
+rcdir = $(kde_datadir)/tdevbashsupport
+rc_DATA = tdevbashsupport.rc
diff --git a/languages/bash/app_templates/bashhello/CMakeLists.txt b/languages/bash/app_templates/bashhello/CMakeLists.txt
index 69abf15c..0c002f83 100644
--- a/languages/bash/app_templates/bashhello/CMakeLists.txt
+++ b/languages/bash/app_templates/bashhello/CMakeLists.txt
@@ -15,8 +15,8 @@ add_custom_target( bashhello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/bashhello.tar.gz bashhello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 install( FILES
-    bashhello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    bashhello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/bash/app_templates/bashhello/Makefile.am b/languages/bash/app_templates/bashhello/Makefile.am
index b26692b4..ed84d271 100644
--- a/languages/bash/app_templates/bashhello/Makefile.am
+++ b/languages/bash/app_templates/bashhello/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = app.sh app.tdevelop
 templateName = bashhello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/bash/app_templates/bashhello/app.tdevelop b/languages/bash/app_templates/bashhello/app.tdevelop
index cab08799..bbc04992 100644
--- a/languages/bash/app_templates/bashhello/app.tdevelop
+++ b/languages/bash/app_templates/bashhello/app.tdevelop
@@ -11,22 +11,22 @@
   </keywords>
   <ignoreparts>
    <part>KDevdistpart</part>
-   <part>KDevDebugger</part>
+   <part>TDevDebugger</part>
   </ignoreparts>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <general>
 		<activedir>src</activedir>
 		<includepatterns>*.sh</includepatterns>
 		<excludepatterns>*~</excludepatterns>
   </general>
- </kdevscriptproject>
- <kdevfileview>
+ </tdevscriptproject>
+ <tdevfileview>
 	 <groups>
 	   <group pattern="*.sh" name="Scripts" />
 	 </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -73,10 +73,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
 			<type ext="sh"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/languages/bash/app_templates/bashhello/bashhello.kdevtemplate b/languages/bash/app_templates/bashhello/bashhello.tdevtemplate
index b9e7bd11..b9e7bd11 100644
--- a/languages/bash/app_templates/bashhello/bashhello.kdevtemplate
+++ b/languages/bash/app_templates/bashhello/bashhello.tdevtemplate
diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
index 9f1be201..7cfd9889 100644
--- a/languages/bash/bashsupport_part.cpp
+++ b/languages/bash/bashsupport_part.cpp
@@ -14,7 +14,7 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <tdeaction.h>
@@ -22,25 +22,25 @@
 #include <kdialogbase.h>
 
 
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
-#include <kdevlanguagesupport.h>
-#include <kdevpartcontroller.h>
-#include <kdevproject.h>
-#include <kdevappfrontend.h>
-#include <kdevplugininfo.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
+#include <tdevlanguagesupport.h>
+#include <tdevpartcontroller.h>
+#include <tdevproject.h>
+#include <tdevappfrontend.h>
+#include <tdevplugininfo.h>
 #include <domutil.h>
 #include <codemodel.h>
 
-typedef KDevGenericFactory<BashSupportPart> BashSupportFactory;
-static const KDevPluginInfo data("kdevbashsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( data ) )
+typedef TDevGenericFactory<BashSupportPart> BashSupportFactory;
+static const TDevPluginInfo data("tdevbashsupport");
+K_EXPORT_COMPONENT_FACTORY( libtdevbashsupport, BashSupportFactory( data ) )
 
 BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStringList& )
-: KDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" )
+: TDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" )
 {
 	setInstance(BashSupportFactory::instance());
-	setXMLFile("kdevbashsupport.rc");
+	setXMLFile("tdevbashsupport.rc");
 
 	TDEAction *action;
 	action = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
@@ -182,12 +182,12 @@ void BashSupportPart::savedFile(const KURL &fileName)
 void BashSupportPart::startApplication(const TQString &program)
 {
 	kdDebug() << "starting application" << program << endl;
-	if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
+	if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
 		appFrontend->startAppCommand(TQString(), program, TRUE);
 }
 
 
-KDevLanguageSupport::Features BashSupportPart::features()
+TDevLanguageSupport::Features BashSupportPart::features()
 {
 	return Features(Variables | Functions);
 }
diff --git a/languages/bash/bashsupport_part.h b/languages/bash/bashsupport_part.h
index 284e4f4c..b1fff80e 100644
--- a/languages/bash/bashsupport_part.h
+++ b/languages/bash/bashsupport_part.h
@@ -3,8 +3,8 @@
  */
 
 
-#ifndef __KDEVPART_BASHSUPPORT_H__
-#define __KDEVPART_BASHSUPPORT_H__
+#ifndef __TDEVPART_BASHSUPPORT_H__
+#define __TDEVPART_BASHSUPPORT_H__
 
 
 #include <tqguardedptr.h>
@@ -13,8 +13,8 @@
 #include <kdialogbase.h>
 
 #include <codemodel.h>
-#include <kdevplugin.h>
-#include <kdevlanguagesupport.h>
+#include <tdevplugin.h>
+#include <tdevlanguagesupport.h>
 
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/viewcursorinterface.h>
@@ -47,7 +47,7 @@ class BashCodeCompletion : TQObject
 		KTextEditor::ViewCursorInterface *m_cursorInterface;
 };
 
-class BashSupportPart : public KDevLanguageSupport
+class BashSupportPart : public TDevLanguageSupport
 {
 	Q_OBJECT
   
diff --git a/languages/bash/doc/CMakeLists.txt b/languages/bash/doc/CMakeLists.txt
index 0d2d2a83..09ad4e33 100644
--- a/languages/bash/doc/CMakeLists.txt
+++ b/languages/bash/doc/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     bash.toc bash_bugs.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs )
diff --git a/languages/bash/doc/Makefile.am b/languages/bash/doc/Makefile.am
index 1474d939..ab1c4f52 100644
--- a/languages/bash/doc/Makefile.am
+++ b/languages/bash/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = bash.toc bash_bugs.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/bash/kdevbashsupport.desktop b/languages/bash/tdevbashsupport.desktop
index 91a98e3e..854201e7 100644
--- a/languages/bash/kdevbashsupport.desktop
+++ b/languages/bash/tdevbashsupport.desktop
@@ -80,6 +80,6 @@ GenericName[tr]=Bash Desteği
 GenericName[zh_CN]=Bash 支持
 GenericName[zh_TW]=Bash 支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libkdevbashsupport
+X-TDE-Library=libtdevbashsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Bash
diff --git a/languages/bash/kdevbashsupport.rc b/languages/bash/tdevbashsupport.rc
index d4592d6b..d4592d6b 100644
--- a/languages/bash/kdevbashsupport.rc
+++ b/languages/bash/tdevbashsupport.rc
diff --git a/languages/cpp/CMakeLists.txt b/languages/cpp/CMakeLists.txt
index 8d1c569a..3da1e579 100644
--- a/languages/cpp/CMakeLists.txt
+++ b/languages/cpp/CMakeLists.txt
@@ -45,17 +45,17 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevcppsupport.desktop kdevcsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevcppsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport )
-install( FILES cpptemplates DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/templates )
-install( FILES configuration DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport )
+install( FILES tdevcppsupport.desktop tdevcsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevcppsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport )
+install( FILES cpptemplates DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/templates )
+install( FILES configuration DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport )
 
 
-##### libkdevcppsupport (module) ################
+##### libtdevcppsupport (module) ################
 
-tde_add_kpart( libkdevcppsupport AUTOMOC
+tde_add_kpart( libtdevcppsupport AUTOMOC
   SOURCES
-    KDevCppSupportIface.cpp KDevCppSupportIface.skel
+    TDevCppSupportIface.cpp TDevCppSupportIface.skel
     addattributedialog.cpp addattributedialogbase.ui
     addmethoddialog.cpp addmethoddialogbase.ui
     ast_utils.cpp backgroundparser.cpp ccconfigwidget.cpp
@@ -72,7 +72,7 @@ tde_add_kpart( libkdevcppsupport AUTOMOC
     creategettersetterdialog.cpp creategettersetterdialog.h
     createpcsdialog.cpp createpcsdialogbase.ui
     doxydoc.cpp includefiles.cpp includepathresolver.cpp
-    kdevdriver.cpp problemreporter.cpp qtbuildconfig.cpp
+    tdevdriver.cpp problemreporter.cpp qtbuildconfig.cpp
     qtdesignercppintegration.cpp setuphelper.cpp
     simplecontext.cpp simpletype.cpp simpletypecatalog.cpp
     simpletypefunction.cpp simpletypenamespace.cpp
@@ -80,7 +80,7 @@ tde_add_kpart( libkdevcppsupport AUTOMOC
     subclassingdlg.cpp subclassingdlgbase.ui tag_creator.cpp
     typedesc.cpp
   LINK
-    lang_interfaces-shared kdevcppparser-shared
-    kdevcatalog-shared designerintegration-shared
+    lang_interfaces-shared tdevcppparser-shared
+    tdevcatalog-shared designerintegration-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/cpp/KDevCppSupportIface.cpp b/languages/cpp/KDevCppSupportIface.cpp
deleted file mode 100644
index 793516ca..00000000
--- a/languages/cpp/KDevCppSupportIface.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#include "KDevCppSupportIface.h"
-#include "cppsupportpart.h"
-
-KDevCppSupportIface::KDevCppSupportIface( CppSupportPart* cppSupport )
-    : TQObject( cppSupport ), DCOPObject( "KDevCppSupport" ), m_cppSupport( cppSupport )
-{
-}
-
-KDevCppSupportIface::~KDevCppSupportIface()
-{
-}
-
-void KDevCppSupportIface::addClass()
-{
-    m_cppSupport->slotNewClass();
-}
-
-void KDevCppSupportIface::parseProject()
-{
-    m_cppSupport->parseProject();
-}
-
-#include "KDevCppSupportIface.moc"
diff --git a/languages/cpp/Makefile.am b/languages/cpp/Makefile.am
index 7c506ac1..dc4974c3 100644
--- a/languages/cpp/Makefile.am
+++ b/languages/cpp/Makefile.am
@@ -10,14 +10,14 @@ INCLUDES = -I$(top_srcdir)/languages/lib/designer_integration \
 	-I$(top_builddir)/languages/lib/designer_integration -I$(top_builddir)/bdb/build_unix -I$(top_srcdir)/bdb/include \
 	$(all_includes)
 
-kde_module_LTLIBRARIES = libkdevcppsupport.la
-libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevcppsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/catalog/libkdevcatalog.la $(top_builddir)/lib/cppparser/libkdevcppparser.la \
+kde_module_LTLIBRARIES = libtdevcppsupport.la
+libtdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevcppsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/catalog/libtdevcatalog.la $(top_builddir)/lib/cppparser/libtdevcppparser.la \
 	$(top_builddir)/languages/lib/interfaces/liblang_interfaces.la \
-	$(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/lib/interfaces/libkdevinterfaces.la
+	$(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/lib/interfaces/libtdevinterfaces.la
 
-libkdevcppsupport_la_SOURCES = KDevCppSupportIface.cpp KDevCppSupportIface.skel \
+libtdevcppsupport_la_SOURCES = TDevCppSupportIface.cpp TDevCppSupportIface.skel \
 	addattributedialog.cpp addattributedialogbase.ui addmethoddialog.cpp addmethoddialogbase.ui \
 	ast_utils.cpp backgroundparser.cpp ccconfigwidget.cpp ccconfigwidgetbase.ui \
 	classgeneratorconfig.cpp classgeneratorconfigbase.ui codeinformationrepository.cpp \
@@ -27,7 +27,7 @@ libkdevcppsupport_la_SOURCES = KDevCppSupportIface.cpp KDevCppSupportIface.skel
 	cppsupportfactory.cpp cppsupportpart.cpp creategettersetter.ui \
 	creategettersetterconfiguration.cpp creategettersetterconfiguration.h creategettersetterdialog.cpp \
 	creategettersetterdialog.h createpcsdialog.cpp createpcsdialogbase.ui doxydoc.cpp includefiles.cpp \
-	includepathresolver.cpp kdevdriver.cpp problemreporter.cpp qtbuildconfig.cpp \
+	includepathresolver.cpp tdevdriver.cpp problemreporter.cpp qtbuildconfig.cpp \
 	qtdesignercppintegration.cpp setuphelper.cpp simplecontext.cpp simpletype.cpp simpletypecatalog.cpp \
 	simpletypefunction.cpp simpletypenamespace.cpp store_walker.cpp storeconverter.cpp \
 	stringhelpers.cpp subclassingdlg.cpp subclassingdlgbase.ui tag_creator.cpp typedesc.cpp
@@ -35,15 +35,15 @@ libkdevcppsupport_la_SOURCES = KDevCppSupportIface.cpp KDevCppSupportIface.skel
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevcppsupport.desktop kdevcsupport.desktop
+service_DATA = tdevcppsupport.desktop tdevcsupport.desktop
 
-rcdir = $(kde_datadir)/kdevcppsupport
-rc_DATA = kdevcppsupport.rc
+rcdir = $(kde_datadir)/tdevcppsupport
+rc_DATA = tdevcppsupport.rc
 
-templatedir = ${kde_datadir}/kdevabbrev/templates
+templatedir = ${kde_datadir}/tdevabbrev/templates
 template_DATA = cpptemplates
 
-configurationdir = ${kde_datadir}/kdevcppsupport
+configurationdir = ${kde_datadir}/tdevcppsupport
 configuration_DATA = configuration
 
 AM_CXXFLAGS = -DAST_DEBUG
@@ -51,8 +51,8 @@ AM_CXXFLAGS = -DAST_DEBUG
 #bin_PROGRAMS = r++
 #r___LDFLAGS = $(all_libraries)
 #r___SOURCES = main.cpp
-#r___DEPENDENCIES = libkdevcppsupport.la
-#r___LDADD = libkdevcppsupport.la $(top_builddir)/lib/catalog/libkdevcatalog.la $(top_builddir)/lib/cppparser/libkdevcppparser.la
+#r___DEPENDENCIES = libtdevcppsupport.la
+#r___LDADD = libtdevcppsupport.la $(top_builddir)/lib/catalog/libtdevcatalog.la $(top_builddir)/lib/cppparser/libtdevcppparser.la
 noinst_HEADERS = cppevaluation.h cppimplementationwidget.h \
 	cppsplitheadersourceconfig.h declarationinfo.h expressioninfo.h includefiles.h includepathresolver.h \
 	qtdesignercppintegration.h setuphelper.h simplecontext.h simpletypecatalog.h simpletypefunction.h \
diff --git a/languages/cpp/README.dox b/languages/cpp/README.dox
index 460c4cc7..527e50ab 100644
--- a/languages/cpp/README.dox
+++ b/languages/cpp/README.dox
@@ -4,7 +4,7 @@ Provides C/C++ language support for KDevelop.
 Well the first thing you should read is lib/catalog it contains the source of the persistant class store
 after that languages/cpp/tag_creator.*
 it is the component that stores the informations collected by the c++ parser into the PCS
-then you can play with KDevPCSImporter the code of the dialog is in languages/cpp/createpcsdialog* and languages/cpp/pcsimporter/*
+then you can play with TDevPCSImporter the code of the dialog is in languages/cpp/createpcsdialog* and languages/cpp/pcsimporter/*
 and of course lib/interfaces/kdevpcsimporter.*
 and if you want play with the c++ parser go to lib/cppparser/, the best is to start to read driver.*
 
diff --git a/languages/cpp/TDevCppSupportIface.cpp b/languages/cpp/TDevCppSupportIface.cpp
new file mode 100644
index 00000000..54977c4c
--- /dev/null
+++ b/languages/cpp/TDevCppSupportIface.cpp
@@ -0,0 +1,24 @@
+
+#include "TDevCppSupportIface.h"
+#include "cppsupportpart.h"
+
+TDevCppSupportIface::TDevCppSupportIface( CppSupportPart* cppSupport )
+    : TQObject( cppSupport ), DCOPObject( "TDevCppSupport" ), m_cppSupport( cppSupport )
+{
+}
+
+TDevCppSupportIface::~TDevCppSupportIface()
+{
+}
+
+void TDevCppSupportIface::addClass()
+{
+    m_cppSupport->slotNewClass();
+}
+
+void TDevCppSupportIface::parseProject()
+{
+    m_cppSupport->parseProject();
+}
+
+#include "TDevCppSupportIface.moc"
diff --git a/languages/cpp/KDevCppSupportIface.h b/languages/cpp/TDevCppSupportIface.h
index cbf8b4f9..c94509ba 100644
--- a/languages/cpp/KDevCppSupportIface.h
+++ b/languages/cpp/TDevCppSupportIface.h
@@ -1,20 +1,20 @@
 
-#ifndef KDEVCPPSUPPORTIFACE_H
-#define KDEVCPPSUPPORTIFACE_H
+#ifndef TDEVCPPSUPPORTIFACE_H
+#define TDEVCPPSUPPORTIFACE_H
 
 #include <tqobject.h>
 #include <dcopobject.h>
 
 class CppSupportPart;
 
-class KDevCppSupportIface : public TQObject, public DCOPObject
+class TDevCppSupportIface : public TQObject, public DCOPObject
 {
 	Q_OBJECT
 //	
 	K_DCOP
 public:
-	KDevCppSupportIface( CppSupportPart* cppSupport );
-	~KDevCppSupportIface();
+	TDevCppSupportIface( CppSupportPart* cppSupport );
+	~TDevCppSupportIface();
 
 k_dcop:
 	void addClass();
diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp
index 6a9a1fbc..705678cd 100644
--- a/languages/cpp/addattributedialog.cpp
+++ b/languages/cpp/addattributedialog.cpp
@@ -23,7 +23,7 @@
 #include "backgroundparser.h"
 #include "cppsupport_utils.h"
 
-#include <kdevpartcontroller.h>
+#include <tdevpartcontroller.h>
 
 #include <codemodel.h>
 
diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp
index c9593844..f9e9c602 100644
--- a/languages/cpp/addmethoddialog.cpp
+++ b/languages/cpp/addmethoddialog.cpp
@@ -24,8 +24,8 @@
 #include "cppsupport_utils.h"
 #include "domutil.h"
 
-#include <kdevpartcontroller.h>
-#include <kdevcreatefile.h>
+#include <tdevpartcontroller.h>
+#include <tdevcreatefile.h>
 
 #include <tdelocale.h>
 #include <tdefiledialog.h>
@@ -236,7 +236,7 @@ void AddMethodDialog::accept()
 		TQFileInfo fileInfo( implementationFile );
 		if ( !TQFile::exists( fileInfo.absFilePath() ) )
 		{
-			if ( KDevCreateFile * createFileSupp = m_cppSupport->extension<KDevCreateFile>( "TDevelop/CreateFile" ) )
+			if ( TDevCreateFile * createFileSupp = m_cppSupport->extension<TDevCreateFile>( "TDevelop/CreateFile" ) )
 				createFileSupp->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.baseName() );
 		}
 
diff --git a/languages/cpp/app_templates/CMakeLists.txt b/languages/cpp/app_templates/CMakeLists.txt
index 52229fc6..2ed5ec56 100644
--- a/languages/cpp/app_templates/CMakeLists.txt
+++ b/languages/cpp/app_templates/CMakeLists.txt
@@ -9,14 +9,14 @@
 #
 #################################################
 
-add_subdirectory( kapp )
+add_subdirectory( tdeapp )
 add_subdirectory( kpartapp )
 add_subdirectory( kpartplugin )
 add_subdirectory( tdecmodule )
 add_subdirectory( kicker )
 add_subdirectory( tdeioslave )
-add_subdirectory( kdevpart )
-add_subdirectory( kdevpart2 )
+add_subdirectory( tdevpart )
+add_subdirectory( tdevpart2 )
 add_subdirectory( chello )
 add_subdirectory( cpphello )
 add_subdirectory( tdescreensaver )
@@ -32,11 +32,11 @@ add_subdirectory( khello2 )
 add_subdirectory( kateplugin )
 add_subdirectory( kateplugin2 )
 add_subdirectory( qtopiaapp )
-add_subdirectory( kdedcop )
+add_subdirectory( tdedcop )
 add_subdirectory( wxhello )
 add_subdirectory( cppsdlhello )
 add_subdirectory( tdeconfig35 )
-add_subdirectory( kdevlang )
+add_subdirectory( tdevlang )
 add_subdirectory( noatunvisual )
 add_subdirectory( noatunui )
 add_subdirectory( kmod )
@@ -64,7 +64,7 @@ add_subdirectory( qmakeempty )
 add_subdirectory( automakeempty )
 add_subdirectory( makefileempty )
 add_subdirectory( qtopia4app )
-add_subdirectory( kde4app )
+add_subdirectory( tde4app )
 
 install( FILES
     c.appwizard
@@ -75,5 +75,5 @@ install( FILES
   DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE )
 
 install( FILES
-    kdecpp.appwizard
+    tdecpp.appwizard
   DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE )
diff --git a/languages/cpp/app_templates/Makefile.am b/languages/cpp/app_templates/Makefile.am
index 8350118d..e594ce4e 100644
--- a/languages/cpp/app_templates/Makefile.am
+++ b/languages/cpp/app_templates/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker tdeioslave kdevpart kdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello tdeconfig35 kdevlang noatunvisual noatunui kmod tdefileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app
+SUBDIRS = tdeapp kpartapp kpartplugin tdecmodule kicker tdeioslave tdevpart tdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp tdedcop wxhello cppsdlhello tdeconfig35 tdevlang noatunvisual noatunui kmod tdefileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qt4hello qmakeempty automakeempty makefileempty qtopia4app tde4app
 
 profilescdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE
 profilesc_DATA = c.appwizard
@@ -6,5 +6,5 @@ profilesc_DATA = c.appwizard
 profilescppdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE
 profilescpp_DATA = cpp.appwizard
 
-profileskdecppdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE
-profileskdecpp_DATA = kdecpp.appwizard
+profilestdecppdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE
+profilestdecpp_DATA = tdecpp.appwizard
diff --git a/languages/cpp/app_templates/automakeempty/CMakeLists.txt b/languages/cpp/app_templates/automakeempty/CMakeLists.txt
index 6785106a..8757cdce 100644
--- a/languages/cpp/app_templates/automakeempty/CMakeLists.txt
+++ b/languages/cpp/app_templates/automakeempty/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( automakeempty.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/automakeempty.tar.gz automakeempty.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    automakeempty.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    automakeempty.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/automakeempty/Makefile.am b/languages/cpp/app_templates/automakeempty/Makefile.am
index 06f9a94c..8c6ceb16 100644
--- a/languages/cpp/app_templates/automakeempty/Makefile.am
+++ b/languages/cpp/app_templates/automakeempty/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = automakeempty-Makefile.am automakeempty-Makefile.cvs \
 templateName = automakeempty
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/automakeempty/app.tdevelop b/languages/cpp/app_templates/automakeempty/app.tdevelop
index ab12095d..f30a3dfc 100644
--- a/languages/cpp/app_templates/automakeempty/app.tdevelop
+++ b/languages/cpp/app_templates/automakeempty/app.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
   </general>
   <run>
@@ -33,8 +33,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevdoctreeview>
+ </tdevautoproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -79,23 +79,23 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="cpp"/>
    <type ext="h"/>
   </useglobaltypes>
- </kdevfilecreate>
- <kdevfileview>
+ </tdevfilecreate>
+ <tdevfileview>
     <groups>
       <group pattern="*.h" name="Header files" />
       <group pattern="*.cpp" name="Source files" />
     </groups>
- </kdevfileview>
-  <kdevdocumentation>
+ </tdevfileview>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate b/languages/cpp/app_templates/automakeempty/automakeempty.tdevtemplate
index a1ced086..6581b4fa 100644
--- a/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate
+++ b/languages/cpp/app_templates/automakeempty/automakeempty.tdevtemplate
@@ -53,11 +53,11 @@ Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [INCADMIN]
 Type=include
-File=%{tdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/chello/CMakeLists.txt b/languages/cpp/app_templates/chello/CMakeLists.txt
index 5d792072..9df341e8 100644
--- a/languages/cpp/app_templates/chello/CMakeLists.txt
+++ b/languages/cpp/app_templates/chello/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( chello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/chello.tar.gz chello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    chello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    chello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/chello/Makefile.am b/languages/cpp/app_templates/chello/Makefile.am
index 0a51e6fd..3c77d4fb 100644
--- a/languages/cpp/app_templates/chello/Makefile.am
+++ b/languages/cpp/app_templates/chello/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = main.c src-Makefile.am c-Makefile.am c-Makefile.cvs \
 templateName = chello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles} ${dataFiles} ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/chello/app.tdevelop b/languages/cpp/app_templates/chello/app.tdevelop
index 41866d9f..825cf9a3 100644
--- a/languages/cpp/app_templates/chello/app.tdevelop
+++ b/languages/cpp/app_templates/chello/app.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -37,8 +37,8 @@
         <cflags>-O0 -g3 %{CFLAGS}</cflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevdoctreeview>
+ </tdevautoproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -85,23 +85,23 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="c"/>
    <type ext="h"/>
   </useglobaltypes>
- </kdevfilecreate>
- <kdevfileview>
+ </tdevfilecreate>
+ <tdevfileview>
     <groups>
       <group pattern="*.h" name="Header files" />
       <group pattern="*.c" name="Source files" />
     </groups>
- </kdevfileview>
-  <kdevdocumentation>
+ </tdevfileview>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/chello/chello.kdevtemplate b/languages/cpp/app_templates/chello/chello.tdevtemplate
index 6dc5fb77..1368d851 100644
--- a/languages/cpp/app_templates/chello/chello.kdevtemplate
+++ b/languages/cpp/app_templates/chello/chello.tdevtemplate
@@ -211,11 +211,11 @@ Archive=chello.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{tdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/cpp/app_templates/chello_gba/CMakeLists.txt b/languages/cpp/app_templates/chello_gba/CMakeLists.txt
index b11230fe..6810ed53 100644
--- a/languages/cpp/app_templates/chello_gba/CMakeLists.txt
+++ b/languages/cpp/app_templates/chello_gba/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( chellogba.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/chellogba.tar.gz chellogba.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    chellogba.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    chellogba.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/chello_gba/Makefile.am b/languages/cpp/app_templates/chello_gba/Makefile.am
index fbc6c2b4..afaf8c0b 100644
--- a/languages/cpp/app_templates/chello_gba/Makefile.am
+++ b/languages/cpp/app_templates/chello_gba/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = main.c font.raw.c master.pal.c src-Makefile.am c-Makefile.am \
 templateName = chellogba
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles} ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/chello_gba/app.tdevelop b/languages/cpp/app_templates/chello_gba/app.tdevelop
index 2f59c978..3c38bcf4 100644
--- a/languages/cpp/app_templates/chello_gba/app.tdevelop
+++ b/languages/cpp/app_templates/chello_gba/app.tdevelop
@@ -11,10 +11,10 @@
    <keyword>GBA</keyword>
   </keywords>
   <ignoreparts>
-   <part>KDevDebugger</part>
+   <part>TDevDebugger</part>
   </ignoreparts>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
   </general>
@@ -33,11 +33,11 @@
     <cflags>-nostartfiles</cflags>
    </default>
   </configurations>
- </kdevautoproject>
- <kdevvisualadvance>
+ </tdevautoproject>
+ <tdevvisualadvance>
    <binary>src/%{APPNAMELC}.gba</binary>
- </kdevvisualadvance>
- <kdevdoctreeview>
+ </tdevvisualadvance>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -84,17 +84,17 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="c"/>
    <type ext="h"/>
   </useglobaltypes>
- </kdevfilecreate>
-  <kdevdocumentation>
+ </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate b/languages/cpp/app_templates/chello_gba/chellogba.tdevtemplate
index ef89357f..e6ea8c90 100644
--- a/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate
+++ b/languages/cpp/app_templates/chello_gba/chellogba.tdevtemplate
@@ -68,11 +68,11 @@ Archive=chellogba.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{tdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/cpp/app_templates/clanlib/CMakeLists.txt b/languages/cpp/app_templates/clanlib/CMakeLists.txt
index e0b99cc2..c8fdfe2d 100644
--- a/languages/cpp/app_templates/clanlib/CMakeLists.txt
+++ b/languages/cpp/app_templates/clanlib/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( clanlib.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/clanlib.tar.gz clanlib.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    clanlib.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    clanlib.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/clanlib/Makefile.am b/languages/cpp/app_templates/clanlib/Makefile.am
index 84e0459b..b6aa9150 100644
--- a/languages/cpp/app_templates/clanlib/Makefile.am
+++ b/languages/cpp/app_templates/clanlib/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = src-Makefile.am app-Makefile.am main.cpp app.tdevelop \
 templateName = clanlib
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/clanlib/app.tdevelop b/languages/cpp/app_templates/clanlib/app.tdevelop
index d2e9e430..15418279 100644
--- a/languages/cpp/app_templates/clanlib/app.tdevelop
+++ b/languages/cpp/app_templates/clanlib/app.tdevelop
@@ -12,7 +12,7 @@
    <keyword>ClanLib</keyword>
   </keywords>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -43,8 +43,8 @@
         <ldflags></ldflags>
       </default>
   </configurations>
-  </kdevautoproject>
- <kdevdoctreeview>
+  </tdevautoproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -90,17 +90,17 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="cpp"/>
    <type ext="h"/>
   </useglobaltypes>
- </kdevfilecreate>
-  <kdevdocumentation>
+ </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate b/languages/cpp/app_templates/clanlib/clanlib.tdevtemplate
index 1b39badc..89243557 100644
--- a/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate
+++ b/languages/cpp/app_templates/clanlib/clanlib.tdevtemplate
@@ -68,7 +68,7 @@ Archive=clanlib.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt
index 841853d8..df6ec7b7 100644
--- a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt
+++ b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( cmakelibc.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/cmakelibc.tar.gz cmakelibc.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    cmakelibc.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    cmakelibc.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/cmakelibc/Makefile.am b/languages/cpp/app_templates/cmakelibc/Makefile.am
index c10e704a..f4fb8bb2 100644
--- a/languages/cpp/app_templates/cmakelibc/Makefile.am
+++ b/languages/cpp/app_templates/cmakelibc/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = test.c lib.h lib.c cmakelibc.png CMakeLists.txt CMakeLists.txt.src
 templateName = cmakelibc
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate b/languages/cpp/app_templates/cmakelibc/cmakelibc.tdevtemplate
index c05eaec4..c05eaec4 100644
--- a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate
+++ b/languages/cpp/app_templates/cmakelibc/cmakelibc.tdevtemplate
diff --git a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt
index 26d7f3e2..cbd6bd5f 100644
--- a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt
+++ b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt
@@ -18,10 +18,10 @@ add_custom_target( cmakelibcpp.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/cmakelibcpp.tar.gz cmakelibcpp.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    cmakelibcpp.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    cmakelibcpp.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
 
diff --git a/languages/cpp/app_templates/cmakelibcpp/Makefile.am b/languages/cpp/app_templates/cmakelibcpp/Makefile.am
index 395bb107..0c3b275e 100644
--- a/languages/cpp/app_templates/cmakelibcpp/Makefile.am
+++ b/languages/cpp/app_templates/cmakelibcpp/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = test.cpp lib.h lib.cpp cmakelibcpp.png CMakeLists.txt CMakeLists.txt
 templateName = cmakelibcpp
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.tdevtemplate
index 653a5ec0..653a5ec0 100644
--- a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate
+++ b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.tdevtemplate
diff --git a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt
index b69d898f..88bb2d36 100644
--- a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt
+++ b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( cmakeqt3app.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/cmakeqt3app.tar.gz cmakeqt3app.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    cmakeqt3app.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    cmakeqt3app.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/cmakeqt3app/Makefile.am b/languages/cpp/app_templates/cmakeqt3app/Makefile.am
index 24bd6c35..e42bdcbf 100644
--- a/languages/cpp/app_templates/cmakeqt3app/Makefile.am
+++ b/languages/cpp/app_templates/cmakeqt3app/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = main.cpp cmakeqt3app.cpp cmakeqt3app.h cmakeqt3app.png \
 templateName = cmakeqt3app
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.tdevtemplate
index 50afb48a..50afb48a 100644
--- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate
+++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.tdevtemplate
diff --git a/languages/cpp/app_templates/cmakesimple/CMakeLists.txt b/languages/cpp/app_templates/cmakesimple/CMakeLists.txt
index 621dd48a..d5e417c3 100644
--- a/languages/cpp/app_templates/cmakesimple/CMakeLists.txt
+++ b/languages/cpp/app_templates/cmakesimple/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( cmakesimple.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/cmakesimple.tar.gz cmakesimple.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    cmakesimple.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    cmakesimple.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/cmakesimple/Makefile.am b/languages/cpp/app_templates/cmakesimple/Makefile.am
index 243ed01d..e6ff1e4d 100644
--- a/languages/cpp/app_templates/cmakesimple/Makefile.am
+++ b/languages/cpp/app_templates/cmakesimple/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = main.cpp cmakesimple.png CMakeLists.txt README
 templateName = cmakesimple
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate b/languages/cpp/app_templates/cmakesimple/cmakesimple.tdevtemplate
index 14df4c4c..14df4c4c 100644
--- a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate
+++ b/languages/cpp/app_templates/cmakesimple/cmakesimple.tdevtemplate
diff --git a/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt b/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt
index 4d07a4d6..70e65075 100644
--- a/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt
+++ b/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( cmakesimplec.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/cmakesimplec.tar.gz cmakesimplec.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    cmakesimplec.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    cmakesimplec.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/cmakesimplec/Makefile.am b/languages/cpp/app_templates/cmakesimplec/Makefile.am
index f5a1c3e7..df69719d 100644
--- a/languages/cpp/app_templates/cmakesimplec/Makefile.am
+++ b/languages/cpp/app_templates/cmakesimplec/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = main.c cmakesimplec.png CMakeLists.txt
 templateName = cmakesimplec
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.tdevtemplate
index 25837634..25837634 100644
--- a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate
+++ b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.tdevtemplate
diff --git a/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt b/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt
index ccb2dd4a..bfdd6d10 100644
--- a/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt
+++ b/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( cppcurseshello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/cppcurseshello.tar.gz cppcurseshello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    cppcurseshello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    cppcurseshello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/cppcurseshello/Makefile.am b/languages/cpp/app_templates/cppcurseshello/Makefile.am
index ef3623f6..17175bfa 100644
--- a/languages/cpp/app_templates/cppcurseshello/Makefile.am
+++ b/languages/cpp/app_templates/cppcurseshello/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs\
 templateName = cppcurseshello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/cppcurseshello/app.tdevelop b/languages/cpp/app_templates/cppcurseshello/app.tdevelop
index 98919071..d771aedf 100644
--- a/languages/cpp/app_templates/cppcurseshello/app.tdevelop
+++ b/languages/cpp/app_templates/cppcurseshello/app.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -37,8 +37,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevdoctreeview>
+ </tdevautoproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -83,23 +83,23 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="cpp"/>
    <type ext="h"/>
   </useglobaltypes>
- </kdevfilecreate>
- <kdevfileview>
+ </tdevfilecreate>
+ <tdevfileview>
     <groups>
       <group pattern="*.h" name="Header files" />
       <group pattern="*.cpp" name="Source files" />
     </groups>
- </kdevfileview>
-  <kdevdocumentation>
+ </tdevfileview>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate b/languages/cpp/app_templates/cppcurseshello/cppcurseshello.tdevtemplate
index 27f85c21..5bd7ebe2 100644
--- a/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate
+++ b/languages/cpp/app_templates/cppcurseshello/cppcurseshello.tdevtemplate
@@ -68,11 +68,11 @@ Archive=cppcurseshello.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{tdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/cpp/app_templates/cpphello/CMakeLists.txt b/languages/cpp/app_templates/cpphello/CMakeLists.txt
index d77effea..9227cfcd 100644
--- a/languages/cpp/app_templates/cpphello/CMakeLists.txt
+++ b/languages/cpp/app_templates/cpphello/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( cpphello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/cpphello.tar.gz cpphello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    cpphello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    cpphello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/cpphello/Makefile.am b/languages/cpp/app_templates/cpphello/Makefile.am
index 2ba017c2..930a46e5 100644
--- a/languages/cpp/app_templates/cpphello/Makefile.am
+++ b/languages/cpp/app_templates/cpphello/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs \
 templateName = cpphello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/cpphello/app.tdevelop b/languages/cpp/app_templates/cpphello/app.tdevelop
index 98919071..d771aedf 100644
--- a/languages/cpp/app_templates/cpphello/app.tdevelop
+++ b/languages/cpp/app_templates/cpphello/app.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -37,8 +37,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevdoctreeview>
+ </tdevautoproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -83,23 +83,23 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="cpp"/>
    <type ext="h"/>
   </useglobaltypes>
- </kdevfilecreate>
- <kdevfileview>
+ </tdevfilecreate>
+ <tdevfileview>
     <groups>
       <group pattern="*.h" name="Header files" />
       <group pattern="*.cpp" name="Source files" />
     </groups>
- </kdevfileview>
-  <kdevdocumentation>
+ </tdevfileview>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate b/languages/cpp/app_templates/cpphello/cpphello.tdevtemplate
index ee529159..1b4fc2fc 100644
--- a/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate
+++ b/languages/cpp/app_templates/cpphello/cpphello.tdevtemplate
@@ -69,11 +69,11 @@ Archive=cpphello.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{tdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt b/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt
index b5e16259..46e4a57f 100644
--- a/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt
+++ b/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( cppsdlhello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/cppsdlhello.tar.gz cppsdlhello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    cppsdlhello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    cppsdlhello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/cppsdlhello/Makefile.am b/languages/cpp/app_templates/cppsdlhello/Makefile.am
index c0357370..3743cf77 100644
--- a/languages/cpp/app_templates/cppsdlhello/Makefile.am
+++ b/languages/cpp/app_templates/cppsdlhello/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs 		configur
 templateName = cppsdlhello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/cppsdlhello/app.tdevelop b/languages/cpp/app_templates/cppsdlhello/app.tdevelop
index 3a60526f..39760184 100644
--- a/languages/cpp/app_templates/cppsdlhello/app.tdevelop
+++ b/languages/cpp/app_templates/cppsdlhello/app.tdevelop
@@ -12,7 +12,7 @@
    <keyword>SDL</keyword>
   </keywords>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -43,8 +43,8 @@
         <ldflags>-lSDL</ldflags>
       </default>
   </configurations>
-  </kdevautoproject>
- <kdevdoctreeview>
+  </tdevautoproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -87,17 +87,17 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="cpp"/>
    <type ext="h"/>
   </useglobaltypes>
- </kdevfilecreate>
-  <kdevdocumentation>
+ </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate b/languages/cpp/app_templates/cppsdlhello/cppsdlhello.tdevtemplate
index 5e559acb..e99f52ab 100644
--- a/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate
+++ b/languages/cpp/app_templates/cppsdlhello/cppsdlhello.tdevtemplate
@@ -69,11 +69,11 @@ Archive=cppsdlhello.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{tdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/cpp/app_templates/dcopservice/CMakeLists.txt b/languages/cpp/app_templates/dcopservice/CMakeLists.txt
index c3a2397b..d2e5458b 100644
--- a/languages/cpp/app_templates/dcopservice/CMakeLists.txt
+++ b/languages/cpp/app_templates/dcopservice/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( dcopservice.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/dcopservice.tar.gz dcopservice.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    dcopservice.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    dcopservice.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/dcopservice/Makefile.am b/languages/cpp/app_templates/dcopservice/Makefile.am
index dddb4916..35b114d2 100644
--- a/languages/cpp/app_templates/dcopservice/Makefile.am
+++ b/languages/cpp/app_templates/dcopservice/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = dcopservice.desktop dcopservice.png dcopservice.h \
 templateName = dcopservice
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop b/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop
index 59569583..dfdea3b8 100644
--- a/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop
+++ b/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop
@@ -14,15 +14,15 @@
    <keyword>tdeioslave</keyword>
   </keywords>
  </general>
- <kdevcppsupport>
+ <tdevcppsupport>
    <qt>
      <version>3</version>
      <used>true</used>
      <includestyle>3</includestyle>
-     <designerintegration>EmbeddedKDevDesigner</designerintegration>
+     <designerintegration>EmbeddedTDevDesigner</designerintegration>
    </qt>
- </kdevcppsupport>
- <kdevautoproject>
+ </tdevcppsupport>
+ <tdevautoproject>
   <general>
    <useconfiguration>debug</useconfiguration>
   </general>
@@ -43,15 +43,15 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -88,22 +88,22 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
- <kdevfilecreate>
+ </tdevdebugger>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="cpp"/>
    <type ext="h"/>
   </useglobaltypes>
- </kdevfilecreate>
-  <kdevdocumentation>
+ </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate b/languages/cpp/app_templates/dcopservice/dcopservice.tdevtemplate
index a4c08a28..0174747d 100644
--- a/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate
+++ b/languages/cpp/app_templates/dcopservice/dcopservice.tdevtemplate
@@ -69,11 +69,11 @@ Archive=dcopservice.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/generichello/Makefile.am b/languages/cpp/app_templates/generichello/Makefile.am
index 75bad862..5f5bf6ed 100644
--- a/languages/cpp/app_templates/generichello/Makefile.am
+++ b/languages/cpp/app_templates/generichello/Makefile.am
@@ -5,10 +5,10 @@ templateName = cppgenerichello
 # png-filename differs from archive file name
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/generichello/app.prj b/languages/cpp/app_templates/generichello/app.prj
index a1eeca82..c6466824 100644
--- a/languages/cpp/app_templates/generichello/app.prj
+++ b/languages/cpp/app_templates/generichello/app.prj
@@ -1,8 +1,8 @@
-<kdevproject>
+<tdevproject>
   <group name = "src">
     <target name = "cpphello">
       <file name = "%{APPNAMELC}.cpp"/>
       <attribute name = "buildscript">gcc -o %{APPNAMELC} %{APPNAMELC}.cpp</attribute>
     </target>
   </group>
-</kdevproject>
+</tdevproject>
diff --git a/languages/cpp/app_templates/generichello/app.tdevelop b/languages/cpp/app_templates/generichello/app.tdevelop
index 63f5ce16..a719a726 100644
--- a/languages/cpp/app_templates/generichello/app.tdevelop
+++ b/languages/cpp/app_templates/generichello/app.tdevelop
@@ -4,14 +4,14 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>KDevGenericProject</projectmanagement>
+  <projectmanagement>TDevGenericProject</projectmanagement>
   <primarylanguage>C++</primarylanguage>
   <keywords>
    <keyword>C++</keyword>
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevgenericproject>
+ <tdevgenericproject>
   <backend>ShellScript</backend>
   <project>%{APPNAMELC}.prj</project>
   <general>
@@ -39,23 +39,23 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevgenericproject>
- <kdevfilecreate>
+ </tdevgenericproject>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="cpp"/>
    <type ext="h"/>
   </useglobaltypes>
- </kdevfilecreate>
- <kdevfileview>
+ </tdevfilecreate>
+ <tdevfileview>
     <groups>
       <group pattern="*.h" name="Header files" />
       <group pattern="*.cpp" name="Source files" />
     </groups>
- </kdevfileview>
-  <kdevdocumentation>
+ </tdevfileview>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/generichello/generichello.kdevtemplate b/languages/cpp/app_templates/generichello/generichello.tdevtemplate
index f30eea5b..27f78afe 100644
--- a/languages/cpp/app_templates/generichello/generichello.kdevtemplate
+++ b/languages/cpp/app_templates/generichello/generichello.tdevtemplate
@@ -68,7 +68,7 @@ Archive=generichello.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/cpp/app_templates/gnome2mmapp/Makefile.am b/languages/cpp/app_templates/gnome2mmapp/Makefile.am
index 9d73ddd6..a0d9505e 100644
--- a/languages/cpp/app_templates/gnome2mmapp/Makefile.am
+++ b/languages/cpp/app_templates/gnome2mmapp/Makefile.am
@@ -7,10 +7,10 @@ dataFiles = acconfig.h autogen.sh gnome2mm.glade main_window.cc \
 templateName = gnome2mmapp
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/gnome2mmapp/app.tdevelop b/languages/cpp/app_templates/gnome2mmapp/app.tdevelop
index 19fbacb7..177611f0 100644
--- a/languages/cpp/app_templates/gnome2mmapp/app.tdevelop
+++ b/languages/cpp/app_templates/gnome2mmapp/app.tdevelop
@@ -12,7 +12,7 @@
    <keyword>GNOME</keyword>
   </keywords>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -39,8 +39,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.h" name="Sources" />
    <group pattern="*.glade" name="User Interface" />
@@ -48,22 +48,22 @@
    <group pattern="*.po" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdebugger>
+ </tdevfileview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
- <kdevfilecreate>
+ </tdevdebugger>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="cpp"/>
    <type ext="h"/>
   </useglobaltypes>
- </kdevfilecreate>
-  <kdevdocumentation>
+ </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.tdevtemplate
index f692d342..363ffd5a 100644
--- a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate
+++ b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.tdevtemplate
@@ -67,15 +67,15 @@ Archive=gnome2mmapp.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{tdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.tdevtemplate
 
 [GNOME2]
 Type=include
-File=%{tdevelop}/template-common/gnome2.kdevtemplate
+File=%{tdevelop}/template-common/gnome2.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt
index 45544ac9..75d52e80 100644
--- a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt
@@ -21,9 +21,9 @@ add_custom_target( gtk2mmapp.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/gtk2mmapp.tar.gz gtk2mmapp.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    gtk2mmapp.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    gtk2mmapp.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/gtk2mmapp/Makefile.am b/languages/cpp/app_templates/gtk2mmapp/Makefile.am
index c44ba568..422f7b00 100644
--- a/languages/cpp/app_templates/gtk2mmapp/Makefile.am
+++ b/languages/cpp/app_templates/gtk2mmapp/Makefile.am
@@ -7,10 +7,10 @@ dataFiles = acconfig.h autogen.sh gtk2mm.glade main_window.cc \
 templateName = gtk2mmapp
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/gtk2mmapp/app.tdevelop b/languages/cpp/app_templates/gtk2mmapp/app.tdevelop
index 6f691439..f9335dad 100644
--- a/languages/cpp/app_templates/gtk2mmapp/app.tdevelop
+++ b/languages/cpp/app_templates/gtk2mmapp/app.tdevelop
@@ -12,7 +12,7 @@
    <keyword>GTK</keyword>
   </keywords>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -39,8 +39,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.h" name="Sources" />
    <group pattern="*.glade" name="User Interface" />
@@ -48,8 +48,8 @@
    <group pattern="*.po" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -92,22 +92,22 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
- <kdevfilecreate>
+ </tdevdebugger>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="cpp"/>
    <type ext="h"/>
   </useglobaltypes>
- </kdevfilecreate>
-  <kdevdocumentation>
+ </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.tdevtemplate
index a8948d26..4559f2d8 100644
--- a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate
+++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.tdevtemplate
@@ -59,11 +59,11 @@ Archive=gtk2mmapp.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{tdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/cpp/app_templates/kateplugin/CMakeLists.txt b/languages/cpp/app_templates/kateplugin/CMakeLists.txt
index 354218ad..2361b5e9 100644
--- a/languages/cpp/app_templates/kateplugin/CMakeLists.txt
+++ b/languages/cpp/app_templates/kateplugin/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( kateplugin.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kateplugin.tar.gz kateplugin.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kateplugin.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    kateplugin.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kateplugin/Makefile.am b/languages/cpp/app_templates/kateplugin/Makefile.am
index 81c1a586..75b44829 100644
--- a/languages/cpp/app_templates/kateplugin/Makefile.am
+++ b/languages/cpp/app_templates/kateplugin/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h\
 		plugin.tdevelop subdirs plugin.desktop
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate b/languages/cpp/app_templates/kateplugin/kateplugin.tdevtemplate
index 3c308223..a3dc2dc8 100644
--- a/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate
+++ b/languages/cpp/app_templates/kateplugin/kateplugin.tdevtemplate
@@ -67,11 +67,11 @@ Archive=kateplugin.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kateplugin/plugin.tdevelop b/languages/cpp/app_templates/kateplugin/plugin.tdevelop
index 799ac6d5..c96d48cc 100644
--- a/languages/cpp/app_templates/kateplugin/plugin.tdevelop
+++ b/languages/cpp/app_templates/kateplugin/plugin.tdevelop
@@ -13,15 +13,15 @@
    <keyword>TDE</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
-<kdevautoproject>
+  </tdevcppsupport>
+<tdevautoproject>
   <general>
    <activetarget>src/lib%{APPNAMELC}plugin.la</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -43,8 +43,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -52,8 +52,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -90,24 +90,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kateplugin2/CMakeLists.txt b/languages/cpp/app_templates/kateplugin2/CMakeLists.txt
index c4a47fba..1546b2b7 100644
--- a/languages/cpp/app_templates/kateplugin2/CMakeLists.txt
+++ b/languages/cpp/app_templates/kateplugin2/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( kateplugin2.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kateplugin2.tar.gz kateplugin2.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kateplugin2.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    kateplugin2.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kateplugin2/Makefile.am b/languages/cpp/app_templates/kateplugin2/Makefile.am
index b12a6477..99969725 100644
--- a/languages/cpp/app_templates/kateplugin2/Makefile.am
+++ b/languages/cpp/app_templates/kateplugin2/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h \
 templateName = kateplugin2
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles} ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate b/languages/cpp/app_templates/kateplugin2/kateplugin2.tdevtemplate
index 3da42f23..236c6a9a 100644
--- a/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate
+++ b/languages/cpp/app_templates/kateplugin2/kateplugin2.tdevtemplate
@@ -68,11 +68,11 @@ Archive=kateplugin2.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kateplugin2/plugin.tdevelop b/languages/cpp/app_templates/kateplugin2/plugin.tdevelop
index 831365dc..01c48bfc 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin.tdevelop
+++ b/languages/cpp/app_templates/kateplugin2/plugin.tdevelop
@@ -13,15 +13,15 @@
    <keyword>TDE</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
-<kdevautoproject>
+  </tdevcppsupport>
+<tdevautoproject>
   <general>
    <activetarget>src/lib%{APPNAMELC}plugin.la</activetarget>
 
@@ -44,8 +44,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -53,8 +53,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -91,24 +91,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kde4app/CMakeLists.txt b/languages/cpp/app_templates/kde4app/CMakeLists.txt
deleted file mode 100644
index 0399f045..00000000
--- a/languages/cpp/app_templates/kde4app/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-add_custom_target( kde4app.tar.gz ALL
-  COMMAND tar zcf kde4app.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp
-    kapp4view.h kapp4view_base.ui main.cpp kde4appui.rc
-    kde4app-CMakeLists.txt kapp4.desktop kapp4.kcfg
-    settings.kcfgc kde4app.png README kde4app.tdevelop
-    kde4app.tdevelop.filelist
-)
-
-
-install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kde4app.tar.gz kde4app.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
-
-
-install( FILES
-    kde4app.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kde4app/Makefile.am b/languages/cpp/app_templates/kde4app/Makefile.am
deleted file mode 100644
index 455acd8d..00000000
--- a/languages/cpp/app_templates/kde4app/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-dataFiles = kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp kapp4view.h kapp4view_base.ui \
-	main.cpp kde4appui.rc CMakeLists.txt kapp4.desktop kapp4.kcfg settings.kcfgc \
-	kde4app.png README kde4app.tdevelop kde4app.tdevelop.filelist
-
-templateName = kde4app
-
-### no need to change below:
-template_DATA = $(templateName).kdevtemplate
-templatedir = ${appwizarddatadir}/templates
-
-appwizarddatadir = ${kde_datadir}/kdevappwizard
-$(templateName).tar.gz: ${dataFiles}
-	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
-	$(GZIP_COMMAND) -f9 $(templateName).tar
-
-archivedir = ${appwizarddatadir}
-archive_DATA = $(templateName).tar.gz ${templateName}.png
-
-CLEANFILES = *.tar.gz
diff --git a/languages/cpp/app_templates/kdevlang/CMakeLists.txt b/languages/cpp/app_templates/kdevlang/CMakeLists.txt
deleted file mode 100644
index 483f85d9..00000000
--- a/languages/cpp/app_templates/kdevlang/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-add_custom_target( kdevlang.tar.gz ALL
-  COMMAND tar zcf kdevlang.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    src-Makefile.am kdevlang_part.cpp kdevlang_part.h
-    kdevlang.rc kdevlang.desktop app.tdevelop
-    kdevlang-configure.in.in README.dox
-)
-
-
-install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kdevlang.tar.gz kdevlang.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
-
-
-install( FILES
-    kdevlang.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kdevpart/CMakeLists.txt b/languages/cpp/app_templates/kdevpart/CMakeLists.txt
deleted file mode 100644
index 53293ea9..00000000
--- a/languages/cpp/app_templates/kdevpart/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-add_custom_target( kdevpart.tar.gz ALL
-  COMMAND tar zcf kdevpart.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    src-Makefile.am kdevpart_part.cpp kdevpart_part.h
-    kdevpart_widget.h kdevpart_widget.cpp kdevpart_part.rc
-    kdevpart.desktop app.tdevelop README.dox
-    globalconfigbase.ui globalconfig.h globalconfig.cpp
-    projectconfigbase.ui projectconfig.h projectconfig.cpp
-)
-
-
-install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kdevpart.tar.gz kdevpart.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
-
-
-install( FILES
-    kdevpart.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kdevpart2/CMakeLists.txt b/languages/cpp/app_templates/kdevpart2/CMakeLists.txt
deleted file mode 100644
index 080603a8..00000000
--- a/languages/cpp/app_templates/kdevpart2/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-add_custom_target( kdevpart2.tar.gz ALL
-  COMMAND tar zcf kdevpart2.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    src-Makefile.am kdevpart_part.cpp kdevpart_part.h
-    kdevpart_widget.h kdevpart_widget.cpp kdevpart_part.rc
-    kdevpart.desktop app.tdevelop kdevpart-configure.in.in
-    README.dox subdirs globalconfigbase.ui globalconfig.h
-    globalconfig.cpp projectconfigbase.ui projectconfig.h
-    projectconfig.cpp
-)
-
-
-install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kdevpart2.tar.gz kdevpart2.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
-
-
-install( FILES
-    kdevpart2.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/khello/CMakeLists.txt b/languages/cpp/app_templates/khello/CMakeLists.txt
index 360e792e..3ed5e064 100644
--- a/languages/cpp/app_templates/khello/CMakeLists.txt
+++ b/languages/cpp/app_templates/khello/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( khello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/khello.tar.gz khello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    khello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    khello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/khello/Makefile.am b/languages/cpp/app_templates/khello/Makefile.am
index 56df4792..49feb06a 100644
--- a/languages/cpp/app_templates/khello/Makefile.am
+++ b/languages/cpp/app_templates/khello/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \
 templateName = khello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/khello/app.tdevelop b/languages/cpp/app_templates/khello/app.tdevelop
index 9c25500e..029288aa 100644
--- a/languages/cpp/app_templates/khello/app.tdevelop
+++ b/languages/cpp/app_templates/khello/app.tdevelop
@@ -13,16 +13,16 @@
    <keyword>TDE</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -47,8 +47,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -56,8 +56,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -92,24 +92,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>  
+  </tdevdocumentation>  
 </tdevelop>
diff --git a/languages/cpp/app_templates/khello/khello.kdevtemplate b/languages/cpp/app_templates/khello/khello.tdevtemplate
index 81d20c5a..2bce3511 100644
--- a/languages/cpp/app_templates/khello/khello.kdevtemplate
+++ b/languages/cpp/app_templates/khello/khello.tdevtemplate
@@ -68,11 +68,11 @@ Archive=khello.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/khello2/CMakeLists.txt b/languages/cpp/app_templates/khello2/CMakeLists.txt
index 8e9fdb9d..151fb079 100644
--- a/languages/cpp/app_templates/khello2/CMakeLists.txt
+++ b/languages/cpp/app_templates/khello2/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( khello2.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/khello2.tar.gz khello2.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    khello2.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    khello2.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/khello2/Makefile.am b/languages/cpp/app_templates/khello2/Makefile.am
index 14445170..96774e3b 100644
--- a/languages/cpp/app_templates/khello2/Makefile.am
+++ b/languages/cpp/app_templates/khello2/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \
 templateName = khello2
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/khello2/app.tdevelop b/languages/cpp/app_templates/khello2/app.tdevelop
index a079670d..b51226ee 100644
--- a/languages/cpp/app_templates/khello2/app.tdevelop
+++ b/languages/cpp/app_templates/khello2/app.tdevelop
@@ -13,16 +13,16 @@
    <keyword>TDE</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -47,8 +47,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -56,8 +56,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -92,24 +92,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/khello2/khello2.kdevtemplate b/languages/cpp/app_templates/khello2/khello2.tdevtemplate
index b85e11fb..66666212 100644
--- a/languages/cpp/app_templates/khello2/khello2.kdevtemplate
+++ b/languages/cpp/app_templates/khello2/khello2.tdevtemplate
@@ -64,11 +64,11 @@ Archive=khello2.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kicker/CMakeLists.txt b/languages/cpp/app_templates/kicker/CMakeLists.txt
index c1a1d7d5..fba98f58 100644
--- a/languages/cpp/app_templates/kicker/CMakeLists.txt
+++ b/languages/cpp/app_templates/kicker/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( kicker.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kicker.tar.gz kicker.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kicker.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    kicker.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kicker/Makefile.am b/languages/cpp/app_templates/kicker/Makefile.am
index 82095d72..254e5917 100644
--- a/languages/cpp/app_templates/kicker/Makefile.am
+++ b/languages/cpp/app_templates/kicker/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = applet.cpp applet.h applet.desktop applet.tdevelop \
 templateName = kicker
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kicker/applet.tdevelop b/languages/cpp/app_templates/kicker/applet.tdevelop
index 929b3c49..88bf952d 100644
--- a/languages/cpp/app_templates/kicker/applet.tdevelop
+++ b/languages/cpp/app_templates/kicker/applet.tdevelop
@@ -14,16 +14,16 @@
    <keyword>Kicker</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/lib%{APPNAMELC}.la</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -45,8 +45,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -54,8 +54,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -92,24 +92,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kicker/kicker.kdevtemplate b/languages/cpp/app_templates/kicker/kicker.tdevtemplate
index 5185eb20..ba1252de 100644
--- a/languages/cpp/app_templates/kicker/kicker.kdevtemplate
+++ b/languages/cpp/app_templates/kicker/kicker.tdevtemplate
@@ -65,11 +65,11 @@ Archive=kicker.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kmake/Makefile.am b/languages/cpp/app_templates/kmake/Makefile.am
index b7bd96f9..35238c7e 100644
--- a/languages/cpp/app_templates/kmake/Makefile.am
+++ b/languages/cpp/app_templates/kmake/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = appui.rc app.desktop app.cpp mainviewimp.cpp mainviewimp.h mainview.
 templateName = kmake
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kmake/app.tdevelop b/languages/cpp/app_templates/kmake/app.tdevelop
index ba82ff4b..ffcb6370 100644
--- a/languages/cpp/app_templates/kmake/app.tdevelop
+++ b/languages/cpp/app_templates/kmake/app.tdevelop
@@ -10,16 +10,16 @@
       <keyword>Qt</keyword>
     </keywords>
   </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -30,8 +30,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>  
     </tree> 
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -68,8 +68,8 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell/>
       <breakpoints/>
@@ -84,28 +84,28 @@
       <demanglenames>true</demanglenames>
     </display>
     <breakpoints/>
-  </kdevdebugger>  
-  <kdevtrollproject>
+  </tdevdebugger>  
+  <tdevtrollproject>
     <run>
       <mainprogram>./bin/%{APPNAMELC}</mainprogram>
       <programargs/>
     </run>
-  </kdevtrollproject>
+  </tdevtrollproject>
   <workspace>
     <openfiles/> 
   </workspace>
-  <kdevfilecreate>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
       <type ext="ts" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kmake/kmake.kdevtemplate b/languages/cpp/app_templates/kmake/kmake.tdevtemplate
index 7c2688d9..7c2688d9 100644
--- a/languages/cpp/app_templates/kmake/kmake.kdevtemplate
+++ b/languages/cpp/app_templates/kmake/kmake.tdevtemplate
diff --git a/languages/cpp/app_templates/kmod/CMakeLists.txt b/languages/cpp/app_templates/kmod/CMakeLists.txt
index af575a10..ff891946 100644
--- a/languages/cpp/app_templates/kmod/CMakeLists.txt
+++ b/languages/cpp/app_templates/kmod/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( kmod.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kmod.tar.gz kmod.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kmod.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    kmod.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kmod/Makefile.am b/languages/cpp/app_templates/kmod/Makefile.am
index f4b1ec98..bae9772c 100644
--- a/languages/cpp/app_templates/kmod/Makefile.am
+++ b/languages/cpp/app_templates/kmod/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = src-Makefile kmod.tdevelop kmod-driver.c
 templateName = kmod
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kmod/kmod.tdevelop b/languages/cpp/app_templates/kmod/kmod.tdevelop
index 6ce5f390..55d6f2b6 100644
--- a/languages/cpp/app_templates/kmod/kmod.tdevelop
+++ b/languages/cpp/app_templates/kmod/kmod.tdevelop
@@ -4,10 +4,10 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>KDevCustomProject</projectmanagement>
+  <projectmanagement>TDevCustomProject</projectmanagement>
   <primarylanguage>C</primarylanguage>
     <ignoreparts>
-      <part>KDevDebugger</part>
+      <part>TDevDebugger</part>
     </ignoreparts>
   <keywords>
    <keyword>C</keyword>
@@ -15,13 +15,13 @@
    <keyword>Kernel</keyword>
   </keywords>
  </general>
-    <kdevfileview>
+    <tdevfileview>
     <groups>
       <group pattern="Makefile" name="Build" />
       <group pattern="*.c" name="Source" />
     </groups>
-  </kdevfileview>
-  <kdevcustomproject>
+  </tdevfileview>
+  <tdevcustomproject>
     <envvars/>
     <build>
       <buildtool>make</buildtool>
@@ -35,8 +35,8 @@
       <envvars/>
     </make>
     <makeenvvars/>
-  </kdevcustomproject>
-  <kdevdoctreeview>
+  </tdevcustomproject>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -83,11 +83,11 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevdocumentation>
+  </tdevdoctreeview>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kmod/kmod.kdevtemplate b/languages/cpp/app_templates/kmod/kmod.tdevtemplate
index 069d5103..c47912f8 100644
--- a/languages/cpp/app_templates/kmod/kmod.kdevtemplate
+++ b/languages/cpp/app_templates/kmod/kmod.tdevtemplate
@@ -66,7 +66,7 @@ Archive=kmod.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/cpp/app_templates/kofficepart/CMakeLists.txt b/languages/cpp/app_templates/kofficepart/CMakeLists.txt
index 955225bc..460b3293 100644
--- a/languages/cpp/app_templates/kofficepart/CMakeLists.txt
+++ b/languages/cpp/app_templates/kofficepart/CMakeLists.txt
@@ -21,9 +21,9 @@ add_custom_target( kopart.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kopart.tar.gz kopart.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kopart.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    kopart.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kofficepart/Makefile.am b/languages/cpp/app_templates/kofficepart/Makefile.am
index a38746b1..d602a552 100644
--- a/languages/cpp/app_templates/kofficepart/Makefile.am
+++ b/languages/cpp/app_templates/kofficepart/Makefile.am
@@ -7,10 +7,10 @@ dataFiles = kopart.tdevelop kopart_aboutdata.h kopart_part.cpp kopart_view.h \
 templateName = kopart
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kofficepart/kopart.tdevelop b/languages/cpp/app_templates/kofficepart/kopart.tdevelop
index 194157d7..7c4b0e4c 100644
--- a/languages/cpp/app_templates/kofficepart/kopart.tdevelop
+++ b/languages/cpp/app_templates/kofficepart/kopart.tdevelop
@@ -14,16 +14,16 @@
    <keyword>tdeioslave</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/lib%{APPNAMELC}part.la</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -45,15 +45,15 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -90,24 +90,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate b/languages/cpp/app_templates/kofficepart/kopart.tdevtemplate
index 0273e0ca..076b650a 100644
--- a/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate
+++ b/languages/cpp/app_templates/kofficepart/kopart.tdevtemplate
@@ -63,11 +63,11 @@ Archive=kopart.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt b/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt
index e38fc279..c683f536 100644
--- a/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt
+++ b/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( konqnavpanel.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/konqnavpanel.tar.gz konqnavpanel.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    konqnavpanel.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    konqnavpanel.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/konqnavpanel/Makefile.am b/languages/cpp/app_templates/konqnavpanel/Makefile.am
index 6fccbf38..a901456b 100644
--- a/languages/cpp/app_templates/konqnavpanel/Makefile.am
+++ b/languages/cpp/app_templates/konqnavpanel/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = konqnavpanel.cpp konqnavpanel.h konqnavpanel.desktop \
 templateName = konqnavpanel
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop
index 929b3c49..88bf952d 100644
--- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop
+++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop
@@ -14,16 +14,16 @@
    <keyword>Kicker</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/lib%{APPNAMELC}.la</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -45,8 +45,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -54,8 +54,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -92,24 +92,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevtemplate
index e6f1a23e..01a924df 100644
--- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate
+++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevtemplate
@@ -65,11 +65,11 @@ Archive=konqnavpanel.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kpartapp/CMakeLists.txt b/languages/cpp/app_templates/kpartapp/CMakeLists.txt
index 9f3d8119..ab0ed3b0 100644
--- a/languages/cpp/app_templates/kpartapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/kpartapp/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( kpartapp.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kpartapp.tar.gz kpartapp.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kpartapp.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    kpartapp.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kpartapp/Makefile.am b/languages/cpp/app_templates/kpartapp/Makefile.am
index bfb8ceed..45c41564 100644
--- a/languages/cpp/app_templates/kpartapp/Makefile.am
+++ b/languages/cpp/app_templates/kpartapp/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = src-Makefile.am app.cpp app.h app_part.cpp\
 	kpartapp.png app.tdevelop subdirs
 templateName = kpartapp
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kpartapp/app.tdevelop b/languages/cpp/app_templates/kpartapp/app.tdevelop
index a8628fe3..56e6f467 100644
--- a/languages/cpp/app_templates/kpartapp/app.tdevelop
+++ b/languages/cpp/app_templates/kpartapp/app.tdevelop
@@ -13,16 +13,16 @@
    <keyword>TDE</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -47,8 +47,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
-</kdevautoproject>
- <kdevfileview>
+</tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -56,8 +56,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -92,24 +92,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate b/languages/cpp/app_templates/kpartapp/kpartapp.tdevtemplate
index 773cc0d8..11aaaabb 100644
--- a/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate
+++ b/languages/cpp/app_templates/kpartapp/kpartapp.tdevtemplate
@@ -65,11 +65,11 @@ Archive=kpartapp.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kpartplugin/CMakeLists.txt b/languages/cpp/app_templates/kpartplugin/CMakeLists.txt
index 00f4c664..a1d063b0 100644
--- a/languages/cpp/app_templates/kpartplugin/CMakeLists.txt
+++ b/languages/cpp/app_templates/kpartplugin/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( kpartplugin.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kpartplugin.tar.gz kpartplugin.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kpartplugin.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    kpartplugin.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kpartplugin/Makefile.am b/languages/cpp/app_templates/kpartplugin/Makefile.am
index 057be667..dd0a5612 100644
--- a/languages/cpp/app_templates/kpartplugin/Makefile.am
+++ b/languages/cpp/app_templates/kpartplugin/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h  \
 templateName = kpartplugin
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate b/languages/cpp/app_templates/kpartplugin/kpartplugin.tdevtemplate
index 59ca51d8..dc3b3e04 100644
--- a/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate
+++ b/languages/cpp/app_templates/kpartplugin/kpartplugin.tdevtemplate
@@ -64,11 +64,11 @@ Archive=kpartplugin.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kpartplugin/plugin.tdevelop b/languages/cpp/app_templates/kpartplugin/plugin.tdevelop
index c94ba886..2a61c8d5 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin.tdevelop
+++ b/languages/cpp/app_templates/kpartplugin/plugin.tdevelop
@@ -13,16 +13,16 @@
    <keyword>TDE</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
-<kdevautoproject>
+<tdevautoproject>
   <general>
    <activetarget>src/lib%{APPNAMELC}.la</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -44,8 +44,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -53,8 +53,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -91,24 +91,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt b/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt
index bf1be9f6..2aa03b98 100644
--- a/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt
+++ b/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt
@@ -21,9 +21,9 @@ add_custom_target( kscons_kxt.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kscons_kxt.tar.gz kscons_kxt.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kscons_kxt.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    kscons_kxt.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kscons_kxt/Makefile.am b/languages/cpp/app_templates/kscons_kxt/Makefile.am
index 59a58ee1..5f00c212 100644
--- a/languages/cpp/app_templates/kscons_kxt/Makefile.am
+++ b/languages/cpp/app_templates/kscons_kxt/Makefile.am
@@ -7,10 +7,10 @@ QUICKSTART INSTALL README
 templateName= kscons_kxt
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles} ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kscons_kxt/app.tdevelop b/languages/cpp/app_templates/kscons_kxt/app.tdevelop
index 317a4cbc..b32b6656 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.tdevelop
+++ b/languages/cpp/app_templates/kscons_kxt/app.tdevelop
@@ -17,16 +17,16 @@
     <description/>
     <ignoreparts/>
   </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
-  <kdevautoproject>
+  <tdevautoproject>
     <general>
       <activetarget>src/%{APPNAMELC}</activetarget>
       <useconfiguration>debug</useconfiguration>
@@ -62,8 +62,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
-  </kdevautoproject>
-  <kdevfileview>
+  </tdevautoproject>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -75,8 +75,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -111,8 +111,8 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs/>
@@ -126,16 +126,16 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevfilecreate>
+  </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcvs>
+  </tdevfilecreate>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions/>
     <updateoptions>-dP</updateoptions>
@@ -144,7 +144,7 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions/>
     <rshoptions/>
-  </kdevcvs>
+  </tdevcvs>
   <cppsupportpart>
     <codecompletion/>
     <filetemplates>
@@ -156,14 +156,14 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevdocumentation>
+  </tdevclassview>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate b/languages/cpp/app_templates/kscons_kxt/kscons_kxt.tdevtemplate
index 20d35070..fd709e79 100644
--- a/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate
+++ b/languages/cpp/app_templates/kscons_kxt/kscons_kxt.tdevtemplate
@@ -65,7 +65,7 @@ Archive=kscons_kxt.tar.gz
 
 [SCONS]
 Type=include
-File=%{tdevelop}/template-common/scons.kdevtemplate
+File=%{tdevelop}/template-common/scons.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt
index c05f1bb1..d8af0f23 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt
+++ b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt
@@ -22,9 +22,9 @@ add_custom_target( kscons_tdemdi.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kscons_tdemdi.tar.gz kscons_tdemdi.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kscons_tdemdi.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    kscons_tdemdi.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kscons_tdemdi/Makefile.am b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am
index 191ea8ee..b51e2bdb 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/Makefile.am
+++ b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am
@@ -7,10 +7,10 @@ app_part.cpp app_part.h app_part.rc app_shell.rc
 templateName= kscons_tdemdi
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles} ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop b/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop
index 317a4cbc..b32b6656 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop
+++ b/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop
@@ -17,16 +17,16 @@
     <description/>
     <ignoreparts/>
   </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
-  <kdevautoproject>
+  <tdevautoproject>
     <general>
       <activetarget>src/%{APPNAMELC}</activetarget>
       <useconfiguration>debug</useconfiguration>
@@ -62,8 +62,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
-  </kdevautoproject>
-  <kdevfileview>
+  </tdevautoproject>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -75,8 +75,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -111,8 +111,8 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs/>
@@ -126,16 +126,16 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevfilecreate>
+  </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcvs>
+  </tdevfilecreate>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions/>
     <updateoptions>-dP</updateoptions>
@@ -144,7 +144,7 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions/>
     <rshoptions/>
-  </kdevcvs>
+  </tdevcvs>
   <cppsupportpart>
     <codecompletion/>
     <filetemplates>
@@ -156,14 +156,14 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevdocumentation>
+  </tdevclassview>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.tdevtemplate
index 2a297d60..4b71d06c 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate
+++ b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.tdevtemplate
@@ -64,7 +64,7 @@ Archive=kscons_tdemdi.tar.gz
 
 [SCONS]
 Type=include
-File=%{tdevelop}/template-common/scons.kdevtemplate
+File=%{tdevelop}/template-common/scons.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kxt/CMakeLists.txt b/languages/cpp/app_templates/kxt/CMakeLists.txt
index 4b203750..c7de3e19 100644
--- a/languages/cpp/app_templates/kxt/CMakeLists.txt
+++ b/languages/cpp/app_templates/kxt/CMakeLists.txt
@@ -20,9 +20,9 @@ add_custom_target( kxt.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kxt.tar.gz kxt.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kxt.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    kxt.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kxt/Makefile.am b/languages/cpp/app_templates/kxt/Makefile.am
index 8321742a..96333456 100644
--- a/languages/cpp/app_templates/kxt/Makefile.am
+++ b/languages/cpp/app_templates/kxt/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \
 templateName= kxt
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kxt/app.tdevelop b/languages/cpp/app_templates/kxt/app.tdevelop
index 317a4cbc..b32b6656 100644
--- a/languages/cpp/app_templates/kxt/app.tdevelop
+++ b/languages/cpp/app_templates/kxt/app.tdevelop
@@ -17,16 +17,16 @@
     <description/>
     <ignoreparts/>
   </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
-  <kdevautoproject>
+  <tdevautoproject>
     <general>
       <activetarget>src/%{APPNAMELC}</activetarget>
       <useconfiguration>debug</useconfiguration>
@@ -62,8 +62,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
-  </kdevautoproject>
-  <kdevfileview>
+  </tdevautoproject>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -75,8 +75,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -111,8 +111,8 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs/>
@@ -126,16 +126,16 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevfilecreate>
+  </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcvs>
+  </tdevfilecreate>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions/>
     <updateoptions>-dP</updateoptions>
@@ -144,7 +144,7 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions/>
     <rshoptions/>
-  </kdevcvs>
+  </tdevcvs>
   <cppsupportpart>
     <codecompletion/>
     <filetemplates>
@@ -156,14 +156,14 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevdocumentation>
+  </tdevclassview>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kxt/kxt.kdevtemplate b/languages/cpp/app_templates/kxt/kxt.tdevtemplate
index 79789759..7b6583f1 100644
--- a/languages/cpp/app_templates/kxt/kxt.kdevtemplate
+++ b/languages/cpp/app_templates/kxt/kxt.tdevtemplate
@@ -67,11 +67,11 @@ Archive=kxt.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/makefileempty/CMakeLists.txt b/languages/cpp/app_templates/makefileempty/CMakeLists.txt
index 48a6e3dd..25f86b01 100644
--- a/languages/cpp/app_templates/makefileempty/CMakeLists.txt
+++ b/languages/cpp/app_templates/makefileempty/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( makefileempty.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/makefileempty.tar.gz makefileempty.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    makefileempty.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    makefileempty.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/makefileempty/Makefile.am b/languages/cpp/app_templates/makefileempty/Makefile.am
index ec381a04..60035c3d 100644
--- a/languages/cpp/app_templates/makefileempty/Makefile.am
+++ b/languages/cpp/app_templates/makefileempty/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = makefileempty-Makefile \
 templateName = makefileempty
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/makefileempty/app.tdevelop b/languages/cpp/app_templates/makefileempty/app.tdevelop
index da576369..e3b8de97 100644
--- a/languages/cpp/app_templates/makefileempty/app.tdevelop
+++ b/languages/cpp/app_templates/makefileempty/app.tdevelop
@@ -4,14 +4,14 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>KDevCustomProject</projectmanagement>
+  <projectmanagement>TDevCustomProject</projectmanagement>
   <primarylanguage>C++</primarylanguage>
   <keywords>
    <keyword>C++</keyword>
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
   </general>
   <run>
@@ -33,8 +33,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevdoctreeview>
+ </tdevautoproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -79,23 +79,23 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="cpp"/>
    <type ext="h"/>
   </useglobaltypes>
- </kdevfilecreate>
- <kdevfileview>
+ </tdevfilecreate>
+ <tdevfileview>
     <groups>
       <group pattern="*.h" name="Header files" />
       <group pattern="*.cpp" name="Source files" />
     </groups>
- </kdevfileview>
-  <kdevdocumentation>
+ </tdevfileview>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate b/languages/cpp/app_templates/makefileempty/makefileempty.tdevtemplate
index b69317d7..97c3f238 100644
--- a/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate
+++ b/languages/cpp/app_templates/makefileempty/makefileempty.tdevtemplate
@@ -53,7 +53,7 @@ Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE2]
 Type=install
diff --git a/languages/cpp/app_templates/noatunui/CMakeLists.txt b/languages/cpp/app_templates/noatunui/CMakeLists.txt
index 332a960a..698684c1 100644
--- a/languages/cpp/app_templates/noatunui/CMakeLists.txt
+++ b/languages/cpp/app_templates/noatunui/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( noatunui.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/noatunui.tar.gz noatunui.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    noatunui.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    noatunui.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/noatunui/Makefile.am b/languages/cpp/app_templates/noatunui/Makefile.am
index a222f235..d72a928d 100644
--- a/languages/cpp/app_templates/noatunui/Makefile.am
+++ b/languages/cpp/app_templates/noatunui/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_impl.cpp plugin_impl.h \
 templateName = noatunui
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate b/languages/cpp/app_templates/noatunui/noatunui.tdevtemplate
index a91349c3..3324640f 100644
--- a/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate
+++ b/languages/cpp/app_templates/noatunui/noatunui.tdevtemplate
@@ -63,11 +63,11 @@ Archive=noatunui.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/noatunui/plugin.tdevelop b/languages/cpp/app_templates/noatunui/plugin.tdevelop
index 66986f2a..bc17550d 100644
--- a/languages/cpp/app_templates/noatunui/plugin.tdevelop
+++ b/languages/cpp/app_templates/noatunui/plugin.tdevelop
@@ -13,16 +13,16 @@
    <keyword>TDE</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
-<kdevautoproject>
+<tdevautoproject>
   <general>
    <activetarget>src/noatun_%{APPNAMELC}plugin.la</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -44,8 +44,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -53,8 +53,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -88,24 +88,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/noatunvisual/CMakeLists.txt b/languages/cpp/app_templates/noatunvisual/CMakeLists.txt
index 8b5668ec..adac7be4 100644
--- a/languages/cpp/app_templates/noatunvisual/CMakeLists.txt
+++ b/languages/cpp/app_templates/noatunvisual/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( noatunvisual.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/noatunvisual.tar.gz noatunvisual.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    noatunvisual.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    noatunvisual.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/noatunvisual/Makefile.am b/languages/cpp/app_templates/noatunvisual/Makefile.am
index d7466e24..e32b274e 100644
--- a/languages/cpp/app_templates/noatunvisual/Makefile.am
+++ b/languages/cpp/app_templates/noatunvisual/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h plugin_impl.cpp \
 templateName = noatunvisual
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate b/languages/cpp/app_templates/noatunvisual/noatunvisual.tdevtemplate
index c747925c..0a91ba64 100644
--- a/languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate
+++ b/languages/cpp/app_templates/noatunvisual/noatunvisual.tdevtemplate
@@ -67,11 +67,11 @@ Archive=noatunvisual.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/noatunvisual/plugin.tdevelop b/languages/cpp/app_templates/noatunvisual/plugin.tdevelop
index 78193361..6833abad 100644
--- a/languages/cpp/app_templates/noatunvisual/plugin.tdevelop
+++ b/languages/cpp/app_templates/noatunvisual/plugin.tdevelop
@@ -13,16 +13,16 @@
    <keyword>TDE</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
-<kdevautoproject>
+<tdevautoproject>
   <general>
    <activetarget>src/noatun_%{APPNAMELC}plugin.la</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -49,8 +49,8 @@
         <ldflags>-lSDL</ldflags>
       </default>
   </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -58,8 +58,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -95,24 +95,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/opieapp/CMakeLists.txt b/languages/cpp/app_templates/opieapp/CMakeLists.txt
index 4f2b2824..45dc1b61 100644
--- a/languages/cpp/app_templates/opieapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/opieapp/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( opieapp.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/opieapp.tar.gz opieapp.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    opieapp.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    opieapp.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/opieapp/Makefile.am b/languages/cpp/app_templates/opieapp/Makefile.am
index 10a1f2a1..854f4c54 100644
--- a/languages/cpp/app_templates/opieapp/Makefile.am
+++ b/languages/cpp/app_templates/opieapp/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = Example.png  app.tdevelop  example.desktop   Makefile.am  \
 templateName = opieapp
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/opieapp/app.tdevelop b/languages/cpp/app_templates/opieapp/app.tdevelop
index 9bdb127e..94c86a45 100644
--- a/languages/cpp/app_templates/opieapp/app.tdevelop
+++ b/languages/cpp/app_templates/opieapp/app.tdevelop
@@ -13,7 +13,7 @@
     </keywords>
     <ignoreparts/>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -24,8 +24,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>gtk</toc>
       <toc>gnustep</toc>
@@ -52,8 +52,8 @@
       <toc>libbonobo</toc>
       <toc>libbonoboui</toc>
     </ignoredevhelp>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell></dbgshell>
       <programargs>-qws</programargs>
@@ -66,8 +66,8 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevtrollproject>
+  </tdevdebugger>
+  <tdevtrollproject>
     <opie>
 	<quick_app>true</quick_app>
     </opie>
@@ -93,15 +93,15 @@
       <programargs>-qws</programargs>
     </run>
     <envvars/>
-  </kdevtrollproject>
-  <kdevfilecreate>
+  </tdevtrollproject>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
 	<type ext="ui" />
 	<type ext="cpp" />
 	<type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
   <cppsupportpart>
     <codecompletion>
       <codehinting outputview="1" enablech="0" selectview="0" />
@@ -120,11 +120,11 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevcvs>
+  </tdevclassview>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions></commitoptions>
     <updateoptions>-dP</updateoptions>
@@ -133,11 +133,11 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions></logoptions>
     <rshoptions></rshoptions>
-  </kdevcvs>
-  <kdevdocumentation>
+  </tdevcvs>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate b/languages/cpp/app_templates/opieapp/opieapp.tdevtemplate
index fc492b55..fc492b55 100644
--- a/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate
+++ b/languages/cpp/app_templates/opieapp/opieapp.tdevtemplate
diff --git a/languages/cpp/app_templates/opieapplet/CMakeLists.txt b/languages/cpp/app_templates/opieapplet/CMakeLists.txt
index e4dc42f0..6c8edbbe 100644
--- a/languages/cpp/app_templates/opieapplet/CMakeLists.txt
+++ b/languages/cpp/app_templates/opieapplet/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( opieapplet.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/opieapplet.tar.gz opieapplet.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    opieapplet.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    opieapplet.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/opieapplet/Makefile.am b/languages/cpp/app_templates/opieapplet/Makefile.am
index 6bbb09ac..845411c7 100644
--- a/languages/cpp/app_templates/opieapplet/Makefile.am
+++ b/languages/cpp/app_templates/opieapplet/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = Makefile.am Example.png  app.tdevelop  app.pro \
 templateName = opieapplet
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/opieapplet/app.tdevelop b/languages/cpp/app_templates/opieapplet/app.tdevelop
index c5544656..da3b91d4 100644
--- a/languages/cpp/app_templates/opieapplet/app.tdevelop
+++ b/languages/cpp/app_templates/opieapplet/app.tdevelop
@@ -13,7 +13,7 @@
     </keywords>
     <ignoreparts/>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -24,8 +24,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>gtk</toc>
       <toc>gnustep</toc>
@@ -52,8 +52,8 @@
       <toc>libbonobo</toc>
       <toc>libbonoboui</toc>
     </ignoredevhelp>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell></dbgshell>
       <programargs>-qws</programargs>
@@ -66,8 +66,8 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevtrollproject>
+  </tdevdebugger>
+  <tdevtrollproject>
     <opie>
 	<quick_app>true</quick_app>
     </opie>
@@ -108,15 +108,15 @@ fi
       <programargs>-qws</programargs>
     </run>
     <envvars/>
-  </kdevtrollproject>
-  <kdevfilecreate>
+  </tdevtrollproject>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
 	<type ext="ui" />
 	<type ext="cpp" />
 	<type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
   <cppsupportpart>
     <codecompletion>
       <codehinting outputview="1" enablech="0" selectview="0" />
@@ -135,11 +135,11 @@ fi
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevcvs>
+  </tdevclassview>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions></commitoptions>
     <updateoptions>-dP</updateoptions>
@@ -148,11 +148,11 @@ fi
     <diffoptions>-u3 -p</diffoptions>
     <logoptions></logoptions>
     <rshoptions></rshoptions>
-  </kdevcvs>
-  <kdevdocumentation>
+  </tdevcvs>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate b/languages/cpp/app_templates/opieapplet/opieapplet.tdevtemplate
index e6cec5eb..e6cec5eb 100644
--- a/languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate
+++ b/languages/cpp/app_templates/opieapplet/opieapplet.tdevtemplate
diff --git a/languages/cpp/app_templates/opieinput/CMakeLists.txt b/languages/cpp/app_templates/opieinput/CMakeLists.txt
index f7bba492..5246ccdb 100644
--- a/languages/cpp/app_templates/opieinput/CMakeLists.txt
+++ b/languages/cpp/app_templates/opieinput/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( opieinput.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/opieinput.tar.gz opieinput.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    opieinput.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    opieinput.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/opieinput/Makefile.am b/languages/cpp/app_templates/opieinput/Makefile.am
index 9a3e5ffd..fee564a7 100644
--- a/languages/cpp/app_templates/opieinput/Makefile.am
+++ b/languages/cpp/app_templates/opieinput/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = Makefile.am Example.png app.tdevelop app.pro \
 templateName = opieinput
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/opieinput/app.tdevelop b/languages/cpp/app_templates/opieinput/app.tdevelop
index cc61122f..9a81ebba 100644
--- a/languages/cpp/app_templates/opieinput/app.tdevelop
+++ b/languages/cpp/app_templates/opieinput/app.tdevelop
@@ -13,7 +13,7 @@
     </keywords>
     <ignoreparts/>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -24,8 +24,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>gtk</toc>
       <toc>gnustep</toc>
@@ -52,8 +52,8 @@
       <toc>libbonobo</toc>
       <toc>libbonoboui</toc>
     </ignoredevhelp>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell></dbgshell>
       <programargs>-qws</programargs>
@@ -66,8 +66,8 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevtrollproject>
+  </tdevdebugger>
+  <tdevtrollproject>
     <opie>
 	<quick_app>false</quick_app>
     </opie>
@@ -109,15 +109,15 @@ fi
       <programargs>-qws</programargs>
     </run>
     <envvars/>
-  </kdevtrollproject>
-  <kdevfilecreate>
+  </tdevtrollproject>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
 	<type ext="ui" />
 	<type ext="cpp" />
 	<type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
   <cppsupportpart>
     <codecompletion>
       <codehinting outputview="1" enablech="0" selectview="0" />
@@ -136,11 +136,11 @@ fi
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevcvs>
+  </tdevclassview>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions></commitoptions>
     <updateoptions>-dP</updateoptions>
@@ -149,11 +149,11 @@ fi
     <diffoptions>-u3 -p</diffoptions>
     <logoptions></logoptions>
     <rshoptions></rshoptions>
-  </kdevcvs>
-  <kdevdocumentation>
+  </tdevcvs>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/opieinput/opieinput.kdevtemplate b/languages/cpp/app_templates/opieinput/opieinput.tdevtemplate
index 19b721bf..19b721bf 100644
--- a/languages/cpp/app_templates/opieinput/opieinput.kdevtemplate
+++ b/languages/cpp/app_templates/opieinput/opieinput.tdevtemplate
diff --git a/languages/cpp/app_templates/opiemenu/CMakeLists.txt b/languages/cpp/app_templates/opiemenu/CMakeLists.txt
index c321604c..12eedcdc 100644
--- a/languages/cpp/app_templates/opiemenu/CMakeLists.txt
+++ b/languages/cpp/app_templates/opiemenu/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( opiemenu.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/opiemenu.tar.gz opiemenu.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    opiemenu.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    opiemenu.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/opiemenu/Makefile.am b/languages/cpp/app_templates/opiemenu/Makefile.am
index 343a2bfa..91d1c2ba 100644
--- a/languages/cpp/app_templates/opiemenu/Makefile.am
+++ b/languages/cpp/app_templates/opiemenu/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = Makefile.am Example.png  app.tdevelop  app.pro \
 templateName = opiemenu
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/opiemenu/app.tdevelop b/languages/cpp/app_templates/opiemenu/app.tdevelop
index c5544656..da3b91d4 100644
--- a/languages/cpp/app_templates/opiemenu/app.tdevelop
+++ b/languages/cpp/app_templates/opiemenu/app.tdevelop
@@ -13,7 +13,7 @@
     </keywords>
     <ignoreparts/>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -24,8 +24,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>gtk</toc>
       <toc>gnustep</toc>
@@ -52,8 +52,8 @@
       <toc>libbonobo</toc>
       <toc>libbonoboui</toc>
     </ignoredevhelp>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell></dbgshell>
       <programargs>-qws</programargs>
@@ -66,8 +66,8 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevtrollproject>
+  </tdevdebugger>
+  <tdevtrollproject>
     <opie>
 	<quick_app>true</quick_app>
     </opie>
@@ -108,15 +108,15 @@ fi
       <programargs>-qws</programargs>
     </run>
     <envvars/>
-  </kdevtrollproject>
-  <kdevfilecreate>
+  </tdevtrollproject>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
 	<type ext="ui" />
 	<type ext="cpp" />
 	<type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
   <cppsupportpart>
     <codecompletion>
       <codehinting outputview="1" enablech="0" selectview="0" />
@@ -135,11 +135,11 @@ fi
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevcvs>
+  </tdevclassview>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions></commitoptions>
     <updateoptions>-dP</updateoptions>
@@ -148,11 +148,11 @@ fi
     <diffoptions>-u3 -p</diffoptions>
     <logoptions></logoptions>
     <rshoptions></rshoptions>
-  </kdevcvs>
-  <kdevdocumentation>
+  </tdevcvs>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate b/languages/cpp/app_templates/opiemenu/opiemenu.tdevtemplate
index 204cf5d8..204cf5d8 100644
--- a/languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate
+++ b/languages/cpp/app_templates/opiemenu/opiemenu.tdevtemplate
diff --git a/languages/cpp/app_templates/opienet/CMakeLists.txt b/languages/cpp/app_templates/opienet/CMakeLists.txt
index a08e71be..19c969d3 100644
--- a/languages/cpp/app_templates/opienet/CMakeLists.txt
+++ b/languages/cpp/app_templates/opienet/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( opienet.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/opienet.tar.gz opienet.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    opienet.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    opienet.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/opienet/Makefile.am b/languages/cpp/app_templates/opienet/Makefile.am
index 5245c17e..d23c835b 100644
--- a/languages/cpp/app_templates/opienet/Makefile.am
+++ b/languages/cpp/app_templates/opienet/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = Makefile.am Example.png  app.tdevelop  app.pro \
 templateName = opienet
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/opienet/app.tdevelop b/languages/cpp/app_templates/opienet/app.tdevelop
index 7717a098..1292af0e 100644
--- a/languages/cpp/app_templates/opienet/app.tdevelop
+++ b/languages/cpp/app_templates/opienet/app.tdevelop
@@ -13,7 +13,7 @@
     </keywords>
     <ignoreparts/>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -24,8 +24,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>gtk</toc>
       <toc>gnustep</toc>
@@ -52,8 +52,8 @@
       <toc>libbonobo</toc>
       <toc>libbonoboui</toc>
     </ignoredevhelp>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell></dbgshell>
       <programargs>-qws</programargs>
@@ -66,8 +66,8 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevtrollproject>
+  </tdevdebugger>
+  <tdevtrollproject>
     <opie>
 	<quick_app>false</quick_app>
     </opie>
@@ -93,15 +93,15 @@
       <programargs>-qws</programargs>
     </run>
     <envvars/>
-  </kdevtrollproject>
-  <kdevfilecreate>
+  </tdevtrollproject>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
 	<type ext="ui" />
 	<type ext="cpp" />
 	<type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
   <cppsupportpart>
     <codecompletion>
       <codehinting outputview="1" enablech="0" selectview="0" />
@@ -120,11 +120,11 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevcvs>
+  </tdevclassview>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions></commitoptions>
     <updateoptions>-dP</updateoptions>
@@ -133,11 +133,11 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions></logoptions>
     <rshoptions></rshoptions>
-  </kdevcvs>
-  <kdevdocumentation>
+  </tdevcvs>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/opienet/opienet.kdevtemplate b/languages/cpp/app_templates/opienet/opienet.tdevtemplate
index 23223d28..23223d28 100644
--- a/languages/cpp/app_templates/opienet/opienet.kdevtemplate
+++ b/languages/cpp/app_templates/opienet/opienet.tdevtemplate
diff --git a/languages/cpp/app_templates/opietoday/CMakeLists.txt b/languages/cpp/app_templates/opietoday/CMakeLists.txt
index 6c7c4d66..2f9e0dd1 100644
--- a/languages/cpp/app_templates/opietoday/CMakeLists.txt
+++ b/languages/cpp/app_templates/opietoday/CMakeLists.txt
@@ -20,9 +20,9 @@ add_custom_target( opietoday.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/opietoday.tar.gz opietoday.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    opietoday.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    opietoday.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/opietoday/Makefile.am b/languages/cpp/app_templates/opietoday/Makefile.am
index 6c999369..8c9ec514 100644
--- a/languages/cpp/app_templates/opietoday/Makefile.am
+++ b/languages/cpp/app_templates/opietoday/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = Makefile.am Example.png  app.tdevelop  app.pro exampleplugin.cpp \
 templateName = opietoday
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/opietoday/app.tdevelop b/languages/cpp/app_templates/opietoday/app.tdevelop
index c387911b..043326d3 100644
--- a/languages/cpp/app_templates/opietoday/app.tdevelop
+++ b/languages/cpp/app_templates/opietoday/app.tdevelop
@@ -13,7 +13,7 @@
     </keywords>
     <ignoreparts/>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -24,8 +24,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>gtk</toc>
       <toc>gnustep</toc>
@@ -52,8 +52,8 @@
       <toc>libbonobo</toc>
       <toc>libbonoboui</toc>
     </ignoredevhelp>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell></dbgshell>
       <programargs>-qws</programargs>
@@ -66,8 +66,8 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevtrollproject>
+  </tdevdebugger>
+  <tdevtrollproject>
     <opie>
 	<quick_app>false</quick_app>
     </opie>
@@ -93,15 +93,15 @@
       <programargs>-qws</programargs>
     </run>
     <envvars/>
-  </kdevtrollproject>
-  <kdevfilecreate>
+  </tdevtrollproject>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
 	<type ext="ui" />
 	<type ext="cpp" />
 	<type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
   <cppsupportpart>
     <codecompletion>
       <codehinting outputview="1" enablech="0" selectview="0" />
@@ -120,11 +120,11 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevcvs>
+  </tdevclassview>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions></commitoptions>
     <updateoptions>-dP</updateoptions>
@@ -133,11 +133,11 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions></logoptions>
     <rshoptions></rshoptions>
-  </kdevcvs>
-  <kdevdocumentation>
+  </tdevcvs>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/opietoday/opietoday.kdevtemplate b/languages/cpp/app_templates/opietoday/opietoday.tdevtemplate
index 91bb39be..91bb39be 100644
--- a/languages/cpp/app_templates/opietoday/opietoday.kdevtemplate
+++ b/languages/cpp/app_templates/opietoday/opietoday.tdevtemplate
diff --git a/languages/cpp/app_templates/prc-tool/Makefile.am b/languages/cpp/app_templates/prc-tool/Makefile.am
index 06f097a4..ee4e2182 100644
--- a/languages/cpp/app_templates/prc-tool/Makefile.am
+++ b/languages/cpp/app_templates/prc-tool/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = prc-tool.png src-Makefile prc-tool.tdevelop callback.h \
 templateName = prc-tool
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop b/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop
index 9015718f..cb31f8a1 100644
--- a/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop
+++ b/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop
@@ -4,23 +4,23 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>KDevCustomProject</projectmanagement>
+  <projectmanagement>TDevCustomProject</projectmanagement>
   <primarylanguage>C</primarylanguage>
     <ignoreparts>
-      <part>KDevDebugger</part>
+      <part>TDevDebugger</part>
     </ignoreparts>
   <keywords>
    <keyword>C</keyword>
    <keyword>PalmOS</keyword>
   </keywords>
  </general>
-    <kdevfileview>
+    <tdevfileview>
     <groups>
       <group pattern="Makefile" name="Build" />
       <group pattern="*.c" name="Source" />
     </groups>
-  </kdevfileview>
-<kdevcustomproject>
+  </tdevfileview>
+<tdevcustomproject>
     <run>
       <mainprogram>make test</mainprogram>
       <programargs/>
@@ -40,12 +40,12 @@
       <envvars/>
     </make>
     <makeenvvars/>
-  </kdevcustomproject>
+  </tdevcustomproject>
 
-  <kdevdocumentation>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate b/languages/cpp/app_templates/prc-tool/prc-tool.tdevtemplate
index 8cfea15f..23b0013e 100644
--- a/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate
+++ b/languages/cpp/app_templates/prc-tool/prc-tool.tdevtemplate
@@ -65,7 +65,7 @@ Archive=prc-tool.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/cpp/app_templates/qmakeapp/CMakeLists.txt b/languages/cpp/app_templates/qmakeapp/CMakeLists.txt
index 4af3dc73..f23ed602 100644
--- a/languages/cpp/app_templates/qmakeapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/qmakeapp/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( qmakeapp.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/qmakeapp.tar.gz qmakeapp.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    qmakeapp.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    qmakeapp.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/qmakeapp/Makefile.am b/languages/cpp/app_templates/qmakeapp/Makefile.am
index 233717d7..11a39e79 100644
--- a/languages/cpp/app_templates/qmakeapp/Makefile.am
+++ b/languages/cpp/app_templates/qmakeapp/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = main.cpp qmakeapp.cpp qmakeapp.h qmakeapp.png qmakeapp.tdevelop \
 templateName = qmakeapp
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop b/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop
index 48a9bd99..04ec68cb 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop
@@ -10,7 +10,7 @@
       <keyword>Qt</keyword>
     </keywords>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -21,18 +21,18 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>  
     </tree> 
-  </kdevfileview>
-  <kdevcppsupport>
+  </tdevfileview>
+  <tdevcppsupport>
     <qt>
       <used>true</used>
       <version>3</version>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
       <root>%{QTDIR}</root>
       <qmake>%{QMAKE}</qmake>
     </qt>
-  </kdevcppsupport>
-  <kdevdoctreeview>
+  </tdevcppsupport>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -69,8 +69,8 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell/>
       <breakpoints/>
@@ -85,28 +85,28 @@
       <demanglenames>true</demanglenames>
     </display>
     <breakpoints/>
-  </kdevdebugger>  
-  <kdevtrollproject>
+  </tdevdebugger>  
+  <tdevtrollproject>
     <run>
       <mainprogram>./bin/%{APPNAMELC}</mainprogram>
       <programargs/>
     </run>
-  </kdevtrollproject>
+  </tdevtrollproject>
   <workspace>
     <openfiles/> 
   </workspace>
-  <kdevfilecreate>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
       <type ext="ts" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate b/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevtemplate
index b89e8a52..b89e8a52 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevtemplate
diff --git a/languages/cpp/app_templates/qmakeempty/CMakeLists.txt b/languages/cpp/app_templates/qmakeempty/CMakeLists.txt
index bc109590..f8bba7c6 100644
--- a/languages/cpp/app_templates/qmakeempty/CMakeLists.txt
+++ b/languages/cpp/app_templates/qmakeempty/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( qmakeempty.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/qmakeempty.tar.gz qmakeempty.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    qmakeempty.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    qmakeempty.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/qmakeempty/Makefile.am b/languages/cpp/app_templates/qmakeempty/Makefile.am
index 9d62ad0a..2eb31a4f 100644
--- a/languages/cpp/app_templates/qmakeempty/Makefile.am
+++ b/languages/cpp/app_templates/qmakeempty/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = qmakeempty.tdevelop \
 templateName = qmakeempty
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop b/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop
index 3dc8acbb..c35d2fe9 100644
--- a/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop
+++ b/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop
@@ -10,7 +10,7 @@
       <keyword>Qt</keyword>
     </keywords>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -21,8 +21,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>  
     </tree> 
-  </kdevfileview>
-  <kdevcppsupport>
+  </tdevfileview>
+  <tdevcppsupport>
     <qt>
       <used>true</used>
       <version>4</version>
@@ -31,8 +31,8 @@
       <qmake>%{QMAKE}</qmake>
       <designer>%{DESIGNER}</designer>
     </qt>
-  </kdevcppsupport>
-  <kdevdoctreeview>
+  </tdevcppsupport>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -69,8 +69,8 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell/>
       <breakpoints/>
@@ -85,17 +85,17 @@
       <demanglenames>true</demanglenames>
     </display>
     <breakpoints/>
-  </kdevdebugger>  
-  <kdevtrollproject>
+  </tdevdebugger>  
+  <tdevtrollproject>
     <run>
       <mainprogram>./bin/%{APPNAMELC}</mainprogram>
       <programargs/>
     </run>
-  </kdevtrollproject>
+  </tdevtrollproject>
   <workspace>
     <openfiles/> 
   </workspace>
-  <kdevfilecreate>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
@@ -103,11 +103,11 @@
       <type ext="ts" />
       <type ext="qrc" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate b/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevtemplate
index 19c03688..19c03688 100644
--- a/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate
+++ b/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevtemplate
diff --git a/languages/cpp/app_templates/qmakesimple/CMakeLists.txt b/languages/cpp/app_templates/qmakesimple/CMakeLists.txt
index 64b3b0bd..71d9301b 100644
--- a/languages/cpp/app_templates/qmakesimple/CMakeLists.txt
+++ b/languages/cpp/app_templates/qmakesimple/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( qmakesimple.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/qmakesimple.tar.gz qmakesimple.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    qmakesimple.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    qmakesimple.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/qmakesimple/Makefile.am b/languages/cpp/app_templates/qmakesimple/Makefile.am
index ac17219f..728d63ba 100644
--- a/languages/cpp/app_templates/qmakesimple/Makefile.am
+++ b/languages/cpp/app_templates/qmakesimple/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = main.cpp qmakesimple.png app.tdevelop app.pro src.pro
 templateName = qmakesimple
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/qmakesimple/app.tdevelop b/languages/cpp/app_templates/qmakesimple/app.tdevelop
index 2af4f7ad..a8e39ca6 100644
--- a/languages/cpp/app_templates/qmakesimple/app.tdevelop
+++ b/languages/cpp/app_templates/qmakesimple/app.tdevelop
@@ -10,25 +10,25 @@
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <kdevfileview>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
    <group pattern="*.png" name="Icons" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevcppsupport>
+ </tdevfileview>
+ <tdevcppsupport>
    <qt>
      <version>3</version>
      <used>true</used>
      <includestyle>3</includestyle>
-     <designerintegration>EmbeddedKDevDesigner</designerintegration>
+     <designerintegration>EmbeddedTDevDesigner</designerintegration>
       <root>%{QTDIR}</root>
       <qmake>%{QMAKE}</qmake>
    </qt>
- </kdevcppsupport>
- <kdevdoctreeview>
+ </tdevcppsupport>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -66,8 +66,8 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <programargs></programargs>
    <gdbpath>/usr/bin/gdb</gdbpath>
@@ -76,25 +76,25 @@
    <floatingtoolbar>false</floatingtoolbar>  
    <dbgshell/>
   </general>
- </kdevdebugger>
- <kdevtrollproject>
+ </tdevdebugger>
+ <tdevtrollproject>
    <run>
     <mainprogram>./bin/%{APPNAMELC}</mainprogram>
     <programargs/>
    </run>
-  </kdevtrollproject>
-  <kdevfilecreate>
+  </tdevtrollproject>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
       <type ext="ts" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate b/languages/cpp/app_templates/qmakesimple/qmakesimple.tdevtemplate
index 8f2dbee7..8f2dbee7 100644
--- a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate
+++ b/languages/cpp/app_templates/qmakesimple/qmakesimple.tdevtemplate
diff --git a/languages/cpp/app_templates/qt4hello/CMakeLists.txt b/languages/cpp/app_templates/qt4hello/CMakeLists.txt
index 7ec55256..d1aee7bd 100644
--- a/languages/cpp/app_templates/qt4hello/CMakeLists.txt
+++ b/languages/cpp/app_templates/qt4hello/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( qt4hello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/qt4hello.tar.gz qt4hello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    qt4hello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    qt4hello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/qt4hello/Makefile.am b/languages/cpp/app_templates/qt4hello/Makefile.am
index 3f735466..20edc902 100644
--- a/languages/cpp/app_templates/qt4hello/Makefile.am
+++ b/languages/cpp/app_templates/qt4hello/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = main.cpp qt4hello.png qt4hello.tdevelop \
 templateName = qt4hello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.tdevelop b/languages/cpp/app_templates/qt4hello/qt4hello.tdevelop
index 3dc8acbb..c35d2fe9 100644
--- a/languages/cpp/app_templates/qt4hello/qt4hello.tdevelop
+++ b/languages/cpp/app_templates/qt4hello/qt4hello.tdevelop
@@ -10,7 +10,7 @@
       <keyword>Qt</keyword>
     </keywords>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -21,8 +21,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>  
     </tree> 
-  </kdevfileview>
-  <kdevcppsupport>
+  </tdevfileview>
+  <tdevcppsupport>
     <qt>
       <used>true</used>
       <version>4</version>
@@ -31,8 +31,8 @@
       <qmake>%{QMAKE}</qmake>
       <designer>%{DESIGNER}</designer>
     </qt>
-  </kdevcppsupport>
-  <kdevdoctreeview>
+  </tdevcppsupport>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -69,8 +69,8 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell/>
       <breakpoints/>
@@ -85,17 +85,17 @@
       <demanglenames>true</demanglenames>
     </display>
     <breakpoints/>
-  </kdevdebugger>  
-  <kdevtrollproject>
+  </tdevdebugger>  
+  <tdevtrollproject>
     <run>
       <mainprogram>./bin/%{APPNAMELC}</mainprogram>
       <programargs/>
     </run>
-  </kdevtrollproject>
+  </tdevtrollproject>
   <workspace>
     <openfiles/> 
   </workspace>
-  <kdevfilecreate>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
@@ -103,11 +103,11 @@
       <type ext="ts" />
       <type ext="qrc" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate b/languages/cpp/app_templates/qt4hello/qt4hello.tdevtemplate
index 2ea95b83..2ea95b83 100644
--- a/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate
+++ b/languages/cpp/app_templates/qt4hello/qt4hello.tdevtemplate
diff --git a/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt b/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt
index 422740dc..5fe14da0 100644
--- a/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt
@@ -20,9 +20,9 @@ add_custom_target( qt4makeapp.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/qt4makeapp.tar.gz qt4makeapp.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    qt4makeapp.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    qt4makeapp.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/qt4makeapp/Makefile.am b/languages/cpp/app_templates/qt4makeapp/Makefile.am
index 68f78acb..265a5cd9 100644
--- a/languages/cpp/app_templates/qt4makeapp/Makefile.am
+++ b/languages/cpp/app_templates/qt4makeapp/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = main.cpp qt4makeapp.cpp qt4makeapp.h qt4makeapp.png qt4makeapp.tdeve
 templateName = qt4makeapp
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop
index 3dc8acbb..c35d2fe9 100644
--- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop
+++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop
@@ -10,7 +10,7 @@
       <keyword>Qt</keyword>
     </keywords>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -21,8 +21,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>  
     </tree> 
-  </kdevfileview>
-  <kdevcppsupport>
+  </tdevfileview>
+  <tdevcppsupport>
     <qt>
       <used>true</used>
       <version>4</version>
@@ -31,8 +31,8 @@
       <qmake>%{QMAKE}</qmake>
       <designer>%{DESIGNER}</designer>
     </qt>
-  </kdevcppsupport>
-  <kdevdoctreeview>
+  </tdevcppsupport>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -69,8 +69,8 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell/>
       <breakpoints/>
@@ -85,17 +85,17 @@
       <demanglenames>true</demanglenames>
     </display>
     <breakpoints/>
-  </kdevdebugger>  
-  <kdevtrollproject>
+  </tdevdebugger>  
+  <tdevtrollproject>
     <run>
       <mainprogram>./bin/%{APPNAMELC}</mainprogram>
       <programargs/>
     </run>
-  </kdevtrollproject>
+  </tdevtrollproject>
   <workspace>
     <openfiles/> 
   </workspace>
-  <kdevfilecreate>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
@@ -103,11 +103,11 @@
       <type ext="ts" />
       <type ext="qrc" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevtemplate
index 1aea3b21..1aea3b21 100644
--- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate
+++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevtemplate
diff --git a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt b/languages/cpp/app_templates/qtopia4app/CMakeLists.txt
index 57849362..ef38e012 100644
--- a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt
+++ b/languages/cpp/app_templates/qtopia4app/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( qtopia4app.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/qtopia4app.tar.gz qtopia4app.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    qtopia4app.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    qtopia4app.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/qtopia4app/Makefile.am b/languages/cpp/app_templates/qtopia4app/Makefile.am
index 324291bb..8dcaa585 100644
--- a/languages/cpp/app_templates/qtopia4app/Makefile.am
+++ b/languages/cpp/app_templates/qtopia4app/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = Example.png app.tdevelop example.desktop \
 templateName = qtopia4app
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	gzip -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/qtopia4app/app.tdevelop b/languages/cpp/app_templates/qtopia4app/app.tdevelop
index b890135e..320ae4d7 100644
--- a/languages/cpp/app_templates/qtopia4app/app.tdevelop
+++ b/languages/cpp/app_templates/qtopia4app/app.tdevelop
@@ -11,7 +11,7 @@
     </keywords>
     <ignoreparts/>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -22,8 +22,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -61,8 +61,8 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs></programargs>
@@ -75,8 +75,8 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevtrollproject>
+  </tdevdebugger>
+  <tdevtrollproject>
     <general>
       <activedir></activedir>
     </general>
@@ -105,11 +105,11 @@
 	<envvar value="$PATH:/opt/Qtopia/SDK/scripts:/opt/Qtopia/SDK/4.2.4/x86/bin:/opt/Qtopia/SDK/4.2.4/x86/scripts" name="PATH" />
       </envvars>
     </make>
-  </kdevtrollproject>
-  <kdevfilecreate>
+  </tdevtrollproject>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes/>
-  </kdevfilecreate>
+  </tdevfilecreate>
   <cppsupportpart>
     <codecompletion>
       <codehinting outputview="1" enablech="0" selectview="0" />
@@ -128,11 +128,11 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevcvs>
+  </tdevclassview>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions></commitoptions>
     <updateoptions>-dP</updateoptions>
@@ -141,14 +141,14 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions></logoptions>
     <rshoptions></rshoptions>
-  </kdevcvs>
-  <kdevdocumentation>
+  </tdevcvs>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
-  <kdevcppsupport>    
+  </tdevdocumentation>
+  <tdevcppsupport>    
     <qt>
       <used>true</used>
       <version>4</version>
@@ -159,5 +159,5 @@
       <designer>/opt/Qtopia/SDK/4.2.4/x86/bin/designer</designer>
       <designerpluginpaths/>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 </tdevelop>
diff --git a/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate b/languages/cpp/app_templates/qtopia4app/qtopia4app.tdevtemplate
index e6a7ec9e..e6a7ec9e 100644
--- a/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate
+++ b/languages/cpp/app_templates/qtopia4app/qtopia4app.tdevtemplate
diff --git a/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt b/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt
index 424d19bc..74826ef3 100644
--- a/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( qtopiaapp.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/qtopiaapp.tar.gz qtopiaapp.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    qtopiaapp.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    qtopiaapp.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/qtopiaapp/Makefile.am b/languages/cpp/app_templates/qtopiaapp/Makefile.am
index afaaf294..342e2a96 100644
--- a/languages/cpp/app_templates/qtopiaapp/Makefile.am
+++ b/languages/cpp/app_templates/qtopiaapp/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = Example.png app.tdevelop example.control example.desktop \
 templateName = qtopiaapp
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/qtopiaapp/app.tdevelop b/languages/cpp/app_templates/qtopiaapp/app.tdevelop
index 962f4622..67916b05 100644
--- a/languages/cpp/app_templates/qtopiaapp/app.tdevelop
+++ b/languages/cpp/app_templates/qtopiaapp/app.tdevelop
@@ -11,7 +11,7 @@
     </keywords>
     <ignoreparts/>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -22,8 +22,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -61,8 +61,8 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs></programargs>
@@ -75,8 +75,8 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevtrollproject>
+  </tdevdebugger>
+  <tdevtrollproject>
     <general>
       <activedir></activedir>
     </general>
@@ -85,11 +85,11 @@
       <programargs>-qws</programargs>
     </run>
     <envvars/>
-  </kdevtrollproject>
-  <kdevfilecreate>
+  </tdevtrollproject>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes/>
-  </kdevfilecreate>
+  </tdevfilecreate>
   <cppsupportpart>
     <codecompletion>
       <codehinting outputview="1" enablech="0" selectview="0" />
@@ -108,11 +108,11 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevcvs>
+  </tdevclassview>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions></commitoptions>
     <updateoptions>-dP</updateoptions>
@@ -121,11 +121,11 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions></logoptions>
     <rshoptions></rshoptions>
-  </kdevcvs>
-  <kdevdocumentation>
+  </tdevcvs>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate b/languages/cpp/app_templates/qtopiaapp/qtopiaapp.tdevtemplate
index 5c7dcc36..5c7dcc36 100644
--- a/languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate
+++ b/languages/cpp/app_templates/qtopiaapp/qtopiaapp.tdevtemplate
diff --git a/languages/cpp/app_templates/tde4app/CMakeLists.txt b/languages/cpp/app_templates/tde4app/CMakeLists.txt
new file mode 100644
index 00000000..29997b2c
--- /dev/null
+++ b/languages/cpp/app_templates/tde4app/CMakeLists.txt
@@ -0,0 +1,29 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_custom_target( tde4app.tar.gz ALL
+  COMMAND tar zcf tde4app.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+    tdeapp4.cpp tdeapp4.h prefs_base.ui tdeapp4view.cpp
+    tdeapp4view.h tdeapp4view_base.ui main.cpp tde4appui.rc
+    tde4app-CMakeLists.txt tdeapp4.desktop tdeapp4.kcfg
+    settings.kcfgc tde4app.png README tde4app.tdevelop
+    tde4app.tdevelop.filelist
+)
+
+
+install( FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/tde4app.tar.gz tde4app.png
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+
+
+install( FILES
+    tde4app.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/tde4app/Makefile.am b/languages/cpp/app_templates/tde4app/Makefile.am
new file mode 100644
index 00000000..3fc82b7a
--- /dev/null
+++ b/languages/cpp/app_templates/tde4app/Makefile.am
@@ -0,0 +1,19 @@
+dataFiles = tdeapp4.cpp tdeapp4.h prefs_base.ui tdeapp4view.cpp tdeapp4view.h tdeapp4view_base.ui \
+	main.cpp tde4appui.rc CMakeLists.txt tdeapp4.desktop tdeapp4.kcfg settings.kcfgc \
+	tde4app.png README tde4app.tdevelop tde4app.tdevelop.filelist
+
+templateName = tde4app
+
+### no need to change below:
+template_DATA = $(templateName).tdevtemplate
+templatedir = ${appwizarddatadir}/templates
+
+appwizarddatadir = ${kde_datadir}/tdevappwizard
+$(templateName).tar.gz: ${dataFiles}
+	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
+	$(GZIP_COMMAND) -f9 $(templateName).tar
+
+archivedir = ${appwizarddatadir}
+archive_DATA = $(templateName).tar.gz ${templateName}.png
+
+CLEANFILES = *.tar.gz
diff --git a/languages/cpp/app_templates/kde4app/README b/languages/cpp/app_templates/tde4app/README
index 8180d28c..8180d28c 100644
--- a/languages/cpp/app_templates/kde4app/README
+++ b/languages/cpp/app_templates/tde4app/README
diff --git a/languages/cpp/app_templates/kde4app/main.cpp b/languages/cpp/app_templates/tde4app/main.cpp
index 5c83921b..5c83921b 100644
--- a/languages/cpp/app_templates/kde4app/main.cpp
+++ b/languages/cpp/app_templates/tde4app/main.cpp
diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/tde4app/prefs_base.ui
index 87a191f1..87a191f1 100644
--- a/languages/cpp/app_templates/kde4app/prefs_base.ui
+++ b/languages/cpp/app_templates/tde4app/prefs_base.ui
diff --git a/languages/cpp/app_templates/kde4app/settings.kcfgc b/languages/cpp/app_templates/tde4app/settings.kcfgc
index 402fad09..402fad09 100644
--- a/languages/cpp/app_templates/kde4app/settings.kcfgc
+++ b/languages/cpp/app_templates/tde4app/settings.kcfgc
diff --git a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt b/languages/cpp/app_templates/tde4app/tde4app-CMakeLists.txt
index db1f4bab..db1f4bab 100644
--- a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt
+++ b/languages/cpp/app_templates/tde4app/tde4app-CMakeLists.txt
diff --git a/languages/cpp/app_templates/kapp/kapp.png b/languages/cpp/app_templates/tde4app/tde4app.png
index a421a664..a421a664 100644
--- a/languages/cpp/app_templates/kapp/kapp.png
+++ b/languages/cpp/app_templates/tde4app/tde4app.png
diff --git a/languages/cpp/app_templates/kde4app/kde4app.tdevelop b/languages/cpp/app_templates/tde4app/tde4app.tdevelop
index d332fa06..87554ffc 100644
--- a/languages/cpp/app_templates/kde4app/kde4app.tdevelop
+++ b/languages/cpp/app_templates/tde4app/tde4app.tdevelop
@@ -4,7 +4,7 @@
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
     <version>%{VERSION}</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
+    <projectmanagement>TDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <keywords>
       <keyword>C++</keyword>
@@ -18,7 +18,7 @@
     <description/>
     <ignoreparts/>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -30,8 +30,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -66,8 +66,8 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs/>
@@ -81,16 +81,16 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevfilecreate>
+  </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcvs>
+  </tdevfilecreate>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions/>
     <updateoptions>-dP</updateoptions>
@@ -99,7 +99,7 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions/>
     <rshoptions/>
-  </kdevcvs>
+  </tdevcvs>
   <cppsupportpart>
     <codecompletion/>
     <filetemplates>
@@ -111,7 +111,7 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevcustomproject>
+  <tdevcustomproject>
     <run>
       <mainprogram>%{dest}/build/%{APPNAMELC}</mainprogram>
       <programargs/>
@@ -181,8 +181,8 @@
     <blacklist>
         <path>build</path>
     </blacklist>
-  </kdevcustomproject>
-  <kdevcppsupport>
+  </tdevcustomproject>
+  <tdevcppsupport>
     <qt>
       <used>true</used>
       <version>4</version>
@@ -191,15 +191,15 @@
       <designer>/usr/bin/designer-qt4</designer>
       <root>/usr/lib/qt4</root>
     </qt>
-  </kdevcppsupport>
-  <kdevclassview>
+  </tdevcppsupport>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevdocumentation>
+  </tdevclassview>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kde4app/kde4app.tdevelop.filelist b/languages/cpp/app_templates/tde4app/tde4app.tdevelop.filelist
index 5235563f..50a0a4f0 100644
--- a/languages/cpp/app_templates/kde4app/kde4app.tdevelop.filelist
+++ b/languages/cpp/app_templates/tde4app/tde4app.tdevelop.filelist
@@ -1,4 +1,4 @@
-# KDevelop Custom Project File List
+# TDevelop Custom Project File List
 CMakeLists.txt
 main.cpp
 prefs_base.ui
diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate b/languages/cpp/app_templates/tde4app/tde4app.tdevtemplate
index 1516e92e..1516e92e 100644
--- a/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
+++ b/languages/cpp/app_templates/tde4app/tde4app.tdevtemplate
diff --git a/languages/cpp/app_templates/kde4app/kde4appui.rc b/languages/cpp/app_templates/tde4app/tde4appui.rc
index 406bccc6..406bccc6 100644
--- a/languages/cpp/app_templates/kde4app/kde4appui.rc
+++ b/languages/cpp/app_templates/tde4app/tde4appui.rc
diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/tde4app/tdeapp4.cpp
index d224123c..d224123c 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.cpp
+++ b/languages/cpp/app_templates/tde4app/tdeapp4.cpp
diff --git a/languages/cpp/app_templates/kde4app/kapp4.desktop b/languages/cpp/app_templates/tde4app/tdeapp4.desktop
index 18cdcbe5..63b359c5 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.desktop
+++ b/languages/cpp/app_templates/tde4app/tdeapp4.desktop
@@ -3,7 +3,7 @@ Name=KApp4
 Name[nds]=KProg4
 Name[sv]=KDE 4-program
 Name[zh_TW]=KApp4 程式
-Exec=kapp4 %i -caption "%c"
+Exec=tdeapp4 %i -caption "%c"
 Icon=kapp4
 Type=Application
 DocPath=kapp4/kapp4.html
diff --git a/languages/cpp/app_templates/kde4app/kapp4.h b/languages/cpp/app_templates/tde4app/tdeapp4.h
index 3c209de2..3c209de2 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.h
+++ b/languages/cpp/app_templates/tde4app/tdeapp4.h
diff --git a/languages/cpp/app_templates/kde4app/kapp4.kcfg b/languages/cpp/app_templates/tde4app/tdeapp4.kcfg
index 6040f769..6040f769 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.kcfg
+++ b/languages/cpp/app_templates/tde4app/tdeapp4.kcfg
diff --git a/languages/cpp/app_templates/kde4app/kapp4view.cpp b/languages/cpp/app_templates/tde4app/tdeapp4view.cpp
index af95aa15..af95aa15 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view.cpp
+++ b/languages/cpp/app_templates/tde4app/tdeapp4view.cpp
diff --git a/languages/cpp/app_templates/kde4app/kapp4view.h b/languages/cpp/app_templates/tde4app/tdeapp4view.h
index 855a2144..855a2144 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view.h
+++ b/languages/cpp/app_templates/tde4app/tdeapp4view.h
diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/tde4app/tdeapp4view_base.ui
index 6738a789..6738a789 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui
+++ b/languages/cpp/app_templates/tde4app/tdeapp4view_base.ui
diff --git a/languages/cpp/app_templates/kapp/CMakeLists.txt b/languages/cpp/app_templates/tdeapp/CMakeLists.txt
index bfe6d93d..10c09f9f 100644
--- a/languages/cpp/app_templates/kapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdeapp/CMakeLists.txt
@@ -9,19 +9,19 @@
 #
 #################################################
 
-add_custom_target( kapp.tar.gz ALL
-  COMMAND tar zcf kapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+add_custom_target( tdeapp.tar.gz ALL
+  COMMAND tar zcf tdeapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app.cpp app.h pref.cpp pref.h appview.cpp appview.h
     appiface.h app_client.cpp main.cpp appui.rc src-Makefile.am
-    kapp.png app.tdevelop subdirs README
+    tdeapp.png app.tdevelop subdirs README
 )
 
 
 install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kapp.tar.gz kapp.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+    ${CMAKE_CURRENT_BINARY_DIR}/tdeapp.tar.gz tdeapp.png
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kapp.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    tdeapp.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kapp/Makefile.am b/languages/cpp/app_templates/tdeapp/Makefile.am
index 145551d3..6adf4430 100644
--- a/languages/cpp/app_templates/kapp/Makefile.am
+++ b/languages/cpp/app_templates/tdeapp/Makefile.am
@@ -1,14 +1,14 @@
 dataFiles = app.cpp app.h pref.cpp pref.h appview.cpp appview.h \
 	appiface.h app_client.cpp main.cpp appui.rc src-Makefile.am \
-	kapp.png app.tdevelop subdirs README
+	tdeapp.png app.tdevelop subdirs README
 
-templateName = kapp
+templateName = tdeapp
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kapp/README b/languages/cpp/app_templates/tdeapp/README
index 7720e6b4..7720e6b4 100644
--- a/languages/cpp/app_templates/kapp/README
+++ b/languages/cpp/app_templates/tdeapp/README
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/tdeapp/app.cpp
index 774efe8e..774efe8e 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/tdeapp/app.cpp
diff --git a/languages/cpp/app_templates/kapp/app.desktop b/languages/cpp/app_templates/tdeapp/app.desktop
index 5c7ab928..5c7ab928 100644
--- a/languages/cpp/app_templates/kapp/app.desktop
+++ b/languages/cpp/app_templates/tdeapp/app.desktop
diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/tdeapp/app.h
index 5f39dd11..5f39dd11 100644
--- a/languages/cpp/app_templates/kapp/app.h
+++ b/languages/cpp/app_templates/tdeapp/app.h
diff --git a/languages/cpp/app_templates/kapp/app.tdevelop b/languages/cpp/app_templates/tdeapp/app.tdevelop
index 6a53f237..e1523988 100644
--- a/languages/cpp/app_templates/kapp/app.tdevelop
+++ b/languages/cpp/app_templates/tdeapp/app.tdevelop
@@ -17,15 +17,15 @@
     <description/>
     <ignoreparts/>
   </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
-  <kdevautoproject>
+  </tdevcppsupport>
+  <tdevautoproject>
     <general>
       <activetarget>src/%{APPNAMELC}</activetarget>
       <useconfiguration>debug</useconfiguration>
@@ -61,8 +61,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
-  </kdevautoproject>
-  <kdevfileview>
+  </tdevautoproject>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -74,8 +74,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -110,8 +110,8 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs/>
@@ -125,16 +125,16 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevfilecreate>
+  </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcvs>
+  </tdevfilecreate>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions/>
     <updateoptions>-dP</updateoptions>
@@ -143,7 +143,7 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions/>
     <rshoptions/>
-  </kdevcvs>
+  </tdevcvs>
   <cppsupportpart>
     <codecompletion/>
     <filetemplates>
@@ -155,14 +155,14 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevdocumentation>
+  </tdevclassview>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kapp/app.kdevses b/languages/cpp/app_templates/tdeapp/app.tdevses
index dcd1c8c1..dcd1c8c1 100644
--- a/languages/cpp/app_templates/kapp/app.kdevses
+++ b/languages/cpp/app_templates/tdeapp/app.tdevses
diff --git a/languages/cpp/app_templates/kapp/app_client.cpp b/languages/cpp/app_templates/tdeapp/app_client.cpp
index ce92c875..ce92c875 100644
--- a/languages/cpp/app_templates/kapp/app_client.cpp
+++ b/languages/cpp/app_templates/tdeapp/app_client.cpp
diff --git a/languages/cpp/app_templates/kapp/appiface.h b/languages/cpp/app_templates/tdeapp/appiface.h
index 9fa7cd1b..9fa7cd1b 100644
--- a/languages/cpp/app_templates/kapp/appiface.h
+++ b/languages/cpp/app_templates/tdeapp/appiface.h
diff --git a/languages/cpp/app_templates/kapp/appui.rc b/languages/cpp/app_templates/tdeapp/appui.rc
index ceb4f14e..ceb4f14e 100644
--- a/languages/cpp/app_templates/kapp/appui.rc
+++ b/languages/cpp/app_templates/tdeapp/appui.rc
diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/tdeapp/appview.cpp
index 16c05a3f..16c05a3f 100644
--- a/languages/cpp/app_templates/kapp/appview.cpp
+++ b/languages/cpp/app_templates/tdeapp/appview.cpp
diff --git a/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/tdeapp/appview.h
index 79513a9d..79513a9d 100644
--- a/languages/cpp/app_templates/kapp/appview.h
+++ b/languages/cpp/app_templates/tdeapp/appview.h
diff --git a/languages/cpp/app_templates/kapp/main.cpp b/languages/cpp/app_templates/tdeapp/main.cpp
index 8c2cc07f..8c2cc07f 100644
--- a/languages/cpp/app_templates/kapp/main.cpp
+++ b/languages/cpp/app_templates/tdeapp/main.cpp
diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/tdeapp/pref.cpp
index 669f591c..669f591c 100644
--- a/languages/cpp/app_templates/kapp/pref.cpp
+++ b/languages/cpp/app_templates/tdeapp/pref.cpp
diff --git a/languages/cpp/app_templates/kapp/pref.h b/languages/cpp/app_templates/tdeapp/pref.h
index b2aae436..b2aae436 100644
--- a/languages/cpp/app_templates/kapp/pref.h
+++ b/languages/cpp/app_templates/tdeapp/pref.h
diff --git a/languages/cpp/app_templates/kapp/src-Makefile.am b/languages/cpp/app_templates/tdeapp/src-Makefile.am
index 8125665b..8125665b 100644
--- a/languages/cpp/app_templates/kapp/src-Makefile.am
+++ b/languages/cpp/app_templates/tdeapp/src-Makefile.am
diff --git a/languages/cpp/app_templates/kapp/subdirs b/languages/cpp/app_templates/tdeapp/subdirs
index 0e678106..0e678106 100644
--- a/languages/cpp/app_templates/kapp/subdirs
+++ b/languages/cpp/app_templates/tdeapp/subdirs
diff --git a/languages/cpp/app_templates/kde4app/kde4app.png b/languages/cpp/app_templates/tdeapp/tdeapp.png
index a421a664..a421a664 100644
--- a/languages/cpp/app_templates/kde4app/kde4app.png
+++ b/languages/cpp/app_templates/tdeapp/tdeapp.png
diff --git a/languages/cpp/app_templates/kapp/kapp.kdevtemplate b/languages/cpp/app_templates/tdeapp/tdeapp.tdevtemplate
index 86675a50..0902455d 100644
--- a/languages/cpp/app_templates/kapp/kapp.kdevtemplate
+++ b/languages/cpp/app_templates/tdeapp/tdeapp.tdevtemplate
@@ -30,7 +30,7 @@ Name[sv]=Programramverk
 Name[tr]=Uygulama Çatısı
 Name[zh_CN]=应用程序框架
 Name[zh_TW]=應用程式框架
-Icon=kapp.png
+Icon=tdeapp.png
 Category=C++/TDE
 Comment=Generates a simple TDE application with one toplevel window, menus and toolbars. A DCOP interface is also provided, so that your application can provide a scripting interface
 Comment[ca]=Genera una simple aplicació per al TDE amb una finestra principal, menús i barres d'eines. També es proveeix la interfície DCOP, de manera que la vostra aplicació podrà proveir d'una interfície per a scripts
@@ -67,11 +67,11 @@ Archive=kapp.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/tdecmodule/CMakeLists.txt b/languages/cpp/app_templates/tdecmodule/CMakeLists.txt
index 072f5f5e..40e12016 100644
--- a/languages/cpp/app_templates/tdecmodule/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdecmodule/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( tdecmodule.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/tdecmodule.tar.gz tdecmodule.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    tdecmodule.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    tdecmodule.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/tdecmodule/Makefile.am b/languages/cpp/app_templates/tdecmodule/Makefile.am
index b3b19611..0938012d 100644
--- a/languages/cpp/app_templates/tdecmodule/Makefile.am
+++ b/languages/cpp/app_templates/tdecmodule/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = module.cpp module.h module.desktop module.tdevelop \
 templateName = tdecmodule
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/tdecmodule/module.tdevelop b/languages/cpp/app_templates/tdecmodule/module.tdevelop
index 7b5a57c0..4f2d0606 100644
--- a/languages/cpp/app_templates/tdecmodule/module.tdevelop
+++ b/languages/cpp/app_templates/tdecmodule/module.tdevelop
@@ -13,15 +13,15 @@
    <keyword>TDE</keyword>
   </keywords>
  </general>
- <kdevcppsupport>
+ <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
- <kdevautoproject>
+  </tdevcppsupport>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -43,8 +43,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -52,8 +52,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -90,24 +90,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate b/languages/cpp/app_templates/tdecmodule/tdecmodule.tdevtemplate
index f646c242..06d6657a 100644
--- a/languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate
+++ b/languages/cpp/app_templates/tdecmodule/tdecmodule.tdevtemplate
@@ -69,11 +69,11 @@ Archive=tdecmodule.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt b/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt
index 32dd830c..1025eb0b 100644
--- a/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt
@@ -20,9 +20,9 @@ add_custom_target( tdeconfig35.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/tdeconfig35.tar.gz tdeconfig35.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    tdeconfig35.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    tdeconfig35.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/tdeconfig35/Makefile.am b/languages/cpp/app_templates/tdeconfig35/Makefile.am
index a172f05f..dc6c56d1 100644
--- a/languages/cpp/app_templates/tdeconfig35/Makefile.am
+++ b/languages/cpp/app_templates/tdeconfig35/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \
 templateName= tdeconfig35
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/tdeconfig35/app.tdevelop b/languages/cpp/app_templates/tdeconfig35/app.tdevelop
index 6a53f237..e1523988 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.tdevelop
+++ b/languages/cpp/app_templates/tdeconfig35/app.tdevelop
@@ -17,15 +17,15 @@
     <description/>
     <ignoreparts/>
   </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
-  <kdevautoproject>
+  </tdevcppsupport>
+  <tdevautoproject>
     <general>
       <activetarget>src/%{APPNAMELC}</activetarget>
       <useconfiguration>debug</useconfiguration>
@@ -61,8 +61,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
-  </kdevautoproject>
-  <kdevfileview>
+  </tdevautoproject>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -74,8 +74,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -110,8 +110,8 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs/>
@@ -125,16 +125,16 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </kdevdebugger>
-  <kdevfilecreate>
+  </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcvs>
+  </tdevfilecreate>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions/>
     <updateoptions>-dP</updateoptions>
@@ -143,7 +143,7 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions/>
     <rshoptions/>
-  </kdevcvs>
+  </tdevcvs>
   <cppsupportpart>
     <codecompletion/>
     <filetemplates>
@@ -155,14 +155,14 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <kdevclassview>
+  <tdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevdocumentation>
+  </tdevclassview>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.tdevtemplate
index b9edfb7a..485b9eb9 100644
--- a/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate
+++ b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.tdevtemplate
@@ -52,11 +52,11 @@ Archive=tdeconfig35.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kdecpp.appwizard b/languages/cpp/app_templates/tdecpp.appwizard
index 14bcbeaa..c4f7b2ac 100644
--- a/languages/cpp/app_templates/kdecpp.appwizard
+++ b/languages/cpp/app_templates/tdecpp.appwizard
@@ -1,2 +1,2 @@
 [General]
-List=kdedcop,tdeioslave,kxt,kdevlang,kmake,kapp,tdeconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,tdefileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,tdescreensaver,kscons_kxt,kscons_tdemdi
+List=kdedcop,tdeioslave,kxt,tdevlang,kmake,kapp,tdeconfig35,tdevlang,tdevpart,kateplugin,tdevpart2,kopart,noatunui,kateplugin2,tdefileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,tdescreensaver,kscons_kxt,kscons_tdemdi
diff --git a/languages/cpp/app_templates/kdedcop/CMakeLists.txt b/languages/cpp/app_templates/tdedcop/CMakeLists.txt
index 0b7e9a3f..f5556887 100644
--- a/languages/cpp/app_templates/kdedcop/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdedcop/CMakeLists.txt
@@ -9,19 +9,19 @@
 #
 #################################################
 
-add_custom_target( kdedcop.tar.gz ALL
-  COMMAND tar zcf kdedcop.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+add_custom_target( tdedcop.tar.gz ALL
+  COMMAND tar zcf tdedcop.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app.cpp app.h app_iface.h app.tdevelop main.cpp
-    mainclass.cpp mainclass.h kdedcop.png src-Makefile.am
+    mainclass.cpp mainclass.h tdedcop.png src-Makefile.am
     subdirs
 )
 
 
 install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kdedcop.tar.gz kdedcop.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+    ${CMAKE_CURRENT_BINARY_DIR}/tdedcop.tar.gz tdedcop.png
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kdedcop.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    tdedcop.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kdedcop/Makefile.am b/languages/cpp/app_templates/tdedcop/Makefile.am
index 21c39778..8a21a2bd 100644
--- a/languages/cpp/app_templates/kdedcop/Makefile.am
+++ b/languages/cpp/app_templates/tdedcop/Makefile.am
@@ -1,13 +1,13 @@
 dataFiles = app.cpp app.h app_iface.h app.tdevelop main.cpp mainclass.cpp \
-	mainclass.h kdedcop.png src-Makefile.am subdirs
+	mainclass.h tdedcop.png src-Makefile.am subdirs
 
-templateName = kdedcop
+templateName = tdedcop
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kdedcop/app.cpp b/languages/cpp/app_templates/tdedcop/app.cpp
index 5c2fa627..5c2fa627 100644
--- a/languages/cpp/app_templates/kdedcop/app.cpp
+++ b/languages/cpp/app_templates/tdedcop/app.cpp
diff --git a/languages/cpp/app_templates/kdedcop/app.h b/languages/cpp/app_templates/tdedcop/app.h
index 814fccad..814fccad 100644
--- a/languages/cpp/app_templates/kdedcop/app.h
+++ b/languages/cpp/app_templates/tdedcop/app.h
diff --git a/languages/cpp/app_templates/kdedcop/app.tdevelop b/languages/cpp/app_templates/tdedcop/app.tdevelop
index 991381c5..c37bd28d 100644
--- a/languages/cpp/app_templates/kdedcop/app.tdevelop
+++ b/languages/cpp/app_templates/tdedcop/app.tdevelop
@@ -14,16 +14,16 @@
    <keyword>DCOP</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -48,8 +48,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -57,8 +57,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -93,24 +93,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kdedcop/app_iface.h b/languages/cpp/app_templates/tdedcop/app_iface.h
index 7049c712..7049c712 100644
--- a/languages/cpp/app_templates/kdedcop/app_iface.h
+++ b/languages/cpp/app_templates/tdedcop/app_iface.h
diff --git a/languages/cpp/app_templates/kdedcop/main.cpp b/languages/cpp/app_templates/tdedcop/main.cpp
index 283ab5cf..283ab5cf 100644
--- a/languages/cpp/app_templates/kdedcop/main.cpp
+++ b/languages/cpp/app_templates/tdedcop/main.cpp
diff --git a/languages/cpp/app_templates/kdedcop/mainclass.cpp b/languages/cpp/app_templates/tdedcop/mainclass.cpp
index a5e0d6a5..a5e0d6a5 100644
--- a/languages/cpp/app_templates/kdedcop/mainclass.cpp
+++ b/languages/cpp/app_templates/tdedcop/mainclass.cpp
diff --git a/languages/cpp/app_templates/kdedcop/mainclass.h b/languages/cpp/app_templates/tdedcop/mainclass.h
index 13504f82..13504f82 100644
--- a/languages/cpp/app_templates/kdedcop/mainclass.h
+++ b/languages/cpp/app_templates/tdedcop/mainclass.h
diff --git a/languages/cpp/app_templates/kdedcop/src-Makefile.am b/languages/cpp/app_templates/tdedcop/src-Makefile.am
index 19ddf2fb..19ddf2fb 100644
--- a/languages/cpp/app_templates/kdedcop/src-Makefile.am
+++ b/languages/cpp/app_templates/tdedcop/src-Makefile.am
diff --git a/languages/cpp/app_templates/kdedcop/subdirs b/languages/cpp/app_templates/tdedcop/subdirs
index 0e678106..0e678106 100644
--- a/languages/cpp/app_templates/kdedcop/subdirs
+++ b/languages/cpp/app_templates/tdedcop/subdirs
diff --git a/languages/cpp/app_templates/kdedcop/kdedcop.png b/languages/cpp/app_templates/tdedcop/tdedcop.png
index 1d25362b..1d25362b 100644
--- a/languages/cpp/app_templates/kdedcop/kdedcop.png
+++ b/languages/cpp/app_templates/tdedcop/tdedcop.png
diff --git a/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate b/languages/cpp/app_templates/tdedcop/tdedcop.tdevtemplate
index ff6a91c1..628fadd3 100644
--- a/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate
+++ b/languages/cpp/app_templates/tdedcop/tdedcop.tdevtemplate
@@ -67,11 +67,11 @@ Archive=kdedcop.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt b/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt
index 5462742c..d6998c33 100644
--- a/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( tdefileplugin.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/tdefileplugin.tar.gz tdefileplugin.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    tdefileplugin.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    tdefileplugin.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/tdefileplugin/Makefile.am b/languages/cpp/app_templates/tdefileplugin/Makefile.am
index 019d2d7c..2896e774 100644
--- a/languages/cpp/app_templates/tdefileplugin/Makefile.am
+++ b/languages/cpp/app_templates/tdefileplugin/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = README.devel tdefile_plugin.cpp tdefile_plugin.desktop \
 templateName = tdefileplugin
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop b/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop
index f09030c1..cb6caa43 100644
--- a/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop
+++ b/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop
@@ -13,16 +13,16 @@
    <keyword>TDE</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
-<kdevautoproject>
+<tdevautoproject>
   <general>
    <activetarget>src/tdefile_%{APPNAMELC}.la</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -44,8 +44,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -53,8 +53,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -91,24 +91,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.tdevtemplate
index 2e53acc7..4ef025de 100644
--- a/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate
+++ b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.tdevtemplate
@@ -65,11 +65,11 @@ Archive=tdefileplugin.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/tdeioslave/CMakeLists.txt b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt
index 584bdc19..730f65e2 100644
--- a/languages/cpp/app_templates/tdeioslave/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( tdeioslave.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/tdeioslave.tar.gz tdeioslave.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    tdeioslave.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    tdeioslave.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/tdeioslave/Makefile.am b/languages/cpp/app_templates/tdeioslave/Makefile.am
index bee7ddb6..003040b4 100644
--- a/languages/cpp/app_templates/tdeioslave/Makefile.am
+++ b/languages/cpp/app_templates/tdeioslave/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = slave.cpp slave.h slave.protocol slave.tdevelop \
 templateName = tdeioslave
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/tdeioslave/slave.tdevelop b/languages/cpp/app_templates/tdeioslave/slave.tdevelop
index cb257385..5cbbe5e0 100644
--- a/languages/cpp/app_templates/tdeioslave/slave.tdevelop
+++ b/languages/cpp/app_templates/tdeioslave/slave.tdevelop
@@ -14,16 +14,16 @@
    <keyword>tdeioslave</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/lib%{APPNAMELC}.la</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -45,15 +45,15 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -91,23 +91,23 @@
       <toc>Qt Designer Manual</toc>
       <toc>Qt Reference Documentation</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate b/languages/cpp/app_templates/tdeioslave/tdeioslave.tdevtemplate
index 2ff27786..6ced25c6 100644
--- a/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate
+++ b/languages/cpp/app_templates/tdeioslave/tdeioslave.tdevtemplate
@@ -56,11 +56,11 @@ Archive=tdeioslave.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt
index b1149d88..eae96197 100644
--- a/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( tdescreensaver.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/tdescreensaver.tar.gz tdescreensaver.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    tdescreensaver.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    tdescreensaver.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/tdescreensaver/Makefile.am b/languages/cpp/app_templates/tdescreensaver/Makefile.am
index bee93bbc..1f9e6179 100644
--- a/languages/cpp/app_templates/tdescreensaver/Makefile.am
+++ b/languages/cpp/app_templates/tdescreensaver/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = tdescreensaver.desktop tdescreensaver.png tdescreensaver.h \
 templateName= tdescreensaver
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
index 28e0a678..c3ae15db 100644
--- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
@@ -14,16 +14,16 @@
    <keyword>tdeioslave</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
-<kdevautoproject>
+<tdevautoproject>
   <general>
    <activetarget>src/lib%{APPNAMELC}.la</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -45,15 +45,15 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -90,24 +90,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevtemplate
index 91510f04..0500fdd5 100644
--- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevtemplate
@@ -68,11 +68,11 @@ Archive=tdescreensaver.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/tdevlang/CMakeLists.txt b/languages/cpp/app_templates/tdevlang/CMakeLists.txt
new file mode 100644
index 00000000..a5768a94
--- /dev/null
+++ b/languages/cpp/app_templates/tdevlang/CMakeLists.txt
@@ -0,0 +1,27 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_custom_target( tdevlang.tar.gz ALL
+  COMMAND tar zcf tdevlang.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+    src-Makefile.am tdevlang_part.cpp tdevlang_part.h
+    tdevlang.rc tdevlang.desktop app.tdevelop
+    tdevlang-configure.in.in README.dox
+)
+
+
+install( FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/tdevlang.tar.gz tdevlang.png
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+
+
+install( FILES
+    tdevlang.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kdevlang/Makefile.am b/languages/cpp/app_templates/tdevlang/Makefile.am
index 7afa5be8..d33ab103 100644
--- a/languages/cpp/app_templates/kdevlang/Makefile.am
+++ b/languages/cpp/app_templates/tdevlang/Makefile.am
@@ -1,12 +1,12 @@
-dataFiles = src-Makefile.am kdevlang_part.cpp kdevlang_part.h kdevlang.rc \
-	kdevlang.desktop app.tdevelop kdevlang-configure.in.in README.dox
-templateName = kdevlang
+dataFiles = src-Makefile.am tdevlang_part.cpp tdevlang_part.h tdevlang.rc \
+	tdevlang.desktop app.tdevelop tdevlang-configure.in.in README.dox
+templateName = tdevlang
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kdevlang/README.dox b/languages/cpp/app_templates/tdevlang/README.dox
index 7069f3a5..7069f3a5 100644
--- a/languages/cpp/app_templates/kdevlang/README.dox
+++ b/languages/cpp/app_templates/tdevlang/README.dox
diff --git a/languages/cpp/app_templates/kdevlang/app.tdevelop b/languages/cpp/app_templates/tdevlang/app.tdevelop
index 3f477a08..d6648708 100644
--- a/languages/cpp/app_templates/kdevlang/app.tdevelop
+++ b/languages/cpp/app_templates/tdevlang/app.tdevelop
@@ -14,16 +14,16 @@
    <keyword>KDevelop</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
   </general>
@@ -47,8 +47,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -56,8 +56,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -92,24 +92,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kdevlang/src-Makefile.am b/languages/cpp/app_templates/tdevlang/src-Makefile.am
index 18b7a21a..6de535df 100644
--- a/languages/cpp/app_templates/kdevlang/src-Makefile.am
+++ b/languages/cpp/app_templates/tdevlang/src-Makefile.am
@@ -1,9 +1,9 @@
 AM_CPPFLAGS = -I$(kde_includes)/tdevelop/interfaces -I$(kde_includes)/tdevelop/util -I$(kde_includes)/kinterfacedesigner $(all_includes)
 
-kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la
-libkdev%{APPNAMELC}_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
-libkdev%{APPNAMELC}_la_LIBADD = -ltdevelop
-libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}_part.cpp
+kde_module_LTLIBRARIES = libtdev%{APPNAMELC}.la
+libtdev%{APPNAMELC}_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+libtdev%{APPNAMELC}_la_LIBADD = -ltdevelop
+libtdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}_part.cpp
 
 METASOURCES = AUTO
 
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang-configure.in.in b/languages/cpp/app_templates/tdevlang/tdevlang-configure.in.in
index 2e3823b0..a7e792f2 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang-configure.in.in
+++ b/languages/cpp/app_templates/tdevlang/tdevlang-configure.in.in
@@ -4,7 +4,7 @@ AM_INIT_AUTOMAKE(%{APPNAMELC}, %{VERSION})
 AC_C_BIGENDIAN
 AC_CHECK_TDEMAXPATHLEN
 
-KDE_CHECK_HEADERS([tdevelop/kdevcore.h])
+KDE_CHECK_HEADERS([tdevelop/tdevcore.h])
 KDE_CHECK_LIB([tdevelop],main,
  [LIBTDEVELOP="-ltdevelop"])
 AC_SUBST(LIBTDEVELOP)
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang.desktop b/languages/cpp/app_templates/tdevlang/tdevlang.desktop
index 93bb3c3b..78fac402 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang.desktop
+++ b/languages/cpp/app_templates/tdevlang/tdevlang.desktop
@@ -10,5 +10,5 @@ Name[ta]=கெடெவ்%{APPNAME}
 Icon=tdevelop
 ServiceTypes=TDevelop/LanguageSupport
 X-TDevelop-Language=ChangeMe
-X-TDE-Library=libkdev%{APPNAMELC}
+X-TDE-Library=libtdev%{APPNAMELC}
 X-TDevelop-Version=3
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang.png b/languages/cpp/app_templates/tdevlang/tdevlang.png
index 840a953c..840a953c 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang.png
+++ b/languages/cpp/app_templates/tdevlang/tdevlang.png
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang.rc b/languages/cpp/app_templates/tdevlang/tdevlang.rc
index b4e153fa..b4e153fa 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang.rc
+++ b/languages/cpp/app_templates/tdevlang/tdevlang.rc
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate b/languages/cpp/app_templates/tdevlang/tdevlang.tdevtemplate
index 6d852324..8692af7e 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate
+++ b/languages/cpp/app_templates/tdevlang/tdevlang.tdevtemplate
@@ -60,15 +60,15 @@ Comment[zh_CN]=这将生成 TDevelop 的语言支持插件，可以在 TDevelop
 Comment[zh_TW]=產生一個 TDevelop 語言支援外掛程式，建立在 TDevelop 程式源碼樹之外。
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}_part.cpp
-Archive=kdevlang.tar.gz
+Archive=tdevlang.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
@@ -88,7 +88,7 @@ Dest=%{dest}/Makefile.cvs
 
 [FILE5]
 Type=install
-Source=%{src}/kdevlang-configure.in.in
+Source=%{src}/tdevlang-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir1]
@@ -102,23 +102,23 @@ Dest=%{dest}/src/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{src}/kdevlang_part.cpp
+Source=%{src}/tdevlang_part.cpp
 Dest=%{dest}/src/%{APPNAMELC}_part.cpp
 
 [FILE8]
 Type=install
-Source=%{src}/kdevlang_part.h
+Source=%{src}/tdevlang_part.h
 Dest=%{dest}/src/%{APPNAMELC}_part.h
 
 [FILE9]
 Type=install
 EscapeXML=true
-Source=%{src}/kdevlang.rc
+Source=%{src}/tdevlang.rc
 Dest=%{dest}/src/kdev%{APPNAMELC}.rc
 
 [FILE10]
 Type=install
-Source=%{src}/kdevlang.desktop
+Source=%{src}/tdevlang.desktop
 Dest=%{dest}/src/kdev%{APPNAMELC}.desktop
 
 [FILE11]
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/tdevlang/tdevlang_part.cpp
index 559a931b..488f494a 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/tdevlang/tdevlang_part.cpp
@@ -6,10 +6,10 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <kgenericfactory.h>
-#include <kdevcore.h>
-#include <kdevpartcontroller.h>
-#include <kdevplugininfo.h>
-#include <kdevproject.h>
+#include <tdevcore.h>
+#include <tdevpartcontroller.h>
+#include <tdevplugininfo.h>
+#include <tdevproject.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
@@ -18,14 +18,14 @@
 #include "%{APPNAMELC}_part.h"
 
 typedef KGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
-K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( "kdev%{APPNAMELC}" ) );
-static const KDevPluginInfo data("kdev%{APPNAMELC}");
+K_EXPORT_COMPONENT_FACTORY( libtdev%{APPNAMELC}, %{APPNAME}Factory( "tdev%{APPNAMELC}" ) );
+static const TDevPluginInfo data("tdev%{APPNAMELC}");
 
 %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList& )
-: KDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" )
+: TDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" )
 {
 	setInstance(%{APPNAME}Factory::instance());
-	setXMLFile("kdevlang_%{APPNAMELC}.rc");
+	setXMLFile("tdevlang_%{APPNAMELC}.rc");
 
 
 	m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
@@ -47,7 +47,7 @@ static const KDevPluginInfo data("kdev%{APPNAMELC}");
 	delete m_build;
 }
 
-KDevLanguageSupport::Features %{APPNAME}Part::features()
+TDevLanguageSupport::Features %{APPNAME}Part::features()
 {
 	return Features(Variables | Functions);
 }
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/tdevlang/tdevlang_part.h
index 1cce0fa6..9b0f2513 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h
+++ b/languages/cpp/app_templates/tdevlang/tdevlang_part.h
@@ -4,9 +4,9 @@
 #define __TDEVPART_%{APPNAMEUC}_H__
 
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include <codemodel.h>
-#include <kdevlanguagesupport.h>
+#include <tdevlanguagesupport.h>
 #include <tqstringlist.h>
 #include <kdialogbase.h>
 
@@ -15,7 +15,7 @@ class TDEAction;
 /*
  Please read the README.dox file for more info about this part
  */
-class %{APPNAME}Part : public KDevLanguageSupport
+class %{APPNAME}Part : public TDevLanguageSupport
 {
 	Q_OBJECT
   
diff --git a/languages/cpp/app_templates/tdevpart/CMakeLists.txt b/languages/cpp/app_templates/tdevpart/CMakeLists.txt
new file mode 100644
index 00000000..e952ce8a
--- /dev/null
+++ b/languages/cpp/app_templates/tdevpart/CMakeLists.txt
@@ -0,0 +1,29 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_custom_target( tdevpart.tar.gz ALL
+  COMMAND tar zcf tdevpart.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+    src-Makefile.am tdevpart_part.cpp tdevpart_part.h
+    tdevpart_widget.h tdevpart_widget.cpp tdevpart_part.rc
+    tdevpart.desktop app.tdevelop README.dox
+    globalconfigbase.ui globalconfig.h globalconfig.cpp
+    projectconfigbase.ui projectconfig.h projectconfig.cpp
+)
+
+
+install( FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/tdevpart.tar.gz tdevpart.png
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+
+
+install( FILES
+    tdevpart.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kdevpart/Makefile.am b/languages/cpp/app_templates/tdevpart/Makefile.am
index 11c12dfe..6aa1f606 100644
--- a/languages/cpp/app_templates/kdevpart/Makefile.am
+++ b/languages/cpp/app_templates/tdevpart/Makefile.am
@@ -1,14 +1,14 @@
-dataFiles = src-Makefile.am kdevpart_part.cpp kdevpart_part.h \
- 	kdevpart_widget.h kdevpart_widget.cpp kdevpart_part.rc \
-	kdevpart.desktop app.tdevelop README.dox globalconfigbase.ui globalconfig.h \
+dataFiles = src-Makefile.am tdevpart_part.cpp tdevpart_part.h \
+ 	tdevpart_widget.h tdevpart_widget.cpp tdevpart_part.rc \
+	tdevpart.desktop app.tdevelop README.dox globalconfigbase.ui globalconfig.h \
 	globalconfig.cpp projectconfigbase.ui projectconfig.h projectconfig.cpp
-templateName = kdevpart
+templateName = tdevpart
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kdevpart/README.dox b/languages/cpp/app_templates/tdevpart/README.dox
index 7069f3a5..7069f3a5 100644
--- a/languages/cpp/app_templates/kdevpart/README.dox
+++ b/languages/cpp/app_templates/tdevpart/README.dox
diff --git a/languages/cpp/app_templates/kdevpart/app.tdevelop b/languages/cpp/app_templates/tdevpart/app.tdevelop
index d16492cd..473da16e 100644
--- a/languages/cpp/app_templates/kdevpart/app.tdevelop
+++ b/languages/cpp/app_templates/tdevpart/app.tdevelop
@@ -14,16 +14,16 @@
    <keyword>KDevelop</keyword>
   </keywords>
  </general>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
-  </kdevcppsupport>
+  </tdevcppsupport>
 
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -48,8 +48,8 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
-</kdevautoproject>
- <kdevfileview>
+</tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -57,8 +57,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -93,24 +93,24 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.cpp b/languages/cpp/app_templates/tdevpart/globalconfig.cpp
index cddf3e7e..cddf3e7e 100644
--- a/languages/cpp/app_templates/kdevpart/globalconfig.cpp
+++ b/languages/cpp/app_templates/tdevpart/globalconfig.cpp
diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.h b/languages/cpp/app_templates/tdevpart/globalconfig.h
index 723dbae2..723dbae2 100644
--- a/languages/cpp/app_templates/kdevpart/globalconfig.h
+++ b/languages/cpp/app_templates/tdevpart/globalconfig.h
diff --git a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui b/languages/cpp/app_templates/tdevpart/globalconfigbase.ui
index 588f9dc9..588f9dc9 100644
--- a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui
+++ b/languages/cpp/app_templates/tdevpart/globalconfigbase.ui
diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.cpp b/languages/cpp/app_templates/tdevpart/projectconfig.cpp
index 42a9f3e7..42a9f3e7 100644
--- a/languages/cpp/app_templates/kdevpart/projectconfig.cpp
+++ b/languages/cpp/app_templates/tdevpart/projectconfig.cpp
diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.h b/languages/cpp/app_templates/tdevpart/projectconfig.h
index 49d4f089..49d4f089 100644
--- a/languages/cpp/app_templates/kdevpart/projectconfig.h
+++ b/languages/cpp/app_templates/tdevpart/projectconfig.h
diff --git a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui b/languages/cpp/app_templates/tdevpart/projectconfigbase.ui
index 30849e54..30849e54 100644
--- a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui
+++ b/languages/cpp/app_templates/tdevpart/projectconfigbase.ui
diff --git a/languages/cpp/app_templates/kdevpart/src-Makefile.am b/languages/cpp/app_templates/tdevpart/src-Makefile.am
index 5fe18f43..e082adff 100644
--- a/languages/cpp/app_templates/kdevpart/src-Makefile.am
+++ b/languages/cpp/app_templates/tdevpart/src-Makefile.am
@@ -1,10 +1,10 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la
-libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
-libkdev%{APPNAMELC}_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdev%{APPNAMELC}.la
+libtdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
+libtdev%{APPNAMELC}_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp \
+libtdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp \
 	%{APPNAMELC}globalconfigbase.ui %{APPNAMELC}globalconfig.cpp \
 	%{APPNAMELC}projectconfigbase.ui %{APPNAMELC}projectconfig.cpp
 
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart.desktop b/languages/cpp/app_templates/tdevpart/tdevpart.desktop
index a3029ac6..c3eb6a81 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart.desktop
+++ b/languages/cpp/app_templates/tdevpart/tdevpart.desktop
@@ -78,6 +78,6 @@ X-TDevelop-Plugin-Copyright=(C) by %{AUTHOR}
 X-TDevelop-Args=
 
 X-TDevelop-Scope=%{SCOPE}
-X-TDE-Library=libkdev%{APPNAMELC}
+X-TDE-Library=libtdev%{APPNAMELC}
 X-TDevelop-Version=3
 X-TDevelop-Properties=%{PROPS}
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart.png b/languages/cpp/app_templates/tdevpart/tdevpart.png
index 840a953c..840a953c 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart.png
+++ b/languages/cpp/app_templates/tdevpart/tdevpart.png
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate b/languages/cpp/app_templates/tdevpart/tdevpart.tdevtemplate
index c1860597..8bdb87e3 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate
+++ b/languages/cpp/app_templates/tdevpart/tdevpart.tdevtemplate
@@ -58,7 +58,7 @@ Comment[zh_CN]=这将生成 TDevelop 的插件，该插件需要与 TDevelop 源
 Comment[zh_TW]=產生一個 TDevelop 外掛程式，建立於 TDevelop 程式源碼樹內。
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}part.cpp
-Archive=kdevpart.tar.gz
+Archive=tdevpart.tar.gz
 
 [SCOPE]
 Type = value
@@ -142,28 +142,28 @@ Dest=%{dest}/Makefile.am
 
 [FILE3]
 Type=install
-Source=%{src}/kdevpart_part.cpp
+Source=%{src}/tdevpart_part.cpp
 Dest=%{dest}/%{APPNAMELC}part.cpp
 
 [FILE4]
 Type=install
-Source=%{src}/kdevpart_part.h
+Source=%{src}/tdevpart_part.h
 Dest=%{dest}/%{APPNAMELC}part.h
 
 [FILE5]
 Type=install
-Source=%{src}/kdevpart_widget.cpp
+Source=%{src}/tdevpart_widget.cpp
 Dest=%{dest}/%{APPNAMELC}widget.cpp
 
 [FILE6]
 Type=install
-Source=%{src}/kdevpart_widget.h
+Source=%{src}/tdevpart_widget.h
 Dest=%{dest}/%{APPNAMELC}widget.h
 
 [FILE7]
 Type=install
 EscapeXML=true
-Source=%{src}/kdevpart_part.rc
+Source=%{src}/tdevpart_part.rc
 Dest=%{dest}/kdev%{APPNAMELC}.rc
 
 [FILE71]
@@ -200,7 +200,7 @@ Dest=%{dest}/%{APPNAMELC}projectconfig.cpp
 
 [FILE8]
 Type=install
-Source=%{src}/kdevpart.desktop
+Source=%{src}/tdevpart.desktop
 Dest=%{dest}/kdev%{APPNAMELC}.desktop
 
 [FILE9]
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/tdevpart/tdevpart_part.cpp
index aa950c8a..0d846d38 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/tdevpart/tdevpart_part.cpp
@@ -10,29 +10,29 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <tdemessagebox.h>
-#include <kdevplugininfo.h>
-#include <kdevgenericfactory.h>
+#include <tdevplugininfo.h>
+#include <tdevgenericfactory.h>
 
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
 #include <configwidgetproxy.h>
 
 #include "%{APPNAMELC}widget.h"
 #include "%{APPNAMELC}globalconfig.h"
 #include "%{APPNAMELC}projectconfig.h"
 
-typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
-KDevPluginInfo data("kdev%{APPNAMELC}");
-K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
+typedef TDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
+TDevPluginInfo data("tdev%{APPNAMELC}");
+K_EXPORT_COMPONENT_FACTORY( libtdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
 
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
 %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
+    : TDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
 {
     setInstance(%{APPNAME}Factory::instance());
-    setXMLFile("kdev%{APPNAMELC}.rc");
+    setXMLFile("tdev%{APPNAMELC}.rc");
 
     m_widget = new %{APPNAME}Widget(this);
     m_widget->setCaption("widget caption");
@@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
 
     TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?"));
     
-    // now you decide what should happen to the widget. Take a look at kdevcore.h
+    // now you decide what should happen to the widget. Take a look at tdevcore.h
     // or at other plugins how to embed it.
     
     // if you want to embed your widget as an outputview, simply uncomment
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/tdevpart/tdevpart_part.h
index 9414d448..1d61dd0c 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h
+++ b/languages/cpp/app_templates/tdevpart/tdevpart_part.h
@@ -2,7 +2,7 @@
 #ifndef TDEV%{APPNAMEUC}_H
 #define TDEV%{APPNAMEUC}_H
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 #include <tqguardedptr.h>
 
@@ -16,7 +16,7 @@ class %{APPNAME}Widget;
 /**
 Please read the README.dox file for more info about this part
 */
-class %{APPNAME}Part: public KDevPlugin
+class %{APPNAME}Part: public TDevPlugin
 {
     Q_OBJECT
   
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.rc b/languages/cpp/app_templates/tdevpart/tdevpart_part.rc
index a38ee14e..a38ee14e 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.rc
+++ b/languages/cpp/app_templates/tdevpart/tdevpart_part.rc
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp b/languages/cpp/app_templates/tdevpart/tdevpart_widget.cpp
index 65bb996e..1f356afd 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp
+++ b/languages/cpp/app_templates/tdevpart/tdevpart_widget.cpp
@@ -5,7 +5,7 @@
 #include <klibloader.h>
 #include <tdeparts/part.h>
 
-#include <kdevcore.h>
+#include <tdevcore.h>
 
 #include "%{APPNAMELC}part.h"
 
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h b/languages/cpp/app_templates/tdevpart/tdevpart_widget.h
index e54abd4d..e9762de3 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h
+++ b/languages/cpp/app_templates/tdevpart/tdevpart_widget.h
@@ -5,7 +5,7 @@
 #include <tqwidget.h>
 #include <tqstring.h>
 
-class KDevProject;
+class TDevProject;
 class %{APPNAME}Part;
 
 class %{APPNAME}Widget: public TQWidget
diff --git a/languages/cpp/app_templates/tdevpart2/CMakeLists.txt b/languages/cpp/app_templates/tdevpart2/CMakeLists.txt
new file mode 100644
index 00000000..d48daf45
--- /dev/null
+++ b/languages/cpp/app_templates/tdevpart2/CMakeLists.txt
@@ -0,0 +1,30 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_custom_target( tdevpart2.tar.gz ALL
+  COMMAND tar zcf tdevpart2.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+    src-Makefile.am tdevpart_part.cpp tdevpart_part.h
+    tdevpart_widget.h tdevpart_widget.cpp tdevpart_part.rc
+    tdevpart.desktop app.tdevelop tdevpart-configure.in.in
+    README.dox subdirs globalconfigbase.ui globalconfig.h
+    globalconfig.cpp projectconfigbase.ui projectconfig.h
+    projectconfig.cpp
+)
+
+
+install( FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/tdevpart2.tar.gz tdevpart2.png
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+
+
+install( FILES
+    tdevpart2.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kdevpart2/Makefile.am b/languages/cpp/app_templates/tdevpart2/Makefile.am
index 436f919c..ae1df924 100644
--- a/languages/cpp/app_templates/kdevpart2/Makefile.am
+++ b/languages/cpp/app_templates/tdevpart2/Makefile.am
@@ -1,16 +1,16 @@
-dataFiles = src-Makefile.am kdevpart_part.cpp kdevpart_part.h\
-	kdevpart_widget.h kdevpart_widget.cpp \
-	kdevpart_part.rc kdevpart.desktop app.tdevelop \
-	kdevpart-configure.in.in README.dox subdirs globalconfigbase.ui globalconfig.h \
+dataFiles = src-Makefile.am tdevpart_part.cpp tdevpart_part.h\
+	tdevpart_widget.h tdevpart_widget.cpp \
+	tdevpart_part.rc tdevpart.desktop app.tdevelop \
+	tdevpart-configure.in.in README.dox subdirs globalconfigbase.ui globalconfig.h \
 	globalconfig.cpp projectconfigbase.ui projectconfig.h projectconfig.cpp
 
-templateName = kdevpart2
+templateName = tdevpart2
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/kdevpart2/README.dox b/languages/cpp/app_templates/tdevpart2/README.dox
index 7069f3a5..7069f3a5 100644
--- a/languages/cpp/app_templates/kdevpart2/README.dox
+++ b/languages/cpp/app_templates/tdevpart2/README.dox
diff --git a/languages/cpp/app_templates/kdevpart2/app.tdevelop b/languages/cpp/app_templates/tdevpart2/app.tdevelop
index 1b7aab6e..ac470cdc 100644
--- a/languages/cpp/app_templates/kdevpart2/app.tdevelop
+++ b/languages/cpp/app_templates/tdevpart2/app.tdevelop
@@ -14,7 +14,7 @@
       <keyword>KDevelop</keyword>
     </keywords>
   </general>
-  <kdevautoproject>
+  <tdevautoproject>
     <general>
       <activetarget>src/%{APPNAMELC}</activetarget>
       <useconfiguration>debug</useconfiguration>
@@ -46,8 +46,8 @@
         <envvar value="1" name="WANT_AUTOMAKE_1_6" />
       </envvars>
     </make>
-  </kdevautoproject>
-  <kdevfileview>
+  </tdevautoproject>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -60,8 +60,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <showvcsfields>true</showvcsfields>
     </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -96,21 +96,21 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
     </general>
-  </kdevdebugger>
-  <kdevfilecreate>
+  </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcvs>
+  </tdevfilecreate>
+  <tdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions></commitoptions>
     <addoptions></addoptions>
@@ -120,13 +120,13 @@
     <revertoptions>-C -d -P</revertoptions>
     <diffoptions>-u3 -p</diffoptions>
     <rshoptions></rshoptions>
-  </kdevcvs>
-  <kdevcppsupport>
+  </tdevcvs>
+  <tdevcppsupport>
     <qt>
       <version>3</version>
       <used>true</used>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
     </qt>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -138,11 +138,11 @@
       <codeCompletionDelay>250</codeCompletionDelay>
       <argumentsHintDelay>400</argumentsHintDelay>
     </codecompletion>
-  </kdevcppsupport>
-  <kdevdocumentation>
+  </tdevcppsupport>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp b/languages/cpp/app_templates/tdevpart2/globalconfig.cpp
index cddf3e7e..cddf3e7e 100644
--- a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp
+++ b/languages/cpp/app_templates/tdevpart2/globalconfig.cpp
diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.h b/languages/cpp/app_templates/tdevpart2/globalconfig.h
index 723dbae2..723dbae2 100644
--- a/languages/cpp/app_templates/kdevpart2/globalconfig.h
+++ b/languages/cpp/app_templates/tdevpart2/globalconfig.h
diff --git a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui b/languages/cpp/app_templates/tdevpart2/globalconfigbase.ui
index 588f9dc9..588f9dc9 100644
--- a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui
+++ b/languages/cpp/app_templates/tdevpart2/globalconfigbase.ui
diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp b/languages/cpp/app_templates/tdevpart2/projectconfig.cpp
index 42a9f3e7..42a9f3e7 100644
--- a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp
+++ b/languages/cpp/app_templates/tdevpart2/projectconfig.cpp
diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.h b/languages/cpp/app_templates/tdevpart2/projectconfig.h
index 49d4f089..49d4f089 100644
--- a/languages/cpp/app_templates/kdevpart2/projectconfig.h
+++ b/languages/cpp/app_templates/tdevpart2/projectconfig.h
diff --git a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui b/languages/cpp/app_templates/tdevpart2/projectconfigbase.ui
index 30849e54..30849e54 100644
--- a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui
+++ b/languages/cpp/app_templates/tdevpart2/projectconfigbase.ui
diff --git a/languages/cpp/app_templates/kdevpart2/src-Makefile.am b/languages/cpp/app_templates/tdevpart2/src-Makefile.am
index c5995af4..407d9565 100644
--- a/languages/cpp/app_templates/kdevpart2/src-Makefile.am
+++ b/languages/cpp/app_templates/tdevpart2/src-Makefile.am
@@ -1,9 +1,9 @@
 INCLUDES = -I$(kde_includes)/tdevelop/interfaces -I$(kde_includes)/tdevelop/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la
-libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN)
-libkdev%{APPNAMELC}_la_LIBADD = -ltdevelop
-libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp %{APPNAMELC}globalconfigbase.ui %{APPNAMELC}globalconfig.cpp %{APPNAMELC}projectconfigbase.ui %{APPNAMELC}projectconfig.cpp
+kde_module_LTLIBRARIES = libtdev%{APPNAMELC}.la
+libtdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN)
+libtdev%{APPNAMELC}_la_LIBADD = -ltdevelop
+libtdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp %{APPNAMELC}globalconfigbase.ui %{APPNAMELC}globalconfig.cpp %{APPNAMELC}projectconfigbase.ui %{APPNAMELC}projectconfig.cpp
 
 METASOURCES = AUTO
 
diff --git a/languages/cpp/app_templates/kdevpart2/subdirs b/languages/cpp/app_templates/tdevpart2/subdirs
index 0e678106..0e678106 100644
--- a/languages/cpp/app_templates/kdevpart2/subdirs
+++ b/languages/cpp/app_templates/tdevpart2/subdirs
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart-configure.in.in b/languages/cpp/app_templates/tdevpart2/tdevpart-configure.in.in
index 55f2f614..f08ae2b7 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart-configure.in.in
+++ b/languages/cpp/app_templates/tdevpart2/tdevpart-configure.in.in
@@ -4,7 +4,7 @@ AM_INIT_AUTOMAKE(%{APPNAMELC}, %{VERSION})
 AC_C_BIGENDIAN
 AC_CHECK_TDEMAXPATHLEN
 
-KDE_CHECK_HEADERS([tdevelop/interfaces/kdevcore.h])
+KDE_CHECK_HEADERS([tdevelop/interfaces/tdevcore.h])
 KDE_CHECK_LIB([tdevelop],main,
  [LIBTDEVELOP="-ltdevelop"])
 AC_SUBST(LIBTDEVELOP)
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart.desktop b/languages/cpp/app_templates/tdevpart2/tdevpart.desktop
index a3029ac6..c3eb6a81 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart.desktop
+++ b/languages/cpp/app_templates/tdevpart2/tdevpart.desktop
@@ -78,6 +78,6 @@ X-TDevelop-Plugin-Copyright=(C) by %{AUTHOR}
 X-TDevelop-Args=
 
 X-TDevelop-Scope=%{SCOPE}
-X-TDE-Library=libkdev%{APPNAMELC}
+X-TDE-Library=libtdev%{APPNAMELC}
 X-TDevelop-Version=3
 X-TDevelop-Properties=%{PROPS}
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart2.png b/languages/cpp/app_templates/tdevpart2/tdevpart2.png
index 840a953c..840a953c 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart2.png
+++ b/languages/cpp/app_templates/tdevpart2/tdevpart2.png
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate b/languages/cpp/app_templates/tdevpart2/tdevpart2.tdevtemplate
index 5aeda5d1..b0431099 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate
+++ b/languages/cpp/app_templates/tdevpart2/tdevpart2.tdevtemplate
@@ -60,7 +60,7 @@ Comment[zh_CN]=这将生成一个 TDevelop 的 KPart，可以在 TDevelop 源代
 Comment[zh_TW]=產生一個 TDevelop 的 KPart 元件，建立在 TDevelop 程式源碼樹之外。
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}_part.cpp
-Archive=kdevpart2.tar.gz
+Archive=tdevpart2.tar.gz
 
 [SCOPE]
 Type = value
@@ -133,11 +133,11 @@ Default=
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
@@ -162,7 +162,7 @@ Dest=%{dest}/subdirs
 
 [FILE5]
 Type=install
-Source=%{src}/kdevpart-configure.in.in
+Source=%{src}/tdevpart-configure.in.in
 Dest=%{dest}/configure.in.in
 
 [MkDir1]
@@ -176,7 +176,7 @@ Dest=%{dest}/src/Makefile.am
 
 [FILE7]
 Type=install
-Source=%{src}/kdevpart_part.cpp
+Source=%{src}/tdevpart_part.cpp
 Dest=%{dest}/src/%{APPNAMELC}part.cpp
 
 [FILE71]
@@ -213,28 +213,28 @@ Dest=%{dest}/src/%{APPNAMELC}projectconfig.cpp
 
 [FILE8]
 Type=install
-Source=%{src}/kdevpart_part.h
+Source=%{src}/tdevpart_part.h
 Dest=%{dest}/src/%{APPNAMELC}part.h
 
 [FILE9]
 Type=install
-Source=%{src}/kdevpart_widget.cpp
+Source=%{src}/tdevpart_widget.cpp
 Dest=%{dest}/src/%{APPNAMELC}widget.cpp
 
 [FILE10]
 Type=install
-Source=%{src}/kdevpart_widget.h
+Source=%{src}/tdevpart_widget.h
 Dest=%{dest}/src/%{APPNAMELC}widget.h
 
 [FILE11]
 Type=install
 EscapeXML=true
-Source=%{src}/kdevpart_part.rc
+Source=%{src}/tdevpart_part.rc
 Dest=%{dest}/src/kdev%{APPNAMELC}.rc
 
 [FILE12]
 Type=install
-Source=%{src}/kdevpart.desktop
+Source=%{src}/tdevpart.desktop
 Dest=%{dest}/src/kdev%{APPNAMELC}.desktop
 
 [FILE13]
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/tdevpart2/tdevpart_part.cpp
index aa950c8a..0d846d38 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/tdevpart2/tdevpart_part.cpp
@@ -10,29 +10,29 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <tdemessagebox.h>
-#include <kdevplugininfo.h>
-#include <kdevgenericfactory.h>
+#include <tdevplugininfo.h>
+#include <tdevgenericfactory.h>
 
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
 #include <configwidgetproxy.h>
 
 #include "%{APPNAMELC}widget.h"
 #include "%{APPNAMELC}globalconfig.h"
 #include "%{APPNAMELC}projectconfig.h"
 
-typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
-KDevPluginInfo data("kdev%{APPNAMELC}");
-K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
+typedef TDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
+TDevPluginInfo data("tdev%{APPNAMELC}");
+K_EXPORT_COMPONENT_FACTORY( libtdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
 
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
 %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
+    : TDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
 {
     setInstance(%{APPNAME}Factory::instance());
-    setXMLFile("kdev%{APPNAMELC}.rc");
+    setXMLFile("tdev%{APPNAMELC}.rc");
 
     m_widget = new %{APPNAME}Widget(this);
     m_widget->setCaption("widget caption");
@@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
 
     TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?"));
     
-    // now you decide what should happen to the widget. Take a look at kdevcore.h
+    // now you decide what should happen to the widget. Take a look at tdevcore.h
     // or at other plugins how to embed it.
     
     // if you want to embed your widget as an outputview, simply uncomment
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/tdevpart2/tdevpart_part.h
index 9414d448..1d61dd0c 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h
+++ b/languages/cpp/app_templates/tdevpart2/tdevpart_part.h
@@ -2,7 +2,7 @@
 #ifndef TDEV%{APPNAMEUC}_H
 #define TDEV%{APPNAMEUC}_H
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 #include <tqguardedptr.h>
 
@@ -16,7 +16,7 @@ class %{APPNAME}Widget;
 /**
 Please read the README.dox file for more info about this part
 */
-class %{APPNAME}Part: public KDevPlugin
+class %{APPNAME}Part: public TDevPlugin
 {
     Q_OBJECT
   
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.rc b/languages/cpp/app_templates/tdevpart2/tdevpart_part.rc
index a38ee14e..a38ee14e 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.rc
+++ b/languages/cpp/app_templates/tdevpart2/tdevpart_part.rc
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp b/languages/cpp/app_templates/tdevpart2/tdevpart_widget.cpp
index 65bb996e..1f356afd 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp
+++ b/languages/cpp/app_templates/tdevpart2/tdevpart_widget.cpp
@@ -5,7 +5,7 @@
 #include <klibloader.h>
 #include <tdeparts/part.h>
 
-#include <kdevcore.h>
+#include <tdevcore.h>
 
 #include "%{APPNAMELC}part.h"
 
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h b/languages/cpp/app_templates/tdevpart2/tdevpart_widget.h
index e54abd4d..e9762de3 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.h
+++ b/languages/cpp/app_templates/tdevpart2/tdevpart_widget.h
@@ -5,7 +5,7 @@
 #include <tqwidget.h>
 #include <tqstring.h>
 
-class KDevProject;
+class TDevProject;
 class %{APPNAME}Part;
 
 class %{APPNAME}Widget: public TQWidget
diff --git a/languages/cpp/app_templates/win32gui/CMakeLists.txt b/languages/cpp/app_templates/win32gui/CMakeLists.txt
index 09d0bc52..3e7bf9d0 100644
--- a/languages/cpp/app_templates/win32gui/CMakeLists.txt
+++ b/languages/cpp/app_templates/win32gui/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( win32gui.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/win32gui.tar.gz win32gui.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    win32gui.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    win32gui.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/win32gui/Makefile.am b/languages/cpp/app_templates/win32gui/Makefile.am
index a29fa6a8..d315f718 100644
--- a/languages/cpp/app_templates/win32gui/Makefile.am
+++ b/languages/cpp/app_templates/win32gui/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = app.cpp src-Makefile.am win32gui-Makefile.am win32gui-Makefile.cvs \
 templateName = win32gui
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/win32gui/app.tdevelop b/languages/cpp/app_templates/win32gui/app.tdevelop
index eb9bbdbd..53ec087b 100644
--- a/languages/cpp/app_templates/win32gui/app.tdevelop
+++ b/languages/cpp/app_templates/win32gui/app.tdevelop
@@ -16,7 +16,7 @@
     <ignoreparts/>
     <secondaryLanguages/>
   </general>
-  <kdevautoproject>
+  <tdevautoproject>
     <general>
       <activetarget>src/%{APPNAMELC}</activetarget>
       <useconfiguration>debug</useconfiguration>
@@ -103,8 +103,8 @@
       <makebin/>
       <prio>0</prio>
     </make>
-  </kdevautoproject>
-  <kdevdoctreeview>
+  </tdevautoproject>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>clanlib</toc>
       <toc>opengl</toc>
@@ -120,15 +120,15 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
+  </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevfileview>
+  </tdevfilecreate>
+  <tdevfileview>
     <groups>
       <group pattern="*.h" name="Header files" />
       <group pattern="*.cpp" name="Source files" />
@@ -139,14 +139,14 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </kdevfileview>
+  </tdevfileview>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
       <includeTypes>true</includeTypes>
@@ -164,8 +164,8 @@
       <pcs>TDElibs</pcs>
       <pcs>ksjembed</pcs>
     </references>
-  </kdevcppsupport>
-  <kdevdebugger>
+  </tdevcppsupport>
+  <tdevdebugger>
     <general>
       <programargs></programargs>
       <gdbpath></gdbpath>
@@ -182,11 +182,11 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </kdevdebugger>
-  <kdevdocumentation>
+  </tdevdebugger>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate b/languages/cpp/app_templates/win32gui/win32gui.tdevtemplate
index dec00262..cd15f549 100644
--- a/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate
+++ b/languages/cpp/app_templates/win32gui/win32gui.tdevtemplate
@@ -64,11 +64,11 @@ Archive=win32gui.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{tdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/cpp/app_templates/win32hello/CMakeLists.txt b/languages/cpp/app_templates/win32hello/CMakeLists.txt
index bc1c8d80..9cc35db0 100644
--- a/languages/cpp/app_templates/win32hello/CMakeLists.txt
+++ b/languages/cpp/app_templates/win32hello/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( win32hello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/win32hello.tar.gz win32hello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    win32hello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    win32hello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/win32hello/Makefile.am b/languages/cpp/app_templates/win32hello/Makefile.am
index a55bcebc..813c591f 100644
--- a/languages/cpp/app_templates/win32hello/Makefile.am
+++ b/languages/cpp/app_templates/win32hello/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = app.cpp src-Makefile.am win32-Makefile.am win32-Makefile.cvs \
 templateName = win32hello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/win32hello/app.tdevelop b/languages/cpp/app_templates/win32hello/app.tdevelop
index 672646c4..3ee2b1af 100644
--- a/languages/cpp/app_templates/win32hello/app.tdevelop
+++ b/languages/cpp/app_templates/win32hello/app.tdevelop
@@ -16,7 +16,7 @@
     <ignoreparts/>
     <secondaryLanguages/>
   </general>
-  <kdevautoproject>
+  <tdevautoproject>
     <general>
       <activetarget>src/%{APPNAMELC}</activetarget>
       <useconfiguration>default</useconfiguration>
@@ -75,8 +75,8 @@
       <makebin/>
       <prio>0</prio>
     </make>
-  </kdevautoproject>
-  <kdevdoctreeview>
+  </tdevautoproject>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>clanlib</toc>
       <toc>opengl</toc>
@@ -92,15 +92,15 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
+  </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevfileview>
+  </tdevfilecreate>
+  <tdevfileview>
     <groups>
       <group pattern="*.h" name="Header files" />
       <group pattern="*.cpp" name="Source files" />
@@ -111,14 +111,14 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </kdevfileview>
+  </tdevfileview>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
       <includeTypes>true</includeTypes>
@@ -136,8 +136,8 @@
       <pcs>TDElibs</pcs>
       <pcs>ksjembed</pcs>
     </references>
-  </kdevcppsupport>
-  <kdevdebugger>
+  </tdevcppsupport>
+  <tdevdebugger>
     <general>
       <programargs></programargs>
       <gdbpath></gdbpath>
@@ -154,11 +154,11 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </kdevdebugger>
-  <kdevdocumentation>
+  </tdevdebugger>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate b/languages/cpp/app_templates/win32hello/win32hello.tdevtemplate
index 3b5f4f3e..ce8804a7 100644
--- a/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate
+++ b/languages/cpp/app_templates/win32hello/win32hello.tdevtemplate
@@ -63,11 +63,11 @@ Archive=win32hello.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{tdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/cpp/app_templates/wxhello/CMakeLists.txt b/languages/cpp/app_templates/wxhello/CMakeLists.txt
index f1a8ffec..48d382bd 100644
--- a/languages/cpp/app_templates/wxhello/CMakeLists.txt
+++ b/languages/cpp/app_templates/wxhello/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target( wxhello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/wxhello.tar.gz wxhello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    wxhello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    wxhello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/wxhello/Makefile.am b/languages/cpp/app_templates/wxhello/Makefile.am
index c45b1d10..f0e0839e 100644
--- a/languages/cpp/app_templates/wxhello/Makefile.am
+++ b/languages/cpp/app_templates/wxhello/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = src-Makefile.am app.cpp app.h app.tdevelop subdirs \
 templateName = wxhello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/wxhello/app.tdevelop b/languages/cpp/app_templates/wxhello/app.tdevelop
index 9de4fa75..9a3f0821 100644
--- a/languages/cpp/app_templates/wxhello/app.tdevelop
+++ b/languages/cpp/app_templates/wxhello/app.tdevelop
@@ -12,7 +12,7 @@
    <keyword>wxWidgets</keyword>
   </keywords>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
    <useconfiguration>debug</useconfiguration>
@@ -37,16 +37,16 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.rc" name="Resource file" />
    <group pattern="*.png" name="Icons" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -91,24 +91,24 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="rc" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate b/languages/cpp/app_templates/wxhello/wxhello.tdevtemplate
index ed1cbc6a..dab3c253 100644
--- a/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate
+++ b/languages/cpp/app_templates/wxhello/wxhello.tdevtemplate
@@ -64,7 +64,7 @@ Archive=wxhello.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [WXARCH]
 Type=install archive
@@ -97,7 +97,7 @@ Dest=%{dest}/doc/en/index.docbook
 
 [WX]
 Type=include
-File=%{tdevelop}/template-common/wx.kdevtemplate
+File=%{tdevelop}/template-common/wx.tdevtemplate
 
 [FILE4]
 Type=install
diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp
index 730a090f..51311dac 100644
--- a/languages/cpp/backgroundparser.cpp
+++ b/languages/cpp/backgroundparser.cpp
@@ -15,8 +15,8 @@
 #include "codeinformationrepository.h"
 #include "cppcodecompletion.h"
 #include "ast_utils.h"
-#include "kdevdeepcopy.h"
-#include "kdevdriver.h"
+#include "tdevdeepcopy.h"
+#include "tdevdriver.h"
 
 #include <tqmutex.h>
 
@@ -25,8 +25,8 @@
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/view.h>
 
-#include <kdevpartcontroller.h>
-#include <kdevproject.h>
+#include <tdevpartcontroller.h>
+#include <tdevproject.h>
 
 #include <kurl.h>
 #include <kdebug.h>
@@ -39,9 +39,9 @@
 #include <tqdatastream.h>
 
 
-class BackgroundKDevDriver : public KDevDriver {
+class BackgroundTDevDriver : public TDevDriver {
 public:
-	BackgroundKDevDriver( CppSupportPart* cppSupport, BackgroundParser* bp ) : KDevDriver( cppSupport, false ), m_backgroundParser(bp) {
+	BackgroundTDevDriver( CppSupportPart* cppSupport, BackgroundParser* bp ) : TDevDriver( cppSupport, false ), m_backgroundParser(bp) {
 	}
 	virtual void fileParsed( ParsedFile& fileName );
 	virtual void addDependence( const TQString& fileName, const Dependence& dep );
@@ -255,7 +255,7 @@ BackgroundParser::BackgroundParser( CppSupportPart* part, TQWaitCondition* consu
 : m_consumed( consumed ), m_cppSupport( part ), m_close( false ), m_saveMemory( false )
 {
 	m_fileList = new SynchronizedFileList();
-	m_driver = new BackgroundKDevDriver( m_cppSupport, this );
+	m_driver = new BackgroundTDevDriver( m_cppSupport, this );
 	m_driver->setSourceProvider( new KDevSourceProvider( m_cppSupport,  m_mutex ) );
 	
 	TQString conf_file_name = m_cppSupport->specialHeaderName();
@@ -347,14 +347,14 @@ void BackgroundParser::removeFile( const TQString& fileName )
 		m_isEmpty.wakeAll();
 }
 
-void BackgroundKDevDriver::addDependence( const TQString& fileName, const Dependence& dep ) {
+void BackgroundTDevDriver::addDependence( const TQString& fileName, const Dependence& dep ) {
 	//give waiting threads a chance to perform their actions
 	m_backgroundParser->m_mutex.unlock();
 	m_backgroundParser->m_mutex.lock();
-	KDevDriver::addDependence( fileName, dep );
+	TDevDriver::addDependence( fileName, dep );
 }
 
-void BackgroundKDevDriver::fileParsed( ParsedFile& fileName ) {
+void BackgroundTDevDriver::fileParsed( ParsedFile& fileName ) {
 	m_backgroundParser->fileParsed( fileName );
 }
 
diff --git a/languages/cpp/backgroundparser.h b/languages/cpp/backgroundparser.h
index f3cd86fd..bd21fd6f 100644
--- a/languages/cpp/backgroundparser.h
+++ b/languages/cpp/backgroundparser.h
@@ -24,7 +24,7 @@
 class CppSupportPart;
 class TranslationUnitAST;
 class SynchronizedFileList;
-class BackgroundKDevDriver;
+class BackgroundTDevDriver;
 class Unit
 {
 public:
@@ -94,14 +94,14 @@ public:
 	virtual void run();
 
 protected:
-    friend class BackgroundKDevDriver;
+    friend class BackgroundTDevDriver;
     void fileParsed( ParsedFile& fileName );
 	Unit* findUnit( const TQString& fileName );
 	void parseFile( const TQString& fileName, bool readFromDisk, bool lock = false )
 		;
 
 private:
-	class KDevDriver* m_driver;
+	class TDevDriver* m_driver;
 	TQString m_currentFile;
 	TQWaitCondition m_canParse;
 	TQWaitCondition m_isEmpty;
diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index 99a6db12..6e285019 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 
 // kde includes
-#include <kdevproject.h>
+#include <tdevproject.h>
 #include <tdefiledialog.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
@@ -41,9 +41,9 @@
 #include <tdeversion.h>
 // tdevelop includes
 #include <domutil.h>
-#include <kdevcoderepository.h>
-#include <kdevmainwindow.h>
-#include <kdevcoderepository.h>
+#include <tdevcoderepository.h>
+#include <tdevmainwindow.h>
+#include <tdevcoderepository.h>
 #include <catalog.h>
 // std includes
 #include <stdlib.h>
@@ -440,11 +440,11 @@ void CCConfigWidget::initTQtTab()
     isExecutable( m_qmakePath->url() );
     m_designerPath->setURL( c->designerPath() );
     isExecutable( m_designerPath->url() );
-	if ( c->designerIntegration() == "EmbeddedKDevDesigner" )
+	if ( c->designerIntegration() == "EmbeddedTDevDesigner" )
 	{
 		m_kdevembedded->setChecked( true );
 	}
-	else if ( c->designerIntegration() == "ExternalKDevDesigner" )
+	else if ( c->designerIntegration() == "ExternalTDevDesigner" )
 	{
 		m_kdevexternal->setChecked( true );
 	}else
@@ -507,11 +507,11 @@ void CCConfigWidget::saveTQtTab()
     c->setDesignerPath( m_designerPath->url() );
 	if( m_kdevembedded->isChecked() )
 	{
-		c->setDesignerIntegration( "EmbeddedKDevDesigner" );
+		c->setDesignerIntegration( "EmbeddedTDevDesigner" );
 	}
 	else if ( m_kdevexternal->isChecked() )
 	{
-		c->setDesignerIntegration( "ExternalKDevDesigner" );
+		c->setDesignerIntegration( "ExternalTDevDesigner" );
 	}else
 	{
 		c->setDesignerIntegration( "ExternalDesigner" );
diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp
index a1ad79b0..de256b00 100644
--- a/languages/cpp/codeinformationrepository.cpp
+++ b/languages/cpp/codeinformationrepository.cpp
@@ -12,7 +12,7 @@
 #include "codeinformationrepository.h"
 #include "cpp_tags.h"
 
-#include <kdevcoderepository.h>
+#include <tdevcoderepository.h>
 #include <kdebug.h>
 
 /// @todo move in utils.cpp
@@ -39,7 +39,7 @@ my_unique( const TQValueList<KTextEditor::CompletionEntry>& entryList )
 	return l;
 }
 
-CodeInformationRepository::CodeInformationRepository( KDevCodeRepository* rep )
+CodeInformationRepository::CodeInformationRepository( TDevCodeRepository* rep )
 		: m_rep( rep )
 {}
 
diff --git a/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h
index 54610e50..4b46ce0e 100644
--- a/languages/cpp/codeinformationrepository.h
+++ b/languages/cpp/codeinformationrepository.h
@@ -23,12 +23,12 @@ struct TypeProcessor {
     virtual TQString parentType() = 0;
 };
 
-class KDevCodeRepository;
+class TDevCodeRepository;
 
 class CodeInformationRepository
 {
 public:
-	CodeInformationRepository( KDevCodeRepository* rep );
+	CodeInformationRepository( TDevCodeRepository* rep );
 	virtual ~CodeInformationRepository();
 
 	static TQValueList<KTextEditor::CompletionEntry> toEntryList( const TQValueList<Tag>& tags,
@@ -46,7 +46,7 @@ public:
 
 private:
 	TQValueList<KTextEditor::CompletionEntry> m_globalEntries;
-	KDevCodeRepository* m_rep;
+	TDevCodeRepository* m_rep;
 
 private:
 	CodeInformationRepository( const CodeInformationRepository& source );
diff --git a/languages/cpp/compiler/Makefile.am b/languages/cpp/compiler/Makefile.am
index 128e715f..ab237cd4 100644
--- a/languages/cpp/compiler/Makefile.am
+++ b/languages/cpp/compiler/Makefile.am
@@ -1,6 +1,6 @@
 # This is the collection of plugins. In contrast to the parts
 # directory, these are 'transient' in a sense and don't
-# share the complete KDevComponent interface.
+# share the complete TDevComponent interface.
 
 SUBDIRS = gccoptions
 
diff --git a/languages/cpp/compiler/gccoptions/CMakeLists.txt b/languages/cpp/compiler/gccoptions/CMakeLists.txt
index 35c6159d..ed9b49d4 100644
--- a/languages/cpp/compiler/gccoptions/CMakeLists.txt
+++ b/languages/cpp/compiler/gccoptions/CMakeLists.txt
@@ -26,15 +26,15 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    kdevgccoptions.desktop kdevgppoptions.desktop
-    kdevg77options.desktop
+    tdevgccoptions.desktop tdevgppoptions.desktop
+    tdevg77options.desktop
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevgccoptions (module) ################
+##### libtdevgccoptions (module) ################
 
-tde_add_kpart( libkdevgccoptions AUTOMOC
+tde_add_kpart( libtdevgccoptions AUTOMOC
   SOURCES gccoptionsplugin.cpp
-  LINK kdevwidgets-shared kdevextras-shared
+  LINK tdevwidgets-shared tdevextras-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/cpp/compiler/gccoptions/Makefile.am b/languages/cpp/compiler/gccoptions/Makefile.am
index e90edb63..23c8a752 100644
--- a/languages/cpp/compiler/gccoptions/Makefile.am
+++ b/languages/cpp/compiler/gccoptions/Makefile.am
@@ -3,17 +3,17 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \
 	-I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevgccoptions.la
-libkdevgccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-libkdevgccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML)
+kde_module_LTLIBRARIES = libtdevgccoptions.la
+libtdevgccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libtdevgccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(LIB_TDEHTML)
 
-libkdevgccoptions_la_SOURCES = gccoptionsplugin.cpp
+libtdevgccoptions_la_SOURCES = gccoptionsplugin.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevgccoptions.desktop kdevgppoptions.desktop kdevg77options.desktop
+service_DATA = tdevgccoptions.desktop tdevgppoptions.desktop tdevg77options.desktop
 
 
 
diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
index 37470a49..d43bf094 100644
--- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
+++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
@@ -24,7 +24,7 @@
 #include "flagboxes.h"
 #include "gccoptionsplugin.h"
 
-K_EXPORT_COMPONENT_FACTORY( libkdevgccoptions, KGenericFactory<GccOptionsPlugin>( "kdevgccoptions" ) )
+K_EXPORT_COMPONENT_FACTORY( libtdevgccoptions, KGenericFactory<GccOptionsPlugin>( "tdevgccoptions" ) )
 
 class GeneralTab : public TQWidget
 {
@@ -650,7 +650,7 @@ TQString GccOptionsDialog::flags() const
 
 
 GccOptionsPlugin::GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args )
-		: KDevCompilerOptions( parent, name )
+		: TDevCompilerOptions( parent, name )
 {
 	gcctype = Unknown;
 
diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h
index 656bd289..3332809a 100644
--- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h
+++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h
@@ -14,7 +14,7 @@
 
 #include <kdialogbase.h>
 
-#include "kdevcompileroptions.h"
+#include "tdevcompileroptions.h"
 
 
 class GeneralTab;
@@ -24,7 +24,7 @@ class Warnings1Tab;
 class Warnings2Tab;
 
 
-class GccOptionsPlugin : public KDevCompilerOptions
+class GccOptionsPlugin : public TDevCompilerOptions
 {
     Q_OBJECT
   
diff --git a/languages/cpp/compiler/gccoptions/kdevg77options.desktop b/languages/cpp/compiler/gccoptions/tdevg77options.desktop
index e2a806f5..bbe1f47c 100644
--- a/languages/cpp/compiler/gccoptions/kdevg77options.desktop
+++ b/languages/cpp/compiler/gccoptions/tdevg77options.desktop
@@ -49,7 +49,7 @@ Name[tg]=G77Интихобҳо
 Name[tr]=G77Seçenekleri
 Name[zh_TW]=G77 選項
 ServiceTypes=TDevelop/CompilerOptions
-X-TDE-Library=libkdevgccoptions
+X-TDE-Library=libtdevgccoptions
 X-TDevelop-Version=5
 X-TDevelop-Language=Fortran
 X-TDevelop-Args=g77
diff --git a/languages/cpp/compiler/gccoptions/kdevgccoptions.desktop b/languages/cpp/compiler/gccoptions/tdevgccoptions.desktop
index 14bc62df..ce01a066 100644
--- a/languages/cpp/compiler/gccoptions/kdevgccoptions.desktop
+++ b/languages/cpp/compiler/gccoptions/tdevgccoptions.desktop
@@ -46,7 +46,7 @@ Name[ta]=Gccவிருப்பங்கள்
 Name[tr]=GccSeçenekleri
 Name[zh_TW]=Gcc 選項
 ServiceTypes=TDevelop/CompilerOptions
-X-TDE-Library=libkdevgccoptions
+X-TDE-Library=libtdevgccoptions
 X-TDevelop-Version=5
 X-TDevelop-Language=C
 X-TDevelop-Args=gcc
diff --git a/languages/cpp/compiler/gccoptions/kdevgppoptions.desktop b/languages/cpp/compiler/gccoptions/tdevgppoptions.desktop
index d8487596..b5fe552e 100644
--- a/languages/cpp/compiler/gccoptions/kdevgppoptions.desktop
+++ b/languages/cpp/compiler/gccoptions/tdevgppoptions.desktop
@@ -48,7 +48,7 @@ Name[ta]=Gppவிருப்பங்கள்
 Name[tr]=GppSeçenekleri
 Name[zh_TW]=Gpp 選項
 ServiceTypes=TDevelop/CompilerOptions
-X-TDE-Library=libkdevgccoptions
+X-TDE-Library=libtdevgccoptions
 X-TDevelop-Version=5
 X-TDevelop-Language=C++
 X-TDevelop-Args=g++
diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h
index 97cc66e1..2b1ad2a3 100644
--- a/languages/cpp/configproblemreporter.ui.h
+++ b/languages/cpp/configproblemreporter.ui.h
@@ -8,7 +8,7 @@
 
 #include "cppsupportpart.h"
 
-#include <kdevproject.h>
+#include <tdevproject.h>
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index bf4bef5a..adfc1c7d 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -59,10 +59,10 @@ email                : david.nolden.kdevelop@art-master.de
 #include <tqpair.h>
 #include <tqvaluestack.h>
 
-#include <kdevpartcontroller.h>
-#include <kdevmainwindow.h>
-#include <kdevproject.h>
-#include <kdevcoderepository.h>
+#include <tdevpartcontroller.h>
+#include <tdevmainwindow.h>
+#include <tdevproject.h>
+#include <tdevcoderepository.h>
 #include <codemodel_utils.h>
 #include <codemodel.h>
 #include <codebrowserfrontend.h>
@@ -1470,7 +1470,7 @@ void CppCodeCompletion::popupDefinitionAction( int number ) {
 }
 
 void CppCodeCompletion::selectItem( ItemDom item ) {
-  Extensions::KDevCodeBrowserFrontend * f = m_pSupport->extension< Extensions::KDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" );
+  Extensions::TDevCodeBrowserFrontend * f = m_pSupport->extension< Extensions::TDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" );
 
   if ( f != 0 ) {
     ItemDom itemDom( &( *item ) );
diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp
index 35069349..5fc00da3 100644
--- a/languages/cpp/cppimplementationwidget.cpp
+++ b/languages/cpp/cppimplementationwidget.cpp
@@ -31,12 +31,12 @@
 #include <tdelistview.h>
 #include <klineedit.h>
 
-#include <kdevlanguagesupport.h>
-#include <kdevproject.h>
+#include <tdevlanguagesupport.h>
+#include <tdevproject.h>
 #include <domutil.h>
 #include <filetemplate.h>
 
-CppImplementationWidget::CppImplementationWidget( KDevLanguageSupport *part,
+CppImplementationWidget::CppImplementationWidget( TDevLanguageSupport *part,
         TQWidget *parent, const char *name, bool modal )
 		: ImplementationWidget( part, parent, name, modal )
 {}
@@ -45,7 +45,7 @@ TQStringList CppImplementationWidget::createClassFiles()
 {
 	TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\n\npublic:\n    $CLASSNAME$(TQWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n";
 	TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *parent, const char *name)\n    :$BASECLASSNAME$(parent, name)\n{\n}\n";
-	if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem )
+	if ( m_part->project() ->options() == TDevProject::UsesAutotoolsBuildSystem )
 		template_cpp += "\n#include \"$MOCINCLUDE$\"\n";
 
 	TQFileInfo formInfo( m_formName );
diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h
index c8569c03..6040cf69 100644
--- a/languages/cpp/cppimplementationwidget.h
+++ b/languages/cpp/cppimplementationwidget.h
@@ -32,7 +32,7 @@ class CppImplementationWidget : public ImplementationWidget
 	Q_OBJECT
   
 public:
-	CppImplementationWidget( KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false );
+	CppImplementationWidget( TDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false );
 
 protected:
 	virtual TQStringList createClassFiles();
diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp
index 6289da44..84c8fe4e 100644
--- a/languages/cpp/cppnewclassdlg.cpp
+++ b/languages/cpp/cppnewclassdlg.cpp
@@ -40,10 +40,10 @@
 #include <tdeversion.h>
 
 #include "cppsupportpart.h"
-#include "kdevproject.h"
-#include "kdevsourceformatter.h"
-#include "kdevcoderepository.h"
-#include "kdevpartcontroller.h"
+#include "tdevproject.h"
+#include "tdevsourceformatter.h"
+#include "tdevcoderepository.h"
+#include "tdevpartcontroller.h"
 #include "backgroundparser.h"
 #include "domutil.h"
 #include "filetemplate.h"
@@ -65,7 +65,7 @@ CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, co
 	implementationModified = false;
 	m_part = part;
 	// read file template configuration
-	//    KDevProject *project = part->project();
+	//    TDevProject *project = part->project();
 	TQDomDocument &dom = *part->projectDom();
 	interface_url = DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/interfaceURL" );
 	implementation_url = DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/implementationURL" );
@@ -1342,7 +1342,7 @@ bool CppNewClassDialog::ClassGenerator::validateInput()
 	}
 
 	/// \FIXME
-    if ( ( header.find( '/' ) != -1 || implementation.find( '/' ) != -1 ) && !( dlg.m_part->project() ->options() & KDevProject::UsesTQMakeBuildSystem) )
+    if ( ( header.find( '/' ) != -1 || implementation.find( '/' ) != -1 ) && !( dlg.m_part->project() ->options() & TDevProject::UsesTQMakeBuildSystem) )
 	{
 		KMessageBox::error( &dlg, i18n( "Generated files will always be added to the "
 		                                "active directory, so you must not give an "
@@ -1376,7 +1376,7 @@ bool CppNewClassDialog::ClassGenerator::generate()
 		return false;
 	}
 
-    if( ( dlg.m_part->project() ->options() & KDevProject::UsesTQMakeBuildSystem) )
+    if( ( dlg.m_part->project() ->options() & TDevProject::UsesTQMakeBuildSystem) )
     {
         TQDir dir( TQFileInfo( project->projectDirectory()+TQString( TQChar( TQDir::separator() ) )+project->activeDirectory() + TQString( TQChar( TQDir::separator() ) ) + header ).dirPath() );
         kdDebug(9024) << "Dir for new file:" << dir.absPath() << endl;
@@ -1818,7 +1818,7 @@ void CppNewClassDialog::ClassGenerator::gen_implementation()
 	classImpl.replace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd );
 	classImpl.replace( TQRegExp( "\\$FILENAME\\$" ), implementation );
 
-	if ( ( dlg.m_part->project() ) && ( childClass || qobject ) && ( dlg.m_part->project() ->options() & KDevProject::UsesAutotoolsBuildSystem ) )
+	if ( ( dlg.m_part->project() ) && ( childClass || qobject ) && ( dlg.m_part->project() ->options() & TDevProject::UsesAutotoolsBuildSystem ) )
 	{
 		TQString moc = header;
 		moc.replace( TQRegExp( "\\..*" ), ".moc" );
diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h
index e7f969db..30aed9e4 100644
--- a/languages/cpp/cppnewclassdlg.h
+++ b/languages/cpp/cppnewclassdlg.h
@@ -24,7 +24,7 @@
 #include "cppnewclassdlgbase.h"
 
 class CppSupportPart;
-class KDevProject;
+class TDevProject;
 class TQPopupMenu;
 class TDECompletion;
 class CodeModel;
@@ -257,7 +257,7 @@ private:
 		TQString advConstructorsHeader;
 		TQString advConstructorsSource;
 
-		KDevProject *project;
+		TDevProject *project;
 		TQString subDir, headerPath, implementationPath;
 		TQString doc;
 		TQString namespaceStr;
diff --git a/languages/cpp/cppsupport_events.h b/languages/cpp/cppsupport_events.h
index b40fc0ec..b8d9909f 100644
--- a/languages/cpp/cppsupport_events.h
+++ b/languages/cpp/cppsupport_events.h
@@ -12,7 +12,7 @@
 #ifndef __cppsupport_events_h
 #define __cppsupport_events_h
 
-#include "kdevdeepcopy.h"
+#include "tdevdeepcopy.h"
 
 #include <tqevent.h>
 #include <tqvaluelist.h>
diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp
index 41335cdb..ca98f2f3 100644
--- a/languages/cpp/cppsupportfactory.cpp
+++ b/languages/cpp/cppsupportfactory.cpp
@@ -11,21 +11,21 @@
 
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 #include "cppsupportfactory.h"
 
-K_EXPORT_COMPONENT_FACTORY( libkdevcppsupport, CppSupportFactory )
+K_EXPORT_COMPONENT_FACTORY( libtdevcppsupport, CppSupportFactory )
 
-static const KDevPluginInfo data("kdevcppsupport");
+static const TDevPluginInfo data("tdevcppsupport");
 
 CppSupportFactory::CppSupportFactory()
-: KDevGenericFactory<CppSupportPart>( data )
+: TDevGenericFactory<CppSupportPart>( data )
 {
 }
 
 TDEInstance *CppSupportFactory::createInstance()
 {
-	TDEInstance *instance = KDevGenericFactory<CppSupportPart>::createInstance();
+	TDEInstance *instance = TDevGenericFactory<CppSupportPart>::createInstance();
 	TDEStandardDirs *dirs = instance->dirs();
 	dirs->addResourceType( "newclasstemplates", TDEStandardDirs::kde_default("data") + "kdevcppsupport/newclass/" );
 	dirs->addResourceType( "pcs", TDEStandardDirs::kde_default( "data" ) + "kdevcppsupport/pcs/" );
@@ -33,7 +33,7 @@ TDEInstance *CppSupportFactory::createInstance()
 	return instance;
 }
 
-const KDevPluginInfo * CppSupportFactory::info()
+const TDevPluginInfo * CppSupportFactory::info()
 {
 	return &data;
 }
diff --git a/languages/cpp/cppsupportfactory.h b/languages/cpp/cppsupportfactory.h
index f543c4fc..0ece65e9 100644
--- a/languages/cpp/cppsupportfactory.h
+++ b/languages/cpp/cppsupportfactory.h
@@ -12,17 +12,17 @@
 #ifndef _CPPSUPPORTFACTORY_H_
 #define _CPPSUPPORTFACTORY_H_
 
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include "cppsupportpart.h"
 
-class KDevPluginInfo;
+class TDevPluginInfo;
 
-class CppSupportFactory : public KDevGenericFactory<CppSupportPart>
+class CppSupportFactory : public TDevGenericFactory<CppSupportPart>
 {
 public:
 	CppSupportFactory();
 
-	static const KDevPluginInfo *info();
+	static const TDevPluginInfo *info();
 
 protected:
 	virtual TDEInstance *createInstance();
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 35739045..f02b967b 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -25,11 +25,11 @@
 #include "ast_utils.h"
 #include "cppcodecompletion.h"
 #include "ccconfigwidget.h"
-#include "KDevCppSupportIface.h"
+#include "TDevCppSupportIface.h"
 #include "cppsupportfactory.h"
 #include "catalog.h"
 #include "cpp_tags.h"
-#include "kdevdriver.h"
+#include "tdevdriver.h"
 #include "cppcodecompletionconfig.h"
 #include "cppsplitheadersourceconfig.h"
 #include "tag_creator.h"
@@ -37,10 +37,10 @@
 #include "classgeneratorconfig.h"
 #include "urlutil.h"
 #include "creategettersetterconfiguration.h"
-#include "kdevsourceformatter.h"
-#include "kdevcreatefile.h"
+#include "tdevsourceformatter.h"
+#include "tdevcreatefile.h"
 #include "qtbuildconfig.h"
-#include "kdeveditorutil.h"
+#include "tdeveditorutil.h"
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdepopupmenu.h>
 // wizards
@@ -93,14 +93,14 @@
 #include <tdetexteditor/clipboardinterface.h>
 #include <tdetexteditor/texthintinterface.h>
 
-#include <kdevcore.h>
-#include <kdevproject.h>
-#include <kdevmainwindow.h>
-#include <kdevpartcontroller.h>
-#include <kdevmakefrontend.h>
-#include <kdevcoderepository.h>
+#include <tdevcore.h>
+#include <tdevproject.h>
+#include <tdevmainwindow.h>
+#include <tdevpartcontroller.h>
+#include <tdevmakefrontend.h>
+#include <tdevcoderepository.h>
 #include <codemodel_utils.h>
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
 #include <domutil.h>
 #include <config.h>
@@ -116,10 +116,10 @@ TQStringList CppSupportPart::m_headerMimeTypes = TQStringList() << "text/x-chdr"
 TQStringList CppSupportPart::m_sourceExtensions = TQStringList::split( ",", "c,C,cc,cpp,c++,cxx,m,mm,M" );
 TQStringList CppSupportPart::m_headerExtensions = TQStringList::split( ",", "h,H,hh,h++,hxx,hpp,inl,tlh,diff,ui.h" );
 
-class CppDriver: public KDevDriver
+class CppDriver: public TDevDriver
 {
 public:
-	CppDriver( CppSupportPart* cppSupport ) : KDevDriver( cppSupport, true )
+	CppDriver( CppSupportPart* cppSupport ) : TDevDriver( cppSupport, true )
 	{}
 
 	void fileParsed( ParsedFile& fileName )
@@ -192,7 +192,7 @@ public:
 
 
 CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStringList &args )
-: KDevLanguageSupport( CppSupportFactory::info(), parent, name ? name : "KDevCppSupport" ), m_backgroundParser(0),
+: TDevLanguageSupport( CppSupportFactory::info(), parent, name ? name : "TDevCppSupport" ), m_backgroundParser(0),
 	m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ),
 	m_projectClosed( true ), m_projectClosing( false ), m_valid( false ), m_isTyping( false ), m_hadErrors( false ),
 	_jd(0)
@@ -232,7 +232,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 	m_saveMemoryTimer->start( 240000, false ); //Free some memory every 4 minutes
 	//    connect( m_functionHintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFunctionHint()) );
 
-	setXMLFile( "kdevcppsupport.rc" );
+	setXMLFile( "tdevcppsupport.rc" );
 
 	m_catalogList.setAutoDelete( true );
 
@@ -309,7 +309,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 	connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this,
 	         TQT_SLOT( projectConfigWidget( KDialogBase* ) ) );
 
-	new KDevCppSupportIface( this );
+	new TDevCppSupportIface( this );
 	//(void) dcopClient();
 
 	m_lockupTester = new UIBlockTester( 100 );
@@ -611,7 +611,7 @@ void CppSupportPart::projectClosed( )
 	}
 	DomUtil::writeListEntry( *project() ->projectDom(), "kdevcppsupport/references", "pcs", enabledPCSs );
 
-	for ( TQMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*>::const_iterator it = m_designers.begin();
+	for ( TQMap<KInterfaceDesigner::DesignerType, TDevDesignerIntegration*>::const_iterator it = m_designers.begin();
 	      it != m_designers.end(); ++it )
 	{
 		kdDebug( 9007 ) << "calling save settings fro designer integration" << endl;
@@ -840,7 +840,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 		{
 			m_contextFileName = url.path();
 			int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) );
-			popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) );
+			popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated TDevDesigner." ) );
 		}
 	}
 }
@@ -1342,7 +1342,7 @@ void CppSupportPart::jumpToCodeModelItem( const ItemDom& item, bool scrollOnly )
 	lastSyncedUrl = url;
 }
 
-KDevLanguageSupport::Features CppSupportPart::features()
+TDevLanguageSupport::Features CppSupportPart::features()
 {
 	if ( withcpp )
 		return Features( Classes | Structs | Functions | Variables | Namespaces | Declarations
@@ -2065,7 +2065,7 @@ void CppSupportPart::codeCompletionConfigStored( )
 	/*
 	m_backgroundParser->updateParserConfiguration();
 
-	KDevDriver* d = dynamic_cast<KDevDriver*>( m_driver ); //The foreground-parse isn't used anymore, and could be removed
+	TDevDriver* d = dynamic_cast<TDevDriver*>( m_driver ); //The foreground-parse isn't used anymore, and could be removed
 	if( d ) {
 		d->setup();
 		d->makeMacrosPersistent();
@@ -2144,7 +2144,7 @@ TQString CppSupportPart::formatModelItem( const CodeModelItem *item, bool shortD
 		return arg.stripWhiteSpace();
 	}
 	else
-		return KDevLanguageSupport::formatModelItem( item, shortDescription );
+		return TDevLanguageSupport::formatModelItem( item, shortDescription );
 }
 
 void CppSupportPart::addClass()
@@ -2677,7 +2677,7 @@ void CppSupportPart::slotCursorPositionChanged()
 	{
 		unsigned int line = 0;
 		unsigned int column = 0;
-		if ( KDevEditorUtil::currentPositionReal( &line, &column, dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) )
+		if ( TDevEditorUtil::currentPositionReal( &line, &column, dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) )
 		{
 			TQString typeInfoString = codeCompletion()->createTypeInfoString( line, column );
 			mainWindow()->statusBar()->message( typeInfoString );
@@ -2738,7 +2738,7 @@ void CppSupportPart::updateParserConfiguration()
 	TQString conf_file_name = specialHeaderName();
 
 	m_driver->removeAllMacrosInFile( conf_file_name );
-	dynamic_cast<KDevDriver*>(m_driver)->setup();
+	dynamic_cast<TDevDriver*>(m_driver)->setup();
 	m_driver->parseFile( conf_file_name, true, true, true );
 
 	m_buildSafeFileSetTimer->start( 500, true );
@@ -2753,9 +2753,9 @@ Driver* CppSupportPart::driver() {
 	return m_driver;
 }
 
-KDevDesignerIntegration * CppSupportPart::designer( KInterfaceDesigner::DesignerType type )
+TDevDesignerIntegration * CppSupportPart::designer( KInterfaceDesigner::DesignerType type )
 {
-	KDevDesignerIntegration * des = 0;
+	TDevDesignerIntegration * des = 0;
 	switch ( type )
 	{
 	case KInterfaceDesigner::Glade:
@@ -2847,7 +2847,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS
 	TQFileInfo info( aClass->fileName() );
 	TQString implementationFile = info.dirPath( true ) + "/" + info.baseName() + ".cpp" ;
 	TQFileInfo fileInfo( implementationFile );
-	KDevCreateFile* createFileSupport = extension<KDevCreateFile>( "TDevelop/CreateFile" );
+	TDevCreateFile* createFileSupport = extension<TDevCreateFile>( "TDevelop/CreateFile" );
 	if ( !TQFile::exists( fileInfo.absFilePath() ) && createFileSupport != 0 )
 		createFileSupport->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.baseName() );
 
diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h
index 7de698c0..ec00cd9c 100644
--- a/languages/cpp/cppsupportpart.h
+++ b/languages/cpp/cppsupportpart.h
@@ -18,8 +18,8 @@
 #ifndef _CPPSUPPORTPART_H_
 #define _CPPSUPPORTPART_H_
 
-#include <kdevcore.h>
-#include <kdevlanguagesupport.h>
+#include <tdevcore.h>
+#include <tdevlanguagesupport.h>
 
 #include <tqthread.h>
 #include <tqmutex.h>
@@ -153,7 +153,7 @@ private:
 	SetType m_fileSet;
 };
 
-class CppSupportPart : public KDevLanguageSupport
+class CppSupportPart : public TDevLanguageSupport
 {
 	Q_OBJECT
   
@@ -243,7 +243,7 @@ public:
     //uses the old simple algorithm to find the header
     TQString findHeaderSimple( const TQString &header );
   
-	virtual KDevDesignerIntegration *designer( KInterfaceDesigner::DesignerType type );
+	virtual TDevDesignerIntegration *designer( KInterfaceDesigner::DesignerType type );
 
 	void setTyping( bool typing );
 	
@@ -284,7 +284,7 @@ signals:
 	void synchronousParseReady( const TQString& file, ParsedFilePointer unit );
     
 protected:
-	virtual KDevLanguageSupport::Features features();
+	virtual TDevLanguageSupport::Features features();
 	virtual KMimeType::List mimeTypes();
 	virtual TQString formatClassName( const TQString &name );
 	virtual TQString unformatClassName( const TQString &name );
@@ -435,7 +435,7 @@ private:
 	KTextEditor::ViewCursorInterface* m_activeViewCursor;
 	TQString m_activeFileName;
 
-	TQMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*> m_designers;
+	TQMap<KInterfaceDesigner::DesignerType, TDevDesignerIntegration*> m_designers;
 
 	TQWaitCondition m_eventConsumed;
 	bool m_projectClosed;
@@ -623,7 +623,7 @@ private:
 	static TQStringList m_sourceExtensions;
 	static TQStringList m_headerExtensions;
 
-	friend class KDevCppSupportIface;
+	friend class TDevCppSupportIface;
 	friend class CppDriver;
 
 	// we need something to plug actions that are not in any menu 
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index 9cca7ef8..0f390477 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -17,8 +17,8 @@
 #include "setuphelper.h"
 
 #include <catalog.h>
-#include <kdevpcsimporter.h>
-#include <kdevcoderepository.h>
+#include <tdevpcsimporter.h>
+#include <tdevcoderepository.h>
 
 #include <tdeparts/componentfactory.h>
 
@@ -132,12 +132,12 @@ private:
 class PCSListViewItem: public TDEListViewItem
 {
 public:
-	PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* parent )
+	PCSListViewItem( KService::Ptr ptr, TDevPCSImporter* importer, TQListViewItem* parent )
 			: TDEListViewItem( parent ), m_importer( importer )
 	{
 		init( ptr );
 	}
-	PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* parent )
+	PCSListViewItem( KService::Ptr ptr, TDevPCSImporter* importer, TQListView* parent )
 			: TDEListViewItem( parent ), m_importer( importer )
 	{
 		init( ptr );
@@ -155,13 +155,13 @@ public:
 		setPixmap( 0, SmallIcon( ptr->icon() ) );
 	}
 
-	KDevPCSImporter* importer()
+	TDevPCSImporter* importer()
 	{
 		return m_importer;
 	}
 
 private:
-	KDevPCSImporter* m_importer;
+	TDevPCSImporter* m_importer;
 };
 
 class CreatePCSDialog::PCSJobData
@@ -212,7 +212,7 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const
 		KService::Ptr ptr = *it;
 
 		int error = 0;
-		KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, TQT_TQOBJECT(this), ptr->name().latin1(), TQStringList(), &error );
+		TDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<TDevPCSImporter>( ptr, TQT_TQOBJECT(this), ptr->name().latin1(), TQStringList(), &error );
 		if ( importer )
 		{
 			new PCSListViewItem( ptr, importer, importerListView );
@@ -272,7 +272,7 @@ void CreatePCSDialog::slotSelected( const TQString & )
 		if ( m_settings )
 			delete( m_settings );
 
-		KDevPCSImporter* importer = static_cast<PCSListViewItem*>( importerListView->selectedItem() ) ->importer();
+		TDevPCSImporter* importer = static_cast<PCSListViewItem*>( importerListView->selectedItem() ) ->importer();
 		m_settings = importer->createSettingsPage( settingsPage );
 		setNextEnabled( currentPage(), false );
 		setHelpEnabled( currentPage(), false );
@@ -286,7 +286,7 @@ void CreatePCSDialog::slotSelected( const TQString & )
 	}
 	else if ( currentPage() == descriptionPage )
 	{
-		KDevPCSImporter* importer = static_cast<PCSListViewItem*>( importerListView->selectedItem() )->importer();
+		TDevPCSImporter* importer = static_cast<PCSListViewItem*>( importerListView->selectedItem() )->importer();
 		filename_edit->setText( importer->dbName() );
 	}
 	else if ( currentPage() == finalPage )
@@ -294,7 +294,7 @@ void CreatePCSDialog::slotSelected( const TQString & )
 		setBackEnabled( currentPage(), false );
 		setNextEnabled( currentPage(), false );
 
-		KDevPCSImporter* importer = static_cast<PCSListViewItem*>( importerListView->selectedItem() )->importer();
+		TDevPCSImporter* importer = static_cast<PCSListViewItem*>( importerListView->selectedItem() )->importer();
 		TQStringList fileList = importer->fileList();
 		progressBar->setTotalSteps( fileList.size() );
 		progressBar->setPercentageVisible( true );
diff --git a/languages/cpp/debugger/CMakeLists.txt b/languages/cpp/debugger/CMakeLists.txt
index 4b660c1d..d5b91df2 100644
--- a/languages/cpp/debugger/CMakeLists.txt
+++ b/languages/cpp/debugger/CMakeLists.txt
@@ -33,13 +33,13 @@ link_directories(
 ##### other data ################################
 
 tde_install_icons( )
-install( FILES kdevdebugger.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevdebugger.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdebugger )
+install( FILES tdevdebugger.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevdebugger.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdebugger )
 
 
-##### libkdevdebugger (module) ##################
+##### libtdevdebugger (module) ##################
 
-tde_add_kpart( libkdevdebugger AUTOMOC
+tde_add_kpart( libtdevdebugger AUTOMOC
   SOURCES
     debuggerdcopinterface.skel debuggerpart.cpp
     dbgcontroller.cpp gdbcontroller.cpp gdbcommand.cpp
@@ -50,6 +50,6 @@ tde_add_kpart( libkdevdebugger AUTOMOC
     debuggerconfigwidgetbase.ui debuggertracingdialogbase.ui
     gdboutputwidget.cpp gdbtable.cpp debuggertracingdialog.cpp
     label_with_double_click.cpp
-  LINK gdbmi_parser-shared lang_debugger-shared kdevwidgets-shared tdevelop-shared
+  LINK gdbmi_parser-shared lang_debugger-shared tdevwidgets-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/cpp/debugger/Makefile.am b/languages/cpp/debugger/Makefile.am
index 09c147ad..40aba33a 100644
--- a/languages/cpp/debugger/Makefile.am
+++ b/languages/cpp/debugger/Makefile.am
@@ -7,13 +7,13 @@ INCLUDES = -I$(top_srcdir)/languages/lib/debugger \
 	-I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util \
 	-I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevdebugger.la
-libkdevdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) \
+kde_module_LTLIBRARIES = libtdevdebugger.la
+libtdevdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) \
 	$(top_builddir)/languages/lib/debugger/liblang_debugger.la \
 	$(top_builddir)/languages/cpp/debugger/mi/libgdbmi_parser.la
 
-libkdevdebugger_la_SOURCES = debuggerdcopinterface.skel debuggerpart.cpp \
+libtdevdebugger_la_SOURCES = debuggerdcopinterface.skel debuggerpart.cpp \
     dbgcontroller.cpp gdbcontroller.cpp gdbcommand.cpp \
     gdbparser.cpp stty.cpp breakpoint.cpp variablewidget.cpp \
     gdbbreakpointwidget.cpp framestackwidget.cpp disassemblewidget.cpp \
@@ -26,8 +26,8 @@ METASOURCES = AUTO
 KDE_ICON = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevdebugger.desktop
+service_DATA = tdevdebugger.desktop
 
-rcdir = $(kde_datadir)/kdevdebugger
-rc_DATA = kdevdebugger.rc
+rcdir = $(kde_datadir)/tdevdebugger
+rc_DATA = tdevdebugger.rc
 noinst_HEADERS =  gdbtable.h
diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp
index 2b8523ae..dab4486b 100644
--- a/languages/cpp/debugger/debuggerconfigwidget.cpp
+++ b/languages/cpp/debugger/debuggerconfigwidget.cpp
@@ -14,7 +14,7 @@
 #include "debuggerconfigwidget.h"
 
 #include "debuggerpart.h"
-#include "kdevproject.h"
+#include "tdevproject.h"
 
 #include "domutil.h"
 #include <kurlrequester.h>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 3cae3762..f2379ccb 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -23,7 +23,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdemainwindow.h>
@@ -37,12 +37,12 @@
 #include <kstringhandler.h>
 #include <kdockwidget.h>
 
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevmainwindow.h"
-#include "kdevappfrontend.h"
-#include "kdevpartcontroller.h"
-#include "kdevdebugger.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevmainwindow.h"
+#include "tdevappfrontend.h"
+#include "tdevpartcontroller.h"
+#include "tdevdebugger.h"
 #include "domutil.h"
 #include "variablewidget.h"
 #include "gdbbreakpointwidget.h"
@@ -61,7 +61,7 @@
 
 #include <iostream>
 
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 #include <debugger.h>
 
 
@@ -71,13 +71,13 @@
 namespace GDBDebugger
 {
 
-static const KDevPluginInfo data("kdevdebugger");
+static const TDevPluginInfo data("tdevdebugger");
 
-typedef KDevGenericFactory<DebuggerPart> DebuggerFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevdebugger, DebuggerFactory( data ) )
+typedef TDevGenericFactory<DebuggerPart> DebuggerFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevdebugger, DebuggerFactory( data ) )
 
 DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringList & ) :
-    KDevPlugin( &data, parent, name ? name : "DebuggerPart" ),
+    TDevPlugin( &data, parent, name ? name : "DebuggerPart" ),
     controller(0), previousDebuggerState_(s_dbgNotStarted),
     justRestarted_(false), needRebuild_(true),
     running_(false)
@@ -85,7 +85,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
     setObjId("DebuggerInterface");
     setInstance(DebuggerFactory::instance());
 
-    setXMLFile("kdevdebugger.rc");
+    setXMLFile("tdevdebugger.rc");
 
     m_debugger = new Debugger( partController() );
 
@@ -333,8 +333,8 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
     connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
              this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 
-    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
-             this, TQT_SLOT(slotStop(KDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
+             this, TQT_SLOT(slotStop(TDevPlugin*)) );
     connect( core(), TQT_SIGNAL(projectClosed()),
              this, TQT_SLOT(projectClosed()) );
 
@@ -858,7 +858,7 @@ void DebuggerPart::slotRun()
             if (rebuild)
             {
                 disconnect(TQT_SIGNAL(buildProject()));
-                // The KDevProject has no method to build the project,
+                // The TDevProject has no method to build the project,
                 // so try connecting to a slot has is present to all
                 // existing project managers.
                 // Note: this assumes that 'slotBuild' will save
@@ -984,7 +984,7 @@ bool DebuggerPart::attachProcess(int pid)
 }
 
 
-void DebuggerPart::slotStop(KDevPlugin* which)
+void DebuggerPart::slotStop(TDevPlugin* which)
 {
     if( which != 0 && which != this )
         return;
@@ -1259,12 +1259,12 @@ bool DebuggerPart::haveModifiedFiles()
 
 }
 
-KDevAppFrontend * GDBDebugger::DebuggerPart::appFrontend( )
+TDevAppFrontend * GDBDebugger::DebuggerPart::appFrontend( )
 {
-    return extension<KDevAppFrontend>("TDevelop/AppFrontend");
+    return extension<TDevAppFrontend>("TDevelop/AppFrontend");
 }
 
-KDevDebugger * GDBDebugger::DebuggerPart::debugger()
+TDevDebugger * GDBDebugger::DebuggerPart::debugger()
 {
     return m_debugger;
 }
diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h
index 50479249..f1f27d23 100644
--- a/languages/cpp/debugger/debuggerpart.h
+++ b/languages/cpp/debugger/debuggerpart.h
@@ -15,8 +15,8 @@
 #define _DEBUGGERPART_H_
 
 #include <tqguardedptr.h>
-#include "kdevplugin.h"
-#include "kdevcore.h"
+#include "tdevplugin.h"
+#include "tdevcore.h"
 
 #include "gdbcontroller.h"
 #include "debuggerdcopinterface.h"
@@ -28,8 +28,8 @@ class TQPopupMenu;
 class KDialogBase;
 class ProcessWidget;
 class ProcessLineMaker;
-class KDevAppFrontend;
-class KDevDebugger;
+class TDevAppFrontend;
+class TDevDebugger;
 
 namespace GDBDebugger
 {
@@ -44,7 +44,7 @@ class VariableWidget;
 class GDBOutputWidget;
 class ViewerWidget;
 
-class DebuggerPart : public KDevPlugin, virtual public DebuggerDCOPInterface
+class DebuggerPart : public TDevPlugin, virtual public DebuggerDCOPInterface
 {
     Q_OBJECT
   
@@ -82,7 +82,7 @@ private slots:
     void slotExamineCore();
     void slotAttachProcess();
     void slotStopDebugger();
-    void slotStop(KDevPlugin* which = 0);
+    void slotStop(TDevPlugin* which = 0);
     void slotPause();
     void slotRunToCursor();
     void slotJumpToCursor();
@@ -116,8 +116,8 @@ private slots:
     void slotEvent(GDBController::event_t);
 
 private:
-    KDevAppFrontend *appFrontend();
-    KDevDebugger *debugger();
+    TDevAppFrontend *appFrontend();
+    TDevDebugger *debugger();
     
     bool attachProcess(int pid);
     bool startDebugger();
@@ -139,7 +139,7 @@ private:
     TQString m_contextIdent;
     TQCString m_drkonqi;
     
-    KDevDebugger *m_debugger;
+    TDevDebugger *m_debugger;
     int previousDebuggerState_;
     // Set to true after each debugger restart
     // Currently used to auto-show variables view
diff --git a/languages/cpp/debugger/kdevdebugger.desktop b/languages/cpp/debugger/tdevdebugger.desktop
index beaf17f3..9db31510 100644
--- a/languages/cpp/debugger/kdevdebugger.desktop
+++ b/languages/cpp/debugger/tdevdebugger.desktop
@@ -34,7 +34,7 @@ Comment[tg]=Ин модул дар GDB интерфейсро ба ихтиёр
 Comment[tr]=Bu eklenti, C, C++ ve daha fazlası için bir kaynak-düzeyinde hata ayıklayıcı olan GDB için bir önucu sağlar. http://sources.redhat.com/gdb/
 Comment[zh_CN]=这个插件是一个 GDB 前端，一个 C、C++ 和其它语言的源代码调试器。http://sources.redhat.com/gdb/
 Comment[zh_TW]=這個外掛程式提供 GDB 的前端介面。GDB 是一個 C/C++ 還有其它語言的除錯器。http://sources.redhat.com/gdb/
-Name=KDevDebugger
+Name=TDevDebugger
 Name[da]=TDevelop Debugger
 Name[de]=Debugger (TDevelop)
 Name[hi]=के-डेव-डिबगर
@@ -80,7 +80,7 @@ GenericName[zh_CN]=调试器前端
 GenericName[zh_TW]=除錯器前端
 Icon=debugger
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevdebugger
+X-TDE-Library=libtdevdebugger
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=CompiledDevelopment
diff --git a/languages/cpp/debugger/kdevdebugger.rc b/languages/cpp/debugger/tdevdebugger.rc
index 801cadb8..99a10f3c 100644
--- a/languages/cpp/debugger/kdevdebugger.rc
+++ b/languages/cpp/debugger/tdevdebugger.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KDevDebugger" version="11">
+<kpartgui name="TDevDebugger" version="11">
 <MenuBar>
  <Menu name="debug">
   <text>&amp;Debug</text>
diff --git a/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop b/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop
index 54214a1b..fc68be33 100644
--- a/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop
+++ b/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop
@@ -4,14 +4,14 @@
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
     <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
+    <projectmanagement>TDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
     <description/>
   </general>
-  <kdevcustomproject>
+  <tdevcustomproject>
     <run>
       <mainprogram>breakpoints</mainprogram>
       <directoryradio>executable</directoryradio>
@@ -38,8 +38,8 @@
         <default/>
       </environments>
     </make>
-  </kdevcustomproject>
-  <kdevdebugger>
+  </tdevcustomproject>
+  <tdevdebugger>
     <general>
       <dbgshell/>
       <programargs/>
@@ -56,8 +56,8 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </kdevdebugger>
-  <kdevdoctreeview>
+  </tdevdebugger>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -102,16 +102,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
+  </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcppsupport>
+  </tdevfilecreate>
+  <tdevcppsupport>
     <references/>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -143,8 +143,8 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-  </kdevcppsupport>
-  <kdevfileview>
+  </tdevcppsupport>
+  <tdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -153,7 +153,7 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </kdevfileview>
+  </tdevfileview>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
diff --git a/languages/cpp/debugger/tests/dll/dll.tdevelop b/languages/cpp/debugger/tests/dll/dll.tdevelop
index f92f1d08..b875ae48 100644
--- a/languages/cpp/debugger/tests/dll/dll.tdevelop
+++ b/languages/cpp/debugger/tests/dll/dll.tdevelop
@@ -4,14 +4,14 @@
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
     <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
+    <projectmanagement>TDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
     <description/>
   </general>
-  <kdevcustomproject>
+  <tdevcustomproject>
     <run>
       <mainprogram>main</mainprogram>
       <directoryradio>executable</directoryradio>
@@ -38,8 +38,8 @@
         <default/>
       </environments>
     </make>
-  </kdevcustomproject>
-  <kdevdebugger>
+  </tdevcustomproject>
+  <tdevdebugger>
     <general>
       <dbgshell/>
       <programargs/>
@@ -56,8 +56,8 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </kdevdebugger>
-  <kdevdoctreeview>
+  </tdevdebugger>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -102,22 +102,22 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
+  </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <qt>
       <used>false</used>
       <version>3</version>
@@ -144,8 +144,8 @@
       <inlineSet>true</inlineSet>
     </creategettersetter>
     <references/>
-  </kdevcppsupport>
-  <kdevfileview>
+  </tdevcppsupport>
+  <tdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -154,5 +154,5 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </kdevfileview>
+  </tdevfileview>
 </tdevelop>
diff --git a/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop b/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop
index 267a73d8..3096faea 100644
--- a/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop
+++ b/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop
@@ -4,22 +4,22 @@
     <author>Vladimir Prus</author>
     <email>ghost@zigzag</email>
     <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
+    <projectmanagement>TDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
   </general>
-  <kdevcustomproject>
+  <tdevcustomproject>
     <run>
       <mainprogram>infinite_loop</mainprogram>
       <directoryradio>executable</directoryradio>
     </run>
-  </kdevcustomproject>
-  <kdevdebugger>
+  </tdevcustomproject>
+  <tdevdebugger>
     <general>
       <dbgshell/>
     </general>
-  </kdevdebugger>
-  <kdevdoctreeview>
+  </tdevdebugger>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -64,16 +64,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
+  </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcppsupport>
+  </tdevfilecreate>
+  <tdevcppsupport>
     <references/>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -95,8 +95,8 @@
       <processPrimaryTypes>true</processPrimaryTypes>
       <processFunctionArguments>false</processFunctionArguments>
     </codecompletion>
-  </kdevcppsupport>
-  <kdevfileview>
+  </tdevcppsupport>
+  <tdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -105,5 +105,5 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </kdevfileview>
+  </tdevfileview>
 </tdevelop>
diff --git a/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop b/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop
index a838d09d..fc7f4d19 100644
--- a/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop
+++ b/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop
@@ -4,7 +4,7 @@
     <author>Vladimir Prus</author>
     <email>ghost@cs.msu.su</email>
     <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
+    <projectmanagement>TDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts>
       <part>kdevsecurity</part>
@@ -18,7 +18,7 @@
     <description/>
     <projectname>print_pointers</projectname>
   </general>
-  <kdevcustomproject>
+  <tdevcustomproject>
     <run>
       <mainprogram>print_pointers</mainprogram>
       <directoryradio>executable</directoryradio>
@@ -62,8 +62,8 @@
       <filetype>CMakeLists.txt</filetype>
     </filetypes>
     <blacklist/>
-  </kdevcustomproject>
-  <kdevdebugger>
+  </tdevcustomproject>
+  <tdevdebugger>
     <general>
       <dbgshell/>
       <programargs/>
@@ -80,8 +80,8 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </kdevdebugger>
-  <kdevdoctreeview>
+  </tdevdebugger>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -126,22 +126,22 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
+  </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
       <implementationsuffix>.cpp</implementationsuffix>
     </filetemplates>
   </cppsupportpart>
-  <kdevcppsupport>
+  <tdevcppsupport>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
       <includeTypes>true</includeTypes>
@@ -185,7 +185,7 @@
       <version>3</version>
       <root>/usr/share/qt3</root>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
       <qmake>/usr/bin/qmake-qt3</qmake>
       <designer>/usr/bin/designer</designer>
       <designerpluginpaths/>
@@ -195,8 +195,8 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-  </kdevcppsupport>
-  <kdevfileview>
+  </tdevcppsupport>
+  <tdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -205,8 +205,8 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </kdevfileview>
-  <kdevvisualadvance>
+  </tdevfileview>
+  <tdevvisualadvance>
     <emulator>VisualBoyAdvance</emulator>
     <binary/>
     <addOptions/>
@@ -214,5 +214,5 @@
     <fullscreen>false</fullscreen>
     <graphicFilter>-f0</graphicFilter>
     <scaling>-1</scaling>
-  </kdevvisualadvance>
+  </tdevvisualadvance>
 </tdevelop>
diff --git a/languages/cpp/debugger/tests/segfault/segfault.tdevelop b/languages/cpp/debugger/tests/segfault/segfault.tdevelop
index 4eccf2e1..e48ed4e4 100644
--- a/languages/cpp/debugger/tests/segfault/segfault.tdevelop
+++ b/languages/cpp/debugger/tests/segfault/segfault.tdevelop
@@ -4,14 +4,14 @@
     <author>Vladimir Prus</author>
     <email>ghost@zigzag</email>
     <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
+    <projectmanagement>TDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
     <description></description>
   </general>
-  <kdevcustomproject>
+  <tdevcustomproject>
     <run>
       <mainprogram>segfault</mainprogram>
       <directoryradio>executable</directoryradio>
@@ -38,8 +38,8 @@
         <default/>
       </environments>
     </make>
-  </kdevcustomproject>
-  <kdevdebugger>
+  </tdevcustomproject>
+  <tdevdebugger>
     <general>
       <dbgshell></dbgshell>
       <programargs></programargs>
@@ -56,8 +56,8 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </kdevdebugger>
-  <kdevdoctreeview>
+  </tdevdebugger>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -102,16 +102,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
+  </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcppsupport>
+  </tdevfilecreate>
+  <tdevcppsupport>
     <references/>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -143,8 +143,8 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-  </kdevcppsupport>
-  <kdevfileview>
+  </tdevcppsupport>
+  <tdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -153,7 +153,7 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </kdevfileview>
+  </tdevfileview>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
diff --git a/languages/cpp/debugger/tests/threads/threads.tdevelop b/languages/cpp/debugger/tests/threads/threads.tdevelop
index 048b3aed..c730bfc4 100644
--- a/languages/cpp/debugger/tests/threads/threads.tdevelop
+++ b/languages/cpp/debugger/tests/threads/threads.tdevelop
@@ -4,22 +4,22 @@
     <author>Vladimir Prus</author>
     <email>ghost@zigzag</email>
     <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
+    <projectmanagement>TDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
   </general>
-  <kdevcustomproject>
+  <tdevcustomproject>
     <run>
       <mainprogram>threads</mainprogram>
       <directoryradio>executable</directoryradio>
     </run>
-  </kdevcustomproject>
-  <kdevdebugger>
+  </tdevcustomproject>
+  <tdevdebugger>
     <general>
       <dbgshell/>
     </general>
-  </kdevdebugger>
-  <kdevdoctreeview>
+  </tdevdebugger>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -64,16 +64,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
+  </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcppsupport>
+  </tdevfilecreate>
+  <tdevcppsupport>
     <references/>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -87,8 +87,8 @@
       <argumentsHintDelay>400</argumentsHintDelay>
       <headerCompletionDelay>250</headerCompletionDelay>
     </codecompletion>
-  </kdevcppsupport>
-  <kdevfileview>
+  </tdevcppsupport>
+  <tdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -97,5 +97,5 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </kdevfileview>
+  </tdevfileview>
 </tdevelop>
diff --git a/languages/cpp/debugger/tests/tracing/tracing.tdevelop b/languages/cpp/debugger/tests/tracing/tracing.tdevelop
index 56743de1..ab1846ef 100644
--- a/languages/cpp/debugger/tests/tracing/tracing.tdevelop
+++ b/languages/cpp/debugger/tests/tracing/tracing.tdevelop
@@ -4,14 +4,14 @@
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
     <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
+    <projectmanagement>TDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
     <description/>
   </general>
-  <kdevcustomproject>
+  <tdevcustomproject>
     <run>
       <mainprogram>tracing</mainprogram>
       <directoryradio>executable</directoryradio>
@@ -38,8 +38,8 @@
         <default/>
       </environments>
     </make>
-  </kdevcustomproject>
-  <kdevdebugger>
+  </tdevcustomproject>
+  <tdevdebugger>
     <general>
       <dbgshell/>
       <programargs/>
@@ -56,8 +56,8 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </kdevdebugger>
-  <kdevdoctreeview>
+  </tdevdebugger>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -102,16 +102,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
+  </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcppsupport>
+  </tdevfilecreate>
+  <tdevcppsupport>
     <references/>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -143,8 +143,8 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-  </kdevcppsupport>
-  <kdevfileview>
+  </tdevcppsupport>
+  <tdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -153,7 +153,7 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </kdevfileview>
+  </tdevfileview>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
diff --git a/languages/cpp/debugger/tests/two_module/two_module.tdevelop b/languages/cpp/debugger/tests/two_module/two_module.tdevelop
index a6d22c2a..e4a9ae33 100644
--- a/languages/cpp/debugger/tests/two_module/two_module.tdevelop
+++ b/languages/cpp/debugger/tests/two_module/two_module.tdevelop
@@ -4,14 +4,14 @@
     <author>Vladimir Prus</author>
     <email>ghost@ghostwalk</email>
     <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
+    <projectmanagement>TDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
     <description></description>
   </general>
-  <kdevcustomproject>
+  <tdevcustomproject>
     <run>
       <mainprogram>two_module</mainprogram>
       <directoryradio>executable</directoryradio>
@@ -38,8 +38,8 @@
         <default/>
       </environments>
     </make>
-  </kdevcustomproject>
-  <kdevdebugger>
+  </tdevcustomproject>
+  <tdevdebugger>
     <general>
       <dbgshell></dbgshell>
       <programargs></programargs>
@@ -56,8 +56,8 @@
       <demanglenames>true</demanglenames>
       <outputradix>10</outputradix>
     </display>
-  </kdevdebugger>
-  <kdevdoctreeview>
+  </tdevdebugger>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -102,16 +102,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
+  </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcppsupport>
+  </tdevfilecreate>
+  <tdevcppsupport>
     <references/>
     <codecompletion>
       <includeGlobalFunctions>true</includeGlobalFunctions>
@@ -143,8 +143,8 @@
       <synchronize>true</synchronize>
       <orientation>Vertical</orientation>
     </splitheadersource>
-  </kdevcppsupport>
-  <kdevfileview>
+  </tdevcppsupport>
+  <tdevfileview>
     <groups>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidenonlocation>false</hidenonlocation>
@@ -153,7 +153,7 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>
-  </kdevfileview>
+  </tdevfileview>
   <cppsupportpart>
     <filetemplates>
       <interfacesuffix>.h</interfacesuffix>
diff --git a/languages/cpp/doc/CMakeLists.txt b/languages/cpp/doc/CMakeLists.txt
index 9a2b4e11..a6371ae2 100644
--- a/languages/cpp/doc/CMakeLists.txt
+++ b/languages/cpp/doc/CMakeLists.txt
@@ -10,8 +10,8 @@
 #################################################
 
 install( FILES
-    libc.toc libstdc++.toc kdetemplates.toc stl.toc
-    qt-kdev3.toc kde2book.toc gnustep.toc gnome1.toc
+    libc.toc libstdc++.toc tdetemplates.toc stl.toc
+    qt-tdev3.toc tde2book.toc gnustep.toc gnome1.toc
     clanlib.toc c++_bugs_gcc.toc gtk_bugs.toc
     wxwidgets_bugs.toc cppannotations.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs )
diff --git a/languages/cpp/doc/Makefile.am b/languages/cpp/doc/Makefile.am
index 55571124..cf1ecd60 100644
--- a/languages/cpp/doc/Makefile.am
+++ b/languages/cpp/doc/Makefile.am
@@ -1,5 +1,5 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
-toc_DATA = libc.toc libstdc++.toc kdetemplates.toc stl.toc qt-kdev3.toc kde2book.toc \
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
+toc_DATA = libc.toc libstdc++.toc tdetemplates.toc stl.toc qt-tdev3.toc tde2book.toc \
 		gnustep.toc gnome1.toc clanlib.toc c++_bugs_gcc.toc gtk_bugs.toc wxwidgets_bugs.toc \
 	cppannotations.toc
 
diff --git a/languages/cpp/doc/clanlib.toc b/languages/cpp/doc/clanlib.toc
index 2cad8dcd..82cfe409 100644
--- a/languages/cpp/doc/clanlib.toc
+++ b/languages/cpp/doc/clanlib.toc
@@ -7,7 +7,7 @@
 	<tocsect2 name="Display overview" url="overview/display-1.html" />
 	<tocsect2 name="Resources" url="overview/resources-1.html" />
 	<tocsect2 name="Sound overview" url="overview/sound_overview.html" />
-	<tocsect2 name="Signals &amp; Slots overview" url="overview/Q_SIGNALS.html" />
+	<tocsect2 name="Signals &amp; Slots overview" url="overview/signals.html" />
 	<tocsect2 name="Sprites overview" url="overview/sprites_overview.html" />
 	<tocsect2 name="Font overview" url="overview/font_overview-1.html" />
 	<tocsect2 name="Loading graphics overview" url="overview/loading_graphics.html" />
diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc
index 577d61af..3cb995d3 100644
--- a/languages/cpp/doc/gnome1.toc
+++ b/languages/cpp/doc/gnome1.toc
@@ -124,7 +124,7 @@
     <tocsect3 name="Keyboard Accelerators" url="gtk/gtk-keyboard-accelerators.html"/>
     <tocsect3 name="Selections" url="gtk/gtk-selections.html"/>
     <tocsect3 name="Drag and Drop" url="gtk/gtk-drag-and-drop.html"/>
-    <tocsect3 name="Signals" url="gtk/gtk-Q_SIGNALS.html"/>
+    <tocsect3 name="Signals" url="gtk/gtk-signals.html"/>
     <tocsect3 name="Signal Marshallers" url="gtk/gtk-signal-marshallers.html"/>
     <tocsect3 name="Implementation of Object Properties" url="gtk/gtk-object-properties.html"/>
     <tocsect3 name="Types" url="gtk/gtk-types.html"/>
diff --git a/languages/cpp/doc/qt-kdev3.toc b/languages/cpp/doc/qt-tdev3.toc
index af086cf5..3f6ffff0 100644
--- a/languages/cpp/doc/qt-kdev3.toc
+++ b/languages/cpp/doc/qt-tdev3.toc
@@ -1,6 +1,6 @@
 <!DOCTYPE tdeveloptoc>
 <tdeveloptoc>
-<title>Qt Designer-3 and KDevelop-3</title>
+<title>Qt Designer-3 and TDevelop-3</title>
 <base href="http://women.kde.org/articles/tutorials/tdevelop3"/>
 <tocsect1 name="Index" url="index.html">
 </tocsect1>
@@ -8,7 +8,7 @@
 </tocsect1>
 <tocsect1 name="Requirements" url="requirements.html">
 	<tocsect2 name="How to get Qt Designer" url="requirements.html"/>
-	<tocsect2 name="How to get KDevelop 3" url="get-kevelop.html"/>
+	<tocsect2 name="How to get TDevelop 3" url="get-kevelop.html"/>
 	<tocsect2 name="Lexicon" url="lexicon.html"/>
 </tocsect1>
 <tocsect1 name="Creating the application" url="creating.html">
@@ -16,9 +16,9 @@
 	<tocsect2 name="Designing the program" url="design-program.html"/>
 	<tocsect2 name="Adding widgets" url="adding-widgets.html"/>
 	<tocsect2 name="Getting spaced out" url="spaced-out.html"/>
-	<tocsect2 name="Signals and Q_SLOTS" url="Q_SIGNALS-and-Q_SLOTS.html"/>
+	<tocsect2 name="Signals and slots" url="signals-and-slots.html"/>
 	<tocsect2 name="Generating the source" url="source.html"/>
-	<tocsect2 name="Implementing the slot" url="Q_SLOTS.html"/>
+	<tocsect2 name="Implementing the slot" url="slots.html"/>
 </tocsect1>
 <tocsect1 name="In short" url="in-short.html">
 </tocsect1>
@@ -26,13 +26,13 @@
 </tocsect1>
 <tocsect1 name="A few general tips" url="a_few_tips.html">
 	<tocsect2 name="General hints" url="a_few_tips.html#id2771559"/>
-	<tocsect2 name="Importing your project in KDE CVS" url="importing.html"/>
+	<tocsect2 name="Importing your project in TDE GIT" url="importing.html"/>
 	<tocsect2 name="How do I release my application as a tarball?" url="release-tarball.html"/>
 	<tocsect2 name="Useful links" url="links.html"/>
 </tocsect1>
 <tocsect1 name="Generating the source (alternate)" url="without_subclass.html">
-	<tocsect2 name="Without using the KDevelop subclassing capability" url="without_subclass.html"/>
-	<tocsect2 name="Implementing the slot" url="Q_SLOTS2.html"/>
+	<tocsect2 name="Without using the TDevelop subclassing capability" url="without_subclass.html"/>
+	<tocsect2 name="Implementing the slot" url="slots2.html"/>
 </tocsect1>
 <tocsect1 name="Credits and License" url="credits.html">
 </tocsect1>
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/tde2book.toc
index d806e440..79ceb137 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/tde2book.toc
@@ -472,15 +472,15 @@
 <entry name="classes, QWidget, example (listing)" url="ch03lev1sec2.html"/>
 <entry name="classes, QWidget, functions" url="ch03lev1sec2.html"/>
 <entry name="classes, QWidget, sample class declaration" url="ch04.html"/>
-<entry name="classes, QWidget, Q_SIGNALS" url="ch04.html"/>
-<entry name="classes, QWidget, Q_SLOTS" url="ch04.html"/>
+<entry name="classes, QWidget, signals" url="ch04.html"/>
+<entry name="classes, QWidget, slots" url="ch04.html"/>
 <entry name="classes, QWidget" url="ch03lev1sec2.html"/>
 <entry name="classes, QWidget" url="ch04.html"/>
 <entry name="classes, ReadOnlyPart" url="ch12lev1sec4.html"/>
 <entry name="classes, ReadWritePart" url="ch12lev1sec4.html"/>
 <entry name="classes, SelectDialog" url="ch08.html"/>
-<entry name="classes, Q_SLOTS in temporary classes" url="ch03lev1sec3.html"/>
-<entry name="classes, Q_SLOTS" url="ch03lev1sec3.html"/>
+<entry name="classes, slots in temporary classes" url="ch03lev1sec3.html"/>
+<entry name="classes, slots" url="ch03lev1sec3.html"/>
 <entry name="classes, template, QList" url="ch03lev1sec5.html"/>
 <entry name="classes, template" url="ch03lev1sec5.html"/>
 <entry name="classes, utility (Qt)" url="ch03lev1sec5.html"/>
@@ -667,7 +667,7 @@
 <entry name="DCOP, programming interface, transactions" url="ch13lev1sec5.html"/>
 <entry name="DCOP, programming interface" url="ch13lev1sec5.html"/>
 <entry name="DCOPRef objects" url="ch13lev1sec6.html"/>
-<entry name="DCOP, Q_SIGNALS and Q_SLOTS" url="ch13lev1sec6.html"/>
+<entry name="DCOP, signals and slots" url="ch13lev1sec6.html"/>
 <entry name="DCOP, underlying technologies, data streaming" url="ch13lev1sec3.html"/>
 <entry name="DCOP, underlying technologies, ICE (Inter-Client Exchange) mechanism" url="ch13lev1sec3.html"/>
 <entry name="DCOP, underlying technologies" url="ch13lev1sec3.html"/>
@@ -897,7 +897,7 @@
 <entry name="embedding, parts, multiple parts" url="ch12lev1sec8.html"/>
 <entry name="embedding, parts" url="ch12lev1sec7.html"/>
 <entry name="emitDCOPSignal() method" url="ch13lev1sec6.html"/>
-<entry name="emitting Q_SIGNALS" url="ch03lev1sec3.html"/>
+<entry name="emitting signals" url="ch03lev1sec3.html"/>
 <entry name="Emphasis tag (DocBook)" url="ch15lev1sec2.html"/>
 <entry name="enabling, application functions" url="ch09lev1sec3.html"/>
 <entry name="enabling, debugging, gdb debugger" url="ch18lev1sec6.html"/>
@@ -912,7 +912,7 @@
 <entry name="event handling, drag events" url="ch07.html"/>
 <entry name="event handling, drop events" url="ch07.html"/>
 <entry name="event handling, Qt" url="ch03lev1sec2.html"/>
-<entry name="event handling, Q_SIGNALS and Q_SLOTS" url="ch03lev1sec3.html"/>
+<entry name="event handling, signals and slots" url="ch03lev1sec3.html"/>
 <entry name="event handling, widgets, closeEvent()" url="ch04.html"/>
 <entry name="event handling, widgets, dragEnterEvent()" url="ch04.html"/>
 <entry name="event handling, widgets, dragLeaveEvent()" url="ch04.html"/>
@@ -1061,7 +1061,7 @@
 <entry name="functions, slotOpen()" url="ch07lev1sec5.html"/>
 <entry name="functions, slotSave()" url="ch07lev1sec5.html"/>
 <entry name="functions, slotSpecialHelp()" url="ch05lev1sec2.html"/>
-<entry name="functions, Q_SLOTS" url="ch03lev1sec3.html"/>
+<entry name="functions, slots" url="ch03lev1sec3.html"/>
 <entry name="functions, sorry()" url="ch05lev1sec3.html"/>
 <entry name="functions, streamEnd()" url="ch14lev1sec3.html"/>
 <entry name="functions, streamInit()" url="ch14lev1sec3.html"/>
@@ -1170,8 +1170,8 @@
 <entry name="GUIs, widgets, event handlers" url="ch04.html"/>
 <entry name="GUIs, widgets, painting" url="ch04lev1sec2.html"/>
 <entry name="GUIs, widgets, sample class declaration" url="ch04.html"/>
-<entry name="GUIs, widgets, Q_SIGNALS" url="ch04.html"/>
-<entry name="GUIs, widgets, Q_SLOTS" url="ch04.html"/>
+<entry name="GUIs, widgets, signals" url="ch04.html"/>
+<entry name="GUIs, widgets, slots" url="ch04.html"/>
 <entry name="GUIs, widgets" url="ch04.html"/>
 <entry name="GUIs, widgets, user input" url="ch04lev1sec4.html"/>
 <entry name="Hausmann, Simon" url="ch13lev1sec7.html"/>
@@ -1637,7 +1637,7 @@
 <entry name="lines, drawing" url="ch04lev1sec2.html"/>
 <entry name="listing, CVS (Concurrent Version System) modules" url="ch17lev1sec5.html"/>
 <entry name="listings, application configuration file example" url="ch07lev1sec2.html"/>
-<entry name="listings, connecting Q_SLOTS to Q_SIGNALS" url="ch03lev1sec3.html"/>
+<entry name="listings, connecting slots to signals" url="ch03lev1sec3.html"/>
 <entry name="listings, DCOP, client using stub interface" url="ch13lev1sec5.html"/>
 <entry name="listings, DCOP, DCOPClient call() method" url="ch13lev1sec5.html"/>
 <entry name="listings, DCOP, DCOPClient send() method" url="ch13lev1sec5.html"/>
@@ -2149,7 +2149,7 @@
 <entry name="panel applet (KWeather), kweather.h class definition" url="ch11lev1sec3.html"/>
 <entry name="panel applet (KWeather), main() method" url="ch11lev1sec3.html"/>
 <entry name="panel applet (KWeather)" url="ch11lev1sec3.html"/>
-<entry name="parameters, Q_SIGNALS and Q_SLOTS" url="ch03lev1sec3.html"/>
+<entry name="parameters, signals and slots" url="ch03lev1sec3.html"/>
 <entry name="param (" url="ch15.html"/>
 <entry name="Para tag (DocBook)" url="ch15lev1sec2.html"/>
 <entry name="Parent Classes command (Classbrowser pop-up menu)" url="ch18lev1sec4.html"/>
@@ -2259,7 +2259,7 @@
 <entry name="protocols, DCOP, message redirection technology (referencing)" url="ch13lev1sec6.html"/>
 <entry name="protocols, DCOP, performance and overhead" url="ch13lev1sec6.html"/>
 <entry name="protocols, DCOP, programming interface" url="ch13lev1sec5.html"/>
-<entry name="protocols, DCOP, Q_SIGNALS and Q_SLOTS" url="ch13lev1sec6.html"/>
+<entry name="protocols, DCOP, signals and slots" url="ch13lev1sec6.html"/>
 <entry name="protocols, DCOP, underlying technologies" url="ch13lev1sec3.html"/>
 <entry name="protocols, DCOP" url="ch13.html"/>
 <entry name="protocols, FTP, snapshots" url="ch17lev1sec3.html"/>
@@ -2313,14 +2313,14 @@
 <entry name="Qt, QWidget class, example (listing)" url="ch03lev1sec2.html"/>
 <entry name="Qt, QWidget class, member functions" url="ch03lev1sec2.html"/>
 <entry name="Qt, QWidget class" url="ch03lev1sec2.html"/>
-<entry name="Qt, Q_SIGNALS, connecting to Q_SLOTS" url="ch03lev1sec3.html"/>
-<entry name="Qt, Q_SIGNALS, emitting" url="ch03lev1sec3.html"/>
-<entry name="Qt, Q_SIGNALS" url="ch03lev1sec3.html"/>
-<entry name="Qt, Q_SLOTS, connecting to Q_SIGNALS" url="ch03lev1sec3.html"/>
-<entry name="Qt, Q_SLOTS, creating" url="ch03lev1sec3.html"/>
-<entry name="Qt, Q_SLOTS, parameters" url="ch03lev1sec3.html"/>
-<entry name="Qt, Q_SLOTS, temporary classes" url="ch03lev1sec3.html"/>
-<entry name="Qt, Q_SLOTS" url="ch03lev1sec3.html"/>
+<entry name="Qt, signals, connecting to slots" url="ch03lev1sec3.html"/>
+<entry name="Qt, signals, emitting" url="ch03lev1sec3.html"/>
+<entry name="Qt, signals" url="ch03lev1sec3.html"/>
+<entry name="Qt, slots, connecting to signals" url="ch03lev1sec3.html"/>
+<entry name="Qt, slots, creating" url="ch03lev1sec3.html"/>
+<entry name="Qt, slots, parameters" url="ch03lev1sec3.html"/>
+<entry name="Qt, slots, temporary classes" url="ch03lev1sec3.html"/>
+<entry name="Qt, slots" url="ch03lev1sec3.html"/>
 <entry name="Qt, STL" url="ch03lev1sec5.html"/>
 <entry name="Qt tookit" url="ch03.html"/>
 <entry name="Qt toolkit, overview" url="ch03lev1sec2.html"/>
@@ -2353,8 +2353,8 @@
 <entry name="QWidget class, event handlers" url="ch04.html"/>
 <entry name="QWidget class, event handlers, wheelEvent()" url="ch04.html"/>
 <entry name="QWidget class, sample class declaration" url="ch04.html"/>
-<entry name="QWidget class, Q_SIGNALS" url="ch04.html"/>
-<entry name="QWidget class, Q_SLOTS" url="ch04.html"/>
+<entry name="QWidget class, signals" url="ch04.html"/>
+<entry name="QWidget class, slots" url="ch04.html"/>
 <entry name="QWidget class" url="ch03lev1sec2.html"/>
 <entry name="QWidget class" url="ch04.html"/>
 <entry name="raises (" url="ch15.html"/>
@@ -2463,13 +2463,13 @@
 <entry name="show() method" url="ch02lev1sec3.html"/>
 <entry name="showStatusbar action" url="ch06.html"/>
 <entry name="showToolbar action" url="ch06.html"/>
-<entry name="Q_SIGNALS, connecting to Q_SLOTS" url="ch03lev1sec3.html"/>
-<entry name="Q_SIGNALS (DCOP)" url="ch13lev1sec6.html"/>
-<entry name="Q_SIGNALS, emitting" url="ch03lev1sec3.html"/>
-<entry name="Q_SIGNALS, parameters" url="ch03lev1sec3.html"/>
-<entry name="Q_SIGNALS, (Qt)" url="ch03lev1sec3.html"/>
-<entry name="Q_SIGNALS" url="ch03lev1sec2.html"/>
-<entry name="Q_SIGNALS (widgets)" url="ch04.html"/>
+<entry name="signals, connecting to slots" url="ch03lev1sec3.html"/>
+<entry name="signals (DCOP)" url="ch13lev1sec6.html"/>
+<entry name="signals, emitting" url="ch03lev1sec3.html"/>
+<entry name="signals, parameters" url="ch03lev1sec3.html"/>
+<entry name="signals, (Qt)" url="ch03lev1sec3.html"/>
+<entry name="signals" url="ch03lev1sec2.html"/>
+<entry name="signals (widgets)" url="ch04.html"/>
 <entry name="SimpleSoundServer interface" url="ch14lev1sec4.html"/>
 <entry name="since (" url="ch15.html"/>
 <entry name="single-instance application, kunique.cpp call definition" url="ch11lev1sec2.html"/>
@@ -2479,17 +2479,17 @@
 <entry name="slotButton()" url="ch03lev1sec4.html"/>
 <entry name="slotOpen() function" url="ch07lev1sec5.html"/>
 <entry name="slotSave() function" url="ch07lev1sec5.html"/>
-<entry name="Q_SLOTS, connecting to Q_SIGNALS" url="ch03lev1sec3.html"/>
-<entry name="Q_SLOTS, creating" url="ch03lev1sec3.html"/>
-<entry name="Q_SLOTS (DCOP)" url="ch13lev1sec6.html"/>
-<entry name="Q_SLOTS, parameters" url="ch03lev1sec3.html"/>
+<entry name="slots, connecting to signals" url="ch03lev1sec3.html"/>
+<entry name="slots, creating" url="ch03lev1sec3.html"/>
+<entry name="slots (DCOP)" url="ch13lev1sec6.html"/>
+<entry name="slots, parameters" url="ch03lev1sec3.html"/>
 <entry name="slotSpecialHelp() function" url="ch05lev1sec2.html"/>
 <entry name="slotSpellCheck() method" url="ch10lev1sec3.html"/>
-<entry name="Q_SLOTS, (Qt)" url="ch03lev1sec3.html"/>
-<entry name="Q_SLOTS, slotButton()" url="ch03lev1sec4.html"/>
-<entry name="Q_SLOTS, temporary classes" url="ch03lev1sec3.html"/>
-<entry name="Q_SLOTS" url="ch03lev1sec2.html"/>
-<entry name="Q_SLOTS (widgets)" url="ch04.html"/>
+<entry name="slots, (Qt)" url="ch03lev1sec3.html"/>
+<entry name="slots, slotButton()" url="ch03lev1sec4.html"/>
+<entry name="slots, temporary classes" url="ch03lev1sec3.html"/>
+<entry name="slots" url="ch03lev1sec2.html"/>
+<entry name="slots (widgets)" url="ch04.html"/>
 <entry name="snapshots" url="ch17lev1sec3.html"/>
 <entry name="socket() method" url="ch13lev1sec6.html"/>
 <entry name="software development, documentation" url="ch18.html"/>
@@ -2836,8 +2836,8 @@
 <entry name="widgets, painting" url="ch04lev1sec2.html"/>
 <entry name="widgets, QGL" url="ch03lev1sec6.html"/>
 <entry name="widgets, sample class declaration" url="ch04.html"/>
-<entry name="widgets, Q_SIGNALS" url="ch04.html"/>
-<entry name="widgets, Q_SLOTS" url="ch04.html"/>
+<entry name="widgets, signals" url="ch04.html"/>
+<entry name="widgets, slots" url="ch04.html"/>
 <entry name="widgets" url="ch01lev1sec2.html"/>
 <entry name="widgets" url="ch04.html"/>
 <entry name="widgets" url="ch04lev1sec3.html"/>
diff --git a/languages/cpp/doc/kdetemplates.toc b/languages/cpp/doc/tdetemplates.toc
index c764c0c4..c764c0c4 100644
--- a/languages/cpp/doc/kdetemplates.toc
+++ b/languages/cpp/doc/tdetemplates.toc
diff --git a/languages/cpp/file_templates/CMakeLists.txt b/languages/cpp/file_templates/CMakeLists.txt
index 17909c7d..f7dbfda7 100644
--- a/languages/cpp/file_templates/CMakeLists.txt
+++ b/languages/cpp/file_templates/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     c cpp h l ll y yy
-  DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
diff --git a/languages/cpp/file_templates/Makefile.am b/languages/cpp/file_templates/Makefile.am
index d688d547..722d3091 100644
--- a/languages/cpp/file_templates/Makefile.am
+++ b/languages/cpp/file_templates/Makefile.am
@@ -1,3 +1,3 @@
-templatedir = $(kde_datadir)/kdevfilecreate/file-templates
+templatedir = $(kde_datadir)/tdevfilecreate/file-templates
 template_DATA = c  cpp  h  l  ll  y  yy
 
diff --git a/languages/cpp/newclass_templates/CMakeLists.txt b/languages/cpp/newclass_templates/CMakeLists.txt
index 73b9bff5..7847d9a7 100644
--- a/languages/cpp/newclass_templates/CMakeLists.txt
+++ b/languages/cpp/newclass_templates/CMakeLists.txt
@@ -12,4 +12,4 @@
 install( FILES
     cpp_header cpp_source gtk_header gtk_source objc_header
     objc_source
-  DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport/newclass )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport/newclass )
diff --git a/languages/cpp/newclass_templates/Makefile.am b/languages/cpp/newclass_templates/Makefile.am
index 5b013d27..2b47443f 100644
--- a/languages/cpp/newclass_templates/Makefile.am
+++ b/languages/cpp/newclass_templates/Makefile.am
@@ -1,4 +1,4 @@
-cppsupportdatadir = ${kde_datadir}/kdevcppsupport
+cppsupportdatadir = ${kde_datadir}/tdevcppsupport
 newclassdir = ${cppsupportdatadir}/newclass
 
 newclass_DATA = cpp_header  cpp_source  gtk_header  gtk_source  objc_header  objc_source
diff --git a/languages/cpp/pcsimporter/customimporter/CMakeLists.txt b/languages/cpp/pcsimporter/customimporter/CMakeLists.txt
index c2e07bdb..90652509 100644
--- a/languages/cpp/pcsimporter/customimporter/CMakeLists.txt
+++ b/languages/cpp/pcsimporter/customimporter/CMakeLists.txt
@@ -24,14 +24,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevpcscustomimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpcscustomimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevcustompcsimporter (module) #########
+##### libtdevcustompcsimporter (module) #########
 
-tde_add_kpart( libkdevcustompcsimporter AUTOMOC
+tde_add_kpart( libtdevcustompcsimporter AUTOMOC
   SOURCES
-    kdevcustomimporter.cpp settingsdialog.cpp
+    tdevcustomimporter.cpp settingsdialog.cpp
     settingsdialogbase.ui
   LINK lang_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/languages/cpp/pcsimporter/customimporter/Makefile.am b/languages/cpp/pcsimporter/customimporter/Makefile.am
index 7e6a7093..1a6c1f1d 100644
--- a/languages/cpp/pcsimporter/customimporter/Makefile.am
+++ b/languages/cpp/pcsimporter/customimporter/Makefile.am
@@ -1,12 +1,12 @@
 INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
-kde_module_LTLIBRARIES =  libkdevcustompcsimporter.la
+kde_module_LTLIBRARIES =  libtdevcustompcsimporter.la
 
 
-noinst_HEADERS =  kdevcustomimporter.h
-libkdevcustompcsimporter_la_SOURCES = kdevcustomimporter.cpp settingsdialog.cpp settingsdialogbase.ui
-libkdevcustompcsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+noinst_HEADERS =  tdevcustomimporter.h
+libtdevcustompcsimporter_la_SOURCES = tdevcustomimporter.cpp settingsdialog.cpp settingsdialogbase.ui
+libtdevcustompcsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/languages/lib/interfaces/liblang_interfaces.la
-libkdevcustompcsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-kde_services_DATA = kdevpcscustomimporter.desktop
+libtdevcustompcsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+kde_services_DATA = tdevpcscustomimporter.desktop
diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp b/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.cpp
index 38a41eb8..33a2bf40 100644
--- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp
+++ b/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.cpp
@@ -7,7 +7,7 @@
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 ***************************************************************************/
-#include "kdevcustomimporter.h"
+#include "tdevcustomimporter.h"
 
 #include "settingsdialog.h"
 
@@ -17,24 +17,24 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkdevcustompcsimporter, KGenericFactory<KDevCustomImporter>( "kdevcustompcsimporter" ) )
+K_EXPORT_COMPONENT_FACTORY( libtdevcustompcsimporter, KGenericFactory<TDevCustomImporter>( "tdevcustompcsimporter" ) )
 
-KDevCustomImporter::KDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args
+TDevCustomImporter::TDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args
                                       )
-		: KDevPCSImporter( parent, name )
+		: TDevPCSImporter( parent, name )
 {}
 
 
-KDevCustomImporter::~KDevCustomImporter()
+TDevCustomImporter::~TDevCustomImporter()
 {}
 
 
-TQString KDevCustomImporter::dbName() const
+TQString TDevCustomImporter::dbName() const
 {
 	return m_settings->dbName();
 }
 
-TQStringList KDevCustomImporter::fileList( const TQString& path )
+TQStringList TDevCustomImporter::fileList( const TQString& path )
 {
 	TQDir dir( path );
 	if ( !dir.exists() )
@@ -49,7 +49,7 @@ TQStringList KDevCustomImporter::fileList( const TQString& path )
 	return fileList;
 }
 
-TQStringList KDevCustomImporter::fileList()
+TQStringList TDevCustomImporter::fileList()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -67,7 +67,7 @@ TQStringList KDevCustomImporter::fileList()
 	return files;
 }
 
-TQStringList KDevCustomImporter::includePaths()
+TQStringList TDevCustomImporter::includePaths()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -75,13 +75,13 @@ TQStringList KDevCustomImporter::includePaths()
 	return m_settings->dirs();
 }
 
-TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name )
+TQWidget* TDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name )
 {
 	m_settings = new SettingsDialog( parent, name );
 	return m_settings;
 }
 
-void KDevCustomImporter::processDir( const TQString path, TQStringList & files )
+void TDevCustomImporter::processDir( const TQString path, TQStringList & files )
 {
 	TQValueStack<TQString> s;
 	s.push( path );
@@ -114,5 +114,5 @@ void KDevCustomImporter::processDir( const TQString path, TQStringList & files )
 	while ( !s.isEmpty() );
 }
 
-#include "kdevcustomimporter.moc" 
+#include "tdevcustomimporter.moc" 
 //kate: indent-mode csands; tab-width 4; space-indent off;
diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.h
index 884a033d..925e42f9 100644
--- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h
+++ b/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.h
@@ -7,23 +7,23 @@
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 ***************************************************************************/
-#ifndef KDEVCUSTOMIMPORTER_H
-#define KDEVCUSTOMIMPORTER_H
+#ifndef TDEVCUSTOMIMPORTER_H
+#define TDEVCUSTOMIMPORTER_H
 
-#include "kdevpcsimporter.h"
+#include "tdevpcsimporter.h"
 
 #include <tqguardedptr.h>
 
 class SettingsDialog;
 
-class KDevCustomImporter : public KDevPCSImporter
+class TDevCustomImporter : public TDevPCSImporter
 {
 Q_OBJECT
   
 public:
-    KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList());
+    TDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList());
 
-    ~KDevCustomImporter();
+    ~TDevCustomImporter();
 
     virtual TQString dbName() const;
     virtual TQStringList fileList();
diff --git a/languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop b/languages/cpp/pcsimporter/customimporter/tdevpcscustomimporter.desktop
index b351a8e3..50530ef8 100644
--- a/languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop
+++ b/languages/cpp/pcsimporter/customimporter/tdevpcscustomimporter.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-Name=KDevPCSCustomImporter
+Name=TDevPCSCustomImporter
 Name[da]=TDevelop brugerdefineret PCS-importør
 Name[nds]=EgenPCS-Import för TDevelop
 Name[pl]=KDevWłasnyImportPCS
@@ -40,5 +40,5 @@ Comment[zh_CN]=TDevelop 自定义目录的 PCS 导入器
 Comment[zh_TW]=TDevelop 自訂目錄 PCS 匯入器
 Icon=gear
 ServiceTypes=TDevelop/PCSImporter
-X-TDE-Library=libkdevcustompcsimporter
+X-TDE-Library=libtdevcustompcsimporter
 X-TDevelop-PCSImporter=
diff --git a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt
index 8e29fdec..908c66fc 100644
--- a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt
+++ b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt
@@ -24,14 +24,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevqt4importer.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevqt4importer.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevqt4importer (module) ###############
+##### libtdevqt4importer (module) ###############
 
-tde_add_kpart( libkdevqt4importer AUTOMOC
+tde_add_kpart( libtdevqt4importer AUTOMOC
   SOURCES
-    kdevqt4importer.cpp settingsdialogbase.ui
+    tdevqt4importer.cpp settingsdialogbase.ui
     settingsdialog.cpp
   LINK lang_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/languages/cpp/pcsimporter/qt4importer/Makefile.am b/languages/cpp/pcsimporter/qt4importer/Makefile.am
index 12f12104..935c7d49 100644
--- a/languages/cpp/pcsimporter/qt4importer/Makefile.am
+++ b/languages/cpp/pcsimporter/qt4importer/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \
         -I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
-kde_module_LTLIBRARIES =  libkdevqt4importer.la
+kde_module_LTLIBRARIES =  libtdevqt4importer.la
 
-noinst_HEADERS = kdevqt4importer.h settingsdialog.h
-libkdevqt4importer_la_SOURCES = kdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp
-kde_services_DATA =  kdevqt4importer.desktop
-libkdevqt4importer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+noinst_HEADERS = tdevqt4importer.h settingsdialog.h
+libtdevqt4importer_la_SOURCES = tdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp
+kde_services_DATA =  tdevqt4importer.desktop
+libtdevqt4importer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
         $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la
-libkdevqt4importer_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libtdevqt4importer_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.cpp
index 0289c7a4..fefa57ee 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.cpp
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "kdevqt4importer.h"
-#include "kdevqt4importer.moc"
+#include "tdevqt4importer.h"
+#include "tdevqt4importer.moc"
 #include "settingsdialog.h"
 
 #include <kgenericfactory.h>
@@ -22,15 +22,15 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevQt4Importer>( "kdevqt4importer" ) )
+K_EXPORT_COMPONENT_FACTORY( libtdevqt4importer, KGenericFactory<TDevQt4Importer>( "tdevqt4importer" ) )
 
-KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& )
-    : KDevPCSImporter( parent, name )
+TDevQt4Importer::TDevQt4Importer( TQObject * parent, const char * name, const TQStringList& )
+    : TDevPCSImporter( parent, name )
 {
     m_qtfile = 0;
 }
 
-KDevQt4Importer::~KDevQt4Importer()
+TDevQt4Importer::~TDevQt4Importer()
 {
     if (m_qtfile)
         delete m_qtfile;
@@ -38,7 +38,7 @@ KDevQt4Importer::~KDevQt4Importer()
     m_qtfile = 0;
 }
 
-TQStringList KDevQt4Importer::fileList()
+TQStringList TDevQt4Importer::fileList()
 {
     if( !m_settings )
         return TQStringList();
@@ -86,7 +86,7 @@ TQStringList KDevQt4Importer::fileList()
     return m_qtfile->name();
 }
 
-TQStringList KDevQt4Importer::includePaths()
+TQStringList TDevQt4Importer::includePaths()
 {
     if( !m_settings || !m_qtfile)
         return TQStringList();
@@ -99,7 +99,7 @@ TQStringList KDevQt4Importer::includePaths()
     return includePaths;
 }
 
-TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name )
+TQWidget * TDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name )
 {
     m_settings = new SettingsDialog( parent, name );
     return m_settings;
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop b/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.desktop
index 5d91d917..cf42c497 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop
+++ b/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Service
-Name=KDevQt4Importer
+Name=TDevQt4Importer
 Name[de]=Qt4-PCS-Import (TDevelop)
-Name[fr]=KDevQtImporter
+Name[fr]=TDevQtImporter
 Name[nds]=Qt4-PCS-Import (TDevelop)
-Name[ru]=KDevQt 4Importer
+Name[ru]=TDevQt 4Importer
 Name[sv]=TDevelop QT4-import
 Comment=TDevelop Qt4 PCS Importer
 Comment[ca]=Importador PCS de Qt4 per a TDevelop
@@ -29,6 +29,6 @@ Comment[sv]=TDevelop QT4 PCS-import
 Comment[zh_TW]=TDevelop Qt4 PCS 匯入器
 Icon=gear
 ServiceTypes=TDevelop/PCSImporter
-X-TDE-Library=libkdevqt4importer
+X-TDE-Library=libtdevqt4importer
 X-TDevelop-PCSImporter=
 X-TDevelop-Version=5
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.h
index 3b9563f3..53f6a18e 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
+++ b/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.h
@@ -9,22 +9,22 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KDEVTQTIMPORTER_H
-#define KDEVTQTIMPORTER_H
+#ifndef TDEVTQTIMPORTER_H
+#define TDEVTQTIMPORTER_H
 
-#include <kdevpcsimporter.h>
+#include <tdevpcsimporter.h>
 #include <tqguardedptr.h>
 
 class SettingsDialog;
 class KTempFile;
 
-class KDevQt4Importer : public KDevPCSImporter
+class TDevQt4Importer : public TDevPCSImporter
 {
     Q_OBJECT
   
 public:
-    KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~KDevQt4Importer();
+    TDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~TDevQt4Importer();
 
     virtual TQString dbName() const { return TQString::fromLatin1("TQt4"); }
     virtual TQStringList fileList();
diff --git a/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt b/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt
index 64e95d39..9af966d9 100644
--- a/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt
+++ b/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt
@@ -24,14 +24,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevqtimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevqtimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevqtimporter (module) ################
+##### libtdevqtimporter (module) ################
 
-tde_add_kpart( libkdevqtimporter AUTOMOC
+tde_add_kpart( libtdevqtimporter AUTOMOC
   SOURCES
-    kdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp
+    tdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp
   LINK lang_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/cpp/pcsimporter/qtimporter/Makefile.am b/languages/cpp/pcsimporter/qtimporter/Makefile.am
index 80ccc8be..23a60885 100644
--- a/languages/cpp/pcsimporter/qtimporter/Makefile.am
+++ b/languages/cpp/pcsimporter/qtimporter/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
-kde_module_LTLIBRARIES =  libkdevqtimporter.la
+kde_module_LTLIBRARIES =  libtdevqtimporter.la
 
-noinst_HEADERS = kdevqtimporter.h settingsdialog.h
-libkdevqtimporter_la_SOURCES = kdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp
-kde_services_DATA =  kdevqtimporter.desktop
-libkdevqtimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+noinst_HEADERS = tdevqtimporter.h settingsdialog.h
+libtdevqtimporter_la_SOURCES = tdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp
+kde_services_DATA =  tdevqtimporter.desktop
+libtdevqtimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/languages/lib/interfaces/liblang_interfaces.la
-libkdevqtimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libtdevqtimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.cpp
index 62eb38fd..b3b94019 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.cpp
@@ -9,8 +9,8 @@
 *                                                                         *
 ***************************************************************************/
 
-#include "kdevqtimporter.h"
-#include "kdevqtimporter.moc"
+#include "tdevqtimporter.h"
+#include "tdevqtimporter.moc"
 #include "settingsdialog.h"
 
 #include <kgenericfactory.h>
@@ -18,16 +18,16 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevQtImporter>( "kdevqtimporter" ) )
+K_EXPORT_COMPONENT_FACTORY( libtdevqtimporter, KGenericFactory<TDevQtImporter>( "tdevqtimporter" ) )
 
-KDevQtImporter::KDevQtImporter( TQObject * parent, const char * name, const TQStringList& )
-		: KDevPCSImporter( parent, name )
+TDevQtImporter::TDevQtImporter( TQObject * parent, const char * name, const TQStringList& )
+		: TDevPCSImporter( parent, name )
 {}
 
-KDevQtImporter::~KDevQtImporter()
+TDevQtImporter::~TDevQtImporter()
 {}
 
-TQStringList KDevQtImporter::fileList()
+TQStringList TDevQtImporter::fileList()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -50,7 +50,7 @@ TQStringList KDevQtImporter::fileList()
 	return fileList;
 }
 
-TQStringList KDevQtImporter::includePaths()
+TQStringList TDevQtImporter::includePaths()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -64,7 +64,7 @@ TQStringList KDevQtImporter::includePaths()
 	return includePaths;
 }
 
-TQWidget * KDevQtImporter::createSettingsPage( TQWidget * parent, const char * name )
+TQWidget * TDevQtImporter::createSettingsPage( TQWidget * parent, const char * name )
 {
 	m_settings = new SettingsDialog( parent, name );
 	return m_settings;
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop b/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.desktop
index 72161838..f9b02306 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop
+++ b/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-Name=KDevQtImporter
+Name=TDevQtImporter
 Name[da]=TDevelop Qt-importør
 Name[de]=Qt-PCS-Import (TDevelop)
 Name[hi]=के-डेव-क्यूटी-आयातक
@@ -32,6 +32,6 @@ Comment[sv]=TDevelop QT3 PCS-import
 Comment[zh_TW]=TDevelop Qt3 PCS 匯入器
 Icon=gear
 ServiceTypes=TDevelop/PCSImporter
-X-TDE-Library=libkdevqtimporter
+X-TDE-Library=libtdevqtimporter
 X-TDevelop-PCSImporter=
 X-TDevelop-Version=5
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.h
index bad9973e..3f7d1ac8 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
+++ b/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.h
@@ -9,21 +9,21 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KDEVTQTIMPORTER_H
-#define KDEVTQTIMPORTER_H
+#ifndef TDEVTQTIMPORTER_H
+#define TDEVTQTIMPORTER_H
 
-#include <kdevpcsimporter.h>
+#include <tdevpcsimporter.h>
 #include <tqguardedptr.h>
 
 class SettingsDialog;
 
-class KDevQtImporter : public KDevPCSImporter
+class TDevQtImporter : public TDevPCSImporter
 {
     Q_OBJECT
   
 public:
-    KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~KDevQtImporter();
+    TDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~TDevQtImporter();
 
     virtual TQString dbName() const { return TQString::fromLatin1("TQt"); }
     virtual TQStringList fileList();
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt b/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt
index d48bad5a..4dbf0d0c 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt
+++ b/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt
@@ -24,14 +24,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevtdelibsimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevtdelibsimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevtdelibsimporter (module) ###########
+##### libtdevtdelibsimporter (module) ###########
 
-tde_add_kpart( libkdevtdelibsimporter AUTOMOC
+tde_add_kpart( libtdevtdelibsimporter AUTOMOC
   SOURCES
-    kdevtdelibsimporter.cpp settingsdialogbase.ui
+    tdevtdelibsimporter.cpp settingsdialogbase.ui
     settingsdialog.cpp
   LINK lang_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am b/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am
index 14efcabc..e7c846d4 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am
+++ b/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
-kde_module_LTLIBRARIES =  libkdevtdelibsimporter.la
+kde_module_LTLIBRARIES =  libtdevtdelibsimporter.la
 
-noinst_HEADERS = kdevtdelibsimporter.h settingsdialog.h
-libkdevtdelibsimporter_la_SOURCES = kdevtdelibsimporter.cpp settingsdialogbase.ui settingsdialog.cpp
-kde_services_DATA =  kdevtdelibsimporter.desktop
-libkdevtdelibsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+noinst_HEADERS = tdevtdelibsimporter.h settingsdialog.h
+libtdevtdelibsimporter_la_SOURCES = tdevtdelibsimporter.cpp settingsdialogbase.ui settingsdialog.cpp
+kde_services_DATA =  tdevtdelibsimporter.desktop
+libtdevtdelibsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/languages/lib/interfaces/liblang_interfaces.la
-libkdevtdelibsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libtdevtdelibsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp b/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.cpp
index d3f5795b..6f83e483 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp
+++ b/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.cpp
@@ -9,8 +9,8 @@
 *                                                                         *
 ***************************************************************************/
 
-#include "kdevtdelibsimporter.h"
-#include "kdevtdelibsimporter.moc"
+#include "tdevtdelibsimporter.h"
+#include "tdevtdelibsimporter.moc"
 #include "settingsdialog.h"
 
 #include <kdebug.h>
@@ -21,16 +21,16 @@
 #include <tqdir.h>
 #include <tqcombobox.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkdevtdelibsimporter, KGenericFactory<KDevKDELibsImporter>( "kdevtdelibsimporter" ) )
+K_EXPORT_COMPONENT_FACTORY( libtdevtdelibsimporter, KGenericFactory<TDevTDELibsImporter>( "tdevtdelibsimporter" ) )
 
-KDevKDELibsImporter::KDevKDELibsImporter( TQObject * parent, const char * name, const TQStringList& )
-		: KDevPCSImporter( parent, name )
+TDevTDELibsImporter::TDevTDELibsImporter( TQObject * parent, const char * name, const TQStringList& )
+		: TDevPCSImporter( parent, name )
 {}
 
-KDevKDELibsImporter::~KDevKDELibsImporter()
+TDevTDELibsImporter::~TDevTDELibsImporter()
 {}
 
-TQStringList KDevKDELibsImporter::fileList( const TQString& path )
+TQStringList TDevTDELibsImporter::fileList( const TQString& path )
 {
 	TQDir dir( path );
 	TQStringList lst = dir.entryList( "*.h" );
@@ -43,7 +43,7 @@ TQStringList KDevKDELibsImporter::fileList( const TQString& path )
 }
 
 
-TQStringList KDevKDELibsImporter::fileList()
+TQStringList TDevTDELibsImporter::fileList()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -99,7 +99,7 @@ TQStringList KDevKDELibsImporter::fileList()
 	return files;
 }
 
-TQStringList KDevKDELibsImporter::includePaths()
+TQStringList TDevTDELibsImporter::includePaths()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -109,7 +109,7 @@ TQStringList KDevKDELibsImporter::includePaths()
 	return includePaths;
 }
 
-TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * parent, const char * name )
+TQWidget * TDevTDELibsImporter::createSettingsPage( TQWidget * parent, const char * name )
 {
 	m_settings = new SettingsDialog( parent, name );
 	return m_settings;
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop b/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.desktop
index 7433518e..54cd2996 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop
+++ b/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Service
-Name=KDevKDELibsImporter
+Name=TDevTDELibsImporter
 Name[da]=TDevelop KDELibs-importør
 Name[de]=KDELibs-PCS-Import (TDevelop)
 Name[hi]=के-डेव-केडीई-लिब्स-इम्पोर्टर
 Name[ja]=KDev KDE 
 Name[nds]=KDELibs-PCS-Import (TDevelop)
-Name[pl]=KDevKDEImportBib
+Name[pl]=TDevTDEImportBib
 Name[sk]=KDev KDE import knižníc
 Name[sv]=TDevelop KDE-biblioteksimport
 Name[ta]=கெடெவ் கெடெலிப்ஸ் இறக்குமதியாளர்
@@ -44,6 +44,6 @@ Comment[zh_CN]=TDevelop KDELibs PCS 导入器
 Comment[zh_TW]=TDevelop KDE 函式庫匯入器
 Icon=gear
 ServiceTypes=TDevelop/PCSImporter
-X-TDE-Library=libkdevtdelibsimporter
+X-TDE-Library=libtdevtdelibsimporter
 X-TDevelop-PCSImporter=
 X-TDevelop-Version=5
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h b/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.h
index 14fb7cff..0d772bba 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h
+++ b/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.h
@@ -9,21 +9,21 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KDEVTQTIMPORTER_H
-#define KDEVTQTIMPORTER_H
+#ifndef TDEVTQTIMPORTER_H
+#define TDEVTQTIMPORTER_H
 
-#include <kdevpcsimporter.h>
+#include <tdevpcsimporter.h>
 #include <tqguardedptr.h>
 
 class SettingsDialog;
 
-class KDevKDELibsImporter : public KDevPCSImporter
+class TDevTDELibsImporter : public TDevPCSImporter
 {
     Q_OBJECT
   
 public:
-    KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~KDevKDELibsImporter();
+    TDevTDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~TDevTDELibsImporter();
 
     virtual TQString dbName() const { return TQString::fromLatin1("KDElibs"); }
     virtual TQStringList fileList();
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index eed7a5b6..bed0c9ae 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -21,9 +21,9 @@
 #include "configproblemreporter.h"
 #include "backgroundparser.h"
 
-#include <kdevpartcontroller.h>
-#include <kdevmainwindow.h>
-#include <kdevproject.h>
+#include <tdevpartcontroller.h>
+#include <tdevmainwindow.h>
+#include <tdevproject.h>
 
 #include <tdeversion.h>
 #include <tdeparts/part.h>
diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp
index c5c87b1c..5c42ffb1 100644
--- a/languages/cpp/qtbuildconfig.cpp
+++ b/languages/cpp/qtbuildconfig.cpp
@@ -77,7 +77,7 @@ void QtBuildConfig::init( )
 	if( m_designerIntegration.isEmpty() )
 	{
 		if ( m_version == 3 )
-			m_designerIntegration = "EmbeddedKDevDesigner";
+			m_designerIntegration = "EmbeddedTDevDesigner";
 		else
 			m_designerIntegration = "ExternalDesigner";
 	}
diff --git a/languages/cpp/qtbuildconfig.h b/languages/cpp/qtbuildconfig.h
index 118503b6..10da233d 100644
--- a/languages/cpp/qtbuildconfig.h
+++ b/languages/cpp/qtbuildconfig.h
@@ -81,7 +81,7 @@ private:
     TQString m_designerPath; ///< The path including the binary name of TQt Designer
     TQString m_qmakePath; ///< The path including the binary name of TQMake
     TQStringList m_designerPluginPaths; ///< The Prefix for Designer
-	TQString m_designerIntegration; ///< The type of designer used, kdevdesigner or qt designer
+	TQString m_designerIntegration; ///< The type of designer used, tdevdesigner or qt designer
 
 	static const TQString m_configRoot; ///< The root path of the configuration
 };
diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp
index db6df895..715da1a9 100644
--- a/languages/cpp/qtdesignercppintegration.cpp
+++ b/languages/cpp/qtdesignercppintegration.cpp
@@ -32,15 +32,15 @@
 #include <tdetexteditor/viewcursorinterface.h>
 
 #include <domutil.h>
-#include <kdevpartcontroller.h>
-#include <kdevcreatefile.h>
+#include <tdevpartcontroller.h>
+#include <tdevcreatefile.h>
 
 #include "backgroundparser.h"
 #include "cppsupportpart.h"
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-QtDesignerCppIntegration::QtDesignerCppIntegration( KDevLanguageSupport *part,
+QtDesignerCppIntegration::QtDesignerCppIntegration( TDevLanguageSupport *part,
 	                                                ImplementationWidget *impl )
 : QtDesignerIntegration( part, impl, true, 0 )
 {}
@@ -126,7 +126,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 	TQFileInfo fileInfo( implementationFile );
 	if ( !TQFile::exists( fileInfo.absFilePath() ) )
 	{
-		if ( KDevCreateFile * createFileSupp = m_part->extension<KDevCreateFile>( "TDevelop/CreateFile" ) )
+		if ( TDevCreateFile * createFileSupp = m_part->extension<TDevCreateFile>( "TDevelop/CreateFile" ) )
 			createFileSupp->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.fileName() );
 	}
 	
diff --git a/languages/cpp/qtdesignercppintegration.h b/languages/cpp/qtdesignercppintegration.h
index d156d276..143cf180 100644
--- a/languages/cpp/qtdesignercppintegration.h
+++ b/languages/cpp/qtdesignercppintegration.h
@@ -27,7 +27,7 @@ class QtDesignerCppIntegration : public QtDesignerIntegration
 	Q_OBJECT
   
 public:
-	QtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl );
+	QtDesignerCppIntegration( TDevLanguageSupport *part, ImplementationWidget *impl );
 
 protected:
 	virtual void addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass );
diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp
index db3f9c79..ac905c33 100644
--- a/languages/cpp/simpletype.cpp
+++ b/languages/cpp/simpletype.cpp
@@ -910,9 +910,9 @@ TQString SimpleTypeImpl::fullTypeResolved( int depth ) {
   TypeDesc t = desc();
   if ( !scope().isEmpty() ) {
     if ( depth > 10 )
-      return "KDevParseError::ToDeep";
+      return "TDeveParseError::ToDeep";
     if ( !safetyCounter )
-      return "KDevParseError::MaximumCountReached";
+      return "TDeveParseError::MaximumCountReached";
 
     ifVerbose( dbg() << "fully resolving type " << t.fullName() << endl );
     if ( scope().size() != 0 ) {
diff --git a/languages/cpp/storeconverter.cpp b/languages/cpp/storeconverter.cpp
index 6ad55925..670e69ff 100644
--- a/languages/cpp/storeconverter.cpp
+++ b/languages/cpp/storeconverter.cpp
@@ -14,7 +14,7 @@
 
 #include <kdebug.h>
 
-#include <kdevcoderepository.h>
+#include <tdevcoderepository.h>
 
 #include "cppcodecompletion.h"
 #include "codeinformationrepository.h"
diff --git a/languages/cpp/subclassing_template/CMakeLists.txt b/languages/cpp/subclassing_template/CMakeLists.txt
index 3223a7d7..4ee02817 100644
--- a/languages/cpp/subclassing_template/CMakeLists.txt
+++ b/languages/cpp/subclassing_template/CMakeLists.txt
@@ -12,4 +12,4 @@
 install( FILES
     subclass_template.h subclass_template.cpp
     subclass_qt4_template.h subclass_qt4_template.cpp
-  DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport/subclassing )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport/subclassing )
diff --git a/languages/cpp/subclassing_template/Makefile.am b/languages/cpp/subclassing_template/Makefile.am
index 4e722ca0..850ec6b9 100644
--- a/languages/cpp/subclassing_template/Makefile.am
+++ b/languages/cpp/subclassing_template/Makefile.am
@@ -1,4 +1,4 @@
-cppsupportdatadir = ${kde_datadir}/kdevcppsupport
+cppsupportdatadir = ${kde_datadir}/tdevcppsupport
 subclassingdir = ${cppsupportdatadir}/subclassing
 
 subclassing_DATA = subclass_template.h subclass_template.cpp \
diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp
index 0982226c..26758d09 100644
--- a/languages/cpp/subclassingdlg.cpp
+++ b/languages/cpp/subclassingdlg.cpp
@@ -16,9 +16,9 @@
 #include "backgroundparser.h"
 #include "store_walker.h"
 #include "cppsupportfactory.h"
-#include "kdevsourceformatter.h"
-#include "kdevapi.h"
-#include "kdevproject.h"
+#include "tdevsourceformatter.h"
+#include "tdevapi.h"
+#include "tdevproject.h"
 #include "filetemplate.h"
 #include "codemodel.h"
 
@@ -475,7 +475,7 @@ void SubclassingDlg::accept()
 		TQString basefilename = fi.baseName(true);
 		buffer.replace(TQRegExp("\\$MODULE\\$"),module);
 		buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename);
-		if ( (m_cppSupport->project()) && (m_cppSupport->project()->options() & KDevProject::UsesAutotoolsBuildSystem))
+		if ( (m_cppSupport->project()) && (m_cppSupport->project()->options() & TDevProject::UsesAutotoolsBuildSystem))
 			buffer += "\n#include \"$NEWFILENAMELC$.moc\"\n";
 	}
 	else
diff --git a/languages/cpp/kdevcppsupport.desktop b/languages/cpp/tdevcppsupport.desktop
index cd638819..93a99f59 100644
--- a/languages/cpp/kdevcppsupport.desktop
+++ b/languages/cpp/tdevcppsupport.desktop
@@ -35,7 +35,7 @@ Comment[tg]=Ёрӣ намудани забони C++
 Comment[tr]=C++ Desteği
 Comment[zh_CN]=C++ 支持
 Comment[zh_TW]=C++ 支援
-Name=KDevCppSupport
+Name=TDevCppSupport
 Name[da]=TDevelop C++ understøttelse
 Name[hi]=के-डेव-सीपीपी-समर्थन
 Name[nds]=CPP-Ünnerstütten för TDevelop
@@ -80,7 +80,7 @@ GenericName[zh_CN]=C++ 支持
 GenericName[zh_TW]=C++ 支援
 ServiceTypes=TDevelop/LanguageSupport
 Icon=source_cpp
-X-TDE-Library=libkdevcppsupport
+X-TDE-Library=libtdevcppsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=C++
 X-TDevelop-Args=Cpp
diff --git a/languages/cpp/kdevcppsupport.rc b/languages/cpp/tdevcppsupport.rc
index 37e3fa3a..1bfcf5a8 100644
--- a/languages/cpp/kdevcppsupport.rc
+++ b/languages/cpp/tdevcppsupport.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KDevCppSupport" version="9">
+<kpartgui name="TDevCppSupport" version="9">
 <MenuBar>
  <Menu name="edit">
   <Action name="edit_complete_text"/>
diff --git a/languages/cpp/kdevcsupport.desktop b/languages/cpp/tdevcsupport.desktop
index cc54dd73..7c196ef0 100644
--- a/languages/cpp/kdevcsupport.desktop
+++ b/languages/cpp/tdevcsupport.desktop
@@ -79,7 +79,7 @@ GenericName[zh_CN]=C 支持
 GenericName[zh_TW]=C 支援
 ServiceTypes=TDevelop/LanguageSupport
 Icon=source_cpp
-X-TDE-Library=libkdevcppsupport
+X-TDE-Library=libtdevcppsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=C
 X-TDevelop-Args=C
diff --git a/languages/cpp/kdevdeepcopy.h b/languages/cpp/tdevdeepcopy.h
index c29ee1e1..3b5d6995 100644
--- a/languages/cpp/kdevdeepcopy.h
+++ b/languages/cpp/tdevdeepcopy.h
@@ -1,5 +1,5 @@
-#ifndef KDEVDEEPCOPY_H
-#define KDEVDEEPCOPY_H
+#ifndef TDEVDEEPCOPY_H
+#define TDEVDEEPCOPY_H
 
 #include <tqstring.h>
 
diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/tdevdriver.cpp
index 4a6c45ec..f2ac1ddb 100644
--- a/languages/cpp/kdevdriver.cpp
+++ b/languages/cpp/tdevdriver.cpp
@@ -1,14 +1,14 @@
 #include "tdelocale.h" /* defines [function] i18n */
 #include <lexer.h>
 
-#include "kdevdriver.h"
+#include "tdevdriver.h"
 #include "cppcodecompletionconfig.h"
 #include "setuphelper.h"
 #include <unistd.h>
 #include "includepathresolver.h"
 
 
-KDevDriver::KDevDriver( CppSupportPart* cppSupport, bool foreground )
+TDevDriver::TDevDriver( CppSupportPart* cppSupport, bool foreground )
 : m_cppSupport( cppSupport ), m_includePathResolver(0), m_foreground(foreground), m_shouldParseIncludedFiles(true)
 {
 	//setupProject();
@@ -16,13 +16,13 @@ KDevDriver::KDevDriver( CppSupportPart* cppSupport, bool foreground )
 	
 }
 
-KDevDriver::~KDevDriver() {
+TDevDriver::~TDevDriver() {
 	delete m_includePathResolver;
 }
 
-CppSupportPart* KDevDriver::cppSupport() { return m_cppSupport; }
+CppSupportPart* TDevDriver::cppSupport() { return m_cppSupport; }
 
-void KDevDriver::setupProject()
+void TDevDriver::setupProject()
 {
 	TQMap<TQString, bool> map;
 	
@@ -43,7 +43,7 @@ void KDevDriver::setupProject()
 	}
 }
 
-void KDevDriver::setupLexer( Lexer* lexer )
+void TDevDriver::setupLexer( Lexer* lexer )
 {
 	Driver::setupLexer( lexer );
 	lexer->setReportMessages( true );
@@ -52,7 +52,7 @@ void KDevDriver::setupLexer( Lexer* lexer )
 
 //! setup the preprocessor
 //! code provided by Reginald Stadlbauer <reggie@trolltech.com>
-void KDevDriver::setup()
+void TDevDriver::setup()
 {
 	if( lexerCache() ) lexerCache()->clear(); ///Clear the lexer-cache so missing headers get a chance to be parsed
 	clearMacros();
@@ -167,9 +167,9 @@ void KDevDriver::setup()
 	m_shouldParseIncludedFiles = cfg->parseMissingHeaders();
 }
 
-TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) {
+TQStringList TDevDriver::getCustomIncludePath( const TQString& file ) {
 	if( !file.startsWith("/") )
-		kdDebug( 9007 ) << "KDevDriver::getCustomIncludePath(..): given file \"" << file << "\" is not absolute" << endl;
+		kdDebug( 9007 ) << "TDevDriver::getCustomIncludePath(..): given file \"" << file << "\" is not absolute" << endl;
 	if( !m_includePathResolver )
 		return includePaths();
 	CppTools::PathResolutionResult res = m_includePathResolver->resolveIncludePath( file );
@@ -183,7 +183,7 @@ TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) {
 	return res.path + includePaths();
 }
 
-bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) {
+bool TDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) {
 	TQString compoundString = file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash());
 
 	if( !m_shouldParseIncludedFiles )
diff --git a/languages/cpp/kdevdriver.h b/languages/cpp/tdevdriver.h
index 8af87e0c..46c7d515 100644
--- a/languages/cpp/kdevdriver.h
+++ b/languages/cpp/tdevdriver.h
@@ -1,11 +1,11 @@
 
-#ifndef __kdevdriver_h
-#define __kdevdriver_h
+#ifndef __tdevdriver_h
+#define __tdevdriver_h
 
 #include "cppsupportpart.h"
 #include "driver.h"
 
-#include <kdevproject.h>
+#include <tdevproject.h>
 #include <tdeversion.h>
 
 #include <cstdlib>
@@ -17,12 +17,12 @@ namespace CppTools {
   class IncludePathResolver;
 };
 
-class KDevDriver: public Driver
+class TDevDriver: public Driver
 {
 public:
     ///When the driver is used in a background-thread, foreground MUST be false(else crash)
-	KDevDriver( CppSupportPart* cppSupport, bool foreground = false );
-    ~KDevDriver();
+	TDevDriver( CppSupportPart* cppSupport, bool foreground = false );
+    ~TDevDriver();
 	CppSupportPart* cppSupport();
 	void setupProject();
 	//! setup the preprocessor
diff --git a/languages/cpp/templates/CMakeLists.txt b/languages/cpp/templates/CMakeLists.txt
index c278a137..c52a25aa 100644
--- a/languages/cpp/templates/CMakeLists.txt
+++ b/languages/cpp/templates/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     default.cpp default.h
-  DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport/templates )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport/templates )
diff --git a/languages/cpp/templates/Makefile.am b/languages/cpp/templates/Makefile.am
index 21f95fa8..d5d24bcb 100644
--- a/languages/cpp/templates/Makefile.am
+++ b/languages/cpp/templates/Makefile.am
@@ -1,2 +1,2 @@
 templatesdata_DATA = default.cpp default.h
-templatesdatadir = $(kde_datadir)/kdevcppsupport/templates
+templatesdatadir = $(kde_datadir)/tdevcppsupport/templates
diff --git a/languages/csharp/CMakeLists.txt b/languages/csharp/CMakeLists.txt
index 5e148431..361ce1a1 100644
--- a/languages/csharp/CMakeLists.txt
+++ b/languages/csharp/CMakeLists.txt
@@ -31,17 +31,17 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    kdevcsharpsupport.desktop csharpdoc.protocol
+    tdevcsharpsupport.desktop csharpdoc.protocol
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 install( FILES
-    kdevcsharpsupport.rc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevcsharpsupport )
+    tdevcsharpsupport.rc
+  DESTINATION ${DATA_INSTALL_DIR}/tdevcsharpsupport )
 
 
-##### libkdevcsharpsupport (module) #############
+##### libtdevcsharpsupport (module) #############
 
-tde_add_kpart( libkdevcsharpsupport AUTOMOC
+tde_add_kpart( libtdevcsharpsupport AUTOMOC
   SOURCES
     csharpsupportpart.cpp csharpconfigwidget.cpp
     csharpconfigwidgetbase.ui
diff --git a/languages/csharp/Makefile.am b/languages/csharp/Makefile.am
index 75ba9513..313e8bca 100644
--- a/languages/csharp/Makefile.am
+++ b/languages/csharp/Makefile.am
@@ -6,11 +6,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 SUBDIRS = app_templates file_templates doc
 
 
-kde_module_LTLIBRARIES = libkdevcsharpsupport.la tdeio_csharpdoc.la
-libkdevcsharpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevcsharpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevcsharpsupport.la tdeio_csharpdoc.la
+libtdevcsharpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevcsharpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevcsharpsupport_la_SOURCES = csharpsupportpart.cpp csharpconfigwidget.cpp csharpconfigwidgetbase.ui
+libtdevcsharpsupport_la_SOURCES = csharpsupportpart.cpp csharpconfigwidget.cpp csharpconfigwidgetbase.ui
 
 tdeio_csharpdoc_la_SOURCES = csharpdoc.cpp
 tdeio_csharpdoc_la_LIBADD = $(LIB_TDEIO)
@@ -19,7 +19,7 @@ tdeio_csharpdoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevcsharpsupport.desktop csharpdoc.protocol
+service_DATA = tdevcsharpsupport.desktop csharpdoc.protocol
 
-rcdir = $(kde_datadir)/kdevcsharpsupport
-rc_DATA = kdevcsharpsupport.rc
+rcdir = $(kde_datadir)/tdevcsharpsupport
+rc_DATA = tdevcsharpsupport.rc
diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
index 154ff911..d410441b 100644
--- a/languages/csharp/csharpsupportpart.cpp
+++ b/languages/csharp/csharpsupportpart.cpp
@@ -19,24 +19,24 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kinputdialog.h>
 #include <tdelocale.h>
 #include <tqregexp.h>
 #include <codemodel.h>
 #include <tqprogressbar.h>
 #include <kstatusbar.h>
-#include "kdevmainwindow.h"
+#include "tdevmainwindow.h"
 
 #include <kprocess.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevpartcontroller.h"
-#include "kdevplugininfo.h"
-#include "kdevappfrontend.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevpartcontroller.h"
+#include "tdevplugininfo.h"
+#include "tdevappfrontend.h"
 //#include "classstore.h"
 //#include "parsedclass.h"
 //#include "parsedmethod.h"
@@ -44,16 +44,16 @@
 #include "domutil.h"
 //#include "programmingbycontract.h"
 
-typedef KDevGenericFactory<CSharpSupportPart> CSharpSupportFactory;
-static const KDevPluginInfo data("kdevcsharpsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) )
+typedef TDevGenericFactory<CSharpSupportPart> CSharpSupportFactory;
+static const TDevPluginInfo data("tdevcsharpsupport");
+K_EXPORT_COMPONENT_FACTORY( libtdevcsharpsupport, CSharpSupportFactory( data ) )
 
 CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart")
+    : TDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart")
 {
     setInstance(CSharpSupportFactory::instance());
 
-    setXMLFile("kdevcsharpsupport.rc");
+    setXMLFile("tdevcsharpsupport.rc");
 
     connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
     connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
@@ -174,9 +174,9 @@ void CSharpSupportPart::savedFile(const KURL &fileName)
 }
 
 
-KDevLanguageSupport::Features CSharpSupportPart::features()
+TDevLanguageSupport::Features CSharpSupportPart::features()
 {
-    return KDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/);
+    return TDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/);
 //    return Functions;
 }
 
@@ -193,7 +193,7 @@ TQString CSharpSupportPart::interpreter()
 void CSharpSupportPart::startApplication(const TQString &program)
 {
     bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevcsharpsupport/run/terminal");
-    if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
+    if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
         appFrontend->startAppCommand(TQString(), program, inTerminal);
 }
 
diff --git a/languages/csharp/csharpsupportpart.h b/languages/csharp/csharpsupportpart.h
index 18e5a663..2256480b 100644
--- a/languages/csharp/csharpsupportpart.h
+++ b/languages/csharp/csharpsupportpart.h
@@ -12,11 +12,11 @@
 #ifndef _CSHARPSUPPORTPART_H_
 #define _CSHARPSUPPORTPART_H_
 
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 #include <codemodel.h>
 // #include "csharpparser.h"
 
-class CSharpSupportPart : public KDevLanguageSupport
+class CSharpSupportPart : public TDevLanguageSupport
 {
     Q_OBJECT
   
diff --git a/languages/csharp/doc/Makefile.am b/languages/csharp/doc/Makefile.am
index e0dfb9eb..1e8dbe53 100644
--- a/languages/csharp/doc/Makefile.am
+++ b/languages/csharp/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = 
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/csharp/file_templates/Makefile.am b/languages/csharp/file_templates/Makefile.am
index b4f0a30c..40ad2f23 100644
--- a/languages/csharp/file_templates/Makefile.am
+++ b/languages/csharp/file_templates/Makefile.am
@@ -1,4 +1,4 @@
-templatedir = $(kde_datadir)/kdevfilecreate/file-templates
+templatedir = $(kde_datadir)/tdevfilecreate/file-templates
 template_DATA = 
 
 
diff --git a/languages/csharp/kdevcsharpsupport.desktop b/languages/csharp/tdevcsharpsupport.desktop
index a5627cc3..c072003e 100644
--- a/languages/csharp/kdevcsharpsupport.desktop
+++ b/languages/csharp/tdevcsharpsupport.desktop
@@ -51,7 +51,7 @@ GenericName[sr@Latn]=Podrška za CSharp
 GenericName[sv]=C#-stöd
 GenericName[zh_TW]=C# 支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libkdevcsharpsupport
+X-TDE-Library=libtdevcsharpsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=CSharp
 
diff --git a/languages/csharp/kdevcsharpsupport.rc b/languages/csharp/tdevcsharpsupport.rc
index b5f735e2..b5f735e2 100644
--- a/languages/csharp/kdevcsharpsupport.rc
+++ b/languages/csharp/tdevcsharpsupport.rc
diff --git a/languages/fortran/CMakeLists.txt b/languages/fortran/CMakeLists.txt
index 507795aa..8829a5b3 100644
--- a/languages/fortran/CMakeLists.txt
+++ b/languages/fortran/CMakeLists.txt
@@ -31,13 +31,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevfortransupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevfortransupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfortransupport )
+install( FILES tdevfortransupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevfortransupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevfortransupport )
 
 
-##### libkdevfortransupport (module) ############
+##### libtdevfortransupport (module) ############
 
-tde_add_kpart( libkdevfortransupport AUTOMOC
+tde_add_kpart( libtdevfortransupport AUTOMOC
   SOURCES
     fortransupportpart.cpp fixedformparser.cpp
     ftnchekconfigwidget.cpp ftnchekconfigwidgetbase.ui
diff --git a/languages/fortran/Makefile.am b/languages/fortran/Makefile.am
index 73f4582c..e6568364 100644
--- a/languages/fortran/Makefile.am
+++ b/languages/fortran/Makefile.am
@@ -5,16 +5,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	$(all_includes)
 SUBDIRS = file_templates app_templates compiler doc
 
-kde_module_LTLIBRARIES = libkdevfortransupport.la
-libkdevfortransupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevfortransupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevfortransupport.la
+libtdevfortransupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevfortransupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevfortransupport_la_SOURCES = fortransupportpart.cpp fixedformparser.cpp ftnchekconfigwidget.cpp ftnchekconfigwidgetbase.ui
+libtdevfortransupport_la_SOURCES = fortransupportpart.cpp fixedformparser.cpp ftnchekconfigwidget.cpp ftnchekconfigwidgetbase.ui
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevfortransupport.desktop
+service_DATA = tdevfortransupport.desktop
 
-rcdir = $(kde_datadir)/kdevfortransupport
-rc_DATA = kdevfortransupport.rc
+rcdir = $(kde_datadir)/tdevfortransupport
+rc_DATA = tdevfortransupport.rc
diff --git a/languages/fortran/app_templates/fortranhello/CMakeLists.txt b/languages/fortran/app_templates/fortranhello/CMakeLists.txt
index 74709631..86254144 100644
--- a/languages/fortran/app_templates/fortranhello/CMakeLists.txt
+++ b/languages/fortran/app_templates/fortranhello/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( fortranhello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/fortranhello.tar.gz fortranhello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    fortranhello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    fortranhello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/fortran/app_templates/fortranhello/Makefile.am b/languages/fortran/app_templates/fortranhello/Makefile.am
index 3bf32575..15da4c3f 100644
--- a/languages/fortran/app_templates/fortranhello/Makefile.am
+++ b/languages/fortran/app_templates/fortranhello/Makefile.am
@@ -3,10 +3,10 @@ dataFiles = main.f src-Makefile.am fortran-Makefile.am fortran-Makefile.cvs \
 templateName = fortranhello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/fortran/app_templates/fortranhello/app.tdevelop b/languages/fortran/app_templates/fortranhello/app.tdevelop
index f97fd76a..238351ec 100644
--- a/languages/fortran/app_templates/fortranhello/app.tdevelop
+++ b/languages/fortran/app_templates/fortranhello/app.tdevelop
@@ -14,7 +14,7 @@
    <part>KDevCTags</part>
   </ignoreparts>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/%{APPNAMELC}</activetarget>
   </general>
@@ -26,16 +26,16 @@
       <envvar value="1" name="WANT_AUTOCONF_2_5" />
       <envvar value="1" name="WANT_AUTOMAKE_1_6" />
     </makeenvvars>
- </kdevautoproject>
- <kdevfilecreate>
+ </tdevautoproject>
+ <tdevfilecreate>
    <useglobaltypes>
      <type ext="F"/>
      <type ext="fpp"/>
      <type ext="f"/>
      <type ext="for"/>
    </useglobaltypes>
- </kdevfilecreate>
- <kdevfortransupport>
+ </tdevfilecreate>
+ <tdevfortransupport>
     <ftnchek>
       <division>false</division>
       <extern>false</extern>
@@ -54,8 +54,8 @@
       <f77only></f77only>
       <portabilityonly></portabilityonly>
     </ftnchek>
- </kdevfortransupport>
- <kdevdoctreeview>
+ </tdevfortransupport>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -103,11 +103,11 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfileview>
+ </tdevdoctreeview>
+  <tdevfileview>
     <groups>
       <group pattern="*.f;*.for;*.FOR" name="Preprocessed Fortran" />
       <group pattern="*.F;*.fpp;*.FPP" name="Fortran77 source files" />
     </groups>
-  </kdevfileview>
+  </tdevfileview>
 </tdevelop>
diff --git a/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate b/languages/fortran/app_templates/fortranhello/fortranhello.tdevtemplate
index e4c5cb33..d25570f7 100644
--- a/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate
+++ b/languages/fortran/app_templates/fortranhello/fortranhello.tdevtemplate
@@ -67,11 +67,11 @@ Archive=fortranhello.tar.gz
 
 [INCADMIN]
 Type=include
-File=%{tdevelop}/template-common/incadmin.kdevtemplate
+File=%{tdevelop}/template-common/incadmin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/fortran/compiler/Makefile.am b/languages/fortran/compiler/Makefile.am
index 3489a85c..183131cb 100644
--- a/languages/fortran/compiler/Makefile.am
+++ b/languages/fortran/compiler/Makefile.am
@@ -1,6 +1,6 @@
 # This is the collection of plugins. In contrast to the parts
 # directory, these are 'transient' in a sense and don't
-# share the complete KDevComponent interface.
+# share the complete TDevComponent interface.
 
 SUBDIRS = pgioptions
 
diff --git a/languages/fortran/compiler/pgioptions/CMakeLists.txt b/languages/fortran/compiler/pgioptions/CMakeLists.txt
index 2111f2ad..82d0d0a2 100644
--- a/languages/fortran/compiler/pgioptions/CMakeLists.txt
+++ b/languages/fortran/compiler/pgioptions/CMakeLists.txt
@@ -25,15 +25,15 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    kdevpghpfoptions.desktop kdevpgf77options.desktop
+    tdevpghpfoptions.desktop tdevpgf77options.desktop
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevpgioptions (module) ################
+##### libtdevpgioptions (module) ################
 
-tde_add_kpart( libkdevpgioptions AUTOMOC
+tde_add_kpart( libtdevpgioptions AUTOMOC
   SOURCES
     pgioptionsfactory.cpp pgioptionsplugin.cpp
-  LINK kdevextras-shared tdeui-shared
+  LINK tdevextras-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/fortran/compiler/pgioptions/Makefile.am b/languages/fortran/compiler/pgioptions/Makefile.am
index 893b7950..c26068e2 100644
--- a/languages/fortran/compiler/pgioptions/Makefile.am
+++ b/languages/fortran/compiler/pgioptions/Makefile.am
@@ -4,15 +4,15 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \
 	$(all_includes)
 
-kde_module_LTLIBRARIES = libkdevpgioptions.la
-libkdevpgioptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-libkdevpgioptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/interfaces/extras/libkdevextras.la
+kde_module_LTLIBRARIES = libtdevpgioptions.la
+libtdevpgioptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libtdevpgioptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/interfaces/extras/libtdevextras.la
 
-libkdevpgioptions_la_SOURCES = pgioptionsfactory.cpp pgioptionsplugin.cpp
+libtdevpgioptions_la_SOURCES = pgioptionsfactory.cpp pgioptionsplugin.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevpghpfoptions.desktop kdevpgf77options.desktop
+service_DATA = tdevpghpfoptions.desktop tdevpgf77options.desktop
 
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp
index 6e019589..474263f0 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp
+++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp
@@ -17,7 +17,7 @@
 
 extern "C" {
 
-    void *init_libkdevpgioptions()
+    void *init_libtdevpgioptions()
     {
         return new PgiOptionsFactory;
     }
@@ -61,7 +61,7 @@ TDEInstance *PgiOptionsFactory::s_instance = 0;
 TDEInstance *PgiOptionsFactory::instance()
 {
     if (!s_instance)
-        s_instance = new TDEInstance("kdevpgioptions");
+        s_instance = new TDEInstance("tdevpgioptions");
 
     return s_instance;
 }
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
index 29301c36..50d907b5 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
+++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
@@ -300,7 +300,7 @@ TQString PgiOptionsDialog::flags() const
 
 
 PgiOptionsPlugin::PgiOptionsPlugin(Type type, TQObject *parent, const char *name)
-    : KDevCompilerOptions(parent, name)
+    : TDevCompilerOptions(parent, name)
 {
     pgitype = type;
 }
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h
index d5d80892..daa8c99b 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h
+++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h
@@ -14,14 +14,14 @@
 
 #include <kdialogbase.h>
 
-#include "kdevcompileroptions.h"
+#include "tdevcompileroptions.h"
 
 class GeneralTab;
 class OptimizationTab;
 class HpfTab;
 
 
-class PgiOptionsPlugin : public KDevCompilerOptions
+class PgiOptionsPlugin : public TDevCompilerOptions
 {
     Q_OBJECT
   
diff --git a/languages/fortran/compiler/pgioptions/kdevpgf77options.desktop b/languages/fortran/compiler/pgioptions/tdevpgf77options.desktop
index 6d2007ea..12dadcff 100644
--- a/languages/fortran/compiler/pgioptions/kdevpgf77options.desktop
+++ b/languages/fortran/compiler/pgioptions/tdevpgf77options.desktop
@@ -47,7 +47,7 @@ Name[ta]=Pgf77 விருப்பங்கள்
 Name[tg]=Pgf77Интихобҳо
 Name[zh_TW]=Pgf77 選項
 ServiceTypes=TDevelop/CompilerOptions
-X-TDE-Library=libkdevpgioptions
+X-TDE-Library=libtdevpgioptions
 X-TDevelop-Version=5
 X-TDevelop-Language=Fortran
 X-TDevelop-Args=pgf77
diff --git a/languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop b/languages/fortran/compiler/pgioptions/tdevpghpfoptions.desktop
index f3793949..7fe27fe8 100644
--- a/languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop
+++ b/languages/fortran/compiler/pgioptions/tdevpghpfoptions.desktop
@@ -44,7 +44,7 @@ Name[ta]=Pghpf விருப்பங்கள்
 Name[tg]=PghpfИнтихобҳо
 Name[zh_TW]=Pghpf 選項
 ServiceTypes=TDevelop/CompilerOptions
-X-TDE-Library=libkdevpgioptions
+X-TDE-Library=libtdevpgioptions
 X-TDevelop-Version=5
 X-TDevelop-Language=Fortran
 X-TDevelop-Args=pghpf
diff --git a/languages/fortran/doc/CMakeLists.txt b/languages/fortran/doc/CMakeLists.txt
index 50e2ab71..423f4cbd 100644
--- a/languages/fortran/doc/CMakeLists.txt
+++ b/languages/fortran/doc/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     fortran_bugs_gcc.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs )
diff --git a/languages/fortran/doc/Makefile.am b/languages/fortran/doc/Makefile.am
index 5e7eab51..b7f9a188 100644
--- a/languages/fortran/doc/Makefile.am
+++ b/languages/fortran/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = fortran_bugs_gcc.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/fortran/file_templates/CMakeLists.txt b/languages/fortran/file_templates/CMakeLists.txt
index 3b5ef22e..b031bbdc 100644
--- a/languages/fortran/file_templates/CMakeLists.txt
+++ b/languages/fortran/file_templates/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     f f77 f90 f95 for fpp ftn
-  DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
diff --git a/languages/fortran/file_templates/Makefile.am b/languages/fortran/file_templates/Makefile.am
index 2a8e4365..d935b552 100644
--- a/languages/fortran/file_templates/Makefile.am
+++ b/languages/fortran/file_templates/Makefile.am
@@ -1,2 +1,2 @@
-templatedir = $(kde_datadir)/kdevfilecreate/file-templates
+templatedir = $(kde_datadir)/tdevfilecreate/file-templates
 template_DATA = f  f77  f90  f95  for  fpp  ftn
diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp
index 4f749ed3..c23a35f3 100644
--- a/languages/fortran/fortransupportpart.cpp
+++ b/languages/fortran/fortransupportpart.cpp
@@ -31,29 +31,29 @@
 #include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kregexp.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 
-#include <kdevcore.h>
-#include <kdevproject.h>
-#include <kdevmakefrontend.h>
-#include <kdevpartcontroller.h>
+#include <tdevcore.h>
+#include <tdevproject.h>
+#include <tdevmakefrontend.h>
+#include <tdevpartcontroller.h>
 #include <domutil.h>
 #include <codemodel.h>
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
 
-typedef KDevGenericFactory<FortranSupportPart> FortranSupportFactory;
-static const KDevPluginInfo data("kdevfortransupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( data ) )
+typedef TDevGenericFactory<FortranSupportPart> FortranSupportFactory;
+static const TDevPluginInfo data("tdevfortransupport");
+K_EXPORT_COMPONENT_FACTORY( libtdevfortransupport, FortranSupportFactory( data ) )
 
 FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart")
+    : TDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart")
 {
     setInstance(FortranSupportFactory::instance());
 
-    setXMLFile("kdevfortransupport.rc");
+    setXMLFile("tdevfortransupport.rc");
 
     connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)),
              this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
@@ -274,14 +274,14 @@ void FortranSupportPart::savedFile(const KURL &fileName)
 }
 
 
-KDevLanguageSupport::Features FortranSupportPart::features()
+TDevLanguageSupport::Features FortranSupportPart::features()
 {
     return Features(Functions);
 }
 
-KDevMakeFrontend * FortranSupportPart::makeFrontend( )
+TDevMakeFrontend * FortranSupportPart::makeFrontend( )
 {
-    return extension<KDevMakeFrontend>("TDevelop/MakeFrontend");
+    return extension<TDevMakeFrontend>("TDevelop/MakeFrontend");
 }
 
 #include "fortransupportpart.moc"
diff --git a/languages/fortran/fortransupportpart.h b/languages/fortran/fortransupportpart.h
index 7ed0f122..fe48e364 100644
--- a/languages/fortran/fortransupportpart.h
+++ b/languages/fortran/fortransupportpart.h
@@ -15,12 +15,12 @@
 class FixedFormParser;
 class KDialogBase;
 class TQStringList;
-class KDevMakeFrontend;
+class TDevMakeFrontend;
 
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 
 
-class FortranSupportPart : public KDevLanguageSupport
+class FortranSupportPart : public TDevLanguageSupport
 {
     Q_OBJECT
   
@@ -30,7 +30,7 @@ public:
     ~FortranSupportPart();
 
 protected:
-    virtual KDevLanguageSupport::Features features();
+    virtual TDevLanguageSupport::Features features();
 
 private slots:
     void slotFtnchek();
@@ -46,7 +46,7 @@ private slots:
 
 private:
     void maybeParse(const TQString fileName);
-    KDevMakeFrontend *makeFrontend();
+    TDevMakeFrontend *makeFrontend();
 
     FixedFormParser *parser;
 };
diff --git a/languages/fortran/kdevfortransupport.desktop b/languages/fortran/tdevfortransupport.desktop
index b6465210..d4da4cba 100644
--- a/languages/fortran/kdevfortransupport.desktop
+++ b/languages/fortran/tdevfortransupport.desktop
@@ -75,6 +75,6 @@ GenericName[tr]=Fortran 77 Desteği
 GenericName[zh_CN]=Fortran 77 支持
 GenericName[zh_TW]=Fortran 77 支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libkdevfortransupport
+X-TDE-Library=libtdevfortransupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Fortran77
diff --git a/languages/fortran/kdevfortransupport.rc b/languages/fortran/tdevfortransupport.rc
index 40e3f80a..40e3f80a 100644
--- a/languages/fortran/kdevfortransupport.rc
+++ b/languages/fortran/tdevfortransupport.rc
diff --git a/languages/java/CMakeLists.txt b/languages/java/CMakeLists.txt
index d3f7f5a7..546c6ac9 100644
--- a/languages/java/CMakeLists.txt
+++ b/languages/java/CMakeLists.txt
@@ -35,20 +35,20 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevjavasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevjavasupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevjavasupport )
+install( FILES tdevjavasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevjavasupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevjavasupport )
 
 
-##### libkdevjavasupport (module) ###############
+##### libtdevjavasupport (module) ###############
 
-tde_add_kpart( libkdevjavasupport AUTOMOC
+tde_add_kpart( libtdevjavasupport AUTOMOC
   SOURCES
-    JavaLexer.cpp KDevJavaSupportIface.cpp
+    JavaLexer.cpp TDevJavaSupportIface.cpp
     javasupportfactory.cpp JavaRecognizer.cpp
     backgroundparser.cpp configproblemreporter.ui
     javasupportpart.cpp JavaStoreWalker.cpp
     javasupport_utils.cpp problemreporter.cpp driver.cpp
-    kdevdriver.cpp KDevJavaSupportIface.skel
-  LINK antlr-static kdevcatalog-shared tdevelop-shared
+    tdevdriver.cpp TDevJavaSupportIface.skel
+  LINK antlr-static tdevcatalog-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/java/KDevJavaSupportIface.cpp b/languages/java/KDevJavaSupportIface.cpp
deleted file mode 100644
index b1225700..00000000
--- a/languages/java/KDevJavaSupportIface.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#include "KDevJavaSupportIface.h"
-#include "javasupportpart.h"
-
-KDevJavaSupportIface::KDevJavaSupportIface( JavaSupportPart* javaSupport )
-    : TQObject( javaSupport ), DCOPObject( "KDevJavaSupport" ), m_javaSupport( javaSupport )
-{
-}
-
-KDevJavaSupportIface::~KDevJavaSupportIface()
-{
-}
-
-void KDevJavaSupportIface::addClass()
-{
-    m_javaSupport->slotNewClass();
-}
-
-void KDevJavaSupportIface::parseProject()
-{
-    m_javaSupport->parseProject();
-}
-
-#include "KDevJavaSupportIface.moc"
diff --git a/languages/java/Makefile.am b/languages/java/Makefile.am
index a1a1e812..8e19da19 100644
--- a/languages/java/Makefile.am
+++ b/languages/java/Makefile.am
@@ -10,13 +10,13 @@ INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \
 	$(all_includes)
 
-kde_module_LTLIBRARIES = libkdevjavasupport.la
-libkdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevjavasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
+kde_module_LTLIBRARIES = libtdevjavasupport.la
+libtdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevjavasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libtdevcatalog.la
 
-libkdevjavasupport_la_SOURCES = JavaLexer.cpp KDevJavaSupportIface.cpp javasupportfactory.cpp \
+libtdevjavasupport_la_SOURCES = JavaLexer.cpp TDevJavaSupportIface.cpp javasupportfactory.cpp \
 JavaRecognizer.cpp backgroundparser.cpp configproblemreporter.ui  javasupportpart.cpp \
-JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp kdevdriver.cpp KDevJavaSupportIface.skel
+JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp tdevdriver.cpp TDevJavaSupportIface.skel
 
 
 EXTRA_DIST = java.g java.tree.g java.store.g
@@ -31,7 +31,7 @@ EXTRA_DIST = java.g java.tree.g java.store.g
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevjavasupport.desktop
+service_DATA = tdevjavasupport.desktop
 
-rcdir = $(kde_datadir)/kdevjavasupport
-rc_DATA = kdevjavasupport.rc
+rcdir = $(kde_datadir)/tdevjavasupport
+rc_DATA = tdevjavasupport.rc
diff --git a/languages/java/TDevJavaSupportIface.cpp b/languages/java/TDevJavaSupportIface.cpp
new file mode 100644
index 00000000..b9847558
--- /dev/null
+++ b/languages/java/TDevJavaSupportIface.cpp
@@ -0,0 +1,24 @@
+
+#include "TDevJavaSupportIface.h"
+#include "javasupportpart.h"
+
+TDevJavaSupportIface::TDevJavaSupportIface( JavaSupportPart* javaSupport )
+    : TQObject( javaSupport ), DCOPObject( "TDevJavaSupport" ), m_javaSupport( javaSupport )
+{
+}
+
+TDevJavaSupportIface::~TDevJavaSupportIface()
+{
+}
+
+void TDevJavaSupportIface::addClass()
+{
+    m_javaSupport->slotNewClass();
+}
+
+void TDevJavaSupportIface::parseProject()
+{
+    m_javaSupport->parseProject();
+}
+
+#include "TDevJavaSupportIface.moc"
diff --git a/languages/java/KDevJavaSupportIface.h b/languages/java/TDevJavaSupportIface.h
index d0c4d441..9732ca51 100644
--- a/languages/java/KDevJavaSupportIface.h
+++ b/languages/java/TDevJavaSupportIface.h
@@ -1,20 +1,20 @@
 
-#ifndef KDEVJAVASUPPORTIFACE_H
-#define KDEVJAVASUPPORTIFACE_H
+#ifndef TDEVJAVASUPPORTIFACE_H
+#define TDEVJAVASUPPORTIFACE_H
 
 #include <tqobject.h>
 #include <dcopobject.h>
 
 class JavaSupportPart;
 
-class KDevJavaSupportIface : public TQObject, public DCOPObject
+class TDevJavaSupportIface : public TQObject, public DCOPObject
 {
     Q_OBJECT
 //    
     K_DCOP
 public:
-    KDevJavaSupportIface( JavaSupportPart* javaSupport );
-    ~KDevJavaSupportIface();
+    TDevJavaSupportIface( JavaSupportPart* javaSupport );
+    ~TDevJavaSupportIface();
     
 k_dcop:
     void addClass();
diff --git a/languages/java/app_templates/CMakeLists.txt b/languages/java/app_templates/CMakeLists.txt
index f7e7d242..34cc305c 100644
--- a/languages/java/app_templates/CMakeLists.txt
+++ b/languages/java/app_templates/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_subdirectory( javahello )
-add_subdirectory( kappjava )
+add_subdirectory( tdeappjava )
 add_subdirectory( superwaba )
 
 install( FILES
diff --git a/languages/java/app_templates/Makefile.am b/languages/java/app_templates/Makefile.am
index fe3931a3..f30aefdb 100644
--- a/languages/java/app_templates/Makefile.am
+++ b/languages/java/app_templates/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = javahello kappjava superwaba
+SUBDIRS = javahello tdeappjava superwaba
 profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE
 profiles_DATA = java.appwizard
diff --git a/languages/java/app_templates/java.appwizard b/languages/java/app_templates/java.appwizard
index 087d6c0c..f4f8d6ba 100644
--- a/languages/java/app_templates/java.appwizard
+++ b/languages/java/app_templates/java.appwizard
@@ -1,2 +1,2 @@
 [General]
-List=javahello,kappjava,superwaba
+List=javahello,tdeappjava,superwaba
diff --git a/languages/java/app_templates/javahello/CMakeLists.txt b/languages/java/app_templates/javahello/CMakeLists.txt
index 8129bbc1..04fd4963 100644
--- a/languages/java/app_templates/javahello/CMakeLists.txt
+++ b/languages/java/app_templates/javahello/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( javahello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/javahello.tar.gz javahello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    javahello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    javahello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/java/app_templates/javahello/Makefile.am b/languages/java/app_templates/javahello/Makefile.am
index f47e7056..e3e3be27 100644
--- a/languages/java/app_templates/javahello/Makefile.am
+++ b/languages/java/app_templates/javahello/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = Main.java build.xml javahello.filelist javahello.tdevelop
 templateName= javahello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/java/app_templates/javahello/javahello.filelist b/languages/java/app_templates/javahello/javahello.filelist
index 97da44be..b9ce43ab 100644
--- a/languages/java/app_templates/javahello/javahello.filelist
+++ b/languages/java/app_templates/javahello/javahello.filelist
@@ -1,2 +1,2 @@
-# KDevelop Custom Project File List
+# TDevelop Custom Project File List
 Main.java
diff --git a/languages/java/app_templates/javahello/javahello.tdevelop b/languages/java/app_templates/javahello/javahello.tdevelop
index a41fae72..ade81a9a 100644
--- a/languages/java/app_templates/javahello/javahello.tdevelop
+++ b/languages/java/app_templates/javahello/javahello.tdevelop
@@ -7,15 +7,15 @@
     <projectmanagement>KDevAntProject</projectmanagement>
     <primarylanguage>Java</primarylanguage>
     <ignoreparts>
-      <part>KDevDebugger</part>
+      <part>TDevDebugger</part>
     </ignoreparts>
   </general>
-  <kdevcustomproject>
+  <tdevcustomproject>
     <build>
       <buildtool>ant</buildtool>
     </build>
-  </kdevcustomproject>
- <kdevdoctreeview>
+  </tdevcustomproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -59,11 +59,11 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfileview>
+ </tdevdoctreeview>
+  <tdevfileview>
     <tree>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </kdevfileview>
+  </tdevfileview>
 </tdevelop>
diff --git a/languages/java/app_templates/javahello/javahello.kdevtemplate b/languages/java/app_templates/javahello/javahello.tdevtemplate
index 62fcffc5..62fcffc5 100644
--- a/languages/java/app_templates/javahello/javahello.kdevtemplate
+++ b/languages/java/app_templates/javahello/javahello.tdevtemplate
diff --git a/languages/java/app_templates/kappjava/CMakeLists.txt b/languages/java/app_templates/kappjava/CMakeLists.txt
deleted file mode 100644
index 042872fd..00000000
--- a/languages/java/app_templates/kappjava/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-add_custom_target( kappjava.tar.gz ALL
-  COMMAND tar zcf kappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.java pref.java appview.java app_client.java appui.rc
-    src-Makefile.am kappjava.png app.tdevelop subdirs
-)
-
-
-install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kappjava.tar.gz kappjava.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
-
-
-install( FILES
-    kappjava.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/java/app_templates/superwaba/CMakeLists.txt b/languages/java/app_templates/superwaba/CMakeLists.txt
index 58932352..ea9517be 100644
--- a/languages/java/app_templates/superwaba/CMakeLists.txt
+++ b/languages/java/app_templates/superwaba/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( superwaba.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/superwaba.tar.gz superwaba.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    superwaba.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    superwaba.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/java/app_templates/superwaba/Makefile.am b/languages/java/app_templates/superwaba/Makefile.am
index bc706fe6..c9c6aa99 100644
--- a/languages/java/app_templates/superwaba/Makefile.am
+++ b/languages/java/app_templates/superwaba/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = superwaba.png sw.java src-Makefile sw.tdevelop sw.filelist
 templateName = superwaba
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/java/app_templates/superwaba/superwaba.kdevtemplate b/languages/java/app_templates/superwaba/superwaba.tdevtemplate
index 27257770..e792af35 100644
--- a/languages/java/app_templates/superwaba/superwaba.kdevtemplate
+++ b/languages/java/app_templates/superwaba/superwaba.tdevtemplate
@@ -162,5 +162,5 @@ Archive=superwaba.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
diff --git a/languages/java/app_templates/superwaba/sw.tdevelop b/languages/java/app_templates/superwaba/sw.tdevelop
index 11db7411..029d3af3 100644
--- a/languages/java/app_templates/superwaba/sw.tdevelop
+++ b/languages/java/app_templates/superwaba/sw.tdevelop
@@ -4,17 +4,17 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>KDevCustomProject</projectmanagement>
+  <projectmanagement>TDevCustomProject</projectmanagement>
   <primarylanguage>Java</primarylanguage>
     <ignoreparts>
-      <part>KDevDebugger</part>
+      <part>TDevDebugger</part>
     </ignoreparts>
   <keywords>
    <keyword>Java</keyword>
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevcustomproject>
+ <tdevcustomproject>
     <run>
       <mainprogram>make test</mainprogram>
       <programargs/>
@@ -34,14 +34,14 @@
       <envvars/>
     </make>
     <makeenvvars/>
- </kdevcustomproject>
- <kdevfileview>
+ </tdevcustomproject>
+ <tdevfileview>
     <groups>
       <group pattern="Makefile" name="Build" />
       <group pattern="*.java" name="Source" />
     </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -85,10 +85,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="java"/>
   </useglobaltypes>
- </kdevfilecreate>
+ </tdevfilecreate>
 </tdevelop>
diff --git a/languages/java/app_templates/tdeappjava/CMakeLists.txt b/languages/java/app_templates/tdeappjava/CMakeLists.txt
new file mode 100644
index 00000000..578b6e9d
--- /dev/null
+++ b/languages/java/app_templates/tdeappjava/CMakeLists.txt
@@ -0,0 +1,26 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_custom_target( tdeappjava.tar.gz ALL
+  COMMAND tar zcf tdeappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+    app.java pref.java appview.java app_client.java appui.rc
+    src-Makefile.am tdeappjava.png app.tdevelop subdirs
+)
+
+
+install( FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/tdeappjava.tar.gz tdeappjava.png
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+
+
+install( FILES
+    tdeappjava.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/java/app_templates/kappjava/Makefile.am b/languages/java/app_templates/tdeappjava/Makefile.am
index edbd4468..889abb5a 100644
--- a/languages/java/app_templates/kappjava/Makefile.am
+++ b/languages/java/app_templates/tdeappjava/Makefile.am
@@ -1,12 +1,12 @@
 dataFiles = app.java pref.java appview.java  app_client.java appui.rc \
-	src-Makefile.am kappjava.png app.tdevelop subdirs
-templateName = kappjava
+	src-Makefile.am tdeappjava.png app.tdevelop subdirs
+templateName = tdeappjava
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/java/app_templates/kappjava/app.desktop b/languages/java/app_templates/tdeappjava/app.desktop
index 3cc75ad8..3cc75ad8 100644
--- a/languages/java/app_templates/kappjava/app.desktop
+++ b/languages/java/app_templates/tdeappjava/app.desktop
diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/tdeappjava/app.java
index 40bc6b93..40bc6b93 100644
--- a/languages/java/app_templates/kappjava/app.java
+++ b/languages/java/app_templates/tdeappjava/app.java
diff --git a/languages/java/app_templates/kappjava/app.tdevelop b/languages/java/app_templates/tdeappjava/app.tdevelop
index 7ee74558..1e07dec0 100644
--- a/languages/java/app_templates/kappjava/app.tdevelop
+++ b/languages/java/app_templates/tdeappjava/app.tdevelop
@@ -13,15 +13,15 @@
    <keyword>KDE</keyword>
   </keywords>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <activetarget>src/java</activetarget>
   </general>
   <run>
    <mainprogram>src/%{APPNAMELC}</mainprogram>
   </run>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.java" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -29,12 +29,12 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdebugger>
+ </tdevfileview>
+ <tdevdebugger>
   <general>
   </general>
- </kdevdebugger>
- <kdevdoctreeview>
+ </tdevdebugger>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -79,10 +79,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="java"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/languages/java/app_templates/kappjava/app_client.java b/languages/java/app_templates/tdeappjava/app_client.java
index 9648cfad..9648cfad 100644
--- a/languages/java/app_templates/kappjava/app_client.java
+++ b/languages/java/app_templates/tdeappjava/app_client.java
diff --git a/languages/java/app_templates/kappjava/appui.rc b/languages/java/app_templates/tdeappjava/appui.rc
index ceb4f14e..ceb4f14e 100644
--- a/languages/java/app_templates/kappjava/appui.rc
+++ b/languages/java/app_templates/tdeappjava/appui.rc
diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/tdeappjava/appview.java
index 347ff58f..347ff58f 100644
--- a/languages/java/app_templates/kappjava/appview.java
+++ b/languages/java/app_templates/tdeappjava/appview.java
diff --git a/languages/java/app_templates/kappjava/pref.java b/languages/java/app_templates/tdeappjava/pref.java
index a50fdb31..a50fdb31 100644
--- a/languages/java/app_templates/kappjava/pref.java
+++ b/languages/java/app_templates/tdeappjava/pref.java
diff --git a/languages/java/app_templates/kappjava/src-Makefile.am b/languages/java/app_templates/tdeappjava/src-Makefile.am
index 6468994c..6468994c 100644
--- a/languages/java/app_templates/kappjava/src-Makefile.am
+++ b/languages/java/app_templates/tdeappjava/src-Makefile.am
diff --git a/languages/java/app_templates/kappjava/subdirs b/languages/java/app_templates/tdeappjava/subdirs
index 0e678106..0e678106 100644
--- a/languages/java/app_templates/kappjava/subdirs
+++ b/languages/java/app_templates/tdeappjava/subdirs
diff --git a/languages/java/app_templates/kappjava/kappjava b/languages/java/app_templates/tdeappjava/tdeappjava
index e199ac25..a62edafa 100644
--- a/languages/java/app_templates/kappjava/kappjava
+++ b/languages/java/app_templates/tdeappjava/tdeappjava
@@ -2,7 +2,7 @@
 [General]
 Name=Application framework
 Name[fr]=Squelette d'application
-Icon=kappjava.png
+Icon=tdeappjava.png
 Category=Java/KDE
 Comment=Generates a simple Java KDE application with one toplevel window, menus and  toolbars.
 Comment[fr]=G�n�re une simple application KDE dans le language JAVA avec une fen�tre principale, des menus, et des barres d'outils.
diff --git a/languages/java/app_templates/kappjava/kappjava.png b/languages/java/app_templates/tdeappjava/tdeappjava.png
index 913ebb87..913ebb87 100644
--- a/languages/java/app_templates/kappjava/kappjava.png
+++ b/languages/java/app_templates/tdeappjava/tdeappjava.png
diff --git a/languages/java/app_templates/kappjava/kappjava.kdevtemplate b/languages/java/app_templates/tdeappjava/tdeappjava.tdevtemplate
index 92cf4710..b5b35e33 100644
--- a/languages/java/app_templates/kappjava/kappjava.kdevtemplate
+++ b/languages/java/app_templates/tdeappjava/tdeappjava.tdevtemplate
@@ -30,7 +30,7 @@ Name[sv]=Programramverk
 Name[tr]=Uygulama Çatısı
 Name[zh_CN]=应用程序框架
 Name[zh_TW]=應用程式框架
-Icon=kappjava.png
+Icon=tdeappjava.png
 Category=Java/KDE
 Comment=Generates a simple Java KDE application with one toplevel window, menus and  toolbars.
 Comment[ca]=Genera una simple aplicació per al KDE en Java amb una finestra principal, menús i barres d'eines.
@@ -61,19 +61,19 @@ Comment[zh_CN]=生成一个简单的带有顶级窗口、菜单和工具栏的 J
 Comment[zh_TW]=產生一個簡單的 Java KDE 應用程式，內含頂層視窗、選單與工具列。
 FileTemplates=java,CStyle
 ShowFilesAfterGeneration=%{dest}/src/%{APPNAME}View.java
-Archive=kappjava.tar.gz
+Archive=tdeappjava.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [DOCBOOK]
 Type=include
-File=%{tdevelop}/template-common/dockbook.kdevtemplate
+File=%{tdevelop}/template-common/dockbook.tdevtemplate
 
 [FILE4]
 Type=install
diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp
index d6a034e4..006b0127 100644
--- a/languages/java/backgroundparser.cpp
+++ b/languages/java/backgroundparser.cpp
@@ -13,8 +13,8 @@
 #include "javasupportpart.h"
 #include "javasupport_events.h"
 #include "driver.h"
-#include "kdevdeepcopy.h"
-#include "kdevdriver.h"
+#include "tdevdeepcopy.h"
+#include "tdevdriver.h"
 
 #include <tqmutex.h>
 
@@ -23,8 +23,8 @@
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/view.h>
 
-#include <kdevpartcontroller.h>
-#include <kdevproject.h>
+#include <tdevpartcontroller.h>
+#include <tdevproject.h>
 
 #include <kurl.h>
 #include <kdebug.h>
@@ -178,7 +178,7 @@ BackgroundParser::BackgroundParser( JavaSupportPart* part, TQWaitCondition* cons
     : m_consumed( consumed ), m_javaSupport( part ), m_close( false )
 {
     m_fileList = new SynchronizedFileList();
-    m_driver = new KDevDriver( m_javaSupport );
+    m_driver = new TDevDriver( m_javaSupport );
     m_driver->setSourceProvider( new KDevSourceProvider(m_javaSupport) );
     //disabled for now m_driver->setResolveDependencesEnabled( true );
 }
diff --git a/languages/java/backgroundparser.h b/languages/java/backgroundparser.h
index fee2bc78..db197e31 100644
--- a/languages/java/backgroundparser.h
+++ b/languages/java/backgroundparser.h
@@ -71,7 +71,7 @@ protected:
     Unit* parseFile( const TQString& fileName, bool readFromDisk );
 
 private:
-    class KDevDriver* m_driver;
+    class TDevDriver* m_driver;
     TQString m_currentFile;
     TQWaitCondition m_canParse;
     TQWaitCondition m_isEmpty;
diff --git a/languages/java/doc/CMakeLists.txt b/languages/java/doc/CMakeLists.txt
index 685a980d..23acf492 100644
--- a/languages/java/doc/CMakeLists.txt
+++ b/languages/java/doc/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     sw.toc java_bugs_gcc.toc java_bugs_sun.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs )
diff --git a/languages/java/doc/Makefile.am b/languages/java/doc/Makefile.am
index adb0f24f..f163d148 100644
--- a/languages/java/doc/Makefile.am
+++ b/languages/java/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = sw.toc java_bugs_gcc.toc java_bugs_sun.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/java/file_templates/CMakeLists.txt b/languages/java/file_templates/CMakeLists.txt
index 848555dd..cee049fb 100644
--- a/languages/java/file_templates/CMakeLists.txt
+++ b/languages/java/file_templates/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     java
-  DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
diff --git a/languages/java/file_templates/Makefile.am b/languages/java/file_templates/Makefile.am
index dc3b82a9..4d9013d4 100644
--- a/languages/java/file_templates/Makefile.am
+++ b/languages/java/file_templates/Makefile.am
@@ -1,4 +1,4 @@
-templatedir = $(kde_datadir)/kdevfilecreate/file-templates
+templatedir = $(kde_datadir)/tdevfilecreate/file-templates
 template_DATA = java
 
 
diff --git a/languages/java/javasupport_events.h b/languages/java/javasupport_events.h
index 36cda51b..b2022af2 100644
--- a/languages/java/javasupport_events.h
+++ b/languages/java/javasupport_events.h
@@ -13,7 +13,7 @@
 #define __javasupport_events_h
 
 #include "driver.h"
-#include "kdevdeepcopy.h"
+#include "tdevdeepcopy.h"
 
 #include <tqevent.h>
 #include <tqvaluelist.h>
diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp
index 94e435f2..ac1eaadb 100644
--- a/languages/java/javasupportfactory.cpp
+++ b/languages/java/javasupportfactory.cpp
@@ -11,28 +11,28 @@
 
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 #include "javasupportfactory.h"
 
-static const KDevPluginInfo data("kdevjavasupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevjavasupport, JavaSupportFactory )
+static const TDevPluginInfo data("tdevjavasupport");
+K_EXPORT_COMPONENT_FACTORY( libtdevjavasupport, JavaSupportFactory )
 
 JavaSupportFactory::JavaSupportFactory()
-    : KDevGenericFactory<JavaSupportPart>( data )
+    : TDevGenericFactory<JavaSupportPart>( data )
 {
 }
 
 TDEInstance *JavaSupportFactory::createInstance()
 {
-    TDEInstance *instance = KDevGenericFactory<JavaSupportPart>::createInstance();
+    TDEInstance *instance = TDevGenericFactory<JavaSupportPart>::createInstance();
     TDEStandardDirs *dirs = instance->dirs();
-    dirs->addResourceType( "newclasstemplates", TDEStandardDirs::kde_default("data") + "kdevjavasupport/newclass/" );
-    dirs->addResourceType( "pcs", TDEStandardDirs::kde_default( "data" ) + "kdevjavasupport/pcs/" );
+    dirs->addResourceType( "newclasstemplates", TDEStandardDirs::kde_default("data") + "tdevjavasupport/newclass/" );
+    dirs->addResourceType( "pcs", TDEStandardDirs::kde_default( "data" ) + "tdevjavasupport/pcs/" );
 
     return instance;
 }
 
-const KDevPluginInfo *JavaSupportFactory::info()
+const TDevPluginInfo *JavaSupportFactory::info()
 {
     return &data;
 }
diff --git a/languages/java/javasupportfactory.h b/languages/java/javasupportfactory.h
index e5ae52b4..cb231d34 100644
--- a/languages/java/javasupportfactory.h
+++ b/languages/java/javasupportfactory.h
@@ -12,17 +12,17 @@
 #ifndef _JAVASUPPORTFACTORY_H_
 #define _JAVASUPPORTFACTORY_H_
 
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include "javasupportpart.h"
 
-class KDevPluginInfo;
+class TDevPluginInfo;
 
-class JavaSupportFactory : public KDevGenericFactory<JavaSupportPart>
+class JavaSupportFactory : public TDevGenericFactory<JavaSupportPart>
 {
 public:
     JavaSupportFactory();
     
-    static const KDevPluginInfo *info();
+    static const TDevPluginInfo *info();
 
 protected:
     virtual TDEInstance *createInstance();
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index 63b174fc..3c2090e8 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -17,10 +17,10 @@
 #include "javasupport_events.h"
 #include "problemreporter.h"
 #include "backgroundparser.h"
-#include "KDevJavaSupportIface.h"
+#include "TDevJavaSupportIface.h"
 #include "javasupportfactory.h"
 #include "catalog.h"
-#include "kdevdriver.h"
+#include "tdevdriver.h"
 #include "javasupport_utils.h"
 
 #include "JavaStoreWalker.hpp"
@@ -63,12 +63,12 @@
 
 #include <tdetexteditor/texthintinterface.h>
 
-#include <kdevcore.h>
-#include <kdevproject.h>
-#include <kdevmainwindow.h>
-#include <kdevpartcontroller.h>
-#include <kdevmakefrontend.h>
-#include <kdevcoderepository.h>
+#include <tdevcore.h>
+#include <tdevproject.h>
+#include <tdevmainwindow.h>
+#include <tdevpartcontroller.h>
+#include <tdevmakefrontend.h>
+#include <tdevcoderepository.h>
 
 #include <domutil.h>
 #include <urlutil.h>
@@ -77,11 +77,11 @@
 enum { KDEV_DB_VERSION = 7 };
 enum { KDEV_PCS_VERSION = 8 };
 
-class JavaDriver: public KDevDriver
+class JavaDriver: public TDevDriver
 {
 public:
     JavaDriver( JavaSupportPart* javaSupport )
-	: KDevDriver( javaSupport )
+	: TDevDriver( javaSupport )
     {
     }
 
@@ -119,7 +119,7 @@ public:
 };
 
 JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : KDevLanguageSupport(JavaSupportFactory::info(), parent, name ? name : "KDevJavaSupport"),
+    : TDevLanguageSupport(JavaSupportFactory::info(), parent, name ? name : "TDevJavaSupport"),
       m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ),
       m_activeViewCursor( 0 ), m_projectClosed( true ), m_valid( false )
 {
@@ -127,7 +127,7 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr
 
     m_driver = new JavaDriver( this );
 
-    setXMLFile( "kdevjavasupport.rc" );
+    setXMLFile( "tdevjavasupport.rc" );
 
     m_catalogList.setAutoDelete( true );
     setupCatalog();
@@ -167,7 +167,7 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr
     connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this,
              TQT_SLOT( projectConfigWidget( KDialogBase* ) ) );
 
-    new KDevJavaSupportIface( this );
+    new TDevJavaSupportIface( this );
     //(void) dcopClient();
 }
 
@@ -434,7 +434,7 @@ TQString JavaSupportPart::findSourceFile()
     return m_activeFileName;
 }
 
-KDevLanguageSupport::Features JavaSupportPart::features()
+TDevLanguageSupport::Features JavaSupportPart::features()
 {
     return Features( Classes | Functions | Variables );
 }
@@ -830,7 +830,7 @@ TQString JavaSupportPart::formatModelItem( const CodeModelItem *item, bool short
 	return arg.stripWhiteSpace();
     }
     else
-        return KDevLanguageSupport::formatModelItem( item, shortDescription );
+        return TDevLanguageSupport::formatModelItem( item, shortDescription );
 }
 
 void JavaSupportPart::addClass( )
diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h
index a69e3524..6154cb8f 100644
--- a/languages/java/javasupportpart.h
+++ b/languages/java/javasupportpart.h
@@ -16,8 +16,8 @@
 #ifndef _JAVASUPPORTPART_H_
 #define _JAVASUPPORTPART_H_
 
-#include <kdevcore.h>
-#include <kdevlanguagesupport.h>
+#include <tdevcore.h>
+#include <tdevlanguagesupport.h>
 
 #include <kdialogbase.h>
 #include <tqguardedptr.h>
@@ -46,7 +46,7 @@ namespace KTextEditor
     class ViewCursorInterface;
 }
 
-class JavaSupportPart : public KDevLanguageSupport
+class JavaSupportPart : public TDevLanguageSupport
 {
     Q_OBJECT
   
@@ -82,7 +82,7 @@ signals:
     void fileParsed( const TQString& fileName );
 
 protected:
-    virtual KDevLanguageSupport::Features features();
+    virtual TDevLanguageSupport::Features features();
     virtual KMimeType::List mimeTypes();
     virtual TQString formatClassName(const TQString &name);
     virtual TQString unformatClassName(const TQString &name);
@@ -159,7 +159,7 @@ private:
     FunctionDom m_activeFunction;
     VariableDom m_activeVariable;
 
-    friend class KDevJavaSupportIface;
+    friend class TDevJavaSupportIface;
     friend class JavaDriver;
 };
 
diff --git a/languages/java/newclass_templates/Makefile.am b/languages/java/newclass_templates/Makefile.am
index d24c99ef..f8b9e3bd 100644
--- a/languages/java/newclass_templates/Makefile.am
+++ b/languages/java/newclass_templates/Makefile.am
@@ -1,4 +1,4 @@
-javasupportdatadir = ${kde_datadir}/kdevjavasupport
+javasupportdatadir = ${kde_datadir}/tdevjavasupport
 newclassdir = ${javasupportdatadir}/newclass
 
 newclass_DATA = java_source
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index 4d4f47af..6b6a46e6 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -21,8 +21,8 @@
 #include "configproblemreporter.h"
 #include "backgroundparser.h"
 
-#include <kdevpartcontroller.h>
-#include <kdevmainwindow.h>
+#include <tdevpartcontroller.h>
+#include <tdevmainwindow.h>
 
 #include <tdeversion.h>
 #include <tdeparts/part.h>
diff --git a/languages/java/kdevdeepcopy.h b/languages/java/tdevdeepcopy.h
index dd4d8f4d..c4f889c1 100644
--- a/languages/java/kdevdeepcopy.h
+++ b/languages/java/tdevdeepcopy.h
@@ -1,5 +1,5 @@
-#ifndef KDEVDEEPCOPY_H
-#define KDEVDEEPCOPY_H
+#ifndef TDEVDEEPCOPY_H
+#define TDEVDEEPCOPY_H
 
 #include <tqstring.h>
 
diff --git a/languages/java/kdevdriver.cpp b/languages/java/tdevdriver.cpp
index d19a20c3..d36a23f3 100644
--- a/languages/java/kdevdriver.cpp
+++ b/languages/java/tdevdriver.cpp
@@ -1,20 +1,20 @@
 
-#include "kdevdriver.h"
+#include "tdevdriver.h"
 #include "JavaLexer.hpp"
 #include <unistd.h>
 #include <tqfileinfo.h>
 
-KDevDriver::KDevDriver( JavaSupportPart* javaSupport )
+TDevDriver::TDevDriver( JavaSupportPart* javaSupport )
 	: m_javaSupport( javaSupport )
 {
 }
 
-JavaSupportPart* KDevDriver::javaSupport()
+JavaSupportPart* TDevDriver::javaSupport()
 {
 	return m_javaSupport;
 }
 
-void KDevDriver::setupProject()
+void TDevDriver::setupProject()
 {
 	TQMap<TQString, bool> map;
 
@@ -38,7 +38,7 @@ void KDevDriver::setupProject()
 	}
 }
 
-void KDevDriver::setupLexer( JavaLexer* lexer )
+void TDevDriver::setupLexer( JavaLexer* lexer )
 {
 	Driver::setupLexer( lexer );
 }
diff --git a/languages/java/kdevdriver.h b/languages/java/tdevdriver.h
index cc0a1393..27fd7854 100644
--- a/languages/java/kdevdriver.h
+++ b/languages/java/tdevdriver.h
@@ -1,10 +1,10 @@
 
-#ifndef __kdevdriver_h
-#define __kdevdriver_h
+#ifndef __tdevdriver_h
+#define __tdevdriver_h
 
 #include "javasupportpart.h"
 
-#include <kdevproject.h>
+#include <tdevproject.h>
 #include <tdeversion.h>
 
 #include "driver.h"
@@ -12,10 +12,10 @@
 #include <cstdlib>
 #include <unistd.h>
 
-class KDevDriver: public Driver
+class TDevDriver: public Driver
 {
 public:
-    KDevDriver( JavaSupportPart* javaSupport );
+    TDevDriver( JavaSupportPart* javaSupport );
     JavaSupportPart* javaSupport();
     void setupProject();
 
diff --git a/languages/java/kdevjavasupport.desktop b/languages/java/tdevjavasupport.desktop
index 620fb10f..6d3553d7 100644
--- a/languages/java/kdevjavasupport.desktop
+++ b/languages/java/tdevjavasupport.desktop
@@ -35,7 +35,7 @@ Comment[tg]=Ёрӣ намудани забони Java
 Comment[tr]=Java Desteği
 Comment[zh_CN]=Java 支持
 Comment[zh_TW]=Java 支援
-Name=KDevJavaSupport
+Name=TDevJavaSupport
 Name[da]=TDevelop Java-understøttelse
 Name[de]=Unterstützung für Java (TDevelop)
 Name[hi]=के-डेव-जावा-समर्थन
@@ -79,7 +79,7 @@ GenericName[tr]=Java Desteği
 GenericName[zh_CN]=Java 支持
 GenericName[zh_TW]=Java 支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libkdevjavasupport
+X-TDE-Library=libtdevjavasupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Java
 X-TDevelop-Args=Java
diff --git a/languages/java/kdevjavasupport.rc b/languages/java/tdevjavasupport.rc
index e9b80d0d..66c7975c 100644
--- a/languages/java/kdevjavasupport.rc
+++ b/languages/java/tdevjavasupport.rc
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KDevJavaSupport" version="4">
+<kpartgui name="TDevJavaSupport" version="4">
 </kpartgui>
 
diff --git a/languages/kjssupport/Makefile.am b/languages/kjssupport/Makefile.am
index 72cc722b..1fd1839b 100644
--- a/languages/kjssupport/Makefile.am
+++ b/languages/kjssupport/Makefile.am
@@ -1,22 +1,22 @@
 INCLUDES = -I$(kde_includes)/tdevelop $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevkjssupport.la
-libkdevkjssupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevkjssupport_la_LIBADD = -lkjsembed -ltdevelop
-libkdevkjssupport_la_SOURCES = kjssupport_part.cpp kjsproblems.cpp jscodecompletion.cpp subclassingdlg.cpp subclassingdlgbase.ui
+kde_module_LTLIBRARIES = libtdevkjssupport.la
+libtdevkjssupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevkjssupport_la_LIBADD = -lkjsembed -ltdevelop
+libtdevkjssupport_la_SOURCES = kjssupport_part.cpp kjsproblems.cpp jscodecompletion.cpp subclassingdlg.cpp subclassingdlgbase.ui
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevkjssupport.desktop
+service_DATA = tdevkjssupport.desktop
 
 mimesrcdir = $(kde_mimedir)/text
 mimesrc_DATA = x-javascript-source.desktop
 
 EXTRA_DIST = $(mimesrc_DATA)
 
-rcdir = $(kde_datadir)/kdevkjssupport
-rc_DATA = kdevkjssupport.rc
+rcdir = $(kde_datadir)/tdevkjssupport
+rc_DATA = tdevkjssupport.rc
 
 SUBDIRS = template subclassing_template
 noinst_HEADERS =  kjsproblems.h
diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp
index 436e0a95..b8f361a4 100644
--- a/languages/kjssupport/jscodecompletion.cpp
+++ b/languages/kjssupport/jscodecompletion.cpp
@@ -28,12 +28,12 @@
 #include <kdialogbase.h>
 
 
-#include <tdevelop/kdevcore.h>
+#include <tdevelop/tdevcore.h>
 #include <tdevelop/kdevmainwindow.h>
-#include <tdevelop/kdevlanguagesupport.h>
-#include <tdevelop/kdevpartcontroller.h>
-#include <tdevelop/kdevproject.h>
-#include <tdevelop/kdevappfrontend.h>
+#include <tdevelop/tdevlanguagesupport.h>
+#include <tdevelop/tdevpartcontroller.h>
+#include <tdevelop/tdevproject.h>
+#include <tdevelop/tdevappfrontend.h>
 #include <tdevelop/domutil.h>
 #include <tdevelop/codemodel.h>
 
diff --git a/languages/kjssupport/jscodecompletion.h b/languages/kjssupport/jscodecompletion.h
index f1d18a70..9e4434bb 100644
--- a/languages/kjssupport/jscodecompletion.h
+++ b/languages/kjssupport/jscodecompletion.h
@@ -15,7 +15,7 @@
 #include <tqobject.h>
 #include <tdevelop/codemodel.h>
 #include <tdevelop/kdevplugin.h>
-#include <tdevelop/kdevlanguagesupport.h>
+#include <tdevelop/tdevlanguagesupport.h>
 
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/viewcursorinterface.h>
diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
index 4a3dbc25..69311ac3 100644
--- a/languages/kjssupport/kjssupport_part.cpp
+++ b/languages/kjssupport/kjssupport_part.cpp
@@ -26,15 +26,15 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <kgenericfactory.h>
-#include <kdevcore.h>
-#include <kdevpartcontroller.h>
-#include <kdevmainwindow.h>
+#include <tdevcore.h>
+#include <tdevpartcontroller.h>
+#include <tdevmainwindow.h>
 #include <domutil.h>
 #include <codemodel.h>
 #include <tdeparts/part.h>
 
 
-#include <kdevproject.h>
+#include <tdevproject.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
@@ -42,16 +42,16 @@
 #include <kjsembed/kjsembedpart.h>
 #include <kjsembed/jsconsolewidget.h>
 
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
 #include "kjssupport_part.h"
 #include "kjsproblems.h"
 #include "jscodecompletion.h"
 #include "subclassingdlg.h"
 
-typedef KDevGenericFactory<kjsSupportPart> kjsSupportFactory;
-static const KDevPluginInfo data("kdevkjssupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( data ) );
+typedef TDevGenericFactory<kjsSupportPart> kjsSupportFactory;
+static const TDevPluginInfo data("tdevkjssupport");
+K_EXPORT_COMPONENT_FACTORY( libtdevkjssupport, kjsSupportFactory( data ) );
 
 
 class typeProperty
@@ -63,10 +63,10 @@ class typeProperty
 };
 
 kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStringList& )
-: KDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" )
+: TDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" )
 {
 	setInstance(kjsSupportFactory::instance());
-	setXMLFile("kdevkjssupport.rc");
+	setXMLFile("tdevkjssupport.rc");
 
 
 	m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
@@ -104,7 +104,7 @@ kjsSupportPart::~kjsSupportPart()
 	delete m_js;
 }
 
-KDevLanguageSupport::Features kjsSupportPart::features()
+TDevLanguageSupport::Features kjsSupportPart::features()
 {
 	return Features(Classes | Variables | Functions);
 }
diff --git a/languages/kjssupport/kjssupport_part.h b/languages/kjssupport/kjssupport_part.h
index 4572b9a2..59b5dae4 100644
--- a/languages/kjssupport/kjssupport_part.h
+++ b/languages/kjssupport/kjssupport_part.h
@@ -17,13 +17,13 @@
 */
 
 
-#ifndef __KDEVPART_KJSSUPPORT_H__
-#define __KDEVPART_KJSSUPPORT_H__
+#ifndef __TDEVPART_KJSSUPPORT_H__
+#define __TDEVPART_KJSSUPPORT_H__
 
 
 #include <tdevelop/kdevplugin.h>
 #include <tdevelop/codemodel.h>
-#include <tdevelop/kdevlanguagesupport.h>
+#include <tdevelop/tdevlanguagesupport.h>
 #include <kdialogbase.h>
 #include <tqstringlist.h>
 #include <tqdict.h>
@@ -43,7 +43,7 @@ class Context;
 class typeProperty;
 
 
-class kjsSupportPart : public KDevLanguageSupport
+class kjsSupportPart : public TDevLanguageSupport
 {
 	Q_OBJECT
   
diff --git a/languages/kjssupport/subclassing_template/Makefile.am b/languages/kjssupport/subclassing_template/Makefile.am
index 8c99d172..bafadb4e 100644
--- a/languages/kjssupport/subclassing_template/Makefile.am
+++ b/languages/kjssupport/subclassing_template/Makefile.am
@@ -1,3 +1,3 @@
-kjssupportdatadir = ${kde_datadir}/kdevkjssupport
+kjssupportdatadir = ${kde_datadir}/tdevkjssupport
 subclassingdir = ${kjssupportdatadir}/subclassing
 subclassing_DATA =  subclass_template.js
diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp
index 513e0180..260e2d49 100644
--- a/languages/kjssupport/subclassingdlg.cpp
+++ b/languages/kjssupport/subclassingdlg.cpp
@@ -17,7 +17,7 @@
 #include "store_walker.h"
 #include "cppsupportfactory.h"*/
 #include <tdevelop/kdevsourceformatter.h>
-#include <tdevelop/kdevproject.h>
+#include <tdevelop/tdevproject.h>
 #include <tdevelop/filetemplate.h>
 #include <tdevelop/codemodel.h>
 
diff --git a/languages/kjssupport/kdevkjssupport.desktop b/languages/kjssupport/tdevkjssupport.desktop
index e972cd18..02640f78 100644
--- a/languages/kjssupport/kdevkjssupport.desktop
+++ b/languages/kjssupport/tdevkjssupport.desktop
@@ -50,5 +50,5 @@ GenericName[zh_TW]=TDE JavaScript 支援
 Icon=tdevelop
 ServiceTypes=TDevelop/LanguageSupport
 X-TDevelop-Language=Javascript
-X-TDE-Library=libkdevkjssupport
+X-TDE-Library=libtdevkjssupport
 X-TDevelop-Version=3
diff --git a/languages/kjssupport/kdevkjssupport.rc b/languages/kjssupport/tdevkjssupport.rc
index e48fc863..e48fc863 100644
--- a/languages/kjssupport/kdevkjssupport.rc
+++ b/languages/kjssupport/tdevkjssupport.rc
diff --git a/languages/kjssupport/template/Makefile.am b/languages/kjssupport/template/Makefile.am
index 284227b7..fd902e1a 100644
--- a/languages/kjssupport/template/Makefile.am
+++ b/languages/kjssupport/template/Makefile.am
@@ -1,4 +1,4 @@
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 commondatadir = ${appwizarddatadir}/template-common
 jshellodir = ${appwizarddatadir}/template-jshello
 templatedir = ${appwizarddatadir}/templates
diff --git a/languages/kjssupport/template/app.tdevelop b/languages/kjssupport/template/app.tdevelop
index cbef8262..d1e55b10 100644
--- a/languages/kjssupport/template/app.tdevelop
+++ b/languages/kjssupport/template/app.tdevelop
@@ -10,24 +10,24 @@
 		<keyword>Javascript</keyword>
   </keywords>
   <ignoreparts>
-   <part>KDevFileView</part>
+   <part>TDevFileView</part>
    <part>KDevdistpart</part>
-   <part>KDevDebugger</part>
+   <part>TDevDebugger</part>
   </ignoreparts>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <general>
 		<activedir>src</activedir>
 		<includepatterns>*.js</includepatterns>
 		<excludepatterns>*~</excludepatterns>
   </general>
- </kdevscriptproject>
- <kdevfileview>
+ </tdevscriptproject>
+ <tdevfileview>
 	 <groups>
 	   <group pattern="*.js" name="Scripts" />
 	 </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
   <ignoretocs>
    <toc>kde</toc>
    <toc>gtk</toc>
@@ -36,10 +36,10 @@
 	 <toc>perl</toc>
 	 <toc>php</toc>
   </ignoretocs>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
 			<type ext="js"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/languages/kjssupport/template/script b/languages/kjssupport/template/script
index 1473d762..3ed2602c 100644
--- a/languages/kjssupport/template/script
+++ b/languages/kjssupport/template/script
@@ -1,4 +1,4 @@
-#!perl -I/usr/kde/3.1/share/apps/kdevappwizard/template-common
+#!perl -I/usr/kde/3.1/share/apps/tdevappwizard/template-common
 
 use gideon;
 
diff --git a/languages/lib/debugger/CMakeLists.txt b/languages/lib/debugger/CMakeLists.txt
index c159528b..fbd121e4 100644
--- a/languages/lib/debugger/CMakeLists.txt
+++ b/languages/lib/debugger/CMakeLists.txt
@@ -24,14 +24,14 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    debugger.h kdevdebugger.h
+    debugger.h tdevdebugger.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/languages/debugger )
 
 
 ##### lang_debugger (shared) ####################
 
 tde_add_library( lang_debugger SHARED AUTOMOC
-  SOURCES kdevdebugger.cpp debugger.cpp
+  SOURCES tdevdebugger.cpp debugger.cpp
   VERSION 0.0.0
   LINK tdetexteditor-shared
   DESTINATION ${LIB_INSTALL_DIR}
diff --git a/languages/lib/debugger/Makefile.am b/languages/lib/debugger/Makefile.am
index fc8923aa..3ca4e3a8 100644
--- a/languages/lib/debugger/Makefile.am
+++ b/languages/lib/debugger/Makefile.am
@@ -3,11 +3,11 @@ METASOURCES = AUTO
 lib_LTLIBRARIES = liblang_debugger.la
 liblang_debugger_la_LDFLAGS = $(all_libraries)
 liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPARTS) -ltdetexteditor
-liblang_debugger_la_SOURCES = kdevdebugger.cpp debugger.cpp
+liblang_debugger_la_SOURCES = tdevdebugger.cpp debugger.cpp
 langincludedirdir = $(includedir)/tdevelop/languages/debugger
-langincludedir_HEADERS = debugger.h kdevdebugger.h
+langincludedir_HEADERS = debugger.h tdevdebugger.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil
-DOXYGEN_PROJECTNAME = KDevelop Debugger Support Library
-DOXYGEN_DOCDIRPREFIX = kdevlang
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces tdevutil
+DOXYGEN_PROJECTNAME = TDevelop Debugger Support Library
+DOXYGEN_DOCDIRPREFIX = tdevlang
 include ../../../Doxyfile.am
diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp
index bc8356b7..341abecd 100644
--- a/languages/lib/debugger/debugger.cpp
+++ b/languages/lib/debugger/debugger.cpp
@@ -6,14 +6,14 @@
 #include <tdetexteditor/document.h>
 
 // #include "editorproxy.h"
-#include <kdevpartcontroller.h>
+#include <tdevpartcontroller.h>
 
 
 using namespace KTextEditor;
 
 Debugger *Debugger::s_instance = 0;
 
-Debugger::Debugger(KDevPartController *partController)
+Debugger::Debugger(TDevPartController *partController)
     :m_partController(partController)
 {
     connect( m_partController, TQT_SIGNAL(partAdded(KParts::Part*)),
diff --git a/languages/lib/debugger/debugger.h b/languages/lib/debugger/debugger.h
index d4112490..1f5cbae8 100644
--- a/languages/lib/debugger/debugger.h
+++ b/languages/lib/debugger/debugger.h
@@ -3,7 +3,7 @@
 
 #include <tqvaluelist.h>
 
-#include "kdevdebugger.h"
+#include "tdevdebugger.h"
 
 #include <tdeparts/part.h>
 #include <tdetexteditor/markinterface.h>
@@ -11,7 +11,7 @@
 #include <tdeversion.h>
 #include <tdetexteditor/markinterfaceextension.h>
 
-class KDevPartController;
+class TDevPartController;
 
 /**
 * Describes a single breakpoint in the system
@@ -54,7 +54,7 @@ private:
 * point of the debugger.
 * We may change, add or remove breakpoints in this class.
 */
-class Debugger : public KDevDebugger
+class Debugger : public TDevDebugger
 {
     Q_OBJECT
   
@@ -94,7 +94,7 @@ public:
 
 // protected:
 
-    Debugger(KDevPartController *partController);
+    Debugger(TDevPartController *partController);
     ~Debugger();
 
 private slots:
@@ -126,7 +126,7 @@ private:
     };
 
     static Debugger *s_instance;
-    KDevPartController *m_partController;
+    TDevPartController *m_partController;
     TQValueList<BPItem> BPList;
 };
 
diff --git a/languages/lib/debugger/kdevdebugger.cpp b/languages/lib/debugger/tdevdebugger.cpp
index b9ee4a05..e005491f 100644
--- a/languages/lib/debugger/kdevdebugger.cpp
+++ b/languages/lib/debugger/tdevdebugger.cpp
@@ -17,19 +17,19 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevdebugger.h"
+#include "tdevdebugger.h"
 
-KDevDebugger::KDevDebugger(TQObject *parent, const char *name)
+TDevDebugger::TDevDebugger(TQObject *parent, const char *name)
   : TQObject(parent, name)
 {
 }
 
 
-KDevDebugger::~KDevDebugger()
+TDevDebugger::~TDevDebugger()
 {
 }
 
-const TQPixmap* KDevDebugger::inactiveBreakpointPixmap()
+const TQPixmap* TDevDebugger::inactiveBreakpointPixmap()
 {
   const char*breakpoint_gr_xpm[]={
   "11 16 6 1",
@@ -59,7 +59,7 @@ const TQPixmap* KDevDebugger::inactiveBreakpointPixmap()
   return &pixmap;
 }
 
-const TQPixmap* KDevDebugger::activeBreakpointPixmap()
+const TQPixmap* TDevDebugger::activeBreakpointPixmap()
 {
   const char* breakpoint_xpm[]={
   "11 16 6 1",
@@ -89,7 +89,7 @@ const TQPixmap* KDevDebugger::activeBreakpointPixmap()
   return &pixmap;
 }
 
-const TQPixmap* KDevDebugger::reachedBreakpointPixmap()
+const TQPixmap* TDevDebugger::reachedBreakpointPixmap()
 {
   const char*breakpoint_bl_xpm[]={
   "11 16 7 1",
@@ -120,7 +120,7 @@ const TQPixmap* KDevDebugger::reachedBreakpointPixmap()
   return &pixmap;
 }
 
-const TQPixmap* KDevDebugger::disabledBreakpointPixmap()
+const TQPixmap* TDevDebugger::disabledBreakpointPixmap()
 {
   const char*breakpoint_wh_xpm[]={
   "11 16 7 1",
@@ -151,7 +151,7 @@ const TQPixmap* KDevDebugger::disabledBreakpointPixmap()
   return &pixmap;
 }
 
-const TQPixmap* KDevDebugger::executionPointPixmap()
+const TQPixmap* TDevDebugger::executionPointPixmap()
 {
   const char*exec_xpm[]={
   "11 16 4 1",
@@ -179,4 +179,4 @@ const TQPixmap* KDevDebugger::executionPointPixmap()
   return &pixmap;
 }
 
-#include "kdevdebugger.moc"
+#include "tdevdebugger.moc"
diff --git a/languages/lib/debugger/kdevdebugger.h b/languages/lib/debugger/tdevdebugger.h
index 4cb7df3f..3cfcd5de 100644
--- a/languages/lib/debugger/kdevdebugger.h
+++ b/languages/lib/debugger/tdevdebugger.h
@@ -17,8 +17,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef _KDEVDEBUGGER_H_
-#define _KDEVDEBUGGER_H_
+#ifndef _TDEVDEBUGGER_H_
+#define _TDEVDEBUGGER_H_
 
 
 #include <tqobject.h>
@@ -31,15 +31,15 @@
 * Base class to handle signals from the editor that relate to breakpoints 
 * and the execution point of the debugger.
 */
-class KDevDebugger : public TQObject
+class TDevDebugger : public TQObject
 {
   Q_OBJECT
   
     
 public:
     
-  KDevDebugger(TQObject *parent=0, const char *name=0);
-  ~KDevDebugger();
+  TDevDebugger(TQObject *parent=0, const char *name=0);
+  ~TDevDebugger();
 
   /**
    * Sets a breakpoint in the editor document belong to fileName.
diff --git a/languages/lib/designer_integration/Mainpage.dox b/languages/lib/designer_integration/Mainpage.dox
index 1f2db949..43070931 100644
--- a/languages/lib/designer_integration/Mainpage.dox
+++ b/languages/lib/designer_integration/Mainpage.dox
@@ -10,18 +10,18 @@ This library contains base classes to implement GUI designer integration in lang
 \section usingintegration Using designer integration support library
 Each language support which wants to use integrated designer, must reimplement 
 @code
-virtual KDevDesignerIntegration *KDevLanguageSupport::designer(KInterfaceDesigner::DesignerType type)
+virtual TDevDesignerIntegration *TDevLanguageSupport::designer(KInterfaceDesigner::DesignerType type)
 @endcode
-method and return designer integration object (@ref KDevLanguageSupport base class returns 0).
+method and return designer integration object (@ref TDevLanguageSupport base class returns 0).
 
 Qt designer integration can be easily implemented by reusing @ref QtDesignerIntegration
 base class.
 
 For example, designer method of a language support could look like:
 @code
-KDevDesignerIntegration * MyLanguageSupportPart::designer(KInterfaceDesigner::DesignerType type)
+TDevDesignerIntegration * MyLanguageSupportPart::designer(KInterfaceDesigner::DesignerType type)
 {
-    KDevDesignerIntegration *des = 0;
+    TDevDesignerIntegration *des = 0;
     switch (type)
     {
         case KInterfaceDesigner::QtDesigner:
@@ -40,7 +40,7 @@ return des;
 @endcode
 In the code above m_designers is a designer cache declared as:
 @code
-QMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*> m_designers;
+QMap<KInterfaceDesigner::DesignerType, TDevDesignerIntegration*> m_designers;
 @endcode
 MyLanguageImplementationWidget and MyLanguageQtDesignerIntegration classes are subclasses
 of @ref QtDesignerIntegration and @ref ImplementationWidget base classes.
diff --git a/languages/lib/designer_integration/Makefile.am b/languages/lib/designer_integration/Makefile.am
index 6e9680a9..41c0395d 100644
--- a/languages/lib/designer_integration/Makefile.am
+++ b/languages/lib/designer_integration/Makefile.am
@@ -4,13 +4,13 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 METASOURCES = AUTO
 libdesignerintegration_la_LDFLAGS = $(all_libraries)
 lib_LTLIBRARIES = libdesignerintegration.la
-libdesignerintegration_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+libdesignerintegration_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 libdesignerintegration_la_SOURCES = implementationwidgetbase.ui \
 	implementationwidget.cpp qtdesignerintegration.cpp
 
 langincludedirdir = $(includedir)/tdevelop/languages/designer_integration
 langincludedir_HEADERS = qtdesignerintegration.h implementationwidget.h implementationwidgetbase.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil
-DOXYGEN_PROJECTNAME = KDevelop Designer Integration Support Library
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces tdevutil
+DOXYGEN_PROJECTNAME = TDevelop Designer Integration Support Library
 include ../../../Doxyfile.am
diff --git a/languages/lib/designer_integration/implementationwidget.cpp b/languages/lib/designer_integration/implementationwidget.cpp
index bdca4558..314e9eeb 100644
--- a/languages/lib/designer_integration/implementationwidget.cpp
+++ b/languages/lib/designer_integration/implementationwidget.cpp
@@ -32,10 +32,10 @@
 #include <tdemessagebox.h>
 #include <tdelistview.h>
 
-#include <kdevproject.h>
+#include <tdevproject.h>
 #include <domutil.h>
 #include <filetemplate.h>
-#include <kdevlanguagesupport.h>
+#include <tdevlanguagesupport.h>
 
 namespace ImplUtils{
 class ClassItem: public TDEListViewItem{
@@ -61,7 +61,7 @@ private:
 };
 }
 
-ImplementationWidget::ImplementationWidget(KDevLanguageSupport *part, TQWidget* parent, const char* name, bool modal)
+ImplementationWidget::ImplementationWidget(TDevLanguageSupport *part, TQWidget* parent, const char* name, bool modal)
     :CreateImplemenationWidgetBase(parent, name, modal), m_part(part)
 {
 }
diff --git a/languages/lib/designer_integration/implementationwidget.h b/languages/lib/designer_integration/implementationwidget.h
index 3dd53763..c74947be 100644
--- a/languages/lib/designer_integration/implementationwidget.h
+++ b/languages/lib/designer_integration/implementationwidget.h
@@ -26,7 +26,7 @@
 #include <codemodel.h>
 
 class TDEListViewItem;
-class KDevLanguageSupport;
+class TDevLanguageSupport;
 
 /**
 Base class for implementation creation widgets.
@@ -42,7 +42,7 @@ class ImplementationWidget : public CreateImplemenationWidgetBase
 Q_OBJECT
   
 public:
-    ImplementationWidget(KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false);
+    ImplementationWidget(TDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false);
     virtual ~ImplementationWidget();
     /*$PUBLIC_FUNCTIONS$*/
 
@@ -77,7 +77,7 @@ protected slots:
     virtual void accept();
     
 protected:
-    KDevLanguageSupport *m_part;
+    TDevLanguageSupport *m_part;
     ClassDom m_selectedClass;
     TQString m_formName;
     TQString m_baseClassName;
diff --git a/languages/lib/designer_integration/qtdesignerintegration.cpp b/languages/lib/designer_integration/qtdesignerintegration.cpp
index 26912ba1..c2b9ab34 100644
--- a/languages/lib/designer_integration/qtdesignerintegration.cpp
+++ b/languages/lib/designer_integration/qtdesignerintegration.cpp
@@ -30,16 +30,16 @@
 
 #include <rurl.h>
 #include <domutil.h>
-#include <kdevpartcontroller.h>
-#include <kdevcreatefile.h>
-#include <kdevlanguagesupport.h>
-#include <kdevproject.h>
+#include <tdevpartcontroller.h>
+#include <tdevcreatefile.h>
+#include <tdevlanguagesupport.h>
+#include <tdevproject.h>
 
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-QtDesignerIntegration::QtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name)
-    :KDevDesignerIntegration(part, name), m_part(part), m_impl(impl),
+QtDesignerIntegration::QtDesignerIntegration(TDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name)
+    :TDevDesignerIntegration(part, name), m_part(part), m_impl(impl),
     m_classHasDefinitions(classHasDefinitions)
 {
 }
diff --git a/languages/lib/designer_integration/qtdesignerintegration.h b/languages/lib/designer_integration/qtdesignerintegration.h
index f76eecba..faafec58 100644
--- a/languages/lib/designer_integration/qtdesignerintegration.h
+++ b/languages/lib/designer_integration/qtdesignerintegration.h
@@ -23,24 +23,24 @@
 #include <tqmap.h>
 
 #include <codemodel.h>
-#include "kdevdesignerintegration.h"
+#include "tdevdesignerintegration.h"
 
-class KDevLanguageSupport;
+class TDevLanguageSupport;
 class ImplementationWidget;
 
 /**
 TQt Designer integration base class.
-Contains language-independent implementation part of a @ref KDevDesignerIntegration interface.
+Contains language-independent implementation part of a @ref TDevDesignerIntegration interface.
 Ready to use in KDevelop language support plugins.
 
 Subclasses of this class should reimplement only pure virtual functions in the common case.
 */
-class QtDesignerIntegration : public KDevDesignerIntegration
+class QtDesignerIntegration : public TDevDesignerIntegration
 {
 Q_OBJECT
   
 public:
-    QtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl,
+    QtDesignerIntegration(TDevLanguageSupport *part, ImplementationWidget *impl,
         bool classHasDefinitions, const char* name = 0);
     virtual ~QtDesignerIntegration();
 
@@ -73,7 +73,7 @@ protected:
     //Form file - derived class name 
     TQMap<TQString, ClassDom> m_implementations;
     
-    KDevLanguageSupport *m_part;
+    TDevLanguageSupport *m_part;
     ImplementationWidget *m_impl;
     bool m_classHasDefinitions;
 };
diff --git a/languages/lib/interfaces/CMakeLists.txt b/languages/lib/interfaces/CMakeLists.txt
index 370eece3..e8af2f36 100644
--- a/languages/lib/interfaces/CMakeLists.txt
+++ b/languages/lib/interfaces/CMakeLists.txt
@@ -22,7 +22,7 @@ link_directories(
 
 ##### headers ###################################
 
-install( FILES kdevpcsimporter.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/languages/interfaces )
+install( FILES tdevpcsimporter.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/languages/interfaces )
 
 
 ##### other data ################################
@@ -33,7 +33,7 @@ install( FILES tdeveloppcsimporter.desktop DESTINATION ${SERVICETYPES_INSTALL_DI
 ##### lang_interfaces (shared) ##################
 
 tde_add_library( lang_interfaces SHARED AUTOMOC
-  SOURCES kdevpcsimporter.cpp
+  SOURCES tdevpcsimporter.cpp
   VERSION 0.0.0
   LINK ${TQT_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
diff --git a/languages/lib/interfaces/Makefile.am b/languages/lib/interfaces/Makefile.am
index c3ed3d00..127999e6 100644
--- a/languages/lib/interfaces/Makefile.am
+++ b/languages/lib/interfaces/Makefile.am
@@ -3,14 +3,14 @@ METASOURCES = AUTO
 langincludedirdir = $(includedir)/tdevelop/languages/interfaces
 lib_LTLIBRARIES = liblang_interfaces.la
 liblang_interfaces_la_LDFLAGS = $(all_libraries)
-liblang_interfaces_la_SOURCES = kdevpcsimporter.cpp
+liblang_interfaces_la_SOURCES = tdevpcsimporter.cpp
 liblang_interfaces_la_LIBADD = $(LIB_QT)
-langincludedir_HEADERS = kdevpcsimporter.h
+langincludedir_HEADERS = tdevpcsimporter.h
 INCLUDES = $(all_includes)
 servicetypedir = $(kde_servicetypesdir)
 servicetype_DATA = tdeveloppcsimporter.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil
-DOXYGEN_PROJECTNAME = KDevelop Language Support Interfaces Library
-DOXYGEN_DOCDIRPREFIX = kdevlang
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces tdevutil
+DOXYGEN_PROJECTNAME = TDevelop Language Support Interfaces Library
+DOXYGEN_DOCDIRPREFIX = tdevlang
 include ../../../Doxyfile.am
diff --git a/languages/lib/interfaces/kdevpcsimporter.cpp b/languages/lib/interfaces/tdevpcsimporter.cpp
index 166cc862..66e29c13 100644
--- a/languages/lib/interfaces/kdevpcsimporter.cpp
+++ b/languages/lib/interfaces/tdevpcsimporter.cpp
@@ -17,19 +17,19 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kdevpcsimporter.h"
-#include "kdevpcsimporter.moc"
+#include "tdevpcsimporter.h"
+#include "tdevpcsimporter.moc"
 
-KDevPCSImporter::KDevPCSImporter( TQObject * parent, const char * name )
+TDevPCSImporter::TDevPCSImporter( TQObject * parent, const char * name )
     : TQObject( parent, name )
 {
 }
 
-KDevPCSImporter::~ KDevPCSImporter( )
+TDevPCSImporter::~ TDevPCSImporter( )
 {
 }
 
-TQWidget * KDevPCSImporter::createSettingsPage( TQWidget * /*parent*/, const char * /*name*/ )
+TQWidget * TDevPCSImporter::createSettingsPage( TQWidget * /*parent*/, const char * /*name*/ )
 {
     return 0;
 }
diff --git a/languages/lib/interfaces/kdevpcsimporter.h b/languages/lib/interfaces/tdevpcsimporter.h
index 870865cb..62878973 100644
--- a/languages/lib/interfaces/kdevpcsimporter.h
+++ b/languages/lib/interfaces/tdevpcsimporter.h
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KDEVPCSIMPORTER_H
-#define KDEVPCSIMPORTER_H
+#ifndef TDEVPCSIMPORTER_H
+#define TDEVPCSIMPORTER_H
 
 #include <tqobject.h>
 #include <tqstringlist.h>
@@ -32,13 +32,13 @@ These plugins are used by language support plugins to fill symbol stores
 with symbol information from certain files. The purpose of the importer
 is to provide file selection wizard.
 */
-class KDevPCSImporter: public TQObject
+class TDevPCSImporter: public TQObject
 {
     Q_OBJECT
   
 public:
-    KDevPCSImporter( TQObject* parent=0, const char* name=0 );
-    virtual ~KDevPCSImporter();
+    TDevPCSImporter( TQObject* parent=0, const char* name=0 );
+    virtual ~TDevPCSImporter();
 
     virtual TQString dbName() const = 0;
     virtual TQStringList includePaths() = 0;
@@ -47,4 +47,4 @@ public:
     virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 );
 };
 
-#endif // KDEVPCSIMPORTER_H
+#endif // TDEVPCSIMPORTER_H
diff --git a/languages/pascal/CMakeLists.txt b/languages/pascal/CMakeLists.txt
index 7449570e..cd398415 100644
--- a/languages/pascal/CMakeLists.txt
+++ b/languages/pascal/CMakeLists.txt
@@ -34,18 +34,18 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevpascalsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpascalsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpascalsupport )
-install( FILES pascaltemplates DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/templates )
+install( FILES tdevpascalsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpascalsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpascalsupport )
+install( FILES pascaltemplates DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/templates )
 
 
-##### libkdevpascalsupport (module) #############
+##### libtdevpascalsupport (module) #############
 
-tde_add_kpart( libkdevpascalsupport AUTOMOC
+tde_add_kpart( libtdevpascalsupport AUTOMOC
   SOURCES
     pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp
     PascalStoreWalker.cpp backgroundparser.cpp
     configproblemreporter.ui problemreporter.cpp
-  LINK antlr-static kdevcatalog-shared tdevelop-shared
+  LINK antlr-static tdevcatalog-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/pascal/Makefile.am b/languages/pascal/Makefile.am
index 9d168734..403f37f9 100644
--- a/languages/pascal/Makefile.am
+++ b/languages/pascal/Makefile.am
@@ -5,19 +5,19 @@ INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \
 	$(all_includes)
 SUBDIRS = file_templates app_templates compiler doc
 
-kde_module_LTLIBRARIES = libkdevpascalsupport.la
-libkdevpascalsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN)
-libkdevpascalsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la
+kde_module_LTLIBRARIES = libtdevpascalsupport.la
+libtdevpascalsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN)
+libtdevpascalsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libtdevcatalog.la
 
-libkdevpascalsupport_la_SOURCES = pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp
+libtdevpascalsupport_la_SOURCES = pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevpascalsupport.desktop
+service_DATA = tdevpascalsupport.desktop
 
-rcdir = $(kde_datadir)/kdevpascalsupport
-rc_DATA = kdevpascalsupport.rc
+rcdir = $(kde_datadir)/tdevpascalsupport
+rc_DATA = tdevpascalsupport.rc
 
 genparser:
 	antlr   pascal.g && antlr pascal.tree.g
@@ -29,5 +29,5 @@ genparser:
 #PascalStoreWalker.hpp PascalStoreWalker.cpp: pascal.tree.g
 #	antlr pascal.tree.g
 
-templatedir = ${kde_datadir}/kdevabbrev/templates
+templatedir = ${kde_datadir}/tdevabbrev/templates
 template_DATA = pascaltemplates
diff --git a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
index eb16e978..b4a2e071 100644
--- a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
+++ b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( fpcgtk.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/fpcgtk.tar.gz fpcgtk.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    fpcgtk.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    fpcgtk.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/pascal/app_templates/fpcgtk/Makefile.am b/languages/pascal/app_templates/fpcgtk/Makefile.am
index 5c4c116f..e9744c9b 100644
--- a/languages/pascal/app_templates/fpcgtk/Makefile.am
+++ b/languages/pascal/app_templates/fpcgtk/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop
 templateName = fpcgtk
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/pascal/app_templates/fpcgtk/app.tdevelop b/languages/pascal/app_templates/fpcgtk/app.tdevelop
index e7b3a147..bbd6d777 100644
--- a/languages/pascal/app_templates/fpcgtk/app.tdevelop
+++ b/languages/pascal/app_templates/fpcgtk/app.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevpascalproject>
+ <tdevpascalproject>
   <general>
     <useconfiguration>default</useconfiguration>
   </general>
@@ -26,8 +26,8 @@
   <run>
    <terminal>false</terminal>
   </run>
- </kdevpascalproject>
- <kdevdoctreeview>
+ </tdevpascalproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -75,12 +75,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="pp"/>
    <type ext="pas"/>
    <type ext="dpr"/>
   </useglobaltypes>
- </kdevfilecreate>
+ </tdevfilecreate>
 </tdevelop>
diff --git a/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate b/languages/pascal/app_templates/fpcgtk/fpcgtk.tdevtemplate
index 45bb7eea..d0103844 100644
--- a/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate
+++ b/languages/pascal/app_templates/fpcgtk/fpcgtk.tdevtemplate
@@ -64,7 +64,7 @@ Archive=fpcgtk.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/pascal/app_templates/fpchello/CMakeLists.txt b/languages/pascal/app_templates/fpchello/CMakeLists.txt
index 12941440..37ac3aa9 100644
--- a/languages/pascal/app_templates/fpchello/CMakeLists.txt
+++ b/languages/pascal/app_templates/fpchello/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( fpchello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/fpchello.tar.gz fpchello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    fpchello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    fpchello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/pascal/app_templates/fpchello/Makefile.am b/languages/pascal/app_templates/fpchello/Makefile.am
index 744bc214..f5567a09 100644
--- a/languages/pascal/app_templates/fpchello/Makefile.am
+++ b/languages/pascal/app_templates/fpchello/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop
 templateName = fpchello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/pascal/app_templates/fpchello/app.tdevelop b/languages/pascal/app_templates/fpchello/app.tdevelop
index a2f83092..603e6e6b 100644
--- a/languages/pascal/app_templates/fpchello/app.tdevelop
+++ b/languages/pascal/app_templates/fpchello/app.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevpascalproject>
+ <tdevpascalproject>
   <general>
     <useconfiguration>default</useconfiguration>
   </general>
@@ -26,8 +26,8 @@
   <run>
    <terminal>true</terminal>
   </run>
- </kdevpascalproject>
- <kdevdoctreeview>
+ </tdevpascalproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -75,12 +75,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="pp"/>
    <type ext="pas"/>
    <type ext="dpr"/>
   </useglobaltypes>
- </kdevfilecreate>
+ </tdevfilecreate>
 </tdevelop>
diff --git a/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate b/languages/pascal/app_templates/fpchello/fpchello.tdevtemplate
index 65c46115..21c213f4 100644
--- a/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate
+++ b/languages/pascal/app_templates/fpchello/fpchello.tdevtemplate
@@ -65,7 +65,7 @@ Archive=fpchello.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt b/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt
index 52a5e4f7..779eda2d 100644
--- a/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt
+++ b/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( fpcsharedlib.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/fpcsharedlib.tar.gz fpcsharedlib.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    fpcsharedlib.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    fpcsharedlib.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/pascal/app_templates/fpcsharedlib/Makefile.am b/languages/pascal/app_templates/fpcsharedlib/Makefile.am
index d1d0eef4..13194e81 100644
--- a/languages/pascal/app_templates/fpcsharedlib/Makefile.am
+++ b/languages/pascal/app_templates/fpcsharedlib/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop
 templateName = fpcsharedlib
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/pascal/app_templates/fpcsharedlib/app.tdevelop b/languages/pascal/app_templates/fpcsharedlib/app.tdevelop
index 8249e017..e0289480 100644
--- a/languages/pascal/app_templates/fpcsharedlib/app.tdevelop
+++ b/languages/pascal/app_templates/fpcsharedlib/app.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevpascalproject>
+ <tdevpascalproject>
   <general>
     <useconfiguration>default</useconfiguration>
   </general>
@@ -26,8 +26,8 @@
   <run>
    <terminal>true</terminal>
   </run>
- </kdevpascalproject>
- <kdevdoctreeview>
+ </tdevpascalproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -75,12 +75,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="pp"/>
    <type ext="pas"/>
    <type ext="dpr"/>
   </useglobaltypes>
- </kdevfilecreate>
+ </tdevfilecreate>
 </tdevelop>
diff --git a/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate b/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.tdevtemplate
index 35835599..3c4e93bf 100644
--- a/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate
+++ b/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.tdevtemplate
@@ -65,7 +65,7 @@ Archive=fpcsharedlib.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/pascal/app_templates/pascalhello/CMakeLists.txt b/languages/pascal/app_templates/pascalhello/CMakeLists.txt
index 3422a8ff..a9d1b313 100644
--- a/languages/pascal/app_templates/pascalhello/CMakeLists.txt
+++ b/languages/pascal/app_templates/pascalhello/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( pascalhello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/pascalhello.tar.gz pascalhello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    pascalhello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    pascalhello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/pascal/app_templates/pascalhello/Makefile.am b/languages/pascal/app_templates/pascalhello/Makefile.am
index 3e72435c..96ce40c7 100644
--- a/languages/pascal/app_templates/pascalhello/Makefile.am
+++ b/languages/pascal/app_templates/pascalhello/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop
 templateName = pascalhello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/pascal/app_templates/pascalhello/app.tdevelop b/languages/pascal/app_templates/pascalhello/app.tdevelop
index 51e8c65e..8e571db2 100644
--- a/languages/pascal/app_templates/pascalhello/app.tdevelop
+++ b/languages/pascal/app_templates/pascalhello/app.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevpascalproject>
+ <tdevpascalproject>
   <general>
     <useconfiguration>default</useconfiguration>
   </general>
@@ -23,8 +23,8 @@
   <run>
    <terminal>true</terminal>
   </run>
- </kdevpascalproject>
- <kdevdoctreeview>
+ </tdevpascalproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -72,12 +72,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="pp"/>
    <type ext="pas"/>
    <type ext="dpr"/>
   </useglobaltypes>
- </kdevfilecreate>
+ </tdevfilecreate>
 </tdevelop>
diff --git a/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate b/languages/pascal/app_templates/pascalhello/pascalhello.tdevtemplate
index ed7104cb..e70ca533 100644
--- a/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate
+++ b/languages/pascal/app_templates/pascalhello/pascalhello.tdevtemplate
@@ -67,7 +67,7 @@ Archive=pascalhello.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/pascal/compiler/Makefile.am b/languages/pascal/compiler/Makefile.am
index c9f7528b..400962be 100644
--- a/languages/pascal/compiler/Makefile.am
+++ b/languages/pascal/compiler/Makefile.am
@@ -1,6 +1,6 @@
 # This is the collection of plugins. In contrast to the parts
 # directory, these are 'transient' in a sense and don't
-# share the complete KDevComponent interface.
+# share the complete TDevComponent interface.
 
 SUBDIRS = dccoptions  fpcoptions
 
diff --git a/languages/pascal/compiler/dccoptions/CMakeLists.txt b/languages/pascal/compiler/dccoptions/CMakeLists.txt
index ae6c6388..3e7fbcdd 100644
--- a/languages/pascal/compiler/dccoptions/CMakeLists.txt
+++ b/languages/pascal/compiler/dccoptions/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevdccoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevdccoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevdccoptions (module) ################
+##### libtdevdccoptions (module) ################
 
-tde_add_kpart( libkdevdccoptions AUTOMOC
+tde_add_kpart( libtdevdccoptions AUTOMOC
   SOURCES dccoptionsplugin.cpp optiontabs.cpp
-  LINK kdevwidgets-shared kdevextras-shared
+  LINK tdevwidgets-shared tdevextras-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/pascal/compiler/dccoptions/Makefile.am b/languages/pascal/compiler/dccoptions/Makefile.am
index 734e63c5..f913ae45 100644
--- a/languages/pascal/compiler/dccoptions/Makefile.am
+++ b/languages/pascal/compiler/dccoptions/Makefile.am
@@ -3,14 +3,14 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \
 	-I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevdccoptions.la
-libkdevdccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-libkdevdccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML)
+kde_module_LTLIBRARIES = libtdevdccoptions.la
+libtdevdccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libtdevdccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(LIB_TDEHTML)
 
-libkdevdccoptions_la_SOURCES = dccoptionsplugin.cpp optiontabs.cpp
+libtdevdccoptions_la_SOURCES = dccoptionsplugin.cpp optiontabs.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevdccoptions.desktop
+service_DATA = tdevdccoptions.desktop
diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp
index 8a8ffc54..cffbbdd5 100644
--- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp
+++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp
@@ -19,10 +19,10 @@
 
 #include "optiontabs.h"
 
-K_EXPORT_COMPONENT_FACTORY( libkdevdccoptions, KGenericFactory<DccOptionsPlugin>( "kdevdccoptions" ) )
+K_EXPORT_COMPONENT_FACTORY( libtdevdccoptions, KGenericFactory<DccOptionsPlugin>( "tdevdccoptions" ) )
 
 DccOptionsPlugin::DccOptionsPlugin(TQObject *parent, const char *name, const TQStringList/* &args*/)
-    : KDevCompilerOptions(parent, name)
+    : TDevCompilerOptions(parent, name)
 {
 }
 
diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h
index d8465520..b0db639d 100644
--- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h
+++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h
@@ -13,9 +13,9 @@
 
 #include <kdialogbase.h>
 
-#include "kdevcompileroptions.h"
+#include "tdevcompileroptions.h"
 
-class DccOptionsPlugin : public KDevCompilerOptions
+class DccOptionsPlugin : public TDevCompilerOptions
 {
     Q_OBJECT
   
diff --git a/languages/pascal/compiler/dccoptions/kdevdccoptions.desktop b/languages/pascal/compiler/dccoptions/tdevdccoptions.desktop
index e99e9385..3631eeb9 100644
--- a/languages/pascal/compiler/dccoptions/kdevdccoptions.desktop
+++ b/languages/pascal/compiler/dccoptions/tdevdccoptions.desktop
@@ -48,7 +48,7 @@ Name[ta]=Dccவிருப்பங்கள்
 Name[tg]=DccИнтихобҳо
 Name[zh_TW]=Dcc 選項
 ServiceTypes=TDevelop/CompilerOptions
-X-TDE-Library=libkdevdccoptions
+X-TDE-Library=libtdevdccoptions
 X-TDevelop-Version=5
 X-TDevelop-Language=Pascal
 X-TDevelop-Args=dcc
diff --git a/languages/pascal/compiler/fpcoptions/CMakeLists.txt b/languages/pascal/compiler/fpcoptions/CMakeLists.txt
index 12c9ef89..7d9a010f 100644
--- a/languages/pascal/compiler/fpcoptions/CMakeLists.txt
+++ b/languages/pascal/compiler/fpcoptions/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevfpcoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevfpcoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevfpcoptions (module) ################
+##### libtdevfpcoptions (module) ################
 
-tde_add_kpart( libkdevfpcoptions AUTOMOC
+tde_add_kpart( libtdevfpcoptions AUTOMOC
   SOURCES fpcoptionsplugin.cpp optiontabs.cpp
-  LINK kdevwidgets-shared kdevextras-shared
+  LINK tdevwidgets-shared tdevextras-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/pascal/compiler/fpcoptions/Makefile.am b/languages/pascal/compiler/fpcoptions/Makefile.am
index 70579448..3d105f6f 100644
--- a/languages/pascal/compiler/fpcoptions/Makefile.am
+++ b/languages/pascal/compiler/fpcoptions/Makefile.am
@@ -3,17 +3,17 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \
 	-I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevfpcoptions.la
-libkdevfpcoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-libkdevfpcoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML)
+kde_module_LTLIBRARIES = libtdevfpcoptions.la
+libtdevfpcoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libtdevfpcoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(LIB_TDEHTML)
 
-libkdevfpcoptions_la_SOURCES = fpcoptionsplugin.cpp optiontabs.cpp
+libtdevfpcoptions_la_SOURCES = fpcoptionsplugin.cpp optiontabs.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevfpcoptions.desktop
+service_DATA = tdevfpcoptions.desktop
 
 
 
diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
index 0b01fb01..31babced 100644
--- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
+++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp
@@ -16,10 +16,10 @@
 #include "optiontabs.h"
 #include "fpcoptionsplugin.h"
 
-K_EXPORT_COMPONENT_FACTORY( libkdevfpcoptions, KGenericFactory<FpcOptionsPlugin>( "kdevfpcoptions" ) )
+K_EXPORT_COMPONENT_FACTORY( libtdevfpcoptions, KGenericFactory<FpcOptionsPlugin>( "tdevfpcoptions" ) )
 
 FpcOptionsPlugin::FpcOptionsPlugin(TQObject *parent, const char *name, const TQStringList& /*args*/)
-    : KDevCompilerOptions(parent, name)
+    : TDevCompilerOptions(parent, name)
 {
 }
 
diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
index e30b33c0..cee18e79 100644
--- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
+++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h
@@ -13,9 +13,9 @@
 
 #include <kdialogbase.h>
 
-#include "kdevcompileroptions.h"
+#include "tdevcompileroptions.h"
 
-class FpcOptionsPlugin : public KDevCompilerOptions
+class FpcOptionsPlugin : public TDevCompilerOptions
 {
     Q_OBJECT
   
diff --git a/languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop b/languages/pascal/compiler/fpcoptions/tdevfpcoptions.desktop
index 660e973d..da25b683 100644
--- a/languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop
+++ b/languages/pascal/compiler/fpcoptions/tdevfpcoptions.desktop
@@ -47,7 +47,7 @@ Name[ta]=Fpcவிருப்பங்கள்
 Name[tg]=FpcИнтихобҳо
 Name[zh_TW]=Fpc 選項
 ServiceTypes=TDevelop/CompilerOptions
-X-TDE-Library=libkdevfpcoptions
+X-TDE-Library=libtdevfpcoptions
 X-TDevelop-Version=5
 X-TDevelop-Language=Pascal
 X-TDevelop-Args=fpc
diff --git a/languages/pascal/doc/CMakeLists.txt b/languages/pascal/doc/CMakeLists.txt
index ade55abb..37627f81 100644
--- a/languages/pascal/doc/CMakeLists.txt
+++ b/languages/pascal/doc/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     pascal_bugs_fp.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs )
diff --git a/languages/pascal/doc/Makefile.am b/languages/pascal/doc/Makefile.am
index a7829d08..bf36ead8 100644
--- a/languages/pascal/doc/Makefile.am
+++ b/languages/pascal/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = pascal_bugs_fp.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/pascal/file_templates/CMakeLists.txt b/languages/pascal/file_templates/CMakeLists.txt
index 812d0398..5a55baad 100644
--- a/languages/pascal/file_templates/CMakeLists.txt
+++ b/languages/pascal/file_templates/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     dpr pas-program pas-unit pp-program pp-unit
-  DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
diff --git a/languages/pascal/file_templates/Makefile.am b/languages/pascal/file_templates/Makefile.am
index 94891c97..fe16bfb0 100644
--- a/languages/pascal/file_templates/Makefile.am
+++ b/languages/pascal/file_templates/Makefile.am
@@ -1,2 +1,2 @@
-templatedir = $(kde_datadir)/kdevfilecreate/file-templates
+templatedir = $(kde_datadir)/tdevfilecreate/file-templates
 template_DATA = dpr pas-program pas-unit pp-program pp-unit
diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp
index 69cbebf8..3b9d8263 100644
--- a/languages/pascal/pascalsupport_part.cpp
+++ b/languages/pascal/pascalsupport_part.cpp
@@ -15,7 +15,7 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kstatusbar.h>
@@ -23,11 +23,11 @@
 #include <antlr/ASTFactory.hpp>
 
 #include "catalog.h"
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
-#include <kdevpartcontroller.h>
-#include <kdevproject.h>
-#include <kdevplugininfo.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
+#include <tdevpartcontroller.h>
+#include <tdevproject.h>
+#include <tdevplugininfo.h>
 
 #include "pascalsupport_part.h"
 #include "problemreporter.h"
@@ -43,16 +43,16 @@ struct PascalSupportPartData{
         {}
 };
 
-typedef KDevGenericFactory<PascalSupportPart> PascalSupportFactory;
-static const KDevPluginInfo data("kdevpascalsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) )
+typedef TDevGenericFactory<PascalSupportPart> PascalSupportFactory;
+static const TDevPluginInfo data("tdevpascalsupport");
+K_EXPORT_COMPONENT_FACTORY( libtdevpascalsupport, PascalSupportFactory( data ) )
 
 PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ),
+  : TDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ),
     d( new PascalSupportPartData() )
 {
     setInstance(PascalSupportFactory::instance());
-    setXMLFile("kdevpascalsupport.rc");
+    setXMLFile("tdevpascalsupport.rc");
 
     d->problemReporter = new ProblemReporter( this );
     connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)),
@@ -317,7 +317,7 @@ TQString PascalSupportPart::formatModelItem( const CodeModelItem * item, bool sh
         return arg.stripWhiteSpace();
     }
     else
-        return KDevLanguageSupport::formatModelItem( item, shortDescription );
+        return TDevLanguageSupport::formatModelItem( item, shortDescription );
 }
 
 #include "pascalsupport_part.moc"
diff --git a/languages/pascal/pascalsupport_part.h b/languages/pascal/pascalsupport_part.h
index 5c99c2ae..bac5c25b 100644
--- a/languages/pascal/pascalsupport_part.h
+++ b/languages/pascal/pascalsupport_part.h
@@ -7,11 +7,11 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
-#ifndef __KDEVPART_PASCALSUPPORT_H__
-#define __KDEVPART_PASCALSUPPORT_H__
+#ifndef __TDEVPART_PASCALSUPPORT_H__
+#define __TDEVPART_PASCALSUPPORT_H__
 
 #include <tqguardedptr.h>
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 
 class PascalSupportWidget;
 class KDialogBase;
@@ -19,7 +19,7 @@ class TQPopupMenu;
 class Context;
 class PascalSupportPartData;
 
-class PascalSupportPart : public KDevLanguageSupport
+class PascalSupportPart : public TDevLanguageSupport
 {
     Q_OBJECT
   
diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp
index 2b477063..0d33aec1 100644
--- a/languages/pascal/problemreporter.cpp
+++ b/languages/pascal/problemreporter.cpp
@@ -18,8 +18,8 @@
 
 #include "problemreporter.h"
 #include "pascalsupport_part.h"
-#include "kdevpartcontroller.h"
-#include "kdevmainwindow.h"
+#include "tdevpartcontroller.h"
+#include "tdevmainwindow.h"
 #include "configproblemreporter.h"
 #include "backgroundparser.h"
 
diff --git a/languages/pascal/kdevpascalsupport.desktop b/languages/pascal/tdevpascalsupport.desktop
index 65e9f851..85c50c20 100644
--- a/languages/pascal/kdevpascalsupport.desktop
+++ b/languages/pascal/tdevpascalsupport.desktop
@@ -79,6 +79,6 @@ GenericName[tr]=Pascal Dil Desteği
 GenericName[zh_CN]=Pascal 语言支持
 GenericName[zh_TW]=Pascal 語言支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libkdevpascalsupport
+X-TDE-Library=libtdevpascalsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Pascal
diff --git a/languages/pascal/kdevpascalsupport.rc b/languages/pascal/tdevpascalsupport.rc
index 4335b2a6..4335b2a6 100644
--- a/languages/pascal/kdevpascalsupport.rc
+++ b/languages/pascal/tdevpascalsupport.rc
diff --git a/languages/perl/CMakeLists.txt b/languages/perl/CMakeLists.txt
index e458c240..01327acb 100644
--- a/languages/perl/CMakeLists.txt
+++ b/languages/perl/CMakeLists.txt
@@ -30,13 +30,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevperlsupport.desktop perldoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevperlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevperlsupport )
+install( FILES tdevperlsupport.desktop perldoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevperlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevperlsupport )
 
 
-##### libkdevperlsupport (module) ###############
+##### libtdevperlsupport (module) ###############
 
-tde_add_kpart( libkdevperlsupport AUTOMOC
+tde_add_kpart( libtdevperlsupport AUTOMOC
   SOURCES
     perlparser.cpp perlsupportpart.cpp
     perlconfigwidget.cpp perlconfigwidgetbase.ui
diff --git a/languages/perl/Makefile.am b/languages/perl/Makefile.am
index fcedfa23..f498dfd3 100644
--- a/languages/perl/Makefile.am
+++ b/languages/perl/Makefile.am
@@ -6,11 +6,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 SUBDIRS = app_templates file_templates doc
 
 
-kde_module_LTLIBRARIES = libkdevperlsupport.la tdeio_perldoc.la
-libkdevperlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevperlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevperlsupport.la tdeio_perldoc.la
+libtdevperlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevperlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevperlsupport_la_SOURCES = perlparser.cpp perlsupportpart.cpp perlconfigwidget.cpp perlconfigwidgetbase.ui
+libtdevperlsupport_la_SOURCES = perlparser.cpp perlsupportpart.cpp perlconfigwidget.cpp perlconfigwidgetbase.ui
 
 tdeio_perldoc_la_SOURCES = perldoc.cpp
 tdeio_perldoc_la_LIBADD = $(LIB_TDEIO)
@@ -19,7 +19,7 @@ tdeio_perldoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevperlsupport.desktop perldoc.protocol
+service_DATA = tdevperlsupport.desktop perldoc.protocol
 
-rcdir = $(kde_datadir)/kdevperlsupport
-rc_DATA = kdevperlsupport.rc
+rcdir = $(kde_datadir)/tdevperlsupport
+rc_DATA = tdevperlsupport.rc
diff --git a/languages/perl/app_templates/perlhello/CMakeLists.txt b/languages/perl/app_templates/perlhello/CMakeLists.txt
index bf51d851..6537b51c 100644
--- a/languages/perl/app_templates/perlhello/CMakeLists.txt
+++ b/languages/perl/app_templates/perlhello/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( perlhello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/perlhello.tar.gz perlhello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    perlhello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    perlhello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/perl/app_templates/perlhello/Makefile.am b/languages/perl/app_templates/perlhello/Makefile.am
index b483b35b..a7987969 100644
--- a/languages/perl/app_templates/perlhello/Makefile.am
+++ b/languages/perl/app_templates/perlhello/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = app.pl app.tdevelop
 templateName = perlhello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/perl/app_templates/perlhello/app.tdevelop b/languages/perl/app_templates/perlhello/app.tdevelop
index a83391b7..2ae93215 100644
--- a/languages/perl/app_templates/perlhello/app.tdevelop
+++ b/languages/perl/app_templates/perlhello/app.tdevelop
@@ -9,7 +9,7 @@
   <projectdirectory>.</projectdirectory>
   <absoluteprojectpath>false</absoluteprojectpath>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <run>
    <mainprogram>./%{APPNAMELC}.pl</mainprogram>
   </run>
@@ -17,8 +17,8 @@
     <includepatterns>*.pl,*.pm</includepatterns>
     <excludepatterns>*~</excludepatterns>
   </general>
- </kdevscriptproject>
- <kdevdoctreeview>
+ </tdevscriptproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -65,13 +65,13 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="" />
       <type ext="pl" />
       <type ext="pm" />
     </useglobaltypes>
- </kdevfilecreate>
+ </tdevfilecreate>
 </tdevelop>
diff --git a/languages/perl/app_templates/perlhello/perlhello.kdevtemplate b/languages/perl/app_templates/perlhello/perlhello.tdevtemplate
index 8ec5a560..8ec5a560 100644
--- a/languages/perl/app_templates/perlhello/perlhello.kdevtemplate
+++ b/languages/perl/app_templates/perlhello/perlhello.tdevtemplate
diff --git a/languages/perl/doc/CMakeLists.txt b/languages/perl/doc/CMakeLists.txt
index 653dc0d7..2e8ed498 100644
--- a/languages/perl/doc/CMakeLists.txt
+++ b/languages/perl/doc/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     perl.toc perl_bugs.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs )
diff --git a/languages/perl/doc/Makefile.am b/languages/perl/doc/Makefile.am
index dae5d699..b62295ed 100644
--- a/languages/perl/doc/Makefile.am
+++ b/languages/perl/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = perl.toc perl_bugs.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/perl/file_templates/CMakeLists.txt b/languages/perl/file_templates/CMakeLists.txt
index 7faec8fc..96c5fa74 100644
--- a/languages/perl/file_templates/CMakeLists.txt
+++ b/languages/perl/file_templates/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     pl pm
-  DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
diff --git a/languages/perl/file_templates/Makefile.am b/languages/perl/file_templates/Makefile.am
index f1f8457d..5dd94646 100644
--- a/languages/perl/file_templates/Makefile.am
+++ b/languages/perl/file_templates/Makefile.am
@@ -1,4 +1,4 @@
-templatedir = $(kde_datadir)/kdevfilecreate/file-templates
+templatedir = $(kde_datadir)/tdevfilecreate/file-templates
 template_DATA = pl pm
 
 
diff --git a/languages/perl/perlparser.cpp b/languages/perl/perlparser.cpp
index 60cca8f5..ca7b8dff 100644
--- a/languages/perl/perlparser.cpp
+++ b/languages/perl/perlparser.cpp
@@ -22,7 +22,7 @@
 #include <tqregexp.h>
 #include <tqfileinfo.h>
 
-perlparser::perlparser(KDevCore* core,CodeModel* model, TQString interpreter) {
+perlparser::perlparser(TDevCore* core,CodeModel* model, TQString interpreter) {
   m_core = core;
   m_model = model;
   m_interpreter=interpreter;
diff --git a/languages/perl/perlparser.h b/languages/perl/perlparser.h
index b536596b..6249ce15 100644
--- a/languages/perl/perlparser.h
+++ b/languages/perl/perlparser.h
@@ -18,7 +18,7 @@
 #ifndef PERLPARSER_H
 #define PERLPARSER_H
 
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 #include <codemodel.h>
 
 
@@ -28,7 +28,7 @@
 
 class perlparser {
   public: 
-  perlparser(KDevCore* core,CodeModel* model, TQString interpreter);
+  perlparser(TDevCore* core,CodeModel* model, TQString interpreter);
   perlparser();
   ~perlparser();
 
@@ -70,7 +70,7 @@ class perlparser {
 
   //CodeModel
   CodeModel* m_model;
-  KDevCore* m_core;
+  TDevCore* m_core;
   FileDom m_file;
 
   //this willhav a list of INC paths
diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
index c8379c77..08627ea5 100644
--- a/languages/perl/perlsupportpart.cpp
+++ b/languages/perl/perlsupportpart.cpp
@@ -19,24 +19,24 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kinputdialog.h>
 #include <tdelocale.h>
 #include <tqregexp.h>
 #include <codemodel.h>
 #include <tqprogressbar.h>
 #include <kstatusbar.h>
-#include "kdevmainwindow.h"
+#include "tdevmainwindow.h"
 
 #include <kprocess.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevpartcontroller.h"
-#include "kdevplugininfo.h"
-#include "kdevappfrontend.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevpartcontroller.h"
+#include "tdevplugininfo.h"
+#include "tdevappfrontend.h"
 //#include "classstore.h"
 //#include "parsedclass.h"
 //#include "parsedmethod.h"
@@ -44,16 +44,16 @@
 #include "domutil.h"
 //#include "programmingbycontract.h"
 
-typedef KDevGenericFactory<PerlSupportPart> PerlSupportFactory;
-static const KDevPluginInfo data("kdevperlsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( data ) )
+typedef TDevGenericFactory<PerlSupportPart> PerlSupportFactory;
+static const TDevPluginInfo data("tdevperlsupport");
+K_EXPORT_COMPONENT_FACTORY( libtdevperlsupport, PerlSupportFactory( data ) )
 
 PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart")
+    : TDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart")
 {
     setInstance(PerlSupportFactory::instance());
 
-    setXMLFile("kdevperlsupport.rc");
+    setXMLFile("tdevperlsupport.rc");
 
     connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
     connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
@@ -174,9 +174,9 @@ void PerlSupportPart::savedFile(const KURL &fileName)
 }
 
 
-KDevLanguageSupport::Features PerlSupportPart::features()
+TDevLanguageSupport::Features PerlSupportPart::features()
 {
-    return KDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/);
+    return TDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/);
 //    return Functions;
 }
 
@@ -193,7 +193,7 @@ TQString PerlSupportPart::interpreter()
 void PerlSupportPart::startApplication(const TQString &program)
 {
     bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevperlsupport/run/terminal");
-    if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
+    if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
         appFrontend->startAppCommand(TQString(), program, inTerminal);
 }
 
diff --git a/languages/perl/perlsupportpart.h b/languages/perl/perlsupportpart.h
index 00c6bc69..b6517bbc 100644
--- a/languages/perl/perlsupportpart.h
+++ b/languages/perl/perlsupportpart.h
@@ -12,11 +12,11 @@
 #ifndef _PERLSUPPORTPART_H_
 #define _PERLSUPPORTPART_H_
 
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 #include <codemodel.h>
 #include "perlparser.h"
 
-class PerlSupportPart : public KDevLanguageSupport
+class PerlSupportPart : public TDevLanguageSupport
 {
     Q_OBJECT
   
diff --git a/languages/perl/kdevperlsupport.desktop b/languages/perl/tdevperlsupport.desktop
index 9c637679..472be4f3 100644
--- a/languages/perl/kdevperlsupport.desktop
+++ b/languages/perl/tdevperlsupport.desktop
@@ -79,7 +79,7 @@ GenericName[tr]=Perl Desteği
 GenericName[zh_CN]=Perl 支持
 GenericName[zh_TW]=Perl 支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libkdevperlsupport
+X-TDE-Library=libtdevperlsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Perl
 
diff --git a/languages/perl/kdevperlsupport.rc b/languages/perl/tdevperlsupport.rc
index 9f5f4ee9..9f5f4ee9 100644
--- a/languages/perl/kdevperlsupport.rc
+++ b/languages/perl/tdevperlsupport.rc
diff --git a/languages/php/CMakeLists.txt b/languages/php/CMakeLists.txt
index 3a9e4123..02faa3cc 100644
--- a/languages/php/CMakeLists.txt
+++ b/languages/php/CMakeLists.txt
@@ -32,20 +32,20 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevphpsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevphpsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevphpsupport )
-install( FILES phptemplates DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/templates )
+install( FILES tdevphpsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevphpsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevphpsupport )
+install( FILES phptemplates DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/templates )
 
 
-##### libkdevphpsupport (module) ################
+##### libtdevphpsupport (module) ################
 
-tde_add_kpart( libkdevphpsupport AUTOMOC
+tde_add_kpart( libtdevphpsupport AUTOMOC
   SOURCES
     phpsupportpart.cpp phpconfigwidgetbase.ui
     phpconfigwidget.cpp phpinfodlg.ui phphtmlview.cpp
     phperrorview.cpp phpconfigdata.cpp phpcodecompletion.cpp
     phpparser.cpp phpnewclassdlgbase.ui phpnewclassdlg.cpp
     phpfile.cpp
-  LINK kdevwidgets-shared tdevelop-shared
+  LINK tdevwidgets-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/php/Makefile.am b/languages/php/Makefile.am
index a10604e5..bc4bb9d9 100644
--- a/languages/php/Makefile.am
+++ b/languages/php/Makefile.am
@@ -6,19 +6,19 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 SUBDIRS = data app_templates file_templates doc
 
 
-kde_module_LTLIBRARIES = libkdevphpsupport.la
-libkdevphpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevphpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML)
+kde_module_LTLIBRARIES = libtdevphpsupport.la
+libtdevphpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevphpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML)
 
-libkdevphpsupport_la_SOURCES = phpsupportpart.cpp phpconfigwidgetbase.ui phpconfigwidget.cpp phpinfodlg.ui phphtmlview.cpp phperrorview.cpp phpconfigdata.cpp phpcodecompletion.cpp phpparser.cpp phpnewclassdlgbase.ui phpnewclassdlg.cpp phpfile.cpp
+libtdevphpsupport_la_SOURCES = phpsupportpart.cpp phpconfigwidgetbase.ui phpconfigwidget.cpp phpinfodlg.ui phphtmlview.cpp phperrorview.cpp phpconfigdata.cpp phpcodecompletion.cpp phpparser.cpp phpnewclassdlgbase.ui phpnewclassdlg.cpp phpfile.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevphpsupport.desktop
+service_DATA = tdevphpsupport.desktop
 
-rcdir = $(kde_datadir)/kdevphpsupport
-rc_DATA = kdevphpsupport.rc
+rcdir = $(kde_datadir)/tdevphpsupport
+rc_DATA = tdevphpsupport.rc
 
-templatedir = ${kde_datadir}/kdevabbrev/templates
+templatedir = ${kde_datadir}/tdevabbrev/templates
 template_DATA = phptemplates
diff --git a/languages/php/app_templates/phphello/CMakeLists.txt b/languages/php/app_templates/phphello/CMakeLists.txt
index 4e534e08..c858f07a 100644
--- a/languages/php/app_templates/phphello/CMakeLists.txt
+++ b/languages/php/app_templates/phphello/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( phphello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/phphello.tar.gz phphello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    phphello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    phphello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/php/app_templates/phphello/Makefile.am b/languages/php/app_templates/phphello/Makefile.am
index bc983960..c1457307 100644
--- a/languages/php/app_templates/phphello/Makefile.am
+++ b/languages/php/app_templates/phphello/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = app.php app.tdevelop
 templateName = phphello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/php/app_templates/phphello/app.tdevelop b/languages/php/app_templates/phphello/app.tdevelop
index 2cdb1c70..961e0f4d 100644
--- a/languages/php/app_templates/phphello/app.tdevelop
+++ b/languages/php/app_templates/phphello/app.tdevelop
@@ -15,13 +15,13 @@
    <part>KDevVisualBoyAdvance</part>
   </ignoreparts>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <general>
    <activedir></activedir>
    <includepatterns>*.php,*.phps,*.php3,*.inc</includepatterns>
   </general>
- </kdevscriptproject>
- <kdevdoctreeview>
+ </tdevscriptproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -65,23 +65,23 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-<kdevphpsupport>
+ </tdevdoctreeview>
+<tdevphpsupport>
 	<codeHelp>
 	   <codeCompletion>true</codeCompletion>
 	   <codeHinting>true</codeHinting>
 	   <realtimeParsing>true</realtimeParsing>
 	  </codeHelp>
-</kdevphpsupport>
-  <kdevfilecreate>
+</tdevphpsupport>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="php"/>
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevfileview>
+  </tdevfilecreate>
+  <tdevfileview>
     <groups>
       <group pattern="*.php;*.phps;*.php3" name="PHP files" />
       <group pattern="*.inc" name="Include files" />
     </groups>
-  </kdevfileview>
+  </tdevfileview>
 </tdevelop>
diff --git a/languages/php/app_templates/phphello/phphello.kdevtemplate b/languages/php/app_templates/phphello/phphello.tdevtemplate
index 481f2748..481f2748 100644
--- a/languages/php/app_templates/phphello/phphello.kdevtemplate
+++ b/languages/php/app_templates/phphello/phphello.tdevtemplate
diff --git a/languages/php/data/CMakeLists.txt b/languages/php/data/CMakeLists.txt
index f89943bc..1662f9c9 100644
--- a/languages/php/data/CMakeLists.txt
+++ b/languages/php/data/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     phpfunctions
-  DESTINATION ${DATA_INSTALL_DIR}/kdevphpsupport )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevphpsupport )
diff --git a/languages/php/data/Makefile.am b/languages/php/data/Makefile.am
index e54b0415..c48e5460 100644
--- a/languages/php/data/Makefile.am
+++ b/languages/php/data/Makefile.am
@@ -1,4 +1,4 @@
-phpsupportdatadir = ${kde_datadir}/kdevphpsupport
+phpsupportdatadir = ${kde_datadir}/tdevphpsupport
 
 install-data-local:		
 	mkdir -p $(DESTDIR)$(phpsupportdatadir)
diff --git a/languages/php/doc/CMakeLists.txt b/languages/php/doc/CMakeLists.txt
index 59ea2199..8b7e6b10 100644
--- a/languages/php/doc/CMakeLists.txt
+++ b/languages/php/doc/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     php.toc php_bugs.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs )
diff --git a/languages/php/doc/Makefile.am b/languages/php/doc/Makefile.am
index 163d435b..2b2ce6aa 100644
--- a/languages/php/doc/Makefile.am
+++ b/languages/php/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = php.toc php_bugs.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/php/file_templates/CMakeLists.txt b/languages/php/file_templates/CMakeLists.txt
index 5de3a576..3b034ae7 100644
--- a/languages/php/file_templates/CMakeLists.txt
+++ b/languages/php/file_templates/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     php
-  DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
diff --git a/languages/php/file_templates/Makefile.am b/languages/php/file_templates/Makefile.am
index 7f031b4a..765157b2 100644
--- a/languages/php/file_templates/Makefile.am
+++ b/languages/php/file_templates/Makefile.am
@@ -1,4 +1,4 @@
-templatedir = $(kde_datadir)/kdevfilecreate/file-templates
+templatedir = $(kde_datadir)/tdevfilecreate/file-templates
 template_DATA = php
 
 
diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp
index af301000..42615f69 100644
--- a/languages/php/phpcodecompletion.cpp
+++ b/languages/php/phpcodecompletion.cpp
@@ -21,7 +21,7 @@
 #include "phpsupportpart.h"
 #include "phpconfigdata.h"
 
-#include <kdevcore.h>
+#include <tdevcore.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/languages/php/phpcodecompletion.h b/languages/php/phpcodecompletion.h
index 65905878..bac6c44f 100644
--- a/languages/php/phpcodecompletion.h
+++ b/languages/php/phpcodecompletion.h
@@ -27,7 +27,7 @@
 #include <kregexp.h>
 #include <tdeparts/part.h>
 
-#include <kdevmainwindow.h>
+#include <tdevmainwindow.h>
 #include <kstatusbar.h>
 
 #include <tdetexteditor/editinterface.h>
@@ -36,7 +36,7 @@
 #include <tdetexteditor/selectioninterface.h>
 
 
-class KDevCore;
+class TDevCore;
 class PHPSupportPart;
 class PHPConfigData;
 
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index 9af14b0d..d408afb9 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.cpp
@@ -20,9 +20,9 @@
 #include "phperrorview.h"
 #include "phpsupportpart.h"
 
-#include <kdevpartcontroller.h>
-#include <kdevmainwindow.h>
-#include <kdevproject.h>
+#include <tdevpartcontroller.h>
+#include <tdevmainwindow.h>
+#include <tdevproject.h>
 
 #include <tdeversion.h>
 #include <tdeparts/part.h>
diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp
index 92d2fc4c..1c4e6d04 100644
--- a/languages/php/phpfile.cpp
+++ b/languages/php/phpfile.cpp
@@ -25,7 +25,7 @@
 #include <kprocess.h>
 #include <kdebug.h>
 
-#include <kdevpartcontroller.h>
+#include <tdevpartcontroller.h>
 
 #include "phphtmlview.h"
 #include "phperrorview.h"
diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h
index ac5a4525..647be68a 100644
--- a/languages/php/phpfile.h
+++ b/languages/php/phpfile.h
@@ -30,9 +30,9 @@
 #include <kprocess.h>
 #include <kdebug.h>
 
-#include <kdevproject.h>
-#include <kdevlanguagesupport.h>
-#include <kdevpartcontroller.h>
+#include <tdevproject.h>
+#include <tdevlanguagesupport.h>
+#include <tdevpartcontroller.h>
 
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/document.h>
diff --git a/languages/php/phphtmlview.cpp b/languages/php/phphtmlview.cpp
index d21a6fa0..01123bb8 100644
--- a/languages/php/phphtmlview.cpp
+++ b/languages/php/phphtmlview.cpp
@@ -18,7 +18,7 @@
 #include "phphtmlview.h"
 
 #include "phpsupportpart.h"
-#include "kdevpartcontroller.h"
+#include "tdevpartcontroller.h"
 
 PHPHTMLView::PHPHTMLView(PHPSupportPart *part):m_part(part) {
    setOptions(CanOpenInNewWindow);
diff --git a/languages/php/phphtmlview.h b/languages/php/phphtmlview.h
index e55be392..2da25349 100644
--- a/languages/php/phphtmlview.h
+++ b/languages/php/phphtmlview.h
@@ -18,14 +18,14 @@
 #ifndef PHPHTMLVIEW_H
 #define PHPHTMLVIEW_H
 
-#include <kdevhtmlpart.h>
+#include <tdevhtmlpart.h>
 
 /**
   *@author
   */
 class PHPSupportPart;
 
-class PHPHTMLView : public KDevHTMLPart  {
+class PHPHTMLView : public TDevHTMLPart  {
 Q_OBJECT
   
 public:
diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp
index 6b725dc8..2af89eee 100644
--- a/languages/php/phpparser.cpp
+++ b/languages/php/phpparser.cpp
@@ -21,8 +21,8 @@
 #include <urlutil.h>
 
 #include <tdeapplication.h>
-#include <kdevcore.h>
-#include <kdevproject.h>
+#include <tdevcore.h>
+#include <tdevproject.h>
 #include <codemodel.h>
 
 #include <tqregexp.h>
diff --git a/languages/php/phpparser.h b/languages/php/phpparser.h
index 87093b06..629e68b6 100644
--- a/languages/php/phpparser.h
+++ b/languages/php/phpparser.h
@@ -31,7 +31,7 @@
 
 #include "phpfile.h"
 
-class KDevCore;
+class TDevCore;
 class PHPSupportPart;
 
 /**
@@ -56,7 +56,7 @@ public:
 
 private:
    CodeModel* m_model;
-   KDevCore* m_core;
+   TDevCore* m_core;
    PHPSupportPart* m_part;
 
    TQMutex m_mutex;
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index 4f764f1f..f5c484a9 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -43,13 +43,13 @@
 #include <kstatusbar.h>
 #include <tdeparts/browserextension.h>
 
-#include <kdevcore.h>
-#include <kdevproject.h>
-#include <kdevmainwindow.h>
-#include <kdevpartcontroller.h>
+#include <tdevcore.h>
+#include <tdevproject.h>
+#include <tdevmainwindow.h>
+#include <tdevpartcontroller.h>
 #include <codemodel.h>
 #include <domutil.h>
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 #include <kiconloader.h>
 
 #include "phpconfigdata.h"
@@ -66,18 +66,18 @@
 
 using namespace std;
 
-static const KDevPluginInfo data("kdevphpsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( data ) )
+static const TDevPluginInfo data("tdevphpsupport");
+K_EXPORT_COMPONENT_FACTORY( libtdevphpsupport, PHPSupportFactory( data ) )
 
 PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart")
+    : TDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart")
 {
    m_htmlView = 0;
    m_parser = 0;
    phpExeProc = 0;
    setInstance(PHPSupportFactory::instance());
 
-   setXMLFile("kdevphpsupport.rc");
+   setXMLFile("tdevphpsupport.rc");
 
    connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
    connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
@@ -545,7 +545,7 @@ TQString PHPSupportPart::getExePath()
    return configData->getPHPExecPath();
 }
 
-KDevLanguageSupport::Features PHPSupportPart::features()
+TDevLanguageSupport::Features PHPSupportPart::features()
 {
    return Features(Classes | Functions);
 }
diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h
index 4dca877b..35203bc7 100644
--- a/languages/php/phpsupportpart.h
+++ b/languages/php/phpsupportpart.h
@@ -25,9 +25,9 @@
 #include <tqprogressbar.h>
 
 #include <kdialogbase.h>
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 #include <tdeio/job.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 
 #include <tdetexteditor/editinterface.h>
 
@@ -41,7 +41,7 @@ class PHPCodeCompletion;
 class PHPParser;
 class PHPFile;
 
-class PHPSupportPart : public KDevLanguageSupport
+class PHPSupportPart : public TDevLanguageSupport
 {
     Q_OBJECT
   
@@ -129,6 +129,6 @@ private:
    VariableDom LastVariable;
 };
 
-typedef KDevGenericFactory<PHPSupportPart> PHPSupportFactory;
+typedef TDevGenericFactory<PHPSupportPart> PHPSupportFactory;
 
 #endif
diff --git a/languages/php/kdevphpsupport.desktop b/languages/php/tdevphpsupport.desktop
index eea6c168..64fe4329 100644
--- a/languages/php/kdevphpsupport.desktop
+++ b/languages/php/tdevphpsupport.desktop
@@ -80,7 +80,7 @@ GenericName[tr]=PHP Desteği
 GenericName[zh_CN]=PHP 支持
 GenericName[zh_TW]=PHP 支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libkdevphpsupport
+X-TDE-Library=libtdevphpsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=PHP
 
diff --git a/languages/php/kdevphpsupport.rc b/languages/php/tdevphpsupport.rc
index 14ebd3ba..14ebd3ba 100644
--- a/languages/php/kdevphpsupport.rc
+++ b/languages/php/tdevphpsupport.rc
diff --git a/languages/python/CMakeLists.txt b/languages/python/CMakeLists.txt
index 989ea1b1..ec9d708b 100644
--- a/languages/python/CMakeLists.txt
+++ b/languages/python/CMakeLists.txt
@@ -32,14 +32,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevpythonsupport.desktop pydoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kde_pydoc.py DESTINATION ${DATA_INSTALL_DIR}/tdeio_pydoc )
-install( FILES kdevpythonsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpythonsupport )
+install( FILES tdevpythonsupport.desktop pydoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tde_pydoc.py DESTINATION ${DATA_INSTALL_DIR}/tdeio_pydoc )
+install( FILES tdevpythonsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpythonsupport )
 
 
-##### libkdevpythonsupport (module) #############
+##### libtdevpythonsupport (module) #############
 
-tde_add_kpart( libkdevpythonsupport AUTOMOC
+tde_add_kpart( libtdevpythonsupport AUTOMOC
   SOURCES
     pythonsupportpart.cpp pythonconfigwidget.cpp
     pythonconfigwidgetbase.ui pythonimplementationwidget.cpp
diff --git a/languages/python/Makefile.am b/languages/python/Makefile.am
index feef469d..12ca5a06 100644
--- a/languages/python/Makefile.am
+++ b/languages/python/Makefile.am
@@ -1,5 +1,5 @@
 # Here resides the Python support part.
-# Do not confuse this with the python part responsible for KDevelop scripting
+# Do not confuse this with the python part responsible for TDevelop scripting
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/languages/lib/designer_integration \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util -I$(top_builddir)/languages/lib/designer_integration \
@@ -7,12 +7,12 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/languages/lib/designer
 SUBDIRS = app_templates file_templates doc
 
 
-kde_module_LTLIBRARIES = libkdevpythonsupport.la tdeio_pydoc.la
+kde_module_LTLIBRARIES = libtdevpythonsupport.la tdeio_pydoc.la
 
-libkdevpythonsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevpythonsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+libtdevpythonsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevpythonsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la
-libkdevpythonsupport_la_SOURCES = pythonsupportpart.cpp pythonconfigwidget.cpp pythonconfigwidgetbase.ui \
+libtdevpythonsupport_la_SOURCES = pythonsupportpart.cpp pythonconfigwidget.cpp pythonconfigwidgetbase.ui \
 	pythonimplementationwidget.cpp qtdesignerpythonintegration.cpp
 
 tdeio_pydoc_la_SOURCES = pydoc.cpp
@@ -22,10 +22,10 @@ tdeio_pydoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 METASOURCES = AUTO
 
 slavedir = $(kde_datadir)/tdeio_pydoc
-slave_DATA = kde_pydoc.py
+slave_DATA = tde_pydoc.py
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevpythonsupport.desktop pydoc.protocol
+service_DATA = tdevpythonsupport.desktop pydoc.protocol
 
-rcdir = $(kde_datadir)/kdevpythonsupport
-rc_DATA = kdevpythonsupport.rc
+rcdir = $(kde_datadir)/tdevpythonsupport
+rc_DATA = tdevpythonsupport.rc
diff --git a/languages/python/app_templates/pyqt/CMakeLists.txt b/languages/python/app_templates/pyqt/CMakeLists.txt
index 672d6652..0beb7976 100644
--- a/languages/python/app_templates/pyqt/CMakeLists.txt
+++ b/languages/python/app_templates/pyqt/CMakeLists.txt
@@ -21,9 +21,9 @@ add_custom_target( pyqt.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/pyqt.tar.gz pyqt.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    pyqt.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    pyqt.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/python/app_templates/pyqt/Makefile.am b/languages/python/app_templates/pyqt/Makefile.am
index dc12ca69..7ace4e15 100644
--- a/languages/python/app_templates/pyqt/Makefile.am
+++ b/languages/python/app_templates/pyqt/Makefile.am
@@ -6,10 +6,10 @@ dataFiles = app.py app.tdevelop fileopen.pyxpm fileprint.pyxpm  \
 templateName = pyqt
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/python/app_templates/pyqt/app.tdevelop b/languages/python/app_templates/pyqt/app.tdevelop
index 2abb394e..7f2743cb 100644
--- a/languages/python/app_templates/pyqt/app.tdevelop
+++ b/languages/python/app_templates/pyqt/app.tdevelop
@@ -12,15 +12,15 @@
     </keywords>
     <ignoreparts/>
   </general>
-  <kdevautoproject>
+  <tdevautoproject>
     <general>
       <activedir/>
     </general>
     <run>
       <mainprogram>./%{APPNAMELC}.py</mainprogram>
     </run>
-  </kdevautoproject>
-  <kdevdoctreeview>
+  </tdevautoproject>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -61,8 +61,8 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfileview>
+  </tdevdoctreeview>
+  <tdevfileview>
     <tree>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
@@ -71,11 +71,11 @@
       <group pattern="*.py" name="Python files" />
       <group pattern="*.ui" name="QT Designer files" />
     </groups>
-  </kdevfileview>
-  <kdevfilecreate>
+  </tdevfileview>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="py"/>
       <type ext="ui"/>
     </useglobaltypes>
-  </kdevfilecreate>  
+  </tdevfilecreate>  
 </tdevelop>
diff --git a/languages/python/app_templates/pyqt/pyqt.kdevtemplate b/languages/python/app_templates/pyqt/pyqt.tdevtemplate
index f19e263c..cb0deace 100644
--- a/languages/python/app_templates/pyqt/pyqt.kdevtemplate
+++ b/languages/python/app_templates/pyqt/pyqt.tdevtemplate
@@ -66,7 +66,7 @@ Archive=pyqt.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [FILE1]
 Type=install
diff --git a/languages/python/app_templates/pythonhello/CMakeLists.txt b/languages/python/app_templates/pythonhello/CMakeLists.txt
index dfdbbc3b..d6c3f09c 100644
--- a/languages/python/app_templates/pythonhello/CMakeLists.txt
+++ b/languages/python/app_templates/pythonhello/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( pythonhello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/pythonhello.tar.gz pythonhello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    pythonhello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    pythonhello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/python/app_templates/pythonhello/Makefile.am b/languages/python/app_templates/pythonhello/Makefile.am
index 2dc4f559..7265f7de 100644
--- a/languages/python/app_templates/pythonhello/Makefile.am
+++ b/languages/python/app_templates/pythonhello/Makefile.am
@@ -1,10 +1,10 @@
 dataFiles = app.py app.tdevelop pythonhello.png
 templateName = pythonhello
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/python/app_templates/pythonhello/app.tdevelop b/languages/python/app_templates/pythonhello/app.tdevelop
index 9826d145..a93a999c 100644
--- a/languages/python/app_templates/pythonhello/app.tdevelop
+++ b/languages/python/app_templates/pythonhello/app.tdevelop
@@ -11,15 +11,15 @@
   </keywords>
   <ignoreparts/>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <general>
    <activedir></activedir>
   </general>
   <run>
    <mainprogram>%{APPNAMELC}.py</mainprogram>
   </run>
- </kdevscriptproject>
- <kdevdoctreeview>
+ </tdevscriptproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -66,8 +66,8 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfileview>
+ </tdevdoctreeview>
+ <tdevfileview>
    <tree>
      <hidenonprojectfiles>false</hidenonprojectfiles>
      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
@@ -75,10 +75,10 @@
    <groups>
      <group pattern="*.py" name="Python files" />
    </groups>
- </kdevfileview>
-  <kdevfilecreate>
+ </tdevfileview>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="py"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate b/languages/python/app_templates/pythonhello/pythonhello.tdevtemplate
index 0e130571..0e130571 100644
--- a/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate
+++ b/languages/python/app_templates/pythonhello/pythonhello.tdevtemplate
diff --git a/languages/python/app_templates/pytk/CMakeLists.txt b/languages/python/app_templates/pytk/CMakeLists.txt
index 1a28ddad..d71c9be1 100644
--- a/languages/python/app_templates/pytk/CMakeLists.txt
+++ b/languages/python/app_templates/pytk/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( pytk.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/pytk.tar.gz pytk.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    pytk.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    pytk.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/python/app_templates/pytk/Makefile.am b/languages/python/app_templates/pytk/Makefile.am
index d1ebe715..94fb2122 100644
--- a/languages/python/app_templates/pytk/Makefile.am
+++ b/languages/python/app_templates/pytk/Makefile.am
@@ -1,10 +1,10 @@
 dataFiles = app.py app.tdevelop pytk.png
 templateName = pytk
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/python/app_templates/pytk/app.tdevelop b/languages/python/app_templates/pytk/app.tdevelop
index 1482b842..95144f90 100644
--- a/languages/python/app_templates/pytk/app.tdevelop
+++ b/languages/python/app_templates/pytk/app.tdevelop
@@ -11,15 +11,15 @@
   </keywords>
   <ignoreparts/>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <general>
    <activedir></activedir>
   </general>
   <run>
    <mainprogram>%{APPNAMELC}.py</mainprogram>
   </run>
- </kdevscriptproject>
- <kdevdoctreeview>
+ </tdevscriptproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -64,8 +64,8 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfileview>
+ </tdevdoctreeview>
+ <tdevfileview>
    <tree>
      <hidenonprojectfiles>false</hidenonprojectfiles>
      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
@@ -73,10 +73,10 @@
    <groups>
      <group pattern="*.py" name="Python files" />
    </groups>
- </kdevfileview>
-  <kdevfilecreate>
+ </tdevfileview>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="py"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/languages/python/app_templates/pytk/pytk.kdevtemplate b/languages/python/app_templates/pytk/pytk.tdevtemplate
index 3b8ac6bc..3b8ac6bc 100644
--- a/languages/python/app_templates/pytk/pytk.kdevtemplate
+++ b/languages/python/app_templates/pytk/pytk.tdevtemplate
diff --git a/languages/python/doc/CMakeLists.txt b/languages/python/doc/CMakeLists.txt
index a3caa5fd..49cdea0d 100644
--- a/languages/python/doc/CMakeLists.txt
+++ b/languages/python/doc/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     python.toc python_bugs.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs )
diff --git a/languages/python/doc/Makefile.am b/languages/python/doc/Makefile.am
index 5159f5f0..1714c774 100644
--- a/languages/python/doc/Makefile.am
+++ b/languages/python/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = python.toc python_bugs.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/python/file_templates/CMakeLists.txt b/languages/python/file_templates/CMakeLists.txt
index ddc20b95..efd7a0bf 100644
--- a/languages/python/file_templates/CMakeLists.txt
+++ b/languages/python/file_templates/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     py
-  DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
diff --git a/languages/python/file_templates/Makefile.am b/languages/python/file_templates/Makefile.am
index 0846fdf2..9073dd5f 100644
--- a/languages/python/file_templates/Makefile.am
+++ b/languages/python/file_templates/Makefile.am
@@ -1,4 +1,4 @@
-templatedir = $(kde_datadir)/kdevfilecreate/file-templates
+templatedir = $(kde_datadir)/tdevfilecreate/file-templates
 template_DATA = py
 
 
diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp
index bcb38b1e..43ceb071 100644
--- a/languages/python/pydoc.cpp
+++ b/languages/python/pydoc.cpp
@@ -20,7 +20,7 @@ PydocProtocol::PydocProtocol(const TQCString &pool, const TQCString &app)
     : SlaveBase("pydoc", pool, app), key()
 {
     python = TDEGlobal::dirs()->findExe("python");
-    script = locate("data", "tdeio_pydoc/kde_pydoc.py");
+    script = locate("data", "tdeio_pydoc/tde_pydoc.py");
 }
 
 
diff --git a/languages/python/pythonconfigwidget.cpp b/languages/python/pythonconfigwidget.cpp
index 29103705..e6915eac 100644
--- a/languages/python/pythonconfigwidget.cpp
+++ b/languages/python/pythonconfigwidget.cpp
@@ -20,8 +20,8 @@ PythonConfigWidget::PythonConfigWidget(TQDomDocument &projectDom,
                                        TQWidget *parent, const char *name)
     : PythonConfigWidgetBase(parent, name), dom(projectDom)
 {
-    interpreter_edit->setText(DomUtil::readEntry(dom, "/kdevpythonsupport/run/interpreter"));
-    terminal_box->setChecked(DomUtil::readBoolEntry(dom, "/kdevpythonsupport/run/terminal"));
+    interpreter_edit->setText(DomUtil::readEntry(dom, "/tdepythonsupport/run/interpreter"));
+    terminal_box->setChecked(DomUtil::readBoolEntry(dom, "/tdepythonsupport/run/terminal"));
 }
 
 
@@ -31,8 +31,8 @@ PythonConfigWidget::~PythonConfigWidget()
 
 void PythonConfigWidget::accept()
 {
-    DomUtil::writeEntry(dom, "/kdevpythonsupport/run/interpreter", interpreter_edit->text());
-    DomUtil::writeBoolEntry(dom, "/kdevpythonsupport/run/terminal", terminal_box->isChecked());
+    DomUtil::writeEntry(dom, "/tdepythonsupport/run/interpreter", interpreter_edit->text());
+    DomUtil::writeBoolEntry(dom, "/tdepythonsupport/run/terminal", terminal_box->isChecked());
 }
 
 #include "pythonconfigwidget.moc"
diff --git a/languages/python/pythonimplementationwidget.cpp b/languages/python/pythonimplementationwidget.cpp
index de351b8e..b89488ef 100644
--- a/languages/python/pythonimplementationwidget.cpp
+++ b/languages/python/pythonimplementationwidget.cpp
@@ -30,10 +30,10 @@
 #include <tdemessagebox.h>
 
 #include <filetemplate.h>
-#include <kdevlanguagesupport.h>
-#include <kdevproject.h>
+#include <tdevlanguagesupport.h>
+#include <tdevproject.h>
 
-PythonImplementationWidget::PythonImplementationWidget(KDevLanguageSupport* part, 
+PythonImplementationWidget::PythonImplementationWidget(TDevLanguageSupport* part, 
     TQWidget* parent, const char* name, bool modal)
     : ImplementationWidget(part, parent, name, modal)
 {
diff --git a/languages/python/pythonimplementationwidget.h b/languages/python/pythonimplementationwidget.h
index c8e1cbde..bc4a945b 100644
--- a/languages/python/pythonimplementationwidget.h
+++ b/languages/python/pythonimplementationwidget.h
@@ -27,7 +27,7 @@ class PythonImplementationWidget : public ImplementationWidget
 Q_OBJECT
   
 public:
-    PythonImplementationWidget(KDevLanguageSupport* part, TQWidget* parent = 0, const char* name = 0, bool modal = true);
+    PythonImplementationWidget(TDevLanguageSupport* part, TQWidget* parent = 0, const char* name = 0, bool modal = true);
 
     ~PythonImplementationWidget();
 
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index 1f2c7b87..279688a6 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -12,10 +12,10 @@
 #include "pythonsupportpart.h"
 #include "pythonconfigwidget.h"
 
-#include <kdevcore.h>
-#include <kdevproject.h>
-#include <kdevappfrontend.h>
-#include <kdevpartcontroller.h>
+#include <tdevcore.h>
+#include <tdevproject.h>
+#include <tdevappfrontend.h>
+#include <tdevpartcontroller.h>
 #include <codemodel.h>
 #include <domutil.h>
 
@@ -29,8 +29,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 #include <kinputdialog.h>
 #include <tdelocale.h>
 #include <tqregexp.h>
@@ -38,16 +38,16 @@
 #include "qtdesignerpythonintegration.h"
 #include "pythonimplementationwidget.h"
 
-typedef KDevGenericFactory<PythonSupportPart> PythonSupportFactory;
-static const KDevPluginInfo data("kdevpythonsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( data ) )
+typedef TDevGenericFactory<PythonSupportPart> PythonSupportFactory;
+static const TDevPluginInfo data("tdepythonsupport");
+K_EXPORT_COMPONENT_FACTORY( libtdevpythonsupport, PythonSupportFactory( data ) )
 
 PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevLanguageSupport(&data, parent, name ? name : "PythonSupportPart")
+    : TDevLanguageSupport(&data, parent, name ? name : "PythonSupportPart")
 {
     setInstance(PythonSupportFactory::instance());
 
-    setXMLFile("kdevpythonsupport.rc");
+    setXMLFile("tdepythonsupport.rc");
 
     connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
     connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
@@ -100,7 +100,7 @@ void PythonSupportPart::contextMenu(TQPopupMenu *popup, const Context *context)
         {
             m_contextFileName = url.fileName();
             int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass()));
-            popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner."));
+            popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated TDevDesigner."));
         }
     }
 }
@@ -217,7 +217,7 @@ void PythonSupportPart::savedFile(const KURL &fileName)
 }
 
 
-KDevLanguageSupport::Features PythonSupportPart::features()
+TDevLanguageSupport::Features PythonSupportPart::features()
 {
     return Features(Classes | Functions);
 }
@@ -316,7 +316,7 @@ void PythonSupportPart::parse(const TQString &fileName)
 
 TQString PythonSupportPart::interpreter()
 {
-    TQString prog = DomUtil::readEntry(*projectDom(), "/kdevpythonsupport/run/interpreter");
+    TQString prog = DomUtil::readEntry(*projectDom(), "/tdepythonsupport/run/interpreter");
     if (prog.isEmpty())
         prog = "python";
 
@@ -326,8 +326,8 @@ TQString PythonSupportPart::interpreter()
 
 void PythonSupportPart::startApplication(const TQString &program)
 {
-    bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevpythonsupport/run/terminal");
-    if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
+    bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/tdepythonsupport/run/terminal");
+    if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
         appFrontend->startAppCommand(TQString(), program, inTerminal);
 }
 
@@ -369,9 +369,9 @@ void PythonSupportPart::slotPydoc()
     }
 }
 
-KDevDesignerIntegration *PythonSupportPart::designer(KInterfaceDesigner::DesignerType type)
+TDevDesignerIntegration *PythonSupportPart::designer(KInterfaceDesigner::DesignerType type)
 {
-    KDevDesignerIntegration *des = 0;
+    TDevDesignerIntegration *des = 0;
     switch (type)
     {
         case KInterfaceDesigner::TQtDesigner:
@@ -381,7 +381,7 @@ KDevDesignerIntegration *PythonSupportPart::designer(KInterfaceDesigner::Designe
                 PythonImplementationWidget *impl = new PythonImplementationWidget(this);
                 des = new QtDesignerPythonIntegration(this, impl);
                 des->loadSettings(*project()->projectDom(),
-                    "kdevpythonsupport/designerintegration");
+                    "tdepythonsupport/designerintegration");
                 m_designers[type] = des;
             }
             break;
diff --git a/languages/python/pythonsupportpart.h b/languages/python/pythonsupportpart.h
index c60a2eb3..873e0934 100644
--- a/languages/python/pythonsupportpart.h
+++ b/languages/python/pythonsupportpart.h
@@ -13,14 +13,14 @@
 #define _PYTHONSUPPORTPART_H_
 
 
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 
 class KDialogBase;
 class TQStringList;
 class TQPopupMenu;
 class Context;
 
-class PythonSupportPart : public KDevLanguageSupport
+class PythonSupportPart : public TDevLanguageSupport
 {
     Q_OBJECT
   
@@ -29,7 +29,7 @@ public:
     PythonSupportPart( TQObject *parent, const char *name, const TQStringList & );
     ~PythonSupportPart();
   
-    virtual KDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type);
+    virtual TDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type);
     
 public slots:
     void contextMenu(TQPopupMenu *popup, const Context *context);
@@ -60,7 +60,7 @@ private:
     void maybeParse(const TQString fileName);
     void parse(const TQString &fileName);
 
-    TQMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*> m_designers;
+    TQMap<KInterfaceDesigner::DesignerType, TDevDesignerIntegration*> m_designers;
     TQString m_contextFileName;
 };
 
diff --git a/languages/python/qtdesignerpythonintegration.cpp b/languages/python/qtdesignerpythonintegration.cpp
index c1627f18..ca8bed51 100644
--- a/languages/python/qtdesignerpythonintegration.cpp
+++ b/languages/python/qtdesignerpythonintegration.cpp
@@ -31,14 +31,14 @@
 #include <tdetexteditor/viewcursorinterface.h>
 
 #include <domutil.h>
-#include <kdevpartcontroller.h>
-#include <kdevcreatefile.h>
-#include <kdevlanguagesupport.h>
+#include <tdevpartcontroller.h>
+#include <tdevcreatefile.h>
+#include <tdevlanguagesupport.h>
 
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-QtDesignerPythonIntegration::QtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl)
+QtDesignerPythonIntegration::QtDesignerPythonIntegration(TDevLanguageSupport* part, ImplementationWidget* impl)
     :QtDesignerIntegration(part, impl, false, 0)
 {
 }
diff --git a/languages/python/qtdesignerpythonintegration.h b/languages/python/qtdesignerpythonintegration.h
index 8b171f17..120e6b47 100644
--- a/languages/python/qtdesignerpythonintegration.h
+++ b/languages/python/qtdesignerpythonintegration.h
@@ -27,7 +27,7 @@ class QtDesignerPythonIntegration : public QtDesignerIntegration
 Q_OBJECT
   
 public:
-    QtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl);
+    QtDesignerPythonIntegration(TDevLanguageSupport* part, ImplementationWidget* impl);
 
     ~QtDesignerPythonIntegration();
 
diff --git a/languages/python/kde_pydoc.py b/languages/python/tde_pydoc.py
index 0516f172..0516f172 100755..100644
--- a/languages/python/kde_pydoc.py
+++ b/languages/python/tde_pydoc.py
diff --git a/languages/python/kdevpythonsupport.desktop b/languages/python/tdevpythonsupport.desktop
index 61f2ff76..973604ff 100644
--- a/languages/python/kdevpythonsupport.desktop
+++ b/languages/python/tdevpythonsupport.desktop
@@ -80,6 +80,6 @@ GenericName[tr]=Python Desteği
 GenericName[zh_CN]=Python 支持
 GenericName[zh_TW]=Python 支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libkdevpythonsupport
+X-TDE-Library=libtdevpythonsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Python
diff --git a/languages/python/kdevpythonsupport.rc b/languages/python/tdevpythonsupport.rc
index d19011b8..d19011b8 100644
--- a/languages/python/kdevpythonsupport.rc
+++ b/languages/python/tdevpythonsupport.rc
diff --git a/languages/ruby/CMakeLists.txt b/languages/ruby/CMakeLists.txt
index 2f1a231e..8418c5c9 100644
--- a/languages/ruby/CMakeLists.txt
+++ b/languages/ruby/CMakeLists.txt
@@ -33,15 +33,15 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevrubysupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES rubytemplates DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/templates )
-install( FILES kdevrubysupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevrubysupport )
-install( FILES ruby_config.png ruby_run.png DESTINATION ${DATA_INSTALL_DIR}/kdevrubysupport/pics )
+install( FILES tdevrubysupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES rubytemplates DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/templates )
+install( FILES tdevrubysupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevrubysupport )
+install( FILES ruby_config.png ruby_run.png DESTINATION ${DATA_INSTALL_DIR}/tdevrubysupport/pics )
 
 
-##### libkdevrubysupport (module) ###############
+##### libtdevrubysupport (module) ###############
 
-tde_add_kpart( libkdevrubysupport AUTOMOC
+tde_add_kpart( libtdevrubysupport AUTOMOC
   SOURCES
     rubysupport_part.cpp rubyconfigwidgetbase.ui
     rubyconfigwidget.cpp qtdesignerrubyintegration.cpp
diff --git a/languages/ruby/Makefile.am b/languages/ruby/Makefile.am
index e0a3612b..95a632cc 100644
--- a/languages/ruby/Makefile.am
+++ b/languages/ruby/Makefile.am
@@ -7,25 +7,25 @@ INCLUDES = -I$(top_srcdir)/languages/lib/designer_integration \
 SUBDIRS = app_templates file_templates doc debugger
 
 
-kde_module_LTLIBRARIES = libkdevrubysupport.la
-libkdevrubysupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevrubysupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/lib/util/libkdevutil.la
+kde_module_LTLIBRARIES = libtdevrubysupport.la
+libtdevrubysupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevrubysupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/lib/util/libtdevutil.la
 
-libkdevrubysupport_la_SOURCES = rubysupport_part.cpp rubyconfigwidgetbase.ui \
+libtdevrubysupport_la_SOURCES = rubysupport_part.cpp rubyconfigwidgetbase.ui \
 		rubyconfigwidget.cpp qtdesignerrubyintegration.cpp rubyimplementationwidget.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevrubysupport.desktop
+service_DATA = tdevrubysupport.desktop
 
-templatedir = ${kde_datadir}/kdevabbrev/templates
+templatedir = ${kde_datadir}/tdevabbrev/templates
 template_DATA = rubytemplates
 
-rcdir = $(kde_datadir)/kdevrubysupport
-rc_DATA = kdevrubysupport.rc
+rcdir = $(kde_datadir)/tdevrubysupport
+rc_DATA = tdevrubysupport.rc
 
-picsdirdir = $(kde_datadir)/kdevrubysupport/pics
+picsdirdir = $(kde_datadir)/tdevrubysupport/pics
 picsdir_DATA = ruby_config.png ruby_run.png
 noinst_HEADERS = qtdesignerrubyintegration.h rubyimplementationwidget.h
diff --git a/languages/ruby/app_templates/CMakeLists.txt b/languages/ruby/app_templates/CMakeLists.txt
index 1f8c054a..9e642f8e 100644
--- a/languages/ruby/app_templates/CMakeLists.txt
+++ b/languages/ruby/app_templates/CMakeLists.txt
@@ -13,7 +13,7 @@ add_subdirectory( rubyhello )
 add_subdirectory( qtruby )
 add_subdirectory( qtrubyapp )
 add_subdirectory( dcopservice )
-add_subdirectory( kapp )
+add_subdirectory( tdeapp )
 add_subdirectory( kxt )
 add_subdirectory( rails )
 add_subdirectory( qtruby4app )
diff --git a/languages/ruby/app_templates/Makefile.am b/languages/ruby/app_templates/Makefile.am
index 3150485b..9e02a942 100644
--- a/languages/ruby/app_templates/Makefile.am
+++ b/languages/ruby/app_templates/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = rubyhello qtruby qtrubyapp dcopservice kapp kxt rails qtruby4app
+SUBDIRS = rubyhello qtruby qtrubyapp dcopservice tdeapp kxt rails qtruby4app
 profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/ScriptingLanguageIDE/RubyIDE
 profiles_DATA = ruby.appwizard
diff --git a/languages/ruby/app_templates/dcopservice/CMakeLists.txt b/languages/ruby/app_templates/dcopservice/CMakeLists.txt
index f673e72c..c971b3cd 100644
--- a/languages/ruby/app_templates/dcopservice/CMakeLists.txt
+++ b/languages/ruby/app_templates/dcopservice/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( dcopserviceruby.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/dcopserviceruby.tar.gz dcopserviceruby.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    dcopserviceruby.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    dcopserviceruby.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/ruby/app_templates/dcopservice/Makefile.am b/languages/ruby/app_templates/dcopservice/Makefile.am
index a7193d6a..3d7668ef 100644
--- a/languages/ruby/app_templates/dcopservice/Makefile.am
+++ b/languages/ruby/app_templates/dcopservice/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = dcopservice.desktop app.cpp app-configure.in.in \
 templateName = dcopserviceruby
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/ruby/app_templates/dcopservice/dcopservice.tdevelop b/languages/ruby/app_templates/dcopservice/dcopservice.tdevelop
index 437aa315..a1b10215 100644
--- a/languages/ruby/app_templates/dcopservice/dcopservice.tdevelop
+++ b/languages/ruby/app_templates/dcopservice/dcopservice.tdevelop
@@ -13,22 +13,22 @@
    <keyword>KDE</keyword>
   </keywords>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
 	<general>
 		<activedir/>
 	</general>
 	<run>
 		<mainprogram>src/%{APPNAMELC}</mainprogram>
 	</run>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.rb" name="Sources" />
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -63,29 +63,29 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
- <kdevfilecreate>
+ </tdevdebugger>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="rb"/>
   </useglobaltypes>
- </kdevfilecreate>
- <kdevrubysupport>
+ </tdevfilecreate>
+ <tdevrubysupport>
    <run>
      <interpreter>ruby</interpreter>
      <terminal>false</terminal>
      <charactercoding>3</charactercoding>
      <mainprogram>src/main.rb</mainprogram>
    </run>
- </kdevrubysupport>
-  <kdevdocumentation>
+ </tdevrubysupport>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate b/languages/ruby/app_templates/dcopservice/dcopserviceruby.tdevtemplate
index fbadd4e3..0bcb93cb 100644
--- a/languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate
+++ b/languages/ruby/app_templates/dcopservice/dcopserviceruby.tdevtemplate
@@ -66,11 +66,11 @@ Archive=dcopserviceruby.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/ruby/app_templates/kxt/CMakeLists.txt b/languages/ruby/app_templates/kxt/CMakeLists.txt
index 539cfdb6..482d5e24 100644
--- a/languages/ruby/app_templates/kxt/CMakeLists.txt
+++ b/languages/ruby/app_templates/kxt/CMakeLists.txt
@@ -20,9 +20,9 @@ add_custom_target( kxtruby.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kxtruby.tar.gz kxtruby.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kxtruby.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    kxtruby.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/ruby/app_templates/kxt/Makefile.am b/languages/ruby/app_templates/kxt/Makefile.am
index 2ea8cf5b..66b2b259 100644
--- a/languages/ruby/app_templates/kxt/Makefile.am
+++ b/languages/ruby/app_templates/kxt/Makefile.am
@@ -6,10 +6,10 @@ dataFiles = app.rb main.rb prefs.rb app.cpp appview.rb appview_base.ui prefs-bas
 templateName = kxtruby
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/ruby/app_templates/kxt/app.tdevelop b/languages/ruby/app_templates/kxt/app.tdevelop
index 5c57b8fb..d416fcdb 100644
--- a/languages/ruby/app_templates/kxt/app.tdevelop
+++ b/languages/ruby/app_templates/kxt/app.tdevelop
@@ -15,18 +15,18 @@
 			<part>KDevDoxygen</part>
 			<part>KDevdistpart</part>
 			<part>KDevVisualBoyAdvance</part>
-			<part>KDevDebugger</part>
+			<part>TDevDebugger</part>
 		</ignoreparts>
 	</general>
-	<kdevautoproject>
+	<tdevautoproject>
 		<general>
 			<activedir/>
 		</general>
 		<run>
 			<mainprogram>src/%{APPNAMELC}</mainprogram>
 		</run>
-	</kdevautoproject>
-	<kdevfileview>
+	</tdevautoproject>
+	<tdevfileview>
 		<tree>
 			<hidenonprojectfiles>false</hidenonprojectfiles>
 			<hidepatterns>CVS,.svn</hidepatterns>
@@ -35,8 +35,8 @@
 			<group pattern="*.rb" name="Ruby files" />
 			<group pattern="*.ui" name="QT Designer files" />
 		</groups>
-	</kdevfileview>											 
-	<kdevdoctreeview>
+	</tdevfileview>											 
+	<tdevdoctreeview>
 		<ignoretocs>
 			<toc>ada</toc>
 			<toc>ada_bugs_gcc</toc>
@@ -72,19 +72,19 @@
 			<toc>w3c-uaag10</toc>
 			<toc>wxwindows_bugs</toc>
 		</ignoretocs>
-	</kdevdoctreeview>
-	<kdevfilecreate>
+	</tdevdoctreeview>
+	<tdevfilecreate>
 		<useglobaltypes>
 			<type ext="rb"/>
 			<type ext="ui"/>
 		</useglobaltypes>
-	</kdevfilecreate>
-	<kdevrubysupport>
+	</tdevfilecreate>
+	<tdevrubysupport>
 		<run>
 			<interpreter>ruby</interpreter>
 			<terminal>false</terminal>
 			<charactercoding>3</charactercoding>
 			<mainprogram>src/main.rb</mainprogram>
 		</run>
-	</kdevrubysupport>
+	</tdevrubysupport>
 </tdevelop>
diff --git a/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate b/languages/ruby/app_templates/kxt/kxtruby.tdevtemplate
index e4756e1d..f17db17b 100644
--- a/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate
+++ b/languages/ruby/app_templates/kxt/kxtruby.tdevtemplate
@@ -67,11 +67,11 @@ Archive=kxtruby.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/ruby/app_templates/qtruby/CMakeLists.txt b/languages/ruby/app_templates/qtruby/CMakeLists.txt
index beac7f1f..edbe6376 100644
--- a/languages/ruby/app_templates/qtruby/CMakeLists.txt
+++ b/languages/ruby/app_templates/qtruby/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( qtruby.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/qtruby.tar.gz qtruby.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    qtruby.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    qtruby.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/ruby/app_templates/qtruby/Makefile.am b/languages/ruby/app_templates/qtruby/Makefile.am
index 919a69f5..a822765c 100644
--- a/languages/ruby/app_templates/qtruby/Makefile.am
+++ b/languages/ruby/app_templates/qtruby/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = app.rb app.tdevelop app-Makefile app.filelist README
 templateName = qtruby
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/ruby/app_templates/qtruby/app.filelist b/languages/ruby/app_templates/qtruby/app.filelist
index 202beb22..2458459f 100644
--- a/languages/ruby/app_templates/qtruby/app.filelist
+++ b/languages/ruby/app_templates/qtruby/app.filelist
@@ -1,2 +1,2 @@
-# KDevelop Custom Project File List
+# TDevelop Custom Project File List
 %{APPNAMELC}.rb
diff --git a/languages/ruby/app_templates/qtruby/app.tdevelop b/languages/ruby/app_templates/qtruby/app.tdevelop
index 3b59130c..ad09b42c 100644
--- a/languages/ruby/app_templates/qtruby/app.tdevelop
+++ b/languages/ruby/app_templates/qtruby/app.tdevelop
@@ -4,7 +4,7 @@
 		<author>%{AUTHOR}</author>
 		<email>%{EMAIL}</email>
 		<version>%{VERSION}</version>
-		<projectmanagement>KDevCustomProject</projectmanagement>
+		<projectmanagement>TDevCustomProject</projectmanagement>
 		<primarylanguage>Ruby</primarylanguage>
 		<keywords>
 			<keyword>Ruby</keyword>
@@ -14,15 +14,15 @@
 			<part>KDevDoxygen</part>
 			<part>KDevdistpart</part>
 			<part>KDevVisualBoyAdvance</part>
-			<part>KDevDebugger</part>
+			<part>TDevDebugger</part>
 		</ignoreparts>
 	</general>
-	<kdevcustomproject>
+	<tdevcustomproject>
 		<general>
 			<activedir/>
 		</general>
-	</kdevcustomproject>
-	<kdevfileview>
+	</tdevcustomproject>
+	<tdevfileview>
 		<tree>
 			<hidenonprojectfiles>false</hidenonprojectfiles>
 			<hidepatterns>CVS,.svn</hidepatterns>
@@ -31,8 +31,8 @@
 			<group pattern="*.rb" name="Ruby files" />
 			<group pattern="*.ui" name="QT Designer files" />
 		</groups>
-	</kdevfileview>											 
-	<kdevdoctreeview>
+	</tdevfileview>											 
+	<tdevdoctreeview>
 		<ignoretocs>
 			<toc>ada</toc>
 			<toc>ada_bugs_gcc</toc>
@@ -68,18 +68,18 @@
 			<toc>w3c-uaag10</toc>
 			<toc>wxwindows_bugs</toc>
 		</ignoretocs>
-	</kdevdoctreeview>
-	<kdevfilecreate>
+	</tdevdoctreeview>
+	<tdevfilecreate>
 		<useglobaltypes>
 			<type ext="rb"/>
 			<type ext="ui"/>
 		</useglobaltypes>
-	</kdevfilecreate>
-	<kdevrubysupport>
+	</tdevfilecreate>
+	<tdevrubysupport>
 		<run>
 			<mainprogram>./%{APPNAMELC}.rb</mainprogram>
 			<interpreter>ruby</interpreter>
 			<terminal>false</terminal>
 		</run>
-	</kdevrubysupport>
+	</tdevrubysupport>
 </tdevelop>
diff --git a/languages/ruby/app_templates/qtruby/qtruby.kdevtemplate b/languages/ruby/app_templates/qtruby/qtruby.tdevtemplate
index da8500dc..da8500dc 100644
--- a/languages/ruby/app_templates/qtruby/qtruby.kdevtemplate
+++ b/languages/ruby/app_templates/qtruby/qtruby.tdevtemplate
diff --git a/languages/ruby/app_templates/qtruby4app/CMakeLists.txt b/languages/ruby/app_templates/qtruby4app/CMakeLists.txt
index e5045380..9bf5e3b6 100644
--- a/languages/ruby/app_templates/qtruby4app/CMakeLists.txt
+++ b/languages/ruby/app_templates/qtruby4app/CMakeLists.txt
@@ -20,9 +20,9 @@ add_custom_target( qtruby4app.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/qtruby4app.tar.gz qtruby4app.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    qtruby4app.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    qtruby4app.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/ruby/app_templates/qtruby4app/Makefile.am b/languages/ruby/app_templates/qtruby4app/Makefile.am
index 8f4adecd..09709aed 100644
--- a/languages/ruby/app_templates/qtruby4app/Makefile.am
+++ b/languages/ruby/app_templates/qtruby4app/Makefile.am
@@ -5,10 +5,10 @@ dataFiles =  main.rb qtruby4app.rb qtruby4app.png qtruby4app.tdevelop \
 templateName = qtruby4app
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/ruby/app_templates/qtruby4app/app.filelist b/languages/ruby/app_templates/qtruby4app/app.filelist
index 339e6998..23f4bc76 100644
--- a/languages/ruby/app_templates/qtruby4app/app.filelist
+++ b/languages/ruby/app_templates/qtruby4app/app.filelist
@@ -1,3 +1,3 @@
-# KDevelop Custom Project File List
+# TDevelop Custom Project File List
 main.rb
 %{APPNAMELC}.rb
diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevelop b/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevelop
index 3df7f3ab..84a1a8e3 100644
--- a/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevelop
+++ b/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevelop
@@ -4,19 +4,19 @@
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
     <version>%{VERSION}</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
+    <projectmanagement>TDevCustomProject</projectmanagement>
     <primarylanguage>Ruby</primarylanguage>
     <keywords>
 	  <keyword>Ruby</keyword>
       <keyword>Qt</keyword>
     </keywords>
   </general>
-	<kdevcustomproject>
+	<tdevcustomproject>
 		<general>
 			<activedir/>
 		</general>
-	</kdevcustomproject>
-  <kdevfileview>
+	</tdevcustomproject>
+  <tdevfileview>
     <groups>
 	  <group pattern="*.rb" name="Ruby files" />
 	  <group pattern="*.ui" name="QT Designer files" />
@@ -27,8 +27,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
 	  <hidepatterns>CVS,.svn</hidepatterns>
     </tree> 
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -63,21 +63,21 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
+  </tdevdoctreeview>
   <workspace>
     <openfiles/> 
   </workspace>
-  <kdevfilecreate>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="rb" />
     </useglobaltypes>
-  </kdevfilecreate>
-	<kdevrubysupport>
+  </tdevfilecreate>
+	<tdevrubysupport>
 		<run>
 			<interpreter>ruby</interpreter>
 			<terminal>false</terminal>
 			<mainprogram>./main.rb</mainprogram>
 		</run>
-	</kdevrubysupport>
+	</tdevrubysupport>
 </tdevelop>
diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate b/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevtemplate
index 70df2248..70df2248 100644
--- a/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate
+++ b/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevtemplate
diff --git a/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt b/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt
index 37f6e5b1..c0a0429e 100644
--- a/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt
+++ b/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( qtrubyapp.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/qtrubyapp.tar.gz qtrubyapp.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    qtrubyapp.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    qtrubyapp.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/ruby/app_templates/qtrubyapp/Makefile.am b/languages/ruby/app_templates/qtrubyapp/Makefile.am
index 7777b886..2ea3aa4b 100644
--- a/languages/ruby/app_templates/qtrubyapp/Makefile.am
+++ b/languages/ruby/app_templates/qtrubyapp/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = main.rb qtrubyapp.rb qtrubyapp.png qtrubyapp.tdevelop \
 templateName = qtrubyapp
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/ruby/app_templates/qtrubyapp/app.filelist b/languages/ruby/app_templates/qtrubyapp/app.filelist
index 339e6998..23f4bc76 100644
--- a/languages/ruby/app_templates/qtrubyapp/app.filelist
+++ b/languages/ruby/app_templates/qtrubyapp/app.filelist
@@ -1,3 +1,3 @@
-# KDevelop Custom Project File List
+# TDevelop Custom Project File List
 main.rb
 %{APPNAMELC}.rb
diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevelop b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevelop
index 3df7f3ab..84a1a8e3 100644
--- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevelop
+++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevelop
@@ -4,19 +4,19 @@
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
     <version>%{VERSION}</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
+    <projectmanagement>TDevCustomProject</projectmanagement>
     <primarylanguage>Ruby</primarylanguage>
     <keywords>
 	  <keyword>Ruby</keyword>
       <keyword>Qt</keyword>
     </keywords>
   </general>
-	<kdevcustomproject>
+	<tdevcustomproject>
 		<general>
 			<activedir/>
 		</general>
-	</kdevcustomproject>
-  <kdevfileview>
+	</tdevcustomproject>
+  <tdevfileview>
     <groups>
 	  <group pattern="*.rb" name="Ruby files" />
 	  <group pattern="*.ui" name="QT Designer files" />
@@ -27,8 +27,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
 	  <hidepatterns>CVS,.svn</hidepatterns>
     </tree> 
-  </kdevfileview>
-  <kdevdoctreeview>
+  </tdevfileview>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -63,21 +63,21 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
+  </tdevdoctreeview>
   <workspace>
     <openfiles/> 
   </workspace>
-  <kdevfilecreate>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="rb" />
     </useglobaltypes>
-  </kdevfilecreate>
-	<kdevrubysupport>
+  </tdevfilecreate>
+	<tdevrubysupport>
 		<run>
 			<interpreter>ruby</interpreter>
 			<terminal>false</terminal>
 			<mainprogram>./main.rb</mainprogram>
 		</run>
-	</kdevrubysupport>
+	</tdevrubysupport>
 </tdevelop>
diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevtemplate
index 3e2c896a..3e2c896a 100644
--- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate
+++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevtemplate
diff --git a/languages/ruby/app_templates/rails/CMakeLists.txt b/languages/ruby/app_templates/rails/CMakeLists.txt
index 6f53dd0d..8d8fb1e2 100644
--- a/languages/ruby/app_templates/rails/CMakeLists.txt
+++ b/languages/ruby/app_templates/rails/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( rails.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/rails.tar.gz rails.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    rails.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    rails.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/ruby/app_templates/rails/Makefile.am b/languages/ruby/app_templates/rails/Makefile.am
index 9d89a708..915e789c 100644
--- a/languages/ruby/app_templates/rails/Makefile.am
+++ b/languages/ruby/app_templates/rails/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = app.tdevelop
 templateName= rails
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/ruby/app_templates/rails/app.tdevelop b/languages/ruby/app_templates/rails/app.tdevelop
index 17a0e6a1..272185c7 100644
--- a/languages/ruby/app_templates/rails/app.tdevelop
+++ b/languages/ruby/app_templates/rails/app.tdevelop
@@ -13,16 +13,16 @@
    <part>KDevDoxygen</part>
    <part>KDevdistpart</part>
    <part>KDevVisualBoyAdvance</part>
-   <part>KDevDebugger</part>
+   <part>TDevDebugger</part>
   </ignoreparts>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <general>
 		<includepatterns>*.rb,*.rhtml,*.rxml,*.rjs,*.css,*.js,*.html.erb,*.js.rjs,*.xml.builder</includepatterns>
 		<excludepatterns>*~</excludepatterns>
   </general>
- </kdevscriptproject>
- <kdevfileview>
+ </tdevscriptproject>
+ <tdevfileview>
 	 <groups>
 	   <group pattern="*.rb" name="Scripts" />
 	   <group pattern="*.css" name="StyleSheets" />
@@ -34,8 +34,8 @@
 	   <group pattern="*.gif,*.jpg,*.png,*.ico" name="Images" />
 	   <group pattern="*.html,*.cgi,*.fcgi,*.txt" name="Public" />
 	 </groups>
- </kdevfileview>											 
- <kdevdoctreeview>
+ </tdevfileview>											 
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -82,8 +82,8 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
 			<type ext="rb"/>
 			<type ext="rhtml"/>
@@ -95,13 +95,13 @@
 			<type ext="css"/>
 			<type ext="js"/>
     </useglobaltypes>
-  </kdevfilecreate>
-	<kdevrubysupport>
+  </tdevfilecreate>
+	<tdevrubysupport>
 		<run>
 			<interpreter>ruby</interpreter>
 			<shell>%{dest}/script/console</shell>
 			<terminal>false</terminal>
 			<mainprogram>script/server</mainprogram>
 		</run>
-	</kdevrubysupport>
+	</tdevrubysupport>
 </tdevelop>
diff --git a/languages/ruby/app_templates/rails/rails.kdevtemplate b/languages/ruby/app_templates/rails/rails.tdevtemplate
index 5ed2d78d..5ed2d78d 100644
--- a/languages/ruby/app_templates/rails/rails.kdevtemplate
+++ b/languages/ruby/app_templates/rails/rails.tdevtemplate
diff --git a/languages/ruby/app_templates/ruby.appwizard b/languages/ruby/app_templates/ruby.appwizard
index 726daeed..b5937b62 100644
--- a/languages/ruby/app_templates/ruby.appwizard
+++ b/languages/ruby/app_templates/ruby.appwizard
@@ -1,2 +1,2 @@
 [General]
-List=rubyhello,qtruby,qtrubyapp,dcopserviceruby,kappruby,kxtruby,rails
+List=rubyhello,qtruby,qtrubyapp,dcopserviceruby,tdeappruby,kxtruby,rails
diff --git a/languages/ruby/app_templates/rubyhello/CMakeLists.txt b/languages/ruby/app_templates/rubyhello/CMakeLists.txt
index 74da59e4..103d97e9 100644
--- a/languages/ruby/app_templates/rubyhello/CMakeLists.txt
+++ b/languages/ruby/app_templates/rubyhello/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( rubyhello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/rubyhello.tar.gz rubyhello.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    rubyhello.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    rubyhello.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/ruby/app_templates/rubyhello/Makefile.am b/languages/ruby/app_templates/rubyhello/Makefile.am
index 5d20526e..9afc2af8 100644
--- a/languages/ruby/app_templates/rubyhello/Makefile.am
+++ b/languages/ruby/app_templates/rubyhello/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = app.rb app.tdevelop
 templateName= rubyhello
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/ruby/app_templates/rubyhello/app.tdevelop b/languages/ruby/app_templates/rubyhello/app.tdevelop
index c938d122..2023467f 100644
--- a/languages/ruby/app_templates/rubyhello/app.tdevelop
+++ b/languages/ruby/app_templates/rubyhello/app.tdevelop
@@ -13,21 +13,21 @@
    <part>KDevDoxygen</part>
    <part>KDevdistpart</part>
    <part>KDevVisualBoyAdvance</part>
-   <part>KDevDebugger</part>
+   <part>TDevDebugger</part>
   </ignoreparts>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <general>
 		<includepatterns>*.rb</includepatterns>
 		<excludepatterns>*~</excludepatterns>
   </general>
- </kdevscriptproject>
- <kdevfileview>
+ </tdevscriptproject>
+ <tdevfileview>
 	 <groups>
 	   <group pattern="*.rb" name="Scripts" />
 	 </groups>
- </kdevfileview>											 
- <kdevdoctreeview>
+ </tdevfileview>											 
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -74,18 +74,18 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
 			<type ext="rb"/>
     </useglobaltypes>
-  </kdevfilecreate>
-        <kdevrubysupport>
+  </tdevfilecreate>
+        <tdevrubysupport>
                 <run>
                         <mainprogram>./%{APPNAMELC}.rb</mainprogram>
                         <interpreter>ruby</interpreter>
                         <terminal>false</terminal>
                 </run>
-        </kdevrubysupport>
+        </tdevrubysupport>
 
 </tdevelop>
diff --git a/languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate b/languages/ruby/app_templates/rubyhello/rubyhello.tdevtemplate
index bce79ff9..bce79ff9 100644
--- a/languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate
+++ b/languages/ruby/app_templates/rubyhello/rubyhello.tdevtemplate
diff --git a/languages/ruby/app_templates/kapp/CMakeLists.txt b/languages/ruby/app_templates/tdeapp/CMakeLists.txt
index 6817278b..598ce743 100644
--- a/languages/ruby/app_templates/kapp/CMakeLists.txt
+++ b/languages/ruby/app_templates/tdeapp/CMakeLists.txt
@@ -9,8 +9,8 @@
 #
 #################################################
 
-add_custom_target( kappruby.tar.gz ALL
-  COMMAND tar zcf kappruby.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+add_custom_target( tdeappruby.tar.gz ALL
+  COMMAND tar zcf tdeappruby.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app_client.rb appiface.rb app.rb appview.rb main.rb pref.rb
     app.cpp appui.rc app.desktop app.tdevelop app-Makefile.am
     app-configure.in.in src-Makefile.am subdirs README
@@ -18,10 +18,10 @@ add_custom_target( kappruby.tar.gz ALL
 
 
 install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kappruby.tar.gz kappruby.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+    ${CMAKE_CURRENT_BINARY_DIR}/tdeappruby.tar.gz tdeappruby.png
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    kappruby.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    tdeappruby.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/ruby/app_templates/kapp/Makefile.am b/languages/ruby/app_templates/tdeapp/Makefile.am
index 9dbc37b5..ff783b87 100644
--- a/languages/ruby/app_templates/kapp/Makefile.am
+++ b/languages/ruby/app_templates/tdeapp/Makefile.am
@@ -2,13 +2,13 @@ dataFiles = app_client.rb appiface.rb app.rb appview.rb main.rb pref.rb app.cpp
 			appui.rc app.desktop app.tdevelop app-Makefile.am app-configure.in.in \
 			src-Makefile.am subdirs README
 
-templateName = kappruby
+templateName = tdeappruby
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/ruby/app_templates/kapp/README b/languages/ruby/app_templates/tdeapp/README
index 39de8b2f..39de8b2f 100644
--- a/languages/ruby/app_templates/kapp/README
+++ b/languages/ruby/app_templates/tdeapp/README
diff --git a/languages/ruby/app_templates/kapp/app-Makefile.am b/languages/ruby/app_templates/tdeapp/app-Makefile.am
index bfe1c599..bfe1c599 100644
--- a/languages/ruby/app_templates/kapp/app-Makefile.am
+++ b/languages/ruby/app_templates/tdeapp/app-Makefile.am
diff --git a/languages/ruby/app_templates/kapp/app-configure.in.in b/languages/ruby/app_templates/tdeapp/app-configure.in.in
index 7d849466..7d849466 100644
--- a/languages/ruby/app_templates/kapp/app-configure.in.in
+++ b/languages/ruby/app_templates/tdeapp/app-configure.in.in
diff --git a/languages/ruby/app_templates/kapp/app.cpp b/languages/ruby/app_templates/tdeapp/app.cpp
index 04770335..04770335 100644
--- a/languages/ruby/app_templates/kapp/app.cpp
+++ b/languages/ruby/app_templates/tdeapp/app.cpp
diff --git a/languages/ruby/app_templates/kapp/app.desktop b/languages/ruby/app_templates/tdeapp/app.desktop
index 4587fd3c..4587fd3c 100644
--- a/languages/ruby/app_templates/kapp/app.desktop
+++ b/languages/ruby/app_templates/tdeapp/app.desktop
diff --git a/languages/ruby/app_templates/kapp/app.rb b/languages/ruby/app_templates/tdeapp/app.rb
index 61531be2..61531be2 100644
--- a/languages/ruby/app_templates/kapp/app.rb
+++ b/languages/ruby/app_templates/tdeapp/app.rb
diff --git a/languages/ruby/app_templates/kapp/app.tdevelop b/languages/ruby/app_templates/tdeapp/app.tdevelop
index 5c57b8fb..d416fcdb 100644
--- a/languages/ruby/app_templates/kapp/app.tdevelop
+++ b/languages/ruby/app_templates/tdeapp/app.tdevelop
@@ -15,18 +15,18 @@
 			<part>KDevDoxygen</part>
 			<part>KDevdistpart</part>
 			<part>KDevVisualBoyAdvance</part>
-			<part>KDevDebugger</part>
+			<part>TDevDebugger</part>
 		</ignoreparts>
 	</general>
-	<kdevautoproject>
+	<tdevautoproject>
 		<general>
 			<activedir/>
 		</general>
 		<run>
 			<mainprogram>src/%{APPNAMELC}</mainprogram>
 		</run>
-	</kdevautoproject>
-	<kdevfileview>
+	</tdevautoproject>
+	<tdevfileview>
 		<tree>
 			<hidenonprojectfiles>false</hidenonprojectfiles>
 			<hidepatterns>CVS,.svn</hidepatterns>
@@ -35,8 +35,8 @@
 			<group pattern="*.rb" name="Ruby files" />
 			<group pattern="*.ui" name="QT Designer files" />
 		</groups>
-	</kdevfileview>											 
-	<kdevdoctreeview>
+	</tdevfileview>											 
+	<tdevdoctreeview>
 		<ignoretocs>
 			<toc>ada</toc>
 			<toc>ada_bugs_gcc</toc>
@@ -72,19 +72,19 @@
 			<toc>w3c-uaag10</toc>
 			<toc>wxwindows_bugs</toc>
 		</ignoretocs>
-	</kdevdoctreeview>
-	<kdevfilecreate>
+	</tdevdoctreeview>
+	<tdevfilecreate>
 		<useglobaltypes>
 			<type ext="rb"/>
 			<type ext="ui"/>
 		</useglobaltypes>
-	</kdevfilecreate>
-	<kdevrubysupport>
+	</tdevfilecreate>
+	<tdevrubysupport>
 		<run>
 			<interpreter>ruby</interpreter>
 			<terminal>false</terminal>
 			<charactercoding>3</charactercoding>
 			<mainprogram>src/main.rb</mainprogram>
 		</run>
-	</kdevrubysupport>
+	</tdevrubysupport>
 </tdevelop>
diff --git a/languages/ruby/app_templates/kapp/app_client.rb b/languages/ruby/app_templates/tdeapp/app_client.rb
index b08e9b21..b08e9b21 100644
--- a/languages/ruby/app_templates/kapp/app_client.rb
+++ b/languages/ruby/app_templates/tdeapp/app_client.rb
diff --git a/languages/ruby/app_templates/kapp/appiface.rb b/languages/ruby/app_templates/tdeapp/appiface.rb
index a8be16b5..a8be16b5 100644
--- a/languages/ruby/app_templates/kapp/appiface.rb
+++ b/languages/ruby/app_templates/tdeapp/appiface.rb
diff --git a/languages/ruby/app_templates/kapp/appui.rc b/languages/ruby/app_templates/tdeapp/appui.rc
index ceb4f14e..ceb4f14e 100644
--- a/languages/ruby/app_templates/kapp/appui.rc
+++ b/languages/ruby/app_templates/tdeapp/appui.rc
diff --git a/languages/ruby/app_templates/kapp/appview.rb b/languages/ruby/app_templates/tdeapp/appview.rb
index e7aabe3c..e7aabe3c 100644
--- a/languages/ruby/app_templates/kapp/appview.rb
+++ b/languages/ruby/app_templates/tdeapp/appview.rb
diff --git a/languages/ruby/app_templates/kapp/main.rb b/languages/ruby/app_templates/tdeapp/main.rb
index 47235013..47235013 100644
--- a/languages/ruby/app_templates/kapp/main.rb
+++ b/languages/ruby/app_templates/tdeapp/main.rb
diff --git a/languages/ruby/app_templates/kapp/pref.rb b/languages/ruby/app_templates/tdeapp/pref.rb
index 98669ad2..98669ad2 100644
--- a/languages/ruby/app_templates/kapp/pref.rb
+++ b/languages/ruby/app_templates/tdeapp/pref.rb
diff --git a/languages/ruby/app_templates/kapp/src-Makefile.am b/languages/ruby/app_templates/tdeapp/src-Makefile.am
index acb41899..acb41899 100644
--- a/languages/ruby/app_templates/kapp/src-Makefile.am
+++ b/languages/ruby/app_templates/tdeapp/src-Makefile.am
diff --git a/languages/ruby/app_templates/kapp/subdirs b/languages/ruby/app_templates/tdeapp/subdirs
index 0e678106..0e678106 100644
--- a/languages/ruby/app_templates/kapp/subdirs
+++ b/languages/ruby/app_templates/tdeapp/subdirs
diff --git a/languages/ruby/app_templates/kapp/kappruby.png b/languages/ruby/app_templates/tdeapp/tdeappruby.png
index 913ebb87..913ebb87 100644
--- a/languages/ruby/app_templates/kapp/kappruby.png
+++ b/languages/ruby/app_templates/tdeapp/tdeappruby.png
diff --git a/languages/ruby/app_templates/kapp/kappruby.kdevtemplate b/languages/ruby/app_templates/tdeapp/tdeappruby.tdevtemplate
index 368e0705..8a4c0320 100644
--- a/languages/ruby/app_templates/kapp/kappruby.kdevtemplate
+++ b/languages/ruby/app_templates/tdeapp/tdeappruby.tdevtemplate
@@ -30,7 +30,7 @@ Name[sv]=Programramverk
 Name[tr]=Uygulama Çatısı
 Name[zh_CN]=应用程序框架
 Name[zh_TW]=應用程式框架
-Icon=kapp.png
+Icon=tdeapp.png
 Category=Ruby/KDE
 Comment=Generates a simple Korundum application with one toplevel window, menus and toolbars. A DCOP interface is also provided, so that your application can provide a scripting interface
 Comment[ca]=Genera una simple aplicació Korundum amb una finestra principal, menús i barres d'eines. També es proveeix la interfície DCOP, de manera que la vostra aplicació podrà proveir d'una interfície per a scripts
@@ -60,15 +60,15 @@ Comment[tr]=Bir üst seviye penceresi, menüleri ve araç çubukları olan basit
 Comment[zh_TW]=產生一個簡單的 Korundum 應用程式，內含頂層視窗、選單與工具列。另外提供一個 DCOP 介面，讓您的應用程式可以使用文稿介面。
 FileTemplates=rb,ShellStyle
 ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.rb
-Archive=kappruby.tar.gz
+Archive=tdeappruby.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.kdevtemplate
+File=%{tdevelop}/template-common/admin.tdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.kdevtemplate
+File=%{tdevelop}/template-common/gnu.tdevtemplate
 
 [MKDIR_DOCBOOK1]
 Type=mkdir
diff --git a/languages/ruby/debugger/CMakeLists.txt b/languages/ruby/debugger/CMakeLists.txt
index 8290afd7..7fb74000 100644
--- a/languages/ruby/debugger/CMakeLists.txt
+++ b/languages/ruby/debugger/CMakeLists.txt
@@ -29,20 +29,20 @@ link_directories(
 ##### other data ################################
 
 tde_install_icons( )
-install( FILES kdevrbdebugger.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES debuggee.rb DESTINATION ${DATA_INSTALL_DIR}/kdevrbdebugger )
-install( FILES kdevrbdebugger.rc DESTINATION ${DATA_INSTALL_DIR}/kdevrbdebugger )
+install( FILES tdevrbdebugger.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES debuggee.rb DESTINATION ${DATA_INSTALL_DIR}/tdevrbdebugger )
+install( FILES tdevrbdebugger.rc DESTINATION ${DATA_INSTALL_DIR}/tdevrbdebugger )
 
 
-##### libkdevrbdebugger (module) ################
+##### libtdevrbdebugger (module) ################
 
-tde_add_kpart( libkdevrbdebugger AUTOMOC
+tde_add_kpart( libtdevrbdebugger AUTOMOC
   SOURCES
     debuggerpart.cpp dbgcontroller.cpp rdbcontroller.cpp
     dbgcommand.cpp rdbcommand.cpp rdbparser.cpp stty.cpp
     breakpoint.cpp variablewidget.cpp rdbbreakpointwidget.cpp
     framestackwidget.cpp dbgpsdlg.cpp dbgtoolbar.cpp
     rdboutputwidget.cpp rdbtable.cpp
-  LINK lang_debugger-shared kdevwidgets-shared tdevelop-shared
+  LINK lang_debugger-shared tdevwidgets-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/languages/ruby/debugger/Makefile.am b/languages/ruby/debugger/Makefile.am
index 88e03f03..0bbe445b 100644
--- a/languages/ruby/debugger/Makefile.am
+++ b/languages/ruby/debugger/Makefile.am
@@ -4,22 +4,22 @@ INCLUDES = -I$(top_srcdir)/languages/lib/debugger \
 	-I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util \
 	-I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevrbdebugger.la
-libkdevrbdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevrbdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) \
+kde_module_LTLIBRARIES = libtdevrbdebugger.la
+libtdevrbdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevrbdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) \
 	$(top_builddir)/languages/lib/debugger/liblang_debugger.la
 
-libkdevrbdebugger_la_SOURCES = debuggerpart.cpp dbgcontroller.cpp rdbcontroller.cpp dbgcommand.cpp rdbcommand.cpp rdbparser.cpp stty.cpp breakpoint.cpp variablewidget.cpp rdbbreakpointwidget.cpp framestackwidget.cpp dbgpsdlg.cpp dbgtoolbar.cpp rdboutputwidget.cpp rdbtable.cpp
+libtdevrbdebugger_la_SOURCES = debuggerpart.cpp dbgcontroller.cpp rdbcontroller.cpp dbgcommand.cpp rdbcommand.cpp rdbparser.cpp stty.cpp breakpoint.cpp variablewidget.cpp rdbbreakpointwidget.cpp framestackwidget.cpp dbgpsdlg.cpp dbgtoolbar.cpp rdboutputwidget.cpp rdbtable.cpp
 
 METASOURCES = AUTO
 KDE_ICON = AUTO
 
 rubysrc_DATA = debuggee.rb
-rubysrcdir = $(kde_datadir)/kdevrbdebugger
+rubysrcdir = $(kde_datadir)/tdevrbdebugger
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevrbdebugger.desktop
+service_DATA = tdevrbdebugger.desktop
 
-rcdir = $(kde_datadir)/kdevrbdebugger
-rc_DATA = kdevrbdebugger.rc
+rcdir = $(kde_datadir)/tdevrbdebugger
+rc_DATA = tdevrbdebugger.rc
 noinst_HEADERS =  rdbtable.h
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 35e6a2d2..9d0c9767 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -26,7 +26,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdemainwindow.h>
@@ -40,12 +40,12 @@
 #include <kstringhandler.h>
 #include <kstandarddirs.h>
 
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevmainwindow.h"
-#include "kdevappfrontend.h"
-#include "kdevpartcontroller.h"
-#include "kdevdebugger.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevmainwindow.h"
+#include "tdevappfrontend.h"
+#include "tdevpartcontroller.h"
+#include "tdevdebugger.h"
 #include "domutil.h"
 #include "variablewidget.h"
 #include "rdbbreakpointwidget.h"
@@ -61,25 +61,25 @@
 
 #include <iostream>
 
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 #include <debugger.h>
 
 
 namespace RDBDebugger
 {
-static const KDevPluginInfo data("kdevrbdebugger");
+static const TDevPluginInfo data("tdevrbdebugger");
 
-typedef KDevGenericFactory<RubyDebuggerPart> RubyDebuggerFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevrbdebugger, RubyDebuggerFactory( data ) )
+typedef TDevGenericFactory<RubyDebuggerPart> RubyDebuggerFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevrbdebugger, RubyDebuggerFactory( data ) )
 
 RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQStringList & ) :
-    KDevPlugin( &data, parent, name ? name : "RubyDebuggerPart" ),
+    TDevPlugin( &data, parent, name ? name : "RubyDebuggerPart" ),
     controller(0)
 {
 //    setObjId("RubyDebuggerInterface");
     setInstance(RubyDebuggerFactory::instance());
 
-    setXMLFile("kdevrbdebugger.rc");
+    setXMLFile("tdevrbdebugger.rc");
 
     m_debugger = new Debugger( partController() );
     
@@ -245,8 +245,8 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ
     connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
              this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 
-    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
-             this, TQT_SLOT(slotStop(KDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
+             this, TQT_SLOT(slotStop(TDevPlugin*)) );
     connect( core(), TQT_SIGNAL(projectClosed()),
              this, TQT_SLOT(projectClosed()) );
 
@@ -616,7 +616,7 @@ void RubyDebuggerPart::slotRun()
 
 
 
-void RubyDebuggerPart::slotStop(KDevPlugin* which)
+void RubyDebuggerPart::slotStop(TDevPlugin* which)
 {
     if( which != 0 && which != this )
         return;
@@ -772,12 +772,12 @@ void RubyDebuggerPart::savePartialProjectSession(TQDomElement* el)
 
 }
 
-KDevAppFrontend * RDBDebugger::RubyDebuggerPart::appFrontend( )
+TDevAppFrontend * RDBDebugger::RubyDebuggerPart::appFrontend( )
 {
-   return extension<KDevAppFrontend>("TDevelop/AppFrontend");
+   return extension<TDevAppFrontend>("TDevelop/AppFrontend");
 }
 
-KDevDebugger * RDBDebugger::RubyDebuggerPart::debugger()
+TDevDebugger * RDBDebugger::RubyDebuggerPart::debugger()
 {
     return m_debugger;
 }
diff --git a/languages/ruby/debugger/debuggerpart.h b/languages/ruby/debugger/debuggerpart.h
index 498a159e..9b554a8f 100644
--- a/languages/ruby/debugger/debuggerpart.h
+++ b/languages/ruby/debugger/debuggerpart.h
@@ -21,8 +21,8 @@
 #define _DEBUGGERPART_H_
 
 #include <tqguardedptr.h>
-#include "kdevplugin.h"
-#include "kdevcore.h"
+#include "tdevplugin.h"
+#include "tdevcore.h"
 
 namespace KParts { class Part; }
 
@@ -31,8 +31,8 @@ class TQPopupMenu;
 class KDialogBase;
 class ProcessWidget;
 class ProcessLineMaker;
-class KDevAppFrontend;
-class KDevDebugger;
+class TDevAppFrontend;
+class TDevDebugger;
 
 namespace RDBDebugger
 {
@@ -45,7 +45,7 @@ class DbgToolBar;
 class VariableWidget;
 class RDBOutputWidget;
 
-class RubyDebuggerPart : public KDevPlugin
+class RubyDebuggerPart : public TDevPlugin
 {
     Q_OBJECT
   
@@ -68,7 +68,7 @@ private slots:
 
     void slotRun();
     void slotStopDebugger();
-    void slotStop(KDevPlugin* which = 0);
+    void slotStop(TDevPlugin* which = 0);
     void slotPause();
     void slotRunToCursor();
     void slotStepOver();
@@ -84,8 +84,8 @@ signals:
     void rubyInspect(const TQString&);
 
 private:
-    KDevAppFrontend *appFrontend();
-    KDevDebugger *debugger();
+    TDevAppFrontend *appFrontend();
+    TDevDebugger *debugger();
     
 	bool startDebugger();
     void setupController();
@@ -103,7 +103,7 @@ private:
     TQString m_contextIdent;
     TQCString m_drkonqi;
 	
-    KDevDebugger *m_debugger;
+    TDevDebugger *m_debugger;
 };
 
 }
diff --git a/languages/ruby/debugger/kdevrbdebugger.desktop b/languages/ruby/debugger/tdevrbdebugger.desktop
index 714b51a3..8b333642 100644
--- a/languages/ruby/debugger/kdevrbdebugger.desktop
+++ b/languages/ruby/debugger/tdevrbdebugger.desktop
@@ -66,7 +66,7 @@ GenericName[zh_CN]=Ruby 调试器前端
 GenericName[zh_TW]=Ruby 除錯器前端介面
 Icon=
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevrbdebugger
+X-TDE-Library=libtdevrbdebugger
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-ProgrammingLanguages=Ruby
diff --git a/languages/ruby/debugger/kdevrbdebugger.rc b/languages/ruby/debugger/tdevrbdebugger.rc
index c7e3b336..c7e3b336 100644
--- a/languages/ruby/debugger/kdevrbdebugger.rc
+++ b/languages/ruby/debugger/tdevrbdebugger.rc
diff --git a/languages/ruby/doc/CMakeLists.txt b/languages/ruby/doc/CMakeLists.txt
index 781fa2ba..127248cd 100644
--- a/languages/ruby/doc/CMakeLists.txt
+++ b/languages/ruby/doc/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     ruby.toc ruby_bugs.toc qtruby.toc rails.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs )
diff --git a/languages/ruby/doc/Makefile.am b/languages/ruby/doc/Makefile.am
index 245b8fe5..38fd2b45 100644
--- a/languages/ruby/doc/Makefile.am
+++ b/languages/ruby/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/kdevdocumentation/tocs
+tocdir = ${kde_datadir}/tdevdocumentation/tocs
 toc_DATA = ruby.toc ruby_bugs.toc qtruby.toc rails.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/ruby/file_templates/CMakeLists.txt b/languages/ruby/file_templates/CMakeLists.txt
index 617e829c..ef75c4e1 100644
--- a/languages/ruby/file_templates/CMakeLists.txt
+++ b/languages/ruby/file_templates/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     rb rhtml rxml rjs js css html.erb xml.builder js.rjs
-  DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
diff --git a/languages/ruby/file_templates/Makefile.am b/languages/ruby/file_templates/Makefile.am
index 7b449085..591930a0 100644
--- a/languages/ruby/file_templates/Makefile.am
+++ b/languages/ruby/file_templates/Makefile.am
@@ -1,4 +1,4 @@
-templatedir = $(kde_datadir)/kdevfilecreate/file-templates
+templatedir = $(kde_datadir)/tdevfilecreate/file-templates
 template_DATA = rb rhtml rxml rjs js css html.erb xml.builder js.rjs
 
 
diff --git a/languages/ruby/qtdesignerrubyintegration.cpp b/languages/ruby/qtdesignerrubyintegration.cpp
index bb9c0113..7172b9e0 100644
--- a/languages/ruby/qtdesignerrubyintegration.cpp
+++ b/languages/ruby/qtdesignerrubyintegration.cpp
@@ -32,14 +32,14 @@
 #include <tdetexteditor/viewcursorinterface.h>
 
 #include <domutil.h>
-#include <kdevpartcontroller.h>
-#include <kdevcreatefile.h>
-#include <kdevlanguagesupport.h>
+#include <tdevpartcontroller.h>
+#include <tdevcreatefile.h>
+#include <tdevlanguagesupport.h>
 
 #include "codemodel_utils.h"
 #include "implementationwidget.h"
 
-QtDesignerRubyIntegration::QtDesignerRubyIntegration(KDevLanguageSupport *part,
+QtDesignerRubyIntegration::QtDesignerRubyIntegration(TDevLanguageSupport *part,
     ImplementationWidget *impl)
     :QtDesignerIntegration(part, impl, false, 0)
 {
diff --git a/languages/ruby/qtdesignerrubyintegration.h b/languages/ruby/qtdesignerrubyintegration.h
index 38722167..91776afa 100644
--- a/languages/ruby/qtdesignerrubyintegration.h
+++ b/languages/ruby/qtdesignerrubyintegration.h
@@ -27,7 +27,7 @@ class QtDesignerRubyIntegration : public QtDesignerIntegration
 Q_OBJECT
   
 public:
-    QtDesignerRubyIntegration(KDevLanguageSupport *part, ImplementationWidget *impl);
+    QtDesignerRubyIntegration(TDevLanguageSupport *part, ImplementationWidget *impl);
 
 protected:
     void addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass);
diff --git a/languages/ruby/rubyimplementationwidget.cpp b/languages/ruby/rubyimplementationwidget.cpp
index ba371526..9a7cde7a 100644
--- a/languages/ruby/rubyimplementationwidget.cpp
+++ b/languages/ruby/rubyimplementationwidget.cpp
@@ -30,10 +30,10 @@
 #include <tdemessagebox.h>
 
 #include <filetemplate.h>
-#include <kdevlanguagesupport.h>
-#include <kdevproject.h>
+#include <tdevlanguagesupport.h>
+#include <tdevproject.h>
 
-RubyImplementationWidget::RubyImplementationWidget(KDevLanguageSupport* part, 
+RubyImplementationWidget::RubyImplementationWidget(TDevLanguageSupport* part, 
     TQWidget* parent, const char* name, bool modal)
     :ImplementationWidget(part, parent, name, modal)
 {
diff --git a/languages/ruby/rubyimplementationwidget.h b/languages/ruby/rubyimplementationwidget.h
index a5d8e491..dac75fb1 100644
--- a/languages/ruby/rubyimplementationwidget.h
+++ b/languages/ruby/rubyimplementationwidget.h
@@ -26,7 +26,7 @@ class RubyImplementationWidget : public ImplementationWidget {
 Q_OBJECT
   
 public:
-    RubyImplementationWidget(KDevLanguageSupport* part, TQWidget* parent = 0, 
+    RubyImplementationWidget(TDevLanguageSupport* part, TQWidget* parent = 0, 
         const char* name = 0, bool modal = true);
 
     virtual TQStringList createClassFiles();
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index e1745a02..915d12a1 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -5,15 +5,15 @@
 #include "qtdesignerrubyintegration.h"
 #include "rubyimplementationwidget.h"
 
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
-#include "kdevlanguagesupport.h"
-#include "kdevpartcontroller.h"
-#include "kdevproject.h"
-#include "kdevappfrontend.h"
-#include "kdevplugininfo.h"
-#include "kdevshellwidget.h"
-#include "kdevquickopen.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
+#include "tdevlanguagesupport.h"
+#include "tdevpartcontroller.h"
+#include "tdevproject.h"
+#include "tdevappfrontend.h"
+#include "tdevplugininfo.h"
+#include "tdevshellwidget.h"
+#include "tdevquickopen.h"
 
 #include <tqdir.h>
 #include <tqwhatsthis.h>
@@ -24,7 +24,7 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <tdeaction.h>
@@ -37,15 +37,15 @@
 
 #include <codemodel_utils.h>
 
-typedef KDevGenericFactory<RubySupportPart> RubySupportFactory;
-static const KDevPluginInfo data("kdevrubysupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( data ) )
+typedef TDevGenericFactory<RubySupportPart> RubySupportFactory;
+static const TDevPluginInfo data("tdevrubysupport");
+K_EXPORT_COMPONENT_FACTORY( libtdevrubysupport, RubySupportFactory( data ) )
 
 RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStringList& )
-  : KDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" )
+  : TDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" )
 {
   setInstance(RubySupportFactory::instance());
-  setXMLFile("kdevrubysupport.rc");
+  setXMLFile("tdevrubysupport.rc");
 
   TDEAction *action;
   action = new TDEAction( i18n("&Run"), "exec", SHIFT + Key_F9,
@@ -72,7 +72,7 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr
 
   kdDebug() << "Creating RubySupportPart" << endl;
 
-  m_shellWidget = new KDevShellWidget( 0, "irb console");
+  m_shellWidget = new TDevShellWidget( 0, "irb console");
   m_shellWidget->setIcon( SmallIcon("ruby_config.png", TDEIcon::SizeMedium, TDEIcon::DefaultState, RubySupportPart::instance()));
   m_shellWidget->setCaption(i18n("Ruby Shell"));
   mainWindow()->embedOutputView( m_shellWidget, i18n("Ruby Shell"), i18n("Ruby Shell"));
@@ -127,7 +127,7 @@ void RubySupportPart::projectOpened()
     TQFileInfo server(project()->projectDirectory() + "/script/server");
     if (! server.exists()) {
       cmd += "rails " + project()->projectDirectory();
-      if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
+      if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
         appFrontend->startAppCommand(project()->projectDirectory(), cmd, false);
     }
   }
@@ -211,7 +211,7 @@ void RubySupportPart::savedFile(const KURL &fileName)
   }
 }
 
-KDevLanguageSupport::Features RubySupportPart::features()
+TDevLanguageSupport::Features RubySupportPart::features()
 {
   return Features(Classes | Functions | Variables | Declarations | Signals | Slots);
 }
@@ -528,7 +528,7 @@ void RubySupportPart::slotRun ()
         // Starting WEBrick for a Rails app. Translate a SIGTERM signal sent by KDevelop
         // to a SIGINT expected by WEBrick (ie control&c) to terminate it.
         cmd += "script/server& \n trap \"kill -s SIGINT $!\" TERM \n wait \n exit 0";
-        if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
+        if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
             appFrontend->startAppCommand(project()->projectDirectory(), cmd, false);
     } else {
         TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6")
@@ -613,7 +613,7 @@ TQString RubySupportPart::characterCoding() {
 
 void RubySupportPart::startApplication(const TQString &program) {
 	bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevrubysupport/run/terminal");
-    if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
+    if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
         appFrontend->startAppCommand(TQString(), program, inTerminal);
 }
 
@@ -627,9 +627,9 @@ KMimeType::List RubySupportPart::mimeTypes( )
     return list;
 }
 
-KDevDesignerIntegration *RubySupportPart::designer(KInterfaceDesigner::DesignerType type)
+TDevDesignerIntegration *RubySupportPart::designer(KInterfaceDesigner::DesignerType type)
 {
-    KDevDesignerIntegration *des = 0;
+    TDevDesignerIntegration *des = 0;
     switch (type)
     {
         case KInterfaceDesigner::TQtDesigner:
@@ -651,7 +651,7 @@ KDevDesignerIntegration *RubySupportPart::designer(KInterfaceDesigner::DesignerT
 
 void RubySupportPart::projectClosed( )
 {
-    for (TQMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*>::const_iterator it =  m_designers.begin();
+    for (TQMap<KInterfaceDesigner::DesignerType, TDevDesignerIntegration*>::const_iterator it =  m_designers.begin();
         it != m_designers.end(); ++it)
     {
         kdDebug() << "calling save settings fro designer integration" << endl;
@@ -669,7 +669,7 @@ void RubySupportPart::contextMenu( TQPopupMenu * popup, const Context * context
         {
             m_contextFileName = url.fileName();
             int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass()));
-            popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner."));
+            popup->setWhatsThis(id, i18n("<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated TDevDesigner."));
         }
     }
 }
diff --git a/languages/ruby/rubysupport_part.h b/languages/ruby/rubysupport_part.h
index 024eae60..c0bfc36e 100644
--- a/languages/ruby/rubysupport_part.h
+++ b/languages/ruby/rubysupport_part.h
@@ -3,19 +3,19 @@
  */
 
 
-#ifndef __KDEVPART_RUBYSUPPORT_H__
-#define __KDEVPART_RUBYSUPPORT_H__
+#ifndef __TDEVPART_RUBYSUPPORT_H__
+#define __TDEVPART_RUBYSUPPORT_H__
 
 #include <tqguardedptr.h>
 
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 
 class KDialogBase;
 class TQPopupMenu;
 class Context;
-class KDevShellWidget;
+class TDevShellWidget;
 
-class RubySupportPart : public KDevLanguageSupport
+class RubySupportPart : public TDevLanguageSupport
 {
   Q_OBJECT
   
@@ -25,7 +25,7 @@ public:
   RubySupportPart(TQObject *parent, const char *name, const TQStringList &);
   virtual ~RubySupportPart();
 
-  virtual KDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type);
+  virtual TDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type);
 
 protected:
     virtual Features features();
@@ -63,12 +63,12 @@ private:
     void maybeParse(const TQString fileName);
     void parse(const TQString &fileName);
 
-    TQMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*> m_designers;
+    TQMap<KInterfaceDesigner::DesignerType, TDevDesignerIntegration*> m_designers;
 
     TQString m_contextFileName;
     TQCString m_shell;
 
-    TQGuardedPtr<KDevShellWidget> m_shellWidget;
+    TQGuardedPtr<TDevShellWidget> m_shellWidget;
 };
 
 
diff --git a/languages/ruby/kdevrubysupport.desktop b/languages/ruby/tdevrubysupport.desktop
index 9b5c6771..1a507ffd 100644
--- a/languages/ruby/kdevrubysupport.desktop
+++ b/languages/ruby/tdevrubysupport.desktop
@@ -79,6 +79,6 @@ GenericName[tr]=Ruby Desteği
 GenericName[zh_CN]=Ruby 支持
 GenericName[zh_TW]=Ruby 支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libkdevrubysupport
+X-TDE-Library=libtdevrubysupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Ruby
diff --git a/languages/ruby/kdevrubysupport.rc b/languages/ruby/tdevrubysupport.rc
index b9269aa2..b9269aa2 100644
--- a/languages/ruby/kdevrubysupport.rc
+++ b/languages/ruby/tdevrubysupport.rc
diff --git a/languages/sql/CMakeLists.txt b/languages/sql/CMakeLists.txt
index 8e7d41cc..67d5aef5 100644
--- a/languages/sql/CMakeLists.txt
+++ b/languages/sql/CMakeLists.txt
@@ -30,13 +30,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevsqlsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevsqlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevsqlsupport )
+install( FILES tdevsqlsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevsqlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevsqlsupport )
 
 
-##### libkdevsqlsupport (module) ################
+##### libtdevsqlsupport (module) ################
 
-tde_add_kpart( libkdevsqlsupport AUTOMOC
+tde_add_kpart( libtdevsqlsupport AUTOMOC
   SOURCES
     sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp
     sqloutputwidget.cpp
diff --git a/languages/sql/Makefile.am b/languages/sql/Makefile.am
index ba410a98..eb48a72f 100644
--- a/languages/sql/Makefile.am
+++ b/languages/sql/Makefile.am
@@ -5,16 +5,16 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \
 	$(all_includes)
 SUBDIRS = app_templates doc
 
-kde_module_LTLIBRARIES = libkdevsqlsupport.la
-libkdevsqlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevsqlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevsqlsupport.la
+libtdevsqlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevsqlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevsqlsupport_la_SOURCES = sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp sqloutputwidget.cpp
+libtdevsqlsupport_la_SOURCES = sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp sqloutputwidget.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevsqlsupport.desktop
+service_DATA = tdevsqlsupport.desktop
 
-rcdir = $(kde_datadir)/kdevsqlsupport
-rc_DATA = kdevsqlsupport.rc
+rcdir = $(kde_datadir)/tdevsqlsupport
+rc_DATA = tdevsqlsupport.rc
diff --git a/languages/sql/app_templates/sqlsimple/CMakeLists.txt b/languages/sql/app_templates/sqlsimple/CMakeLists.txt
index 05ddb17f..290dd962 100644
--- a/languages/sql/app_templates/sqlsimple/CMakeLists.txt
+++ b/languages/sql/app_templates/sqlsimple/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( sqlsimple.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/sqlsimple.tar.gz sqlsimple.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    sqlsimple.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    sqlsimple.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/sql/app_templates/sqlsimple/Makefile.am b/languages/sql/app_templates/sqlsimple/Makefile.am
index 6bfae1c4..1b49cc21 100644
--- a/languages/sql/app_templates/sqlsimple/Makefile.am
+++ b/languages/sql/app_templates/sqlsimple/Makefile.am
@@ -2,10 +2,10 @@ templateName = sqlsimple
 dataFiles = app.sql app.tdevelop
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/sql/app_templates/sqlsimple/app.tdevelop b/languages/sql/app_templates/sqlsimple/app.tdevelop
index 7fc4efc9..6977b304 100644
--- a/languages/sql/app_templates/sqlsimple/app.tdevelop
+++ b/languages/sql/app_templates/sqlsimple/app.tdevelop
@@ -11,22 +11,22 @@
   </keywords>
   <ignoreparts>
    <part>KDevdistpart</part>
-   <part>KDevDebugger</part>
+   <part>TDevDebugger</part>
   </ignoreparts>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <general>
 		<activedir>src</activedir>
 		<includepatterns>*.sql</includepatterns>
 		<excludepatterns>*~</excludepatterns>
   </general>
- </kdevscriptproject>
- <kdevfileview>
+ </tdevscriptproject>
+ <tdevfileview>
 	 <groups>
 	   <group pattern="*.sql" name="SQL" />
 	 </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -75,10 +75,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
 			<type ext="sql"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate b/languages/sql/app_templates/sqlsimple/sqlsimple.tdevtemplate
index 5081e992..5081e992 100644
--- a/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate
+++ b/languages/sql/app_templates/sqlsimple/sqlsimple.tdevtemplate
diff --git a/languages/sql/doc/Makefile.am b/languages/sql/doc/Makefile.am
index d42aec82..f6fd6d52 100644
--- a/languages/sql/doc/Makefile.am
+++ b/languages/sql/doc/Makefile.am
@@ -1,4 +1,4 @@
-#tocdir = ${kde_datadir}/kdevdoctreeview/tocs
+#tocdir = ${kde_datadir}/tdevdoctreeview/tocs
 #toc_DATA =
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp
index 1d1a5b14..f737b694 100644
--- a/languages/sql/sqlactions.cpp
+++ b/languages/sql/sqlactions.cpp
@@ -21,8 +21,8 @@
 #include <kiconloader.h>
 #include <kcombobox.h>
 
-#include "kdevplugin.h"
-#include "kdevlanguagesupport.h"
+#include "tdevplugin.h"
+#include "tdevlanguagesupport.h"
 #include "sqlsupport_part.h"
 
 SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, 
diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h
index c06413e7..e58930f9 100644
--- a/languages/sql/sqlconfigwidget.ui.h
+++ b/languages/sql/sqlconfigwidget.ui.h
@@ -195,7 +195,7 @@ void SqlConfigWidget::accept()
 {
     Q_ASSERT( doc );
 
-    TQDomElement dbElem = DomUtil::createElementByPath( *doc, "/kdevsqlsupport/servers" );
+    TQDomElement dbElem = DomUtil::createElementByPath( *doc, "/tdevsqlsupport/servers" );
     DomUtil::makeEmpty( dbElem );
 
     for ( int i = 0; i < dbTable->numRows() - 1; i++ ) {
@@ -206,7 +206,7 @@ void SqlConfigWidget::accept()
 		<< SQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password );
 	
 	DomUtil::writeListEntry( *doc, 
-				 "/kdevsqlsupport/servers/server" + TQString::number( i ), 
+				 "/tdevsqlsupport/servers/server" + TQString::number( i ), 
 				 "el", db );
     }
     if ( changed )
@@ -227,7 +227,7 @@ void SqlConfigWidget::loadConfig()
     TQStringList db;
     int i = 0;
     while ( true ) {
-        TQStringList db = DomUtil::readListEntry( *doc, "kdevsqlsupport/servers/server" + TQString::number( i ), "el" );
+        TQStringList db = DomUtil::readListEntry( *doc, "tdevsqlsupport/servers/server" + TQString::number( i ), "el" );
         if ( db.isEmpty() )
             return;
 
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index 2ecb2ec4..c4d0a235 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -8,7 +8,7 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdeparts/part.h>
@@ -16,28 +16,28 @@
 #include <tdetexteditor/editinterface.h>
 #include <tdemessagebox.h>
 
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
-#include "kdevlanguagesupport.h"
-#include "kdevpartcontroller.h"
-#include "kdevproject.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
+#include "tdevlanguagesupport.h"
+#include "tdevpartcontroller.h"
+#include "tdevproject.h"
 #include "codemodel.h"
-#include "kdevplugininfo.h"
+#include "tdevplugininfo.h"
 
 #include "sqlconfigwidget.h"
 #include "sqlactions.h"
 #include "sqloutputwidget.h"
 #include "domutil.h"
 
-typedef KDevGenericFactory<SQLSupportPart> SQLSupportFactory;
-static const KDevPluginInfo data("kdevsqlsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( data ) )
+typedef TDevGenericFactory<SQLSupportPart> SQLSupportFactory;
+static const TDevPluginInfo data("tdevsqlsupport");
+K_EXPORT_COMPONENT_FACTORY( libtdevsqlsupport, SQLSupportFactory( data ) )
 
 SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& )
-        : KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" )
+        : TDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" )
 {
     setInstance( SQLSupportFactory::instance() );
-    setXMLFile( "kdevsqlsupport.rc" );
+    setXMLFile( "tdevsqlsupport.rc" );
 
     TDEAction *action;
     action = new TDEAction( i18n( "&Run" ), "exec", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" );
@@ -106,7 +106,7 @@ void SQLSupportPart::loadConfig()
     int i = 0;
     TQString conName;
     while ( true ) {
-        TQStringList sdb = DomUtil::readListEntry( *doc, "kdevsqlsupport/servers/server" + TQString::number( i ), "el" );
+        TQStringList sdb = DomUtil::readListEntry( *doc, "tdevsqlsupport/servers/server" + TQString::number( i ), "el" );
         if ( (int)sdb.size() < 6 )
             break;
 
@@ -267,7 +267,7 @@ void SQLSupportPart::savedFile( const KURL &fileName )
     }
 }
 
-KDevLanguageSupport::Features SQLSupportPart::features()
+TDevLanguageSupport::Features SQLSupportPart::features()
 {
     return Features( Classes | Functions );
 }
diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h
index d5efca5b..4798d7fa 100644
--- a/languages/sql/sqlsupport_part.h
+++ b/languages/sql/sqlsupport_part.h
@@ -1,5 +1,5 @@
-#ifndef __KDEVPART_SQLSUPPORT_H__
-#define __KDEVPART_SQLSUPPORT_H__
+#ifndef __TDEVPART_SQLSUPPORT_H__
+#define __TDEVPART_SQLSUPPORT_H__
 
 #include <tqguardedptr.h>
 #include <tqstringlist.h>
@@ -7,14 +7,14 @@
 #include <kprocess.h>
 #include <kdialogbase.h>
 
-#include "kdevplugin.h"
-#include "kdevlanguagesupport.h"
+#include "tdevplugin.h"
+#include "tdevlanguagesupport.h"
 
 class SqlListAction;
 class SqlOutputWidget;
 class CodeModel;
 
-class SQLSupportPart : public KDevLanguageSupport
+class SQLSupportPart : public TDevLanguageSupport
 {
   Q_OBJECT
   
diff --git a/languages/sql/kdevsqlsupport.desktop b/languages/sql/tdevsqlsupport.desktop
index f5ee67ab..5357d127 100644
--- a/languages/sql/kdevsqlsupport.desktop
+++ b/languages/sql/tdevsqlsupport.desktop
@@ -79,7 +79,7 @@ GenericName[tr]=SQL Desteği
 GenericName[zh_CN]=SQL 支持
 GenericName[zh_TW]=SQL 支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libkdevsqlsupport
+X-TDE-Library=libtdevsqlsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=SQL
 X-TDevelop-Args=SQL
diff --git a/languages/sql/kdevsqlsupport.rc b/languages/sql/tdevsqlsupport.rc
index 36b91d7a..36b91d7a 100644
--- a/languages/sql/kdevsqlsupport.rc
+++ b/languages/sql/tdevsqlsupport.rc
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 0398ddf0..e9088337 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -31,9 +31,9 @@ link_directories(
 tde_add_library( tdevelop SHARED
   SOURCES dummy.cpp
   VERSION 1.0.0
-  EMBED kdevutil-static kdevinterfaces-static
+  EMBED tdevutil-static tdevinterfaces-static
   LINK
-    kdevpropertyeditor-shared
+    tdevpropertyeditor-shared
     tdescript-shared tdeparts-shared tdetexteditor-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d590051e..55b974c5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-# Here resides the library of general KDevelop-related utilities,
+# Here resides the library of general TDevelop-related utilities,
 # which may be linked by any plugin or part. This is installed
 # as a shared library, including header files
 
@@ -6,11 +6,11 @@ INCLUDES = $(all_includes)
 
 lib_LTLIBRARIES = libtdevelop.la
 libtdevelop_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 1:0
-libtdevelop_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \
-	$(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la $(LIB_TDEIO)
+libtdevelop_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la \
+	$(top_builddir)/lib/widgets/propeditor/libtdevpropertyeditor.la $(LIB_TDEIO)
 
-#	$(top_builddir)/lib/util/libkdevutil.la $(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la \
-#	$(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la \
+#	$(top_builddir)/lib/util/libtdevutil.la $(top_builddir)/lib/widgets/propeditor/libtdevpropertyeditor.la \
+#	$(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la \
 #	-ltdetexteditor $(LIB_TDEPARTS) $(LIB_TDEIO)  -ltdescript
 libtdevelop_la_SOURCES = dummy.cpp
 
diff --git a/lib/catalog/CMakeLists.txt b/lib/catalog/CMakeLists.txt
index 5c1b4f2b..13b008d1 100644
--- a/lib/catalog/CMakeLists.txt
+++ b/lib/catalog/CMakeLists.txt
@@ -28,9 +28,9 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/catalog )
 
 
-##### kdevcatalog (shared) ######################
+##### tdevcatalog (shared) ######################
 
-tde_add_library( kdevcatalog SHARED AUTOMOC
+tde_add_library( tdevcatalog SHARED AUTOMOC
   SOURCES tag.cpp catalog.cpp
   VERSION 0.0.0
   LINK tdecore-shared ${BDB_LIBRARY}
diff --git a/lib/catalog/Makefile.am b/lib/catalog/Makefile.am
index c8c7ddc1..e45a2530 100644
--- a/lib/catalog/Makefile.am
+++ b/lib/catalog/Makefile.am
@@ -1,13 +1,13 @@
 INCLUDES = $(all_includes) $(DB3INCLUDES)
-lib_LTLIBRARIES = libkdevcatalog.la
-libkdevcatalog_la_SOURCES = tag.cpp catalog.cpp
-libkdevcatalog_la_LDFLAGS = -no-undefined $(all_libraries) $(DB3LDFLAGS)
-libkdevcatalog_la_LIBADD = -l$(DB3LIB) $(LIB_TDECORE) $(LIB_QT)
+lib_LTLIBRARIES = libtdevcatalog.la
+libtdevcatalog_la_SOURCES = tag.cpp catalog.cpp
+libtdevcatalog_la_LDFLAGS = -no-undefined $(all_libraries) $(DB3LDFLAGS)
+libtdevcatalog_la_LIBADD = -l$(DB3LIB) $(LIB_TDECORE) $(LIB_QT)
 
-kdevcatalogincludedir = $(includedir)/tdevelop/catalog
-kdevcataloginclude_HEADERS = catalog.h tag.h
+tdevcatalogincludedir = $(includedir)/tdevelop/catalog
+tdevcataloginclude_HEADERS = catalog.h tag.h
 
 DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils
 DOXYGEN_PROJECTNAME = TDevelop Catalog Library
-DOXYGEN_DOCDIRPREFIX = kdev
+DOXYGEN_DOCDIRPREFIX = tdev
 include ../../Doxyfile.am
diff --git a/lib/cppparser/CMakeLists.txt b/lib/cppparser/CMakeLists.txt
index 3b53e900..20db36c5 100644
--- a/lib/cppparser/CMakeLists.txt
+++ b/lib/cppparser/CMakeLists.txt
@@ -31,13 +31,13 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/cppparser )
 
 
-##### kdevcppparser (shared) ####################
+##### tdevcppparser (shared) ####################
 
-tde_add_library( kdevcppparser SHARED AUTOMOC
+tde_add_library( tdevcppparser SHARED AUTOMOC
   SOURCES
     ast.cpp cachemanager.cpp driver.cpp errors.cpp lexer.cpp
     lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp
   VERSION 0.0.0
-  LINK kdevinterfaces-static tdeio-shared
+  LINK tdevinterfaces-static tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/lib/cppparser/Makefile.am b/lib/cppparser/Makefile.am
index 4e62cebf..082c8227 100644
--- a/lib/cppparser/Makefile.am
+++ b/lib/cppparser/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
 AM_CXXFLAGS = -DKDEVELOP_BGPARSER
-lib_LTLIBRARIES = libkdevcppparser.la
-libkdevcppparser_la_LDFLAGS = $(all_libraries)
-libkdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libkdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) -ltdetexteditor $(LIB_TDEIO) -ltdescript
-libkdevcppparser_la_SOURCES = ast.cpp cachemanager.cpp driver.cpp errors.cpp \
+lib_LTLIBRARIES = libtdevcppparser.la
+libtdevcppparser_la_LDFLAGS = $(all_libraries)
+libtdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libtdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) -ltdetexteditor $(LIB_TDEIO) -ltdescript
+libtdevcppparser_la_SOURCES = ast.cpp cachemanager.cpp driver.cpp errors.cpp \
 	lexer.cpp lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp
 
-kdevcppparserincludedir = $(includedir)/tdevelop/cppparser
-kdevcppparserinclude_HEADERS = ast.h  driver.h lexer.h parser.h tree_parser.h errors.h lookup.h cachemanager.h lexercache.h macro.h
+tdevcppparserincludedir = $(includedir)/tdevelop/cppparser
+tdevcppparserinclude_HEADERS = ast.h  driver.h lexer.h parser.h tree_parser.h errors.h lookup.h cachemanager.h lexercache.h macro.h
 
diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp
index 5325c80f..5f01a19e 100644
--- a/lib/cppparser/lexer.cpp
+++ b/lib/cppparser/lexer.cpp
@@ -30,7 +30,7 @@
 #if defined( KDEVELOP_BGPARSER )
 #include <tqthread.h>
 
-class KDevTread: public TQThread
+class TDevTread: public TQThread
 {
 public:
     static void yield()
@@ -41,7 +41,7 @@ public:
 
 inline void qthread_yield()
 {
-    KDevTread::yield();
+    TDevTread::yield();
 }
 
 #endif
diff --git a/lib/interfaces/CMakeLists.txt b/lib/interfaces/CMakeLists.txt
index 94b07bec..47d6855d 100644
--- a/lib/interfaces/CMakeLists.txt
+++ b/lib/interfaces/CMakeLists.txt
@@ -27,12 +27,12 @@ include_directories(
 ##### headers ###################################
 
 install( FILES
-    kdevlanguagesupport.h kdevmainwindow.h kdevpartcontroller.h
-    kdevplugin.h kdevproject.h kdevcore.h kdevcoderepository.h
+    tdevlanguagesupport.h tdevmainwindow.h tdevpartcontroller.h
+    tdevplugin.h tdevproject.h tdevcore.h tdevcoderepository.h
     codemodel.h codemodel_utils.h codemodel_treeparser.h
-    kdevgenericfactory.h kdevapi.h kdevdesignerintegration.h
-    kdevplugincontroller.h kdevplugininfo.h KDevCoreIface.h
-    KDevPartControllerIface.h katedocumentmanagerinterface.h
+    tdevgenericfactory.h tdevapi.h tdevdesignerintegration.h
+    tdevplugincontroller.h tdevplugininfo.h TDevCoreIface.h
+    TDevPartControllerIface.h katedocumentmanagerinterface.h
     hashedstring.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/interfaces )
 
@@ -42,20 +42,20 @@ install( FILES
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### kdevinterfaces (static) ###################
+##### tdevinterfaces (static) ###################
 
-tde_add_library( kdevinterfaces STATIC_PIC AUTOMOC
+tde_add_library( tdevinterfaces STATIC_PIC AUTOMOC
   SOURCES
-    kdevcore.cpp kdevproject.cpp kdevlanguagesupport.cpp
-    kdevpartcontroller.cpp kdevapi.cpp KDevCoreIface.skel
-    kdevmainwindow.cpp KDevPartControllerIface.skel
-    kdevplugin.cpp kdevcoderepository.cpp
+    tdevcore.cpp tdevproject.cpp tdevlanguagesupport.cpp
+    tdevpartcontroller.cpp tdevapi.cpp TDevCoreIface.skel
+    tdevmainwindow.cpp TDevPartControllerIface.skel
+    tdevplugin.cpp tdevcoderepository.cpp
     codemodel.cpp codemodel_treeparser.cpp
-    codemodel_utils.cpp kdevdesignerintegration.cpp
-    kdevplugincontroller.cpp kdevplugininfo.cpp
-    KDevCoreIface.cpp KDevPartControllerIface.cpp
+    codemodel_utils.cpp tdevdesignerintegration.cpp
+    tdevplugincontroller.cpp tdevplugininfo.cpp
+    TDevCoreIface.cpp TDevPartControllerIface.cpp
     katedocumentmanagerinterface.cpp
-    katedocumentmanagerinterface.skel kdevprojectiface.cpp
-    kdevprojectiface.skel kdevdesignerintegrationiface.cpp
-    kdevdesignerintegrationiface.skel hashedstring.cpp
+    katedocumentmanagerinterface.skel tdevprojectiface.cpp
+    tdevprojectiface.skel tdevdesignerintegrationiface.cpp
+    tdevdesignerintegrationiface.skel hashedstring.cpp
 )
diff --git a/lib/interfaces/Makefile.am b/lib/interfaces/Makefile.am
index 1944f4f9..93533492 100644
--- a/lib/interfaces/Makefile.am
+++ b/lib/interfaces/Makefile.am
@@ -1,27 +1,27 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/cppparser \
 	$(all_includes)
 
-noinst_LTLIBRARIES = libkdevinterfaces.la
+noinst_LTLIBRARIES = libtdevinterfaces.la
 
-libkdevinterfaces_la_SOURCES = kdevcore.cpp kdevproject.cpp \
-			kdevlanguagesupport.cpp kdevpartcontroller.cpp kdevapi.cpp KDevCoreIface.skel \
-			kdevmainwindow.cpp KDevPartControllerIface.skel kdevplugin.cpp kdevcoderepository.cpp \
+libtdevinterfaces_la_SOURCES = tdevcore.cpp tdevproject.cpp \
+			tdevlanguagesupport.cpp tdevpartcontroller.cpp tdevapi.cpp TDevCoreIface.skel \
+			tdevmainwindow.cpp TDevPartControllerIface.skel tdevplugin.cpp tdevcoderepository.cpp \
 			codemodel.cpp codemodel_treeparser.cpp codemodel_utils.cpp \
-			kdevdesignerintegration.cpp kdevplugincontroller.cpp kdevplugininfo.cpp KDevCoreIface.cpp \
-			KDevPartControllerIface.cpp katedocumentmanagerinterface.cpp katedocumentmanagerinterface.skel \
-		kdevprojectiface.cpp kdevprojectiface.skel kdevdesignerintegrationiface.cpp \
-		kdevdesignerintegrationiface.skel hashedstring.cpp
-libkdevinterfaces_la_LDFLAGS = -no-undefined $(all_libraries)
-libkdevinterfaces_la_LIBADD = $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la \
-	$(top_builddir)/lib/util/libkdevutil.la \
+			tdevdesignerintegration.cpp tdevplugincontroller.cpp tdevplugininfo.cpp TDevCoreIface.cpp \
+			TDevPartControllerIface.cpp katedocumentmanagerinterface.cpp katedocumentmanagerinterface.skel \
+		tdevprojectiface.cpp tdevprojectiface.skel tdevdesignerintegrationiface.cpp \
+		tdevdesignerintegrationiface.skel hashedstring.cpp
+libtdevinterfaces_la_LDFLAGS = -no-undefined $(all_libraries)
+libtdevinterfaces_la_LIBADD = $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la \
+	$(top_builddir)/lib/util/libtdevutil.la \
 	$(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEPARTS) -ltdetexteditor -ltdescript -lDCOP
 
 tdevelopincludedir = $(includedir)/tdevelop/interfaces
-tdevelopinclude_HEADERS = kdevlanguagesupport.h kdevmainwindow.h \
-	kdevpartcontroller.h kdevplugin.h kdevproject.h kdevcore.h kdevcoderepository.h codemodel.h \
-	codemodel_utils.h codemodel_treeparser.h kdevgenericfactory.h kdevapi.h \
-	kdevdesignerintegration.h kdevplugincontroller.h kdevplugininfo.h KDevCoreIface.h \
-	KDevPartControllerIface.h katedocumentmanagerinterface.h \
+tdevelopinclude_HEADERS = tdevlanguagesupport.h tdevmainwindow.h \
+	tdevpartcontroller.h tdevplugin.h tdevproject.h tdevcore.h tdevcoderepository.h codemodel.h \
+	codemodel_utils.h codemodel_treeparser.h tdevgenericfactory.h tdevapi.h \
+	tdevdesignerintegration.h tdevplugincontroller.h tdevplugininfo.h TDevCoreIface.h \
+	TDevPartControllerIface.h katedocumentmanagerinterface.h \
 	hashedstring.h
 
 
@@ -33,8 +33,8 @@ METASOURCES = AUTO
 
 SUBDIRS = extensions external extras
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil designer_integration tdevcatalog tdevprofileslib tdevextensions
 DOXYGEN_PROJECTNAME = TDevelop Interfaces Library
-DOXYGEN_DOCDIRPREFIX = kdev
+DOXYGEN_DOCDIRPREFIX = tdev
 include ../../Doxyfile.am
-noinst_HEADERS = kdevprojectiface.h kdevdesignerintegrationiface.h 
+noinst_HEADERS = tdevprojectiface.h tdevdesignerintegrationiface.h
diff --git a/lib/interfaces/KDevCoreIface.cpp b/lib/interfaces/TDevCoreIface.cpp
index aa70e01b..39d4bb97 100644
--- a/lib/interfaces/KDevCoreIface.cpp
+++ b/lib/interfaces/TDevCoreIface.cpp
@@ -22,38 +22,38 @@
 */
 #include <kdebug.h>
 #include <dcopclient.h>
-#include "KDevCoreIface.h"
-#include "kdevcore.h"
+#include "TDevCoreIface.h"
+#include "tdevcore.h"
 
 
-KDevCoreIface::KDevCoreIface(KDevCore *core)
-    : TQObject(core), DCOPObject("KDevCore"), m_core(core)
+TDevCoreIface::TDevCoreIface(TDevCore *core)
+    : TQObject(core), DCOPObject("TDevCore"), m_core(core)
 {
     connect( m_core, TQT_SIGNAL(projectOpened()), this, TQT_SLOT(forwardProjectOpened()) );
     connect( m_core, TQT_SIGNAL(projectClosed()), this, TQT_SLOT(forwardProjectClosed()) );
 }
 
 
-KDevCoreIface::~KDevCoreIface()
+TDevCoreIface::~TDevCoreIface()
 {}
 
 
-void KDevCoreIface::forwardProjectOpened()
+void TDevCoreIface::forwardProjectOpened()
 {
     kdDebug(9000) << "dcop emitting project opened" << endl;
     emitDCOPSignal("projectOpened()", TQByteArray());
 }
 
 
-void KDevCoreIface::forwardProjectClosed()
+void TDevCoreIface::forwardProjectClosed()
 {
     kdDebug(9000) << "dcop emitting project closed" << endl;
     emitDCOPSignal("projectClosed()", TQByteArray());
 }
 
-void KDevCoreIface::openProject( const TQString & projectFileName )
+void TDevCoreIface::openProject( const TQString & projectFileName )
 {
     m_core->openProject(projectFileName);
 }
 
-#include "KDevCoreIface.moc"
+#include "TDevCoreIface.moc"
diff --git a/lib/interfaces/KDevCoreIface.h b/lib/interfaces/TDevCoreIface.h
index 612c8457..f259005a 100644
--- a/lib/interfaces/KDevCoreIface.h
+++ b/lib/interfaces/TDevCoreIface.h
@@ -18,16 +18,16 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef _KDEVCOREIFACE_H_
-#define _KDEVCOREIFACE_H_
+#ifndef _TDEVCOREIFACE_H_
+#define _TDEVCOREIFACE_H_
 
 #include <dcopobject.h>
 #include <dcopref.h>
 
-class KDevCore;
+class TDevCore;
 
 
-class KDevCoreIface : public TQObject, public DCOPObject
+class TDevCoreIface : public TQObject, public DCOPObject
 {
     Q_OBJECT
 //    
@@ -35,8 +35,8 @@ class KDevCoreIface : public TQObject, public DCOPObject
     
 public:
     
-    KDevCoreIface( KDevCore *core );
-    ~KDevCoreIface();
+    TDevCoreIface( TDevCore *core );
+    ~TDevCoreIface();
     
 k_dcop:
     void openProject(const TQString& projectFileName);
@@ -46,7 +46,7 @@ private slots:
     void forwardProjectClosed();
     
 private:
-    KDevCore *m_core;
+    TDevCore *m_core;
 };
 
 #endif
diff --git a/lib/interfaces/KDevPartControllerIface.cpp b/lib/interfaces/TDevPartControllerIface.cpp
index 1b184453..e8bd1bb7 100644
--- a/lib/interfaces/KDevPartControllerIface.cpp
+++ b/lib/interfaces/TDevPartControllerIface.cpp
@@ -21,12 +21,12 @@
 #include <kurl.h>
 
 
-#include "KDevPartControllerIface.h"
-#include "kdevpartcontroller.h"
+#include "TDevPartControllerIface.h"
+#include "tdevpartcontroller.h"
 
 
-KDevPartControllerIface::KDevPartControllerIface(KDevPartController *pc)
-  : TQObject(pc), DCOPObject("KDevPartController"), m_controller(pc)
+TDevPartControllerIface::TDevPartControllerIface(TDevPartController *pc)
+  : TQObject(pc), DCOPObject("TDevPartController"), m_controller(pc)
 {
   connect(pc, TQT_SIGNAL(loadedFile(const KURL &)), this, TQT_SLOT(forwardLoadedFile(const KURL &)));
   connect(pc, TQT_SIGNAL(savedFile(const KURL &)), this, TQT_SLOT(forwardSavedFile(const KURL &)));
@@ -34,62 +34,62 @@ KDevPartControllerIface::KDevPartControllerIface(KDevPartController *pc)
 }
 
 
-KDevPartControllerIface::~KDevPartControllerIface()
+TDevPartControllerIface::~TDevPartControllerIface()
 {
 }
 
 
-void KDevPartControllerIface::editDocument(const TQString &url, int lineNum)
+void TDevPartControllerIface::editDocument(const TQString &url, int lineNum)
 {
   m_controller->editDocument(KURL(url), lineNum);
 }
 
 
-void KDevPartControllerIface::showDocument(const TQString &url, bool newWin)
+void TDevPartControllerIface::showDocument(const TQString &url, bool newWin)
 {
   m_controller->showDocument(KURL(url), newWin);
 }
 
 
-void KDevPartControllerIface::saveAllFiles()
+void TDevPartControllerIface::saveAllFiles()
 {
   m_controller->saveAllFiles();
 }
 
 
-void KDevPartControllerIface::revertAllFiles()
+void TDevPartControllerIface::revertAllFiles()
 {
   m_controller->revertAllFiles();
 }
 
 
-void KDevPartControllerIface::forwardLoadedFile(const KURL &fileName)
+void TDevPartControllerIface::forwardLoadedFile(const KURL &fileName)
 {
   kdDebug(9000) << "dcop emitting loadedFile " << fileName << endl;
   emitDCOPSignal("projectOpened()", TQByteArray());
 }
 
 
-void KDevPartControllerIface::forwardSavedFile(const KURL &fileName)
+void TDevPartControllerIface::forwardSavedFile(const KURL &fileName)
 {
   kdDebug(9000) << "dcop emitting savedFile " << fileName << endl;
   emitDCOPSignal("projectClosed()", TQByteArray());
 }
 
-void KDevPartControllerIface::forwardClosedFile(const KURL &fileName)
+void TDevPartControllerIface::forwardClosedFile(const KURL &fileName)
 {
   kdDebug(9000) << "dcop emitting closedFile " << fileName << endl;
   emitDCOPSignal("projectClosed()", TQByteArray());
 }
 
-bool KDevPartControllerIface::closeAllFiles( )
+bool TDevPartControllerIface::closeAllFiles( )
 {
   return m_controller->closeAllFiles();
 }
 
-uint KDevPartControllerIface::documentState( const KURL & url )
+uint TDevPartControllerIface::documentState( const KURL & url )
 {
   return (uint) m_controller->documentState(url);
 }
 
-#include "KDevPartControllerIface.moc"
+#include "TDevPartControllerIface.moc"
diff --git a/lib/interfaces/KDevPartControllerIface.h b/lib/interfaces/TDevPartControllerIface.h
index 8c3647ea..87a4e04e 100644
--- a/lib/interfaces/KDevPartControllerIface.h
+++ b/lib/interfaces/TDevPartControllerIface.h
@@ -16,16 +16,16 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef _KDEVPARTCONTROLLERIFACE_H_
-#define _KDEVPARTCONTROLLERIFACE_H_
+#ifndef _TDEVPARTCONTROLLERIFACE_H_
+#define _TDEVPARTCONTROLLERIFACE_H_
 
 #include <dcopobject.h>
 #include <dcopref.h>
 #include <kurl.h>
 
-class KDevPartController;
+class TDevPartController;
 
-class KDevPartControllerIface : public TQObject, public DCOPObject
+class TDevPartControllerIface : public TQObject, public DCOPObject
 {
   Q_OBJECT
 //  
@@ -33,8 +33,8 @@ class KDevPartControllerIface : public TQObject, public DCOPObject
     
 public:
     
-  KDevPartControllerIface(KDevPartController *pc);
-  ~KDevPartControllerIface();
+  TDevPartControllerIface(TDevPartController *pc);
+  ~TDevPartControllerIface();
 
 
 k_dcop:
@@ -56,7 +56,7 @@ private slots:
 
 private:
   
-  KDevPartController *m_controller;
+  TDevPartController *m_controller;
     
 };
 
diff --git a/lib/interfaces/extensions/CMakeLists.txt b/lib/interfaces/extensions/CMakeLists.txt
index 459c1197..cf5514be 100644
--- a/lib/interfaces/extensions/CMakeLists.txt
+++ b/lib/interfaces/extensions/CMakeLists.txt
@@ -22,9 +22,9 @@ include_directories(
 ##### headers ###################################
 
 install( FILES
-    codebrowserfrontend.h kdevappfrontend.h kdevcreatefile.h
-    kdevdifffrontend.h kdevmakefrontend.h kdevquickopen.h
-    kdevsourceformatter.h kdevversioncontrol.h
+    codebrowserfrontend.h tdevappfrontend.h tdevcreatefile.h
+    tdevdifffrontend.h tdevmakefrontend.h tdevquickopen.h
+    tdevsourceformatter.h tdevversioncontrol.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/interfaces/extensions )
 
 install( FILES
@@ -35,20 +35,20 @@ install( FILES
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### kdevextensions (static) ###################
+##### tdevextensions (static) ###################
 
 add_custom_command( OUTPUT codebrowserfrontend.moc.cpp
   COMMAND
     ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h -o codebrowserfrontend.moc.cpp
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h )
 
-add_custom_command( OUTPUT kdevversioncontrol.moc.cpp
+add_custom_command( OUTPUT tdevversioncontrol.moc.cpp
   COMMAND
-    ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h -o kdevversioncontrol.moc.cpp
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h )
+    ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tdevversioncontrol.h -o tdevversioncontrol.moc.cpp
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tdevversioncontrol.h )
 
-tde_add_library( kdevextensions STATIC_PIC AUTOMOC
+tde_add_library( tdevextensions STATIC_PIC AUTOMOC
   SOURCES
-    kdevappfrontend.cpp kdevappfrontend.cpp kdevmakefrontend.cpp
-    codebrowserfrontend.moc.cpp kdevversioncontrol.moc.cpp
+    tdevappfrontend.cpp tdevappfrontend.cpp tdevmakefrontend.cpp
+    codebrowserfrontend.moc.cpp tdevversioncontrol.moc.cpp
 )
diff --git a/lib/interfaces/extensions/Mainpage.dox b/lib/interfaces/extensions/Mainpage.dox
index 3b493fde..37c72c16 100644
--- a/lib/interfaces/extensions/Mainpage.dox
+++ b/lib/interfaces/extensions/Mainpage.dox
@@ -10,8 +10,8 @@ This library contains extension interfaces used by TDevelop plugin architecture.
 \section whatisextension What is the TDevelop extension
 
 Extension is a TDevelop plugin which implements one of extension interfaces.
-Extension is usually not important enough to be returned by @ref KDevApi and @ref KDevPlugin
-methods. Therefore extension instance can be obtained by @ref KDevPlugin::extension method.
+Extension is usually not important enough to be returned by @ref TDevApi and @ref TDevPlugin
+methods. Therefore extension instance can be obtained by @ref TDevPlugin::extension method.
 
 Note: extension plugins can be either core, global and project plugins. They are loaded
 in the same way other plugins are. But extensions differ from usual plugins.
@@ -36,10 +36,10 @@ those should be loaded at a time. This can be accomplished by:
   @endcode
 - Define an abstract base class for an extension like:
   @code
-  class KDevMyExtension: public KDevPlugin {
+  class KDevMyExtension: public TDevPlugin {
   public:
-      KDevMyExtension(const KDevPluginInfo *info, QObject* parent, const char* name)
-          :KDevPlugin(info, parent, name) {}
+      KDevMyExtension(const TDevPluginInfo *info, QObject* parent, const char* name)
+          :TDevPlugin(info, parent, name) {}
       
       virtual void doSomething() = 0;
   };
diff --git a/lib/interfaces/extensions/Makefile.am b/lib/interfaces/extensions/Makefile.am
index a6d00bc2..55f4d774 100644
--- a/lib/interfaces/extensions/Makefile.am
+++ b/lib/interfaces/extensions/Makefile.am
@@ -1,7 +1,7 @@
 tdevelopincludeextdir = $(includedir)/tdevelop/interfaces/extensions
-tdevelopincludeext_HEADERS = codebrowserfrontend.h kdevappfrontend.h \
-	kdevcreatefile.h kdevdifffrontend.h kdevmakefrontend.h kdevquickopen.h \
-	kdevsourceformatter.h kdevversioncontrol.h
+tdevelopincludeext_HEADERS = codebrowserfrontend.h tdevappfrontend.h \
+	tdevcreatefile.h tdevdifffrontend.h tdevmakefrontend.h tdevquickopen.h \
+	tdevsourceformatter.h tdevversioncontrol.h
 
 servicetypedir = $(kde_servicetypesdir)
 servicetype_DATA = tdevelopappfrontend.desktop \
@@ -10,14 +10,14 @@ servicetype_DATA = tdevelopappfrontend.desktop \
 	tdevelopversioncontrol.desktop
 
 SUBDIRS = dcop
-libkdevextensions_la_LDFLAGS = $(all_libraries)
-noinst_LTLIBRARIES = libkdevextensions.la
-libkdevextensions_la_SOURCES = kdevappfrontend.cpp kdevmakefrontend.cpp
+libtdevextensions_la_LDFLAGS = $(all_libraries)
+noinst_LTLIBRARIES = libtdevextensions.la
+libtdevextensions_la_SOURCES = tdevappfrontend.cpp tdevmakefrontend.cpp
 INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces
-DOXYGEN_PROJECTNAME = KDevelop Extension Interfaces Library
-DOXYGEN_DOCDIRPREFIX = kdev
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces
+DOXYGEN_PROJECTNAME = TDevelop Extension Interfaces Library
+DOXYGEN_DOCDIRPREFIX = tdev
 include ../../../Doxyfile.am
 noinst_HEADERS = codebrowserfrontend.h
diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h
index e8158fe4..68c4e90f 100644
--- a/lib/interfaces/extensions/codebrowserfrontend.h
+++ b/lib/interfaces/extensions/codebrowserfrontend.h
@@ -20,18 +20,18 @@
 #define CODEBROWSERRONTEND_H
 
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include <codemodel.h>
 
 namespace Extensions {
 
-class KDevCodeBrowserFrontend  : public KDevPlugin {
+class TDevCodeBrowserFrontend  : public TDevPlugin {
     Q_OBJECT
   
 
     public:
-        KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-            :KDevPlugin(info, parent, name ? name : "CodeBrowserFrontend") {}
+        TDevCodeBrowserFrontend(const TDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
+            :TDevPlugin(info, parent, name ? name : "CodeBrowserFrontend") {}
         
         ///Used by the quickopen-plugin to notify extensions that it jumped to a searched item
         virtual bool jumpedToItem( ItemDom item ) = 0;
diff --git a/lib/interfaces/extensions/dcop/CMakeLists.txt b/lib/interfaces/extensions/dcop/CMakeLists.txt
index b6255fc6..8658d320 100644
--- a/lib/interfaces/extensions/dcop/CMakeLists.txt
+++ b/lib/interfaces/extensions/dcop/CMakeLists.txt
@@ -21,14 +21,14 @@ include_directories(
 ##### headers ###################################
 
 install( FILES
-    KDevAppFrontendIface.h KDevMakeFrontendIface.h
+    TDevAppFrontendIface.h TDevMakeFrontendIface.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/interfaces/extensions/dcop )
 
 
-##### kdevdcopextensions (static) ###############
+##### tdevdcopextensions (static) ###############
 
-tde_add_library( kdevdcopextensions STATIC_PIC
+tde_add_library( tdevdcopextensions STATIC_PIC
   SOURCES
-    KDevAppFrontendIface.cpp KDevMakeFrontendIface.cpp
-    KDevAppFrontendIface.skel KDevMakeFrontendIface.skel
+    TDevAppFrontendIface.cpp TDevMakeFrontendIface.cpp
+    TDevAppFrontendIface.skel TDevMakeFrontendIface.skel
 )
diff --git a/lib/interfaces/extensions/dcop/Makefile.am b/lib/interfaces/extensions/dcop/Makefile.am
index 116c4979..e46606ac 100644
--- a/lib/interfaces/extensions/dcop/Makefile.am
+++ b/lib/interfaces/extensions/dcop/Makefile.am
@@ -1,10 +1,10 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions $(all_includes)
 METASOURCES = AUTO
 
-noinst_LTLIBRARIES = libkdevdcopextensions.la
-libkdevdcopextensions_la_LDFLAGS = $(all_libraries)
-libkdevdcopextensions_la_SOURCES = KDevAppFrontendIface.cpp \
-		KDevMakeFrontendIface.cpp KDevAppFrontendIface.skel KDevMakeFrontendIface.skel 
+noinst_LTLIBRARIES = libtdevdcopextensions.la
+libtdevdcopextensions_la_LDFLAGS = $(all_libraries)
+libtdevdcopextensions_la_SOURCES = TDevAppFrontendIface.cpp \
+		TDevMakeFrontendIface.cpp TDevAppFrontendIface.skel TDevMakeFrontendIface.skel 
 
 dcopincludeextdir = $(includedir)/tdevelop/interfaces/extensions/dcop
-dcopincludeext_HEADERS = KDevAppFrontendIface.h KDevMakeFrontendIface.h
+dcopincludeext_HEADERS = TDevAppFrontendIface.h TDevMakeFrontendIface.h
diff --git a/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp b/lib/interfaces/extensions/dcop/TDevAppFrontendIface.cpp
index 1eca4bfc..a42d0d7d 100644
--- a/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp
+++ b/lib/interfaces/extensions/dcop/TDevAppFrontendIface.cpp
@@ -21,56 +21,56 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "KDevAppFrontendIface.h"
-#include "kdevappfrontend.h"
+#include "TDevAppFrontendIface.h"
+#include "tdevappfrontend.h"
 
 
-KDevAppFrontendIface::KDevAppFrontendIface(KDevAppFrontend *appFrontend)
-  : DCOPObject("KDevAppFrontend"), m_appFrontend(appFrontend)
+TDevAppFrontendIface::TDevAppFrontendIface(TDevAppFrontend *appFrontend)
+  : DCOPObject("TDevAppFrontend"), m_appFrontend(appFrontend)
 {
 }
 
 
-KDevAppFrontendIface::~KDevAppFrontendIface()
+TDevAppFrontendIface::~TDevAppFrontendIface()
 {}
 
 
-void KDevAppFrontendIface::startAppCommand(const TQString &directory, const TQString &command, bool inTerminal)
+void TDevAppFrontendIface::startAppCommand(const TQString &directory, const TQString &command, bool inTerminal)
 {
     m_appFrontend->startAppCommand(directory, command, inTerminal);
 }
 
-void KDevAppFrontendIface::stopApplication( )
+void TDevAppFrontendIface::stopApplication( )
 {
     m_appFrontend->stopApplication();
 }
 
-bool KDevAppFrontendIface::isRunning( )
+bool TDevAppFrontendIface::isRunning( )
 {
     return m_appFrontend->isRunning();
 }
 
-void KDevAppFrontendIface::clearView( )
+void TDevAppFrontendIface::clearView( )
 {
     m_appFrontend->clearView();
 }
 
-void KDevAppFrontendIface::insertStderrLine( const TQCString & line )
+void TDevAppFrontendIface::insertStderrLine( const TQCString & line )
 {
     m_appFrontend->insertStderrLine(line);
 }
 
-void KDevAppFrontendIface::insertStdoutLine( const TQCString & line )
+void TDevAppFrontendIface::insertStdoutLine( const TQCString & line )
 {
     m_appFrontend->insertStdoutLine(line);
 }
 
-void KDevAppFrontendIface::addPartialStderrLine( const TQCString& line )
+void TDevAppFrontendIface::addPartialStderrLine( const TQCString& line )
 {
     m_appFrontend->addPartialStderrLine(line);
 }
 
-void KDevAppFrontendIface::addPartialStdoutLine( const TQCString& line )
+void TDevAppFrontendIface::addPartialStdoutLine( const TQCString& line )
 {
     m_appFrontend->addPartialStdoutLine(line);
 }
diff --git a/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h b/lib/interfaces/extensions/dcop/TDevAppFrontendIface.h
index 3903e897..5061c782 100644
--- a/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h
+++ b/lib/interfaces/extensions/dcop/TDevAppFrontendIface.h
@@ -19,21 +19,21 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef _KDEVAPPFRONTENDIFACE_H_
-#define _KDEVAPPFRONTENDIFACE_H_
+#ifndef _TDEVAPPFRONTENDIFACE_H_
+#define _TDEVAPPFRONTENDIFACE_H_
 
 #include <dcopobject.h>
 
-class KDevAppFrontend;
+class TDevAppFrontend;
 
-class KDevAppFrontendIface : public DCOPObject
+class TDevAppFrontendIface : public DCOPObject
 {
     K_DCOP
     
 public:
     
-    KDevAppFrontendIface( KDevAppFrontend *appFrontend );
-    ~KDevAppFrontendIface();
+    TDevAppFrontendIface( TDevAppFrontend *appFrontend );
+    ~TDevAppFrontendIface();
 
 k_dcop:
     void startAppCommand(const TQString &directory, const TQString &command, bool inTerminal);
@@ -46,7 +46,7 @@ k_dcop:
     void addPartialStdoutLine(const TQCString &line);
     
 private:
-    KDevAppFrontend *m_appFrontend;
+    TDevAppFrontend *m_appFrontend;
 };
 
 #endif
diff --git a/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp b/lib/interfaces/extensions/dcop/TDevMakeFrontendIface.cpp
index 73305e4a..06bd432f 100644
--- a/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp
+++ b/lib/interfaces/extensions/dcop/TDevMakeFrontendIface.cpp
@@ -20,27 +20,27 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "KDevMakeFrontendIface.h"
-#include "kdevmakefrontend.h"
+#include "TDevMakeFrontendIface.h"
+#include "tdevmakefrontend.h"
 
 
-KDevMakeFrontendIface::KDevMakeFrontendIface(KDevMakeFrontend *makeFrontend)
-    : DCOPObject("KDevMakeFrontend")
+TDevMakeFrontendIface::TDevMakeFrontendIface(TDevMakeFrontend *makeFrontend)
+    : DCOPObject("TDevMakeFrontend")
 {
     m_makeFrontend = makeFrontend;
 }
 
 
-KDevMakeFrontendIface::~KDevMakeFrontendIface()
+TDevMakeFrontendIface::~TDevMakeFrontendIface()
 {}
 
 
-void KDevMakeFrontendIface::queueCommand(const TQString &dir, const TQString &command) 
+void TDevMakeFrontendIface::queueCommand(const TQString &dir, const TQString &command) 
 {
     m_makeFrontend->queueCommand(dir, command);
 }
 
-bool KDevMakeFrontendIface::isRunning( )
+bool TDevMakeFrontendIface::isRunning( )
 {
     return m_makeFrontend->isRunning();
 }
diff --git a/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h b/lib/interfaces/extensions/dcop/TDevMakeFrontendIface.h
index 53217359..3aee75be 100644
--- a/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h
+++ b/lib/interfaces/extensions/dcop/TDevMakeFrontendIface.h
@@ -18,28 +18,28 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef _KDEVMAKEFRONTENDIFACE_H_
-#define _KDEVMAKEFRONTENDIFACE_H_
+#ifndef _TDEVMAKEFRONTENDIFACE_H_
+#define _TDEVMAKEFRONTENDIFACE_H_
 
 #include <dcopobject.h>
 
-class KDevMakeFrontend;
+class TDevMakeFrontend;
 
-class KDevMakeFrontendIface : public DCOPObject
+class TDevMakeFrontendIface : public DCOPObject
 {
     K_DCOP
     
 public:
     
-    KDevMakeFrontendIface( KDevMakeFrontend *makeFrontend );
-    ~KDevMakeFrontendIface();
+    TDevMakeFrontendIface( TDevMakeFrontend *makeFrontend );
+    ~TDevMakeFrontendIface();
 
 k_dcop:
     void queueCommand(const TQString &dir, const TQString &command);
     bool isRunning();
 
 private:
-    KDevMakeFrontend *m_makeFrontend;
+    TDevMakeFrontend *m_makeFrontend;
 };
 
 #endif
diff --git a/lib/interfaces/extensions/kdevappfrontend.cpp b/lib/interfaces/extensions/kdevappfrontend.cpp
deleted file mode 100644
index 3d918fe2..00000000
--- a/lib/interfaces/extensions/kdevappfrontend.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "kdevappfrontend.h"
-#include "kdevappfrontend.moc"
diff --git a/lib/interfaces/extensions/kdevmakefrontend.cpp b/lib/interfaces/extensions/kdevmakefrontend.cpp
deleted file mode 100644
index 5e035270..00000000
--- a/lib/interfaces/extensions/kdevmakefrontend.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "kdevmakefrontend.h"
-#include "kdevmakefrontend.moc"
diff --git a/lib/interfaces/extensions/tdevappfrontend.cpp b/lib/interfaces/extensions/tdevappfrontend.cpp
new file mode 100644
index 00000000..4f7c52a7
--- /dev/null
+++ b/lib/interfaces/extensions/tdevappfrontend.cpp
@@ -0,0 +1,2 @@
+#include "tdevappfrontend.h"
+#include "tdevappfrontend.moc"
diff --git a/lib/interfaces/extensions/kdevappfrontend.h b/lib/interfaces/extensions/tdevappfrontend.h
index 76952f35..085d3c9d 100644
--- a/lib/interfaces/extensions/kdevappfrontend.h
+++ b/lib/interfaces/extensions/tdevappfrontend.h
@@ -23,14 +23,14 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVAPPFRONTEND_H
-#define KDEVAPPFRONTEND_H
+#ifndef TDEVAPPFRONTEND_H
+#define TDEVAPPFRONTEND_H
 
 #include <tqstringlist.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 /**
-@file kdevappfrontend.h
+@file tdevappfrontend.h
 Application frontend interface.
 */
 
@@ -45,16 +45,16 @@ Currently, this interface defines ways to do the following:
 
 Instances that implement this interface are available through extension architecture:
 @code
-KDevAppFrontend *apf = extension<KDevAppFrontend>("TDevelop/AppFrontend");
+TDevAppFrontend *apf = extension<TDevAppFrontend>("TDevelop/AppFrontend");
 if (apf) {
     // do something
 } else {
     // fail
 }
 @endcode
-@sa KDevPlugin::extension method documentation.
+@sa TDevPlugin::extension method documentation.
 */
-class KDevAppFrontend : public KDevPlugin
+class TDevAppFrontend : public TDevPlugin
 {
     Q_OBJECT
   
@@ -66,11 +66,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref TDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevAppFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-        :KDevPlugin(info, parent, name ? name : "KDevAppFrontend") {}
+    TDevAppFrontend(const TDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
+        :TDevPlugin(info, parent, name ? name : "TDevAppFrontend") {}
 
     /**@return Whether the application is currently running.*/
     virtual bool isRunning() = 0;
diff --git a/lib/interfaces/extensions/kdevcreatefile.h b/lib/interfaces/extensions/tdevcreatefile.h
index 35b98d19..b1148e94 100644
--- a/lib/interfaces/extensions/kdevcreatefile.h
+++ b/lib/interfaces/extensions/tdevcreatefile.h
@@ -17,15 +17,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVCREATEFILE_H
-#define KDEVCREATEFILE_H
+#ifndef TDEVCREATEFILE_H
+#define TDEVCREATEFILE_H
 
 #include <tqstring.h>
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 /**
-@file kdevcreatefile.h
+@file tdevcreatefile.h
 File creation facility interface.
 */
 
@@ -36,20 +36,20 @@ An abstract class for all extensions that are responsible for file creation.
 
 Instances that implement this interface are available through extension architecture:
 @code
-KDevCreateFile *cf = extension<KDevCreateFile>("TDevelop/CreateFile");
+TDevCreateFile *cf = extension<TDevCreateFile>("TDevelop/CreateFile");
 if (cf) {
     // do something
 } else {
     // fail
 }
 @endcode
-@sa KDevPlugin::extension method documentation.
+@sa TDevPlugin::extension method documentation.
 */
-class KDevCreateFile : public KDevPlugin
+class TDevCreateFile : public TDevPlugin
 {
 
 public:
-  /**File created with @ref KDevCreateFile implementation.*/
+  /**File created with @ref TDevCreateFile implementation.*/
   class CreatedFile {
 
   public:
@@ -119,11 +119,11 @@ public:
   plugin information in various places like "about application" dialog, plugin selector
   dialog, etc. Plugin does not take ownership on info object, also its lifetime should
   be equal to the lifetime of the plugin.
-  @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+  @param parent The parent object for the plugin. Parent object must implement @ref TDevApi
   interface. Otherwise the plugin will not be constructed.
   @param name The internal name which identifies the plugin.*/
-  KDevCreateFile(const KDevPluginInfo *info, TQObject * parent = 0, const char * name = 0)
-      :KDevPlugin(info, parent, name) {}
+  TDevCreateFile(const TDevPluginInfo *info, TQObject * parent = 0, const char * name = 0)
+      :TDevPlugin(info, parent, name) {}
 
   /**Creates a new file, within or without the project.
   Supply as much information as you know. Leave what you don't know as TQString().
diff --git a/lib/interfaces/extensions/kdevdifffrontend.cpp b/lib/interfaces/extensions/tdevdifffrontend.cpp
index 745703e4..aa7e0b19 100644
--- a/lib/interfaces/extensions/kdevdifffrontend.cpp
+++ b/lib/interfaces/extensions/tdevdifffrontend.cpp
@@ -18,16 +18,16 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevdifffrontend.h"
+#include "tdevdifffrontend.h"
 
 
-KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *parent, const char *name)
-    : KDevPlugin(info, parent, name ? name : "KDevDiffFrontend")
+TDevDiffFrontend::TDevDiffFrontend(const TDevPluginInfo *info, TQObject *parent, const char *name)
+    : TDevPlugin(info, parent, name ? name : "TDevDiffFrontend")
 {
 }
 
-KDevDiffFrontend::~KDevDiffFrontend()
+TDevDiffFrontend::~TDevDiffFrontend()
 {
 }
 
-#include "kdevdifffrontend.moc"
+#include "tdevdifffrontend.moc"
diff --git a/lib/interfaces/extensions/kdevdifffrontend.h b/lib/interfaces/extensions/tdevdifffrontend.h
index 6d4cb2b6..c0c343cb 100644
--- a/lib/interfaces/extensions/kdevdifffrontend.h
+++ b/lib/interfaces/extensions/tdevdifffrontend.h
@@ -18,14 +18,14 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVDIFFFRONTEND_H
-#define KDEVDIFFFRONTEND_H
+#ifndef TDEVDIFFFRONTEND_H
+#define TDEVDIFFFRONTEND_H
 
 #include <kurl.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 /**
-@file kdevdifffrontend.h
+@file tdevdifffrontend.h
 Diff frontend interface.
 */
 
@@ -36,16 +36,16 @@ files.
 
 Instances that implement this interface are available through extension architecture:
 @code
-KDevDiffFrontend *df = extension<KDevDiffFrontend>("TDevelop/DiffFrontend");
+TDevDiffFrontend *df = extension<TDevDiffFrontend>("TDevelop/DiffFrontend");
 if (df) {
     // do something
 } else {
     // fail
 }
 @endcode
-@sa KDevPlugin::extension method documentation.
+@sa TDevPlugin::extension method documentation.
 */
-class KDevDiffFrontend : public KDevPlugin
+class TDevDiffFrontend : public TDevPlugin
 {
 
 public:
@@ -55,11 +55,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref TDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevDiffFrontend( const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-        :KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") {}
+    TDevDiffFrontend( const TDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
+        :TDevPlugin(info, parent, name ? name : "TDevDiffFrontend") {}
 
     /**Displays the patch.
     @param diff A string which contains a patch in unified format.*/
diff --git a/lib/interfaces/extensions/tdevmakefrontend.cpp b/lib/interfaces/extensions/tdevmakefrontend.cpp
new file mode 100644
index 00000000..140d074d
--- /dev/null
+++ b/lib/interfaces/extensions/tdevmakefrontend.cpp
@@ -0,0 +1,2 @@
+#include "tdevmakefrontend.h"
+#include "tdevmakefrontend.moc"
diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/tdevmakefrontend.h
index 52afa3d3..47b14fc4 100644
--- a/lib/interfaces/extensions/kdevmakefrontend.h
+++ b/lib/interfaces/extensions/tdevmakefrontend.h
@@ -23,14 +23,14 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVMAKEFRONTEND_H
-#define KDEVMAKEFRONTEND_H
+#ifndef TDEVMAKEFRONTEND_H
+#define TDEVMAKEFRONTEND_H
 
 #include <tqstringlist.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 /**
-@file kdevmakefrontend.h
+@file tdevmakefrontend.h
 Make frontend interface.
 */
 
@@ -41,16 +41,16 @@ or similar commands to build a project, api documentation, etc.
 
 Instances that implement this interface are available through extension architecture:
 @code
-KDevMakeFrontend *mf = extension<KDevMakeFrontend>("TDevelop/MakeFrontend");
+TDevMakeFrontend *mf = extension<TDevMakeFrontend>("TDevelop/MakeFrontend");
 if (mf) {
     // do something
 } else {
     // fail
 }
 @endcode
-@sa KDevPlugin::extension method documentation.
+@sa TDevPlugin::extension method documentation.
 */
-class KDevMakeFrontend : public KDevPlugin
+class TDevMakeFrontend : public TDevPlugin
 {
     Q_OBJECT
   
@@ -63,11 +63,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref TDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevMakeFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-        :KDevPlugin(info, parent, name ? name : "KDevMakeFrontend") {}
+    TDevMakeFrontend(const TDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
+        :TDevPlugin(info, parent, name ? name : "TDevMakeFrontend") {}
 
     /**@return The widget where the make output is shown.*/
     virtual TQWidget* widget() { return 0L; }
diff --git a/lib/interfaces/extensions/kdevquickopen.h b/lib/interfaces/extensions/tdevquickopen.h
index 91dce7ca..e1fd2f65 100644
--- a/lib/interfaces/extensions/kdevquickopen.h
+++ b/lib/interfaces/extensions/tdevquickopen.h
@@ -16,14 +16,14 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVQUICKOPEN_H
-#define KDEVQUICKOPEN_H
+#ifndef TDEVQUICKOPEN_H
+#define TDEVQUICKOPEN_H
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include <kurl.h>
 
 /**
-@file kdevquickopen.h
+@file tdevquickopen.h
 Source formatter interface.
 */
 
@@ -39,10 +39,10 @@ if (qo) {
     // fail
 }
 @endcode
-@sa @ref KDevPlugin::extension method documentation.
+@sa @ref TDevPlugin::extension method documentation.
 @sa @ref whatisextension and @ref creatingextension sections of Platform API documentation.
 */
-class KDevQuickOpen : public KDevPlugin
+class KDevQuickOpen : public TDevPlugin
 {
 public:
     /**Constructor.
@@ -51,11 +51,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref TDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name)
-        :KDevPlugin(info, parent, name) {}
+    KDevQuickOpen(const TDevPluginInfo *info, TQObject* parent, const char* name)
+        :TDevPlugin(info, parent, name) {}
 
     /**Shows the file selection dialog.
     @param text A list of urls to open.*/
@@ -81,14 +81,14 @@ public:
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVQUICKOPEN_H
-#define KDEVQUICKOPEN_H
+#ifndef TDEVQUICKOPEN_H
+#define TDEVQUICKOPEN_H
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include <kurl.h>
 
 /**
-@file kdevquickopen.h
+@file tdevquickopen.h
 Source formatter interface.
 */
 
@@ -104,10 +104,10 @@ if (qo) {
     // fail
 }
 @endcode
-@sa @ref KDevPlugin::extension method documentation.
+@sa @ref TDevPlugin::extension method documentation.
 @sa @ref whatisextension and @ref creatingextension sections of Platform API documentation.
 */
-class KDevQuickOpen : public KDevPlugin
+class KDevQuickOpen : public TDevPlugin
 {
 public:
     /**Constructor.
@@ -116,11 +116,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref TDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name)
-        :KDevPlugin(info, parent, name) {}
+    KDevQuickOpen(const TDevPluginInfo *info, TQObject* parent, const char* name)
+        :TDevPlugin(info, parent, name) {}
 
     /**Shows the file selection dialog.
     @param text A list of urls to open.*/
diff --git a/lib/interfaces/extensions/kdevsourceformatter.h b/lib/interfaces/extensions/tdevsourceformatter.h
index c4a380cf..3403a5d2 100644
--- a/lib/interfaces/extensions/kdevsourceformatter.h
+++ b/lib/interfaces/extensions/tdevsourceformatter.h
@@ -16,13 +16,13 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVSOURCEFORMATTER_H
-#define KDEVSOURCEFORMATTER_H
+#ifndef TDEVSOURCEFORMATTER_H
+#define TDEVSOURCEFORMATTER_H
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 /**
-@file kdevsourceformatter.h
+@file tdevsourceformatter.h
 Source formatter interface.
 */
 
@@ -39,10 +39,10 @@ if (sf) {
     // fail
 }
 @endcode
-@sa @ref KDevPlugin::extension method documentation.
+@sa @ref TDevPlugin::extension method documentation.
 @sa @ref whatisextension and @ref creatingextension sections of Platform API documentation.
 */
-class KDevSourceFormatter : public KDevPlugin
+class KDevSourceFormatter : public TDevPlugin
 {
 public:
     /**Constructor.
@@ -51,11 +51,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref TDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevSourceFormatter(const KDevPluginInfo *info, TQObject* parent, const char* name)
-        :KDevPlugin(info, parent, name) {}
+    KDevSourceFormatter(const TDevPluginInfo *info, TQObject* parent, const char* name)
+        :TDevPlugin(info, parent, name) {}
 
     /**Formats the source.
     @param text A string with a code.
diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/tdevversioncontrol.h
index a19c6275..d796e31f 100644
--- a/lib/interfaces/extensions/kdevversioncontrol.h
+++ b/lib/interfaces/extensions/tdevversioncontrol.h
@@ -20,8 +20,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVVERSIONCONTROL_H
-#define KDEVVERSIONCONTROL_H
+#ifndef TDEVVERSIONCONTROL_H
+#define TDEVVERSIONCONTROL_H
 
 #include <tqobject.h>
 #include <tqstring.h>
@@ -29,10 +29,10 @@
 #include <tqmap.h>
 #include <tqvaluelist.h>
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 /**
-@file kdevversioncontrol.h
+@file tdevversioncontrol.h
 Version control system interface and utility classes.
 */
 
@@ -112,7 +112,7 @@ This is a type definition: @code TQMap<TQString,VCSFileInfo> VCSFileInfoMap; @en
 */
 typedef TQMap<TQString,VCSFileInfo> VCSFileInfoMap;
 
-class KDevVCSFileInfoProvider;
+class TDevVCSFileInfoProvider;
 
 
 /**
@@ -123,16 +123,16 @@ VCS support plugins should implement this interface.
 
 Instances that implement this interface are available through extension architecture:
 @code
-KDevVersionControl *vcs = extension<KDevVersionControl>("TDevelop/VersionControl");
+TDevVersionControl *vcs = extension<TDevVersionControl>("TDevelop/VersionControl");
 if (vcs) {
     // do something
 } else {
     // fail
 }
 @endcode
-@sa KDevPlugin::extension method documentation.
+@sa TDevPlugin::extension method documentation.
 */
-class KDevVersionControl: public KDevPlugin
+class TDevVersionControl: public TDevPlugin
 {
     Q_OBJECT
   
@@ -144,11 +144,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref TDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevVersionControl(const KDevPluginInfo *info, TQObject *parent, const char *name )
-        :KDevPlugin(info, parent, name ) {}
+    TDevVersionControl(const TDevPluginInfo *info, TQObject *parent, const char *name )
+        :TDevPlugin(info, parent, name ) {}
 
     /**Creates a new project in the passed path @p dir. This should instantiate
     VCS infrastructure and import a project into the VCS in that directory.
@@ -161,7 +161,7 @@ public:
     virtual bool fetchFromRepository() = 0;
 
     /**@return The file info provider for this version control (0 if none is available).*/
-    virtual KDevVCSFileInfoProvider *fileInfoProvider() const = 0;
+    virtual TDevVCSFileInfoProvider *fileInfoProvider() const = 0;
 
     /**Checks if the directory is valid for this version control (for example
     CVS may check for the presence of "<dirPath>/CVS/" subdir and something else)
@@ -182,7 +182,7 @@ signals:
 /**
 Basic interface for providing info on file registered in a version control repository repository.
 */
-class KDevVCSFileInfoProvider: public TQObject
+class TDevVCSFileInfoProvider: public TQObject
 {
     Q_OBJECT
   
@@ -190,7 +190,7 @@ public:
     /**Constructor.
     @param parent The parent VCS plugin.
     @param name The name of a provider object.*/
-    KDevVCSFileInfoProvider(KDevVersionControl *parent, const char *name)
+    TDevVCSFileInfoProvider(TDevVersionControl *parent, const char *name)
         : TQObject( parent, name ), m_owner(parent) {}
 
     /**Gets the status for local files in the specified directory:
@@ -226,14 +226,14 @@ signals:
 
 protected:
     /**@return The version control which owns this provider.*/
-    KDevVersionControl *owner() const { return m_owner; }
+    TDevVersionControl *owner() const { return m_owner; }
 
 private:
-    KDevVersionControl *m_owner;
+    TDevVersionControl *m_owner;
 
 private:
-    KDevVCSFileInfoProvider( const KDevVCSFileInfoProvider & );
-    KDevVCSFileInfoProvider &operator=( const KDevVCSFileInfoProvider & );
+    TDevVCSFileInfoProvider( const TDevVCSFileInfoProvider & );
+    TDevVCSFileInfoProvider &operator=( const TDevVCSFileInfoProvider & );
 };
 
 #endif
diff --git a/lib/interfaces/external/Mainpage.dox b/lib/interfaces/external/Mainpage.dox
index 4ed571dd..6c2fb2b9 100644
--- a/lib/interfaces/external/Mainpage.dox
+++ b/lib/interfaces/external/Mainpage.dox
@@ -30,7 +30,7 @@ are connected to corresponding Q_SLOTS of TDevelop designer integration engine w
  
 Each language support which wants to use integrated designer, must reimplement 
 @code
-virtual KDevDesignerIntegration *KDevLanguageSupport::designer(KInterfaceDesigner::DesignerType type)
+virtual TDevDesignerIntegration *TDevLanguageSupport::designer(KInterfaceDesigner::DesignerType type)
 @endcode
 method and return designer integration object.
 
@@ -39,15 +39,15 @@ developers. With the convenience library writing %Qt designer integration for th
 trivial task.
 
 
-\section kdevdesigner KDevelop Designer technical overview
-KDevelop version >= 3.1 comes with a customized version (fork ;)) of %Qt Designer. It is called KDevelop Designer (KDevDesigner, kdevdesigner from the command line). KDevDesigner has some important differences:
-- KDevDesigner provides a read/write KPart which can be embedded into any application which wants to edit .ui files. TDevelop IDE embeds KDevDesigner this way.
-- KDevDesigner uses %KDE icons and dialogs and thus provides better integration with a system.
+\section tdevdesigner KDevelop Designer technical overview
+KDevelop version >= 3.1 comes with a customized version (fork ;)) of %Qt Designer. It is called KDevelop Designer (TDevDesigner, tdevdesigner from the command line). TDevDesigner has some important differences:
+- TDevDesigner provides a read/write KPart which can be embedded into any application which wants to edit .ui files. TDevelop IDE embeds TDevDesigner this way.
+- TDevDesigner uses %KDE icons and dialogs and thus provides better integration with a system.
 .
 
-It is safe to preview forms with some %KDE widgets from tdeui and tdeio libraries - KDevDesigner part is linked to those libraries so it will not crash under some circumstances.
+It is safe to preview forms with some %KDE widgets from tdeui and tdeio libraries - TDevDesigner part is linked to those libraries so it will not crash under some circumstances.
 
-KDevDesigner will not create .ui.h files - this feature is completely disabled. Integrated KDevDesigner will use subclassing approach, standalone does not allow to enter code.
+TDevDesigner will not create .ui.h files - this feature is completely disabled. Integrated TDevDesigner will use subclassing approach, standalone does not allow to enter code.
 
 \section other Other information
 
diff --git a/lib/interfaces/extras/CMakeLists.txt b/lib/interfaces/extras/CMakeLists.txt
index eb4cdb75..afe233aa 100644
--- a/lib/interfaces/extras/CMakeLists.txt
+++ b/lib/interfaces/extras/CMakeLists.txt
@@ -22,7 +22,7 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kdevcompileroptions.h kdevvcsintegrator.h
+    tdevcompileroptions.h tdevvcsintegrator.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/interfaces/extras )
 
 install( FILES
@@ -30,10 +30,10 @@ install( FILES
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### kdevextras (shared) #######################
+##### tdevextras (shared) #######################
 
-tde_add_library( kdevextras SHARED AUTOMOC
-  SOURCES kdevcompileroptions.cpp kdevvcsintegrator.cpp
+tde_add_library( tdevextras SHARED AUTOMOC
+  SOURCES tdevcompileroptions.cpp tdevvcsintegrator.cpp
   VERSION 0.0.0
   LINK ${TQT_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
diff --git a/lib/interfaces/extras/Makefile.am b/lib/interfaces/extras/Makefile.am
index 67615223..c504621e 100644
--- a/lib/interfaces/extras/Makefile.am
+++ b/lib/interfaces/extras/Makefile.am
@@ -1,18 +1,18 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \
 	$(all_includes)
 METASOURCES = AUTO
-libkdevextras_la_LIBADD = $(LIB_QT)
-libkdevextras_la_LDFLAGS = $(all_libraries)
-lib_LTLIBRARIES = libkdevextras.la
+libtdevextras_la_LIBADD = $(LIB_QT)
+libtdevextras_la_LDFLAGS = $(all_libraries)
+lib_LTLIBRARIES = libtdevextras.la
 tdevelopincludedir = $(includedir)/tdevelop/interfaces/extras
 servicetypedir = $(kde_servicetypesdir)
 
-tdevelopinclude_HEADERS = kdevcompileroptions.h kdevvcsintegrator.h
-libkdevextras_la_SOURCES = kdevcompileroptions.cpp kdevvcsintegrator.cpp
+tdevelopinclude_HEADERS = tdevcompileroptions.h tdevvcsintegrator.h
+libtdevextras_la_SOURCES = tdevcompileroptions.cpp tdevvcsintegrator.cpp
 servicetype_DATA = tdevelopcompileroptions.desktop \
 	tdevelopvcsintegrator.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces
 DOXYGEN_PROJECTNAME = TDevelop Extra Interfaces Library
-DOXYGEN_DOCDIRPREFIX = kdev
+DOXYGEN_DOCDIRPREFIX = tdev
 include ../../../Doxyfile.am
diff --git a/lib/interfaces/extras/kdevcompileroptions.cpp b/lib/interfaces/extras/kdevcompileroptions.cpp
deleted file mode 100644
index 22c701f1..00000000
--- a/lib/interfaces/extras/kdevcompileroptions.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "kdevcompileroptions.h"
-
-KDevCompilerOptions::KDevCompilerOptions( TQObject * parent, const char * name )
-        :TQObject(parent, name)
-{
-}
-
-#include "kdevcompileroptions.moc"
diff --git a/lib/interfaces/extras/tdevcompileroptions.cpp b/lib/interfaces/extras/tdevcompileroptions.cpp
new file mode 100644
index 00000000..9eead32f
--- /dev/null
+++ b/lib/interfaces/extras/tdevcompileroptions.cpp
@@ -0,0 +1,8 @@
+#include "tdevcompileroptions.h"
+
+TDevCompilerOptions::TDevCompilerOptions( TQObject * parent, const char * name )
+        :TQObject(parent, name)
+{
+}
+
+#include "tdevcompileroptions.moc"
diff --git a/lib/interfaces/extras/kdevcompileroptions.h b/lib/interfaces/extras/tdevcompileroptions.h
index 6544c5d0..b8509a99 100644
--- a/lib/interfaces/extras/kdevcompileroptions.h
+++ b/lib/interfaces/extras/tdevcompileroptions.h
@@ -19,12 +19,12 @@
 */
 
 /**
-@file kdevcompileroptions.h
+@file tdevcompileroptions.h
 The interface to compiler options configuration.
 */
 
-#ifndef _KDEVCOMPILEROPTIONS_H_
-#define _KDEVCOMPILEROPTIONS_H_
+#ifndef _TDEVCOMPILEROPTIONS_H_
+#define _TDEVCOMPILEROPTIONS_H_
 
 #include <tqobject.h>
 
@@ -34,7 +34,7 @@ Used by build systems to give users a compiler options configuration dialog.
 
 Common use case:
 @code
-static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent )
+static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent )
 {
     KService::Ptr service = KService::serviceByDesktopName( name );
     if ( !service )
@@ -50,17 +50,17 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
         args = TQStringList::split(" ", prop.toString());
 
     TQObject *obj = factory->create(parent, service->name().latin1(),
-                                   "KDevCompilerOptions", args);
+                                   "TDevCompilerOptions", args);
 
-    if (!obj->inherits("KDevCompilerOptions"))
+    if (!obj->inherits("TDevCompilerOptions"))
         return 0;
     
-    KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
+    TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
     return dlg;
 }
 
 ...
-KDevCompilerOptions *plugin = createCompilerOptions(compilerName, parent);
+TDevCompilerOptions *plugin = createCompilerOptions(compilerName, parent);
 TQString flags = ""; //old compiler flags
 if ( plugin )
 {
@@ -69,13 +69,13 @@ if ( plugin )
 }
 @endcode
 */
-class KDevCompilerOptions : public TQObject
+class TDevCompilerOptions : public TQObject
 {
     Q_OBJECT
   
 
 public:
-    KDevCompilerOptions( TQObject *parent=0, const char *name=0 );
+    TDevCompilerOptions( TQObject *parent=0, const char *name=0 );
 
     /**
      * Opens a dialog which allows the user to configure the
diff --git a/lib/interfaces/extras/kdevvcsintegrator.cpp b/lib/interfaces/extras/tdevvcsintegrator.cpp
index 5a6ab429..26bf915d 100644
--- a/lib/interfaces/extras/kdevvcsintegrator.cpp
+++ b/lib/interfaces/extras/tdevvcsintegrator.cpp
@@ -16,11 +16,11 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevvcsintegrator.h"
+#include "tdevvcsintegrator.h"
 
-KDevVCSIntegrator::KDevVCSIntegrator(TQObject *parent, const char *name)
+TDevVCSIntegrator::TDevVCSIntegrator(TQObject *parent, const char *name)
     :TQObject(parent, name)
 {
 }
 
-#include "kdevvcsintegrator.moc"
+#include "tdevvcsintegrator.moc"
diff --git a/lib/interfaces/extras/kdevvcsintegrator.h b/lib/interfaces/extras/tdevvcsintegrator.h
index 793070b3..23ee6c22 100644
--- a/lib/interfaces/extras/kdevvcsintegrator.h
+++ b/lib/interfaces/extras/tdevvcsintegrator.h
@@ -16,13 +16,13 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVVCSINTEGRATOR_H
-#define KDEVVCSINTEGRATOR_H
+#ifndef TDEVVCSINTEGRATOR_H
+#define TDEVVCSINTEGRATOR_H
 
 #include <tqobject.h>
 
 /**
-@file kdevvcsintegrator.h
+@file tdevvcsintegrator.h
 The interface to VCS integrators.
 */
 
@@ -62,11 +62,11 @@ The interface to VCS integrators.
 VCS integrator takes care about setting up VCS for new and existing projects.
 It can, for example, perform checkout or import operations.
 */
-class KDevVCSIntegrator: public TQObject {
+class TDevVCSIntegrator: public TQObject {
     Q_OBJECT
   
 public:
-    KDevVCSIntegrator(TQObject *parent = 0, const char *name = 0);
+    TDevVCSIntegrator(TQObject *parent = 0, const char *name = 0);
 
     /**Reimplement to return a dialog to fetch the project from VCS.*/
     virtual VCSDialog *fetcher(TQWidget *parent) = 0;
diff --git a/lib/interfaces/katedocumentmanagerinterface.cpp b/lib/interfaces/katedocumentmanagerinterface.cpp
index 0afbcc81..360be1c4 100644
--- a/lib/interfaces/katedocumentmanagerinterface.cpp
+++ b/lib/interfaces/katedocumentmanagerinterface.cpp
@@ -17,7 +17,7 @@
   Boston, MA 02110-1301, USA.
 */
 #include "katedocumentmanagerinterface.h"
-#include "kdevpartcontroller.h"
+#include "tdevpartcontroller.h"
 #include <kurl.h>
 #include <dcopclient.h>
 #include <tdeapplication.h>
@@ -26,7 +26,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-KateDocumentManagerInterface::KateDocumentManagerInterface( KDevPartController *pc)
+KateDocumentManagerInterface::KateDocumentManagerInterface( TDevPartController *pc)
     : TQObject(pc), DCOPObject("KateDocumentManager"), m_controller(pc)
 {
 
diff --git a/lib/interfaces/katedocumentmanagerinterface.h b/lib/interfaces/katedocumentmanagerinterface.h
index 8bdbdf8f..235c7738 100644
--- a/lib/interfaces/katedocumentmanagerinterface.h
+++ b/lib/interfaces/katedocumentmanagerinterface.h
@@ -23,7 +23,7 @@
 #include <dcopobject.h>
 #include <dcopref.h>
 #include <kurl.h>
-class KDevPartController;
+class TDevPartController;
 
 /**
 This is an emulated interface to provide compatibility with Kate scripts.
@@ -36,7 +36,7 @@ class KateDocumentManagerInterface : public TQObject, public DCOPObject {
 //    
     K_DCOP
 public:
-    KateDocumentManagerInterface( KDevPartController *pc );
+    KateDocumentManagerInterface( TDevPartController *pc );
 
     ~KateDocumentManagerInterface();
 
@@ -53,7 +53,7 @@ k_dcop:
     uint documents();
 private:
 
-    KDevPartController *m_controller;
+    TDevPartController *m_controller;
 };
 
 #endif
diff --git a/lib/interfaces/kdevapi.cpp b/lib/interfaces/tdevapi.cpp
index 04cf078d..4f726107 100644
--- a/lib/interfaces/kdevapi.cpp
+++ b/lib/interfaces/tdevapi.cpp
@@ -17,15 +17,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevapi.h"
+#include "tdevapi.h"
 
-#include "kdevcoderepository.h"
+#include "tdevcoderepository.h"
 
 ///////////////////////////////////////////////////////////////////////////////
-// class KDevApi::Private
+// class TDevApi::Private
 ///////////////////////////////////////////////////////////////////////////////
 
-class KDevApi::Private
+class TDevApi::Private
 {
 public:
     Private()
@@ -34,60 +34,60 @@ public:
     {}
     
     TQDomDocument *m_projectDom;
-    KDevProject  *m_project;
-    KDevLanguageSupport *m_languageSupport;
-    KDevCodeRepository* m_codeRepository;
+    TDevProject  *m_project;
+    TDevLanguageSupport *m_languageSupport;
+    TDevCodeRepository* m_codeRepository;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-// class KDevApi
+// class TDevApi
 ///////////////////////////////////////////////////////////////////////////////
 
-KDevApi::KDevApi()
+TDevApi::TDevApi()
 {
-    d = new KDevApi::Private;
-    d->m_codeRepository = new KDevCodeRepository();
+    d = new TDevApi::Private;
+    d->m_codeRepository = new TDevCodeRepository();
 }
 
-KDevApi::~KDevApi()
+TDevApi::~TDevApi()
 {
     delete d->m_codeRepository;
     delete d;
 }
 
-KDevProject *KDevApi::project() const
+TDevProject *TDevApi::project() const
 {
   return d->m_project;
 }
 
-void KDevApi::setProject(KDevProject *project)
+void TDevApi::setProject(TDevProject *project)
 {
   d->m_project = project;
 }
 
-KDevLanguageSupport *KDevApi::languageSupport() const
+TDevLanguageSupport *TDevApi::languageSupport() const
 {
   return d->m_languageSupport;
 }
 
-void KDevApi::setLanguageSupport(KDevLanguageSupport *languageSupport)
+void TDevApi::setLanguageSupport(TDevLanguageSupport *languageSupport)
 {
   d->m_languageSupport = languageSupport;
 }
 
-TQDomDocument *KDevApi::projectDom() const
+TQDomDocument *TDevApi::projectDom() const
 {
     return d->m_projectDom;
 }
 
-void KDevApi::setProjectDom(TQDomDocument *dom)
+void TDevApi::setProjectDom(TQDomDocument *dom)
 {
     d->m_projectDom = dom;
 }
 
-KDevCodeRepository *KDevApi::codeRepository() const
+TDevCodeRepository *TDevApi::codeRepository() const
 {
     return d->m_codeRepository;
 }
 
-#include "kdevapi.moc"
+#include "tdevapi.moc"
diff --git a/lib/interfaces/kdevapi.h b/lib/interfaces/tdevapi.h
index d1f4f5cc..a2e38f7c 100644
--- a/lib/interfaces/kdevapi.h
+++ b/lib/interfaces/tdevapi.h
@@ -17,56 +17,56 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVAPI_H
-#define KDEVAPI_H
+#ifndef TDEVAPI_H
+#define TDEVAPI_H
 
 #include <tqobject.h>
 
 class TQStringList;
 class TQDomDocument;
-class KDevCore;
-class KDevProject;
-class KDevLanguageSupport;
+class TDevCore;
+class TDevProject;
+class TDevLanguageSupport;
 class CodeModel;
-class KDevPartController;
-class KDevMainWindow;
-class KDevCodeRepository;
-class KDevPlugin;
-class KDevPluginController;
+class TDevPartController;
+class TDevMainWindow;
+class TDevCodeRepository;
+class TDevPlugin;
+class TDevPluginController;
 
 /**
-@file kdevapi.h
+@file tdevapi.h
 KDevelop API interface.
 */
 
 /**
 The interface to KDevelop's core components.
 Needs to be implemented in a shell. Developers do not need to use this
-class because @ref KDevPlugin already provides API convenience methods.
+class because @ref TDevPlugin already provides API convenience methods.
 */
-class KDevApi: public TQObject
+class TDevApi: public TQObject
 {
     Q_OBJECT
   
 public:
     /**Constructor.*/
-    KDevApi();
+    TDevApi();
 
     /**Destructor.*/
-    virtual ~KDevApi();
+    virtual ~TDevApi();
 
     /**@return A reference to the toplevel widget.*/
-    virtual KDevMainWindow *mainWindow() const = 0;
+    virtual TDevMainWindow *mainWindow() const = 0;
 
     /**@return A reference to the part controller which is used to manipulate loaded KParts.*/
-    virtual KDevPartController *partController() const = 0;
+    virtual TDevPartController *partController() const = 0;
 
     /**@return A reference to the plugin controller which is used to manipulate loaded plugin.*/
-    virtual KDevPluginController *pluginController() const = 0;
+    virtual TDevPluginController *pluginController() const = 0;
 
     /**@return A reference to the application core - an object which provides
     basic functionalities for inter-parts communications / cooperation.*/
-    virtual KDevCore *core() const = 0;
+    virtual TDevCore *core() const = 0;
 
     /**@return A reference to the memory symbol store.*/
     virtual CodeModel *codeModel() const = 0;
@@ -79,22 +79,22 @@ public:
     void setProjectDom(TQDomDocument *dom);
 
     /**@return A reference to the current project component or 0 if no project is loaded.*/
-    KDevProject *project() const;
+    TDevProject *project() const;
 
     /**Sets the current project.
     @param project The project plugin which becames the current project.*/
-    void setProject(KDevProject *project);
+    void setProject(TDevProject *project);
 
     /**@return A reference to the language support component or 0 if no support available.*/
-    KDevLanguageSupport *languageSupport() const;
+    TDevLanguageSupport *languageSupport() const;
 
     /**Sets the object charged of providing handling for the source files written in particular
     language (languages support component).
     @param languageSupport The language support plugin.*/
-    void setLanguageSupport(KDevLanguageSupport *languageSupport);
+    void setLanguageSupport(TDevLanguageSupport *languageSupport);
 
     /**@return A reference to the code repository (accessor to persistent symbol stores).*/
-    KDevCodeRepository *codeRepository() const;
+    TDevCodeRepository *codeRepository() const;
 
 private:
     class Private;
diff --git a/lib/interfaces/kdevcoderepository.cpp b/lib/interfaces/tdevcoderepository.cpp
index 26249544..f5716294 100644
--- a/lib/interfaces/kdevcoderepository.cpp
+++ b/lib/interfaces/tdevcoderepository.cpp
@@ -16,56 +16,56 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevcoderepository.h"
+#include "tdevcoderepository.h"
 
-struct KDevCodeRepositoryData
+struct TDevCodeRepositoryData
 {
     Catalog* mainCatalog;
     TQValueList<Catalog*> catalogs;
     
-    KDevCodeRepositoryData(): mainCatalog( 0 ) {}
+    TDevCodeRepositoryData(): mainCatalog( 0 ) {}
 };
 
-KDevCodeRepository::KDevCodeRepository( )
-    : d( new KDevCodeRepositoryData )
+TDevCodeRepository::TDevCodeRepository( )
+    : d( new TDevCodeRepositoryData )
 {
 }
 
-KDevCodeRepository::~KDevCodeRepository( )
+TDevCodeRepository::~TDevCodeRepository( )
 {
     delete( d );
 }
 
-Catalog* KDevCodeRepository::mainCatalog()
+Catalog* TDevCodeRepository::mainCatalog()
 {
     return d->mainCatalog;
 }
 
-void KDevCodeRepository::setMainCatalog( Catalog * mainCatalog )
+void TDevCodeRepository::setMainCatalog( Catalog * mainCatalog )
 {
     d->mainCatalog = mainCatalog;
 }
 
-void KDevCodeRepository::registerCatalog( Catalog * catalog )
+void TDevCodeRepository::registerCatalog( Catalog * catalog )
 {
     d->catalogs.append( catalog );
     emit catalogRegistered( catalog );
 }
 
-void KDevCodeRepository::unregisterCatalog( Catalog * catalog )
+void TDevCodeRepository::unregisterCatalog( Catalog * catalog )
 {
     d->catalogs.remove( catalog );
     emit catalogUnregistered( catalog );
 }
 
-void KDevCodeRepository::touchCatalog( Catalog * catalog )
+void TDevCodeRepository::touchCatalog( Catalog * catalog )
 {
     emit catalogChanged( catalog );
 }
 
-TQValueList< Catalog * > KDevCodeRepository::registeredCatalogs( )
+TQValueList< Catalog * > TDevCodeRepository::registeredCatalogs( )
 {
     return d->catalogs;
 }
 
-#include "kdevcoderepository.moc"
+#include "tdevcoderepository.moc"
diff --git a/lib/interfaces/kdevcoderepository.h b/lib/interfaces/tdevcoderepository.h
index 4e1dd765..b87d66e8 100644
--- a/lib/interfaces/kdevcoderepository.h
+++ b/lib/interfaces/tdevcoderepository.h
@@ -16,18 +16,18 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVCODEREPOSITORY_H
-#define KDEVCODEREPOSITORY_H
+#ifndef TDEVCODEREPOSITORY_H
+#define TDEVCODEREPOSITORY_H
 
 #include <tqobject.h>
 #include <tqvaluelist.h>
 
 /**
-@file kdevcoderepository.h
+@file tdevcoderepository.h
 Code repository - the persistent symbol store accessor.
 */
 
-class KDevCodeRepositoryData;
+class TDevCodeRepositoryData;
 class Catalog;
 
 /**
@@ -45,15 +45,15 @@ never or rarely changes. System libraries are perfect examples of such code.
 Symbols from code contained in project files are better stored in memory
 symbol store like @ref CodeModel.
 */
-class KDevCodeRepository : public TQObject
+class TDevCodeRepository : public TQObject
 {
     Q_OBJECT
   
 public:
     /**Constructor.*/
-    KDevCodeRepository();
+    TDevCodeRepository();
     /**Destructor.*/
-    virtual ~KDevCodeRepository();
+    virtual ~TDevCodeRepository();
 
     /**@return The main catalog. Each catalog can be marked is main
     to provide easy access to it.*/
@@ -89,7 +89,7 @@ signals:
     void catalogChanged( Catalog* catalog );
 
 private:
-    KDevCodeRepositoryData* d;
+    TDevCodeRepositoryData* d;
 };
 
 #endif
diff --git a/lib/interfaces/kdevcore.cpp b/lib/interfaces/tdevcore.cpp
index dda66cbf..726bf2cb 100644
--- a/lib/interfaces/kdevcore.cpp
+++ b/lib/interfaces/tdevcore.cpp
@@ -21,8 +21,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "KDevCoreIface.h"
-#include "kdevcore.h"
+#include "TDevCoreIface.h"
+#include "tdevcore.h"
 
 #include "urlutil.h"
 
@@ -282,17 +282,17 @@ const ProjectModelItem* ProjectModelItemContext::item() const
 
 
 ///////////////////////////////////////////////////////////////////////////////
-// class KDevCore
+// class TDevCore
 ///////////////////////////////////////////////////////////////////////////////
 
-KDevCore::KDevCore( TQObject *parent, const char *name )
+TDevCore::TDevCore( TQObject *parent, const char *name )
     : TQObject( parent, name )
 {
-    new KDevCoreIface(this);
+    new TDevCoreIface(this);
 }
 
-KDevCore::~KDevCore()
+TDevCore::~TDevCore()
 {
 }
 
-#include "kdevcore.moc"
+#include "tdevcore.moc"
diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/tdevcore.h
index fad2891a..fadcdfde 100644
--- a/lib/interfaces/kdevcore.h
+++ b/lib/interfaces/tdevcore.h
@@ -25,11 +25,11 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVCORE_H
-#define KDEVCORE_H
+#ifndef TDEVCORE_H
+#define TDEVCORE_H
 
 /**
-@file kdevcore.h
+@file tdevcore.h
 The interface to the application core and context menu classes.
 */
 
@@ -40,7 +40,7 @@ The interface to the application core and context menu classes.
 #include <kurl.h>
 
 class KDialogBase;
-class KDevPlugin;
+class TDevPlugin;
 class CodeModelItem;
 class ProjectModelItem;
 
@@ -75,7 +75,7 @@ to if you reimplement TQWidget::contextMenuEvent method.
 
 <b>How to fill context menu from a plugin:</b>
 -# Create a @code contextMenu(TQPopupMenu *, const Context *) @endcode slot in your plugin class.
--# Connect KDevCore::contextMenu(TQPopupMenu *, const Context *) signal to that slot in
+-# Connect TDevCore::contextMenu(TQPopupMenu *, const Context *) signal to that slot in
 the constructor of your plugin:\n 
 @code
 connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
@@ -287,7 +287,7 @@ private:
 
 
 /**
-A KDevCore class defines an object which takes care about the cooperation
+A TDevCore class defines an object which takes care about the cooperation
 between the various plug-in which compose KDevelop.
 It defines:
 - signals that can be captured for menu customization;
@@ -297,7 +297,7 @@ It defines:
 - etc.
 .
 */
-class KDevCore: public TQObject
+class TDevCore: public TQObject
 {
     Q_OBJECT
   
@@ -305,10 +305,10 @@ public:
     /**Constructor
     @param parent The TQObject that's the parent of this class.
     @param name The name of the class.*/
-    KDevCore(TQObject *parent=0, const char *name=0);
+    TDevCore(TQObject *parent=0, const char *name=0);
 
     /**Destructor.*/
-    virtual ~KDevCore();
+    virtual ~TDevCore();
 
     /**Fills the context menu.
     This method should be called by a part that wants to show a
@@ -322,7 +322,7 @@ public:
     @param context The pointer to a Context object of this popup menu.*/
     virtual void fillContextMenu(TQPopupMenu *popup, const Context *context) = 0;
 
-    /**Closes the current project and open the new one. You cannot use the @ref KDevPlugin::project() 
+    /**Closes the current project and open the new one. You cannot use the @ref TDevPlugin::project() 
     * method right after opening a new project, as it will return a null pointer.
     *You must wait for the eventloop to be reentered, so use a signleshot timer
     *to do the job needed after the project is opened or connect a slot to the
@@ -338,7 +338,7 @@ public:
     manually by means of stop button.
     @param which The plugin to mark.
     @param runs true if plugin is running something, false if it is not.*/
-    virtual void running(KDevPlugin *which, bool runs) = 0;
+    virtual void running(TDevPlugin *which, bool runs) = 0;
 
 signals:
     /**Emitted after the core has done all initializations and
@@ -356,8 +356,8 @@ signals:
 
     /**The user has clicked the stop button.
     If all actions should be cancelled, pass 0 to @p which
-    @param which The KDevPlugin object to stop.*/
-    void stopButtonClicked(KDevPlugin *which);
+    @param which The TDevPlugin object to stop.*/
+    void stopButtonClicked(TDevPlugin *which);
 
     /**A context menu has been requested somewhere. Components
     may hook some entries into it. More information on the
diff --git a/lib/interfaces/kdevdesignerintegration.cpp b/lib/interfaces/tdevdesignerintegration.cpp
index 0ba325ab..73fa7999 100644
--- a/lib/interfaces/kdevdesignerintegration.cpp
+++ b/lib/interfaces/tdevdesignerintegration.cpp
@@ -16,25 +16,25 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevdesignerintegration.h"
-#include "kdevdesignerintegrationiface.h"
+#include "tdevdesignerintegration.h"
+#include "tdevdesignerintegrationiface.h"
 
-class KDevDesignerIntegration::KDevDesignerIntegrationPrivate {
+class TDevDesignerIntegration::TDevDesignerIntegrationPrivate {
 public:
-  	KDevDesignerIntegrationIface *m_iface;
+  	TDevDesignerIntegrationIface *m_iface;
 };
 
-KDevDesignerIntegration::KDevDesignerIntegration(TQObject *parent, const char *name)
+TDevDesignerIntegration::TDevDesignerIntegration(TQObject *parent, const char *name)
  : TQObject(parent, name)
 {
-  dptr = new KDevDesignerIntegrationPrivate();
+  dptr = new TDevDesignerIntegrationPrivate();
   
-  dptr->m_iface = new KDevDesignerIntegrationIface(this);
+  dptr->m_iface = new TDevDesignerIntegrationIface(this);
 }
 
-KDevDesignerIntegration::~KDevDesignerIntegration()
+TDevDesignerIntegration::~TDevDesignerIntegration()
 {
   delete dptr;
 }
 
-#include "kdevdesignerintegration.moc"
+#include "tdevdesignerintegration.moc"
diff --git a/lib/interfaces/kdevdesignerintegration.h b/lib/interfaces/tdevdesignerintegration.h
index 528926cb..532d8b8b 100644
--- a/lib/interfaces/kdevdesignerintegration.h
+++ b/lib/interfaces/tdevdesignerintegration.h
@@ -16,15 +16,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVDESIGNERINTEGRATION_H
-#define KDEVDESIGNERINTEGRATION_H
+#ifndef TDEVDESIGNERINTEGRATION_H
+#define TDEVDESIGNERINTEGRATION_H
 
 #include <designer.h>
 #include <tqobject.h>
 #include <tqdom.h>
 
 /**
-@file kdevdesignerintegration.h
+@file tdevdesignerintegration.h
 TDevelop designer integration interface.
 */
 
@@ -48,7 +48,7 @@ necessary files at desired line numbers and adds (edits, removes) code for imple
 For example, TQt Designer integration should be able to create an subclass for a form
 and reimplement slots defined in the form.
 */
-class KDevDesignerIntegration : public TQObject
+class TDevDesignerIntegration : public TQObject
 {
 Q_OBJECT
   
@@ -56,9 +56,9 @@ public:
     /**Constructor.
     @param parent Parent object.
     @param name Internal name.*/
-    KDevDesignerIntegration(TQObject *parent = 0, const char *name = 0);
+    TDevDesignerIntegration(TQObject *parent = 0, const char *name = 0);
     /**Destructor.*/
-    ~KDevDesignerIntegration();
+    ~TDevDesignerIntegration();
     
     /**Saves designer integration settings.*/
     virtual void saveSettings(TQDomDocument dom, TQString path) = 0;
@@ -91,8 +91,8 @@ public slots:
     @param formName The name of a GUI form.*/
     virtual void openSource(const TQString &formName) = 0;
   private:
-    class KDevDesignerIntegrationPrivate;
-    KDevDesignerIntegrationPrivate *dptr;
+    class TDevDesignerIntegrationPrivate;
+    TDevDesignerIntegrationPrivate *dptr;
 };
 
 #endif
diff --git a/lib/interfaces/kdevdesignerintegrationiface.cpp b/lib/interfaces/tdevdesignerintegrationiface.cpp
index 964ca340..bd4f349b 100644
--- a/lib/interfaces/kdevdesignerintegrationiface.cpp
+++ b/lib/interfaces/tdevdesignerintegrationiface.cpp
@@ -16,46 +16,46 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevdesignerintegrationiface.h"
+#include "tdevdesignerintegrationiface.h"
 #include <designer.h>
-#include "kdevdesignerintegration.h"
+#include "tdevdesignerintegration.h"
 
-KDevDesignerIntegrationIface::KDevDesignerIntegrationIface(KDevDesignerIntegration *p)
+TDevDesignerIntegrationIface::TDevDesignerIntegrationIface(TDevDesignerIntegration *p)
   : DCOPObject("GUIDesigner"), m_designer(p)
 {
   //FIXME figure out what number our interface is...
 }
 
 
-KDevDesignerIntegrationIface::~KDevDesignerIntegrationIface()
+TDevDesignerIntegrationIface::~TDevDesignerIntegrationIface()
 {
 }
 
-void KDevDesignerIntegrationIface::addFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type )
+void TDevDesignerIntegrationIface::addFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type )
 {
   KInterfaceDesigner::Function f = {returnType, function, specifier, access, (KInterfaceDesigner::FunctionType)type };
   m_designer->addFunction(formName, f);
 }
 
-void KDevDesignerIntegrationIface::removeFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type )
+void TDevDesignerIntegrationIface::removeFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type )
 {
   KInterfaceDesigner::Function f = {returnType, function, specifier, access, (KInterfaceDesigner::FunctionType)type };
   m_designer->addFunction(formName, f);
 }
 
-void KDevDesignerIntegrationIface::editFunction( const TQString & formName, TQString oldReturnType, TQString oldFunction, TQString oldSpecifier, TQString oldAccess, uint oldType, TQString returnType, TQString function, TQString specifier, TQString access, uint type )
+void TDevDesignerIntegrationIface::editFunction( const TQString & formName, TQString oldReturnType, TQString oldFunction, TQString oldSpecifier, TQString oldAccess, uint oldType, TQString returnType, TQString function, TQString specifier, TQString access, uint type )
 {
   KInterfaceDesigner::Function fold = {oldReturnType, oldFunction, oldSpecifier, oldAccess, (KInterfaceDesigner::FunctionType)oldType };
   KInterfaceDesigner::Function fnew = {returnType, function, specifier, access, (KInterfaceDesigner::FunctionType)type };
   m_designer->editFunction(formName,fold,fnew);
 }
 
-void KDevDesignerIntegrationIface::openFunction( const TQString & formName, const TQString & functionName )
+void TDevDesignerIntegrationIface::openFunction( const TQString & formName, const TQString & functionName )
 {
   m_designer->openFunction(formName,functionName);
 }
 
-void KDevDesignerIntegrationIface::openSource( const TQString & formName )
+void TDevDesignerIntegrationIface::openSource( const TQString & formName )
 {
   m_designer->openSource(formName);
 }
diff --git a/lib/interfaces/kdevdesignerintegrationiface.h b/lib/interfaces/tdevdesignerintegrationiface.h
index c6c8988a..0dd6f8d1 100644
--- a/lib/interfaces/kdevdesignerintegrationiface.h
+++ b/lib/interfaces/tdevdesignerintegrationiface.h
@@ -16,23 +16,23 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVDESIGNERINTEGRATIONIFACE_H
-#define KDEVDESIGNERINTEGRATIONIFACE_H
+#ifndef TDEVDESIGNERINTEGRATIONIFACE_H
+#define TDEVDESIGNERINTEGRATIONIFACE_H
 
 #include <dcopobject.h>
-class KDevDesignerIntegration;
+class TDevDesignerIntegration;
 /**
 The dcop interface for GUI designers in KDevelop.
 
 @author KDevelop Authors
 */
-class KDevDesignerIntegrationIface : public DCOPObject
+class TDevDesignerIntegrationIface : public DCOPObject
 {
   K_DCOP
 public:
-  KDevDesignerIntegrationIface(KDevDesignerIntegration *p);
+  TDevDesignerIntegrationIface(TDevDesignerIntegration *p);
 
-    ~KDevDesignerIntegrationIface();
+    ~TDevDesignerIntegrationIface();
 k_dcop:
     void addFunction(const TQString &formName, TQString returnType, TQString function,TQString specifier,TQString access,uint type);
     void removeFunction(const TQString &formName, TQString returnType, TQString function,TQString specifier,TQString access,uint type);
@@ -43,7 +43,7 @@ k_dcop:
     void openSource(const TQString &formName);
     
   private:
-    KDevDesignerIntegration *m_designer;
+    TDevDesignerIntegration *m_designer;
 };
 
 #endif
diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/tdevgenericfactory.h
index 6f8d3dc9..7fdbdb28 100644
--- a/lib/interfaces/kdevgenericfactory.h
+++ b/lib/interfaces/tdevgenericfactory.h
@@ -21,7 +21,7 @@
 #include <tdeaboutdata.h>
 
 /**
-@file kdevgenericfactory.h
+@file tdevgenericfactory.h
 KDevelop generic plugin factory.
 */
 
@@ -32,37 +32,37 @@ Usually it is convenient to use K_EXPORT_COMPONENT_FACTORY macro
 to create factories for TDevelop plugins. For example, for DummyPlugin
 the factory can be created (in dummyplugin.cpp file) as:
 @code
-typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory;
-K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) )
+typedef TDevGenericFactory<DummyPlugin> DummyPluginFactory;
+K_EXPORT_COMPONENT_FACTORY(libtdevdummyplugin, DummyPluginFactory( data ) )
 @endcode
 Data should be a const static object. This way it complies with the requirements
-for data objecs of KDevGenericFactory constructor.
+for data objecs of TDevGenericFactory constructor.
 
 <b>Important:</b><br>
 There is no need to create @ref TDEAboutData objects. It is more useful to create 
-a static const @ref KDevPluginInfo object which can be used also in the constructor
+a static const @ref TDevPluginInfo object which can be used also in the constructor
 of a plugin.
 
 For example, dummyplugin.cpp file could contain:
 @code
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
-static const KDevPluginInfo data("KDevDummyPlugin");
-typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory;
-K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) )
+static const TDevPluginInfo data("KDevDummyPlugin");
+typedef TDevGenericFactory<DummyPlugin> DummyPluginFactory;
+K_EXPORT_COMPONENT_FACTORY(libtdevdummyplugin, DummyPluginFactory( data ) )
 
 DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & )
-    :KDevPlugin(&data, parent, name)
+    :TDevPlugin(&data, parent, name)
 {
 }
 @endcode
 
-In the example above the duplication of information is avoided as same @ref KDevPluginInfo
-objects are used for plugin and for plugin factory. This is possible because @ref KDevPluginInfo
-class has an operator to cast @ref KDevPluginInfo to @ref TDEAboutData.
+In the example above the duplication of information is avoided as same @ref TDevPluginInfo
+objects are used for plugin and for plugin factory. This is possible because @ref TDevPluginInfo
+class has an operator to cast @ref TDevPluginInfo to @ref TDEAboutData.
 */
 template <class T, class ParentType = TQObject>
-class KDevGenericFactory: public KGenericFactory<T, ParentType>
+class TDevGenericFactory: public KGenericFactory<T, ParentType>
 {
 public:
     /**Constructor.
@@ -73,7 +73,7 @@ public:
     - license type number.
     .
     data object should live as long as factory lives.*/
-    KDevGenericFactory(TDEAboutData *data)
+    TDevGenericFactory(TDEAboutData *data)
         :KGenericFactory<T, ParentType>(data->appName()), aboutData(data)
     {
     }
diff --git a/lib/interfaces/kdevlanguagesupport.cpp b/lib/interfaces/tdevlanguagesupport.cpp
index aa5b560c..d283a434 100644
--- a/lib/interfaces/kdevlanguagesupport.cpp
+++ b/lib/interfaces/tdevlanguagesupport.cpp
@@ -26,141 +26,141 @@
 
 #include <kdebug.h>
 
-#include "kdevdesignerintegration.h"
-#include "kdevlanguagesupport.h"
+#include "tdevdesignerintegration.h"
+#include "tdevlanguagesupport.h"
 
-KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name)
-    : KDevPlugin(info, parent, name ? name : "KDevLanguageSupport" )
+TDevLanguageSupport::TDevLanguageSupport(const TDevPluginInfo *info, TQObject *parent, const char *name)
+    : TDevPlugin(info, parent, name ? name : "TDevLanguageSupport" )
 {
 }
 
-KDevLanguageSupport::~KDevLanguageSupport()
+TDevLanguageSupport::~TDevLanguageSupport()
 {
 }
 
-KDevLanguageSupport::Features KDevLanguageSupport::features()
+TDevLanguageSupport::Features TDevLanguageSupport::features()
 {
     return Features(0);
 }
 
-KMimeType::List KDevLanguageSupport::mimeTypes()
+KMimeType::List TDevLanguageSupport::mimeTypes()
 {
     return KMimeType::List();
 }
 
-TQString KDevLanguageSupport::formatTag( const Tag& /*tag*/ )
+TQString TDevLanguageSupport::formatTag( const Tag& /*tag*/ )
 {
     return TQString();
 }
 
-TQString KDevLanguageSupport::formatClassName(const TQString &name)
+TQString TDevLanguageSupport::formatClassName(const TQString &name)
 {
     return name;
 }
 
-TQString KDevLanguageSupport::unformatClassName(const TQString &name)
+TQString TDevLanguageSupport::unformatClassName(const TQString &name)
 {
     return name;
 }
 
-bool KDevLanguageSupport::shouldSplitDocument(const KURL &url)
+bool TDevLanguageSupport::shouldSplitDocument(const KURL &url)
 {
     return false;
 }
 
-Qt::Orientation KDevLanguageSupport::splitOrientation() const
+Qt::Orientation TDevLanguageSupport::splitOrientation() const
 {
     return Qt::Vertical;
 }
 
-void KDevLanguageSupport::addClass()
+void TDevLanguageSupport::addClass()
 {
 }
 
-void KDevLanguageSupport::addMethod( ClassDom /*klass*/ )
+void TDevLanguageSupport::addMethod( ClassDom /*klass*/ )
 {
 }
 
-void KDevLanguageSupport::implementVirtualMethods( ClassDom /*klass*/ )
+void TDevLanguageSupport::implementVirtualMethods( ClassDom /*klass*/ )
 {
 }
 
-void KDevLanguageSupport::addAttribute( ClassDom /*klass*/ )
+void TDevLanguageSupport::addAttribute( ClassDom /*klass*/ )
 {
 }
 
-TQStringList KDevLanguageSupport::subclassWidget(const TQString& /*formName*/)
+TQStringList TDevLanguageSupport::subclassWidget(const TQString& /*formName*/)
 {
     return TQStringList();
 }
 
-TQStringList KDevLanguageSupport::updateWidget(const TQString& /*formName*/, const TQString& /*fileName*/)
+TQStringList TDevLanguageSupport::updateWidget(const TQString& /*formName*/, const TQString& /*fileName*/)
 {
     return TQStringList();
 }
 
-TQString KDevLanguageSupport::formatModelItem( const CodeModelItem *item, bool /*shortDescription*/ )
+TQString TDevLanguageSupport::formatModelItem( const CodeModelItem *item, bool /*shortDescription*/ )
 {
     return item->name();
 }
 
-void KDevLanguageSupport::addFunction( DesignerType type, const TQString & formName, Function function )
+void TDevLanguageSupport::addFunction( DesignerType type, const TQString & formName, Function function )
 {
-//    kdDebug() << "KDevLanguageSupport::addFunction: 1" << endl;
-    KDevDesignerIntegration *designerIntegration = designer(type);
-//    kdDebug() << "KDevLanguageSupport::addFunction: 2" << endl;
+//    kdDebug() << "TDevLanguageSupport::addFunction: 1" << endl;
+    TDevDesignerIntegration *designerIntegration = designer(type);
+//    kdDebug() << "TDevLanguageSupport::addFunction: 2" << endl;
     if (!designerIntegration)
     {
-//        kdDebug() << "KDevLanguageSupport::addFunction: x" << endl;
+//        kdDebug() << "TDevLanguageSupport::addFunction: x" << endl;
         return;
     }
-//    kdDebug() << "KDevLanguageSupport::addFunction: 3" << endl;
+//    kdDebug() << "TDevLanguageSupport::addFunction: 3" << endl;
     designerIntegration->addFunction(formName, function);
-//    kdDebug() << "KDevLanguageSupport::addFunction: 4" << endl;
+//    kdDebug() << "TDevLanguageSupport::addFunction: 4" << endl;
 }
 
-void KDevLanguageSupport::editFunction( DesignerType type, const TQString & formName, Function oldFunction, Function function )
+void TDevLanguageSupport::editFunction( DesignerType type, const TQString & formName, Function oldFunction, Function function )
 {
-    KDevDesignerIntegration *designerIntegration = designer(type);
+    TDevDesignerIntegration *designerIntegration = designer(type);
     if (!designerIntegration)
         return;
     designerIntegration->editFunction(formName, oldFunction, function);
 }
 
-void KDevLanguageSupport::removeFunction( DesignerType type, const TQString & formName, Function function )
+void TDevLanguageSupport::removeFunction( DesignerType type, const TQString & formName, Function function )
 {
-    KDevDesignerIntegration *designerIntegration = designer(type);
+    TDevDesignerIntegration *designerIntegration = designer(type);
     if (!designerIntegration)
         return;
     designerIntegration->removeFunction(formName, function);
 }
 
-KDevDesignerIntegration * KDevLanguageSupport::designer( DesignerType // type
+TDevDesignerIntegration * TDevLanguageSupport::designer( DesignerType // type
                                                          )
 {
     return 0;
 }
 
-void KDevLanguageSupport::openFunction( DesignerType type, const TQString & formName, const TQString & functionName )
+void TDevLanguageSupport::openFunction( DesignerType type, const TQString & formName, const TQString & functionName )
 {
-    KDevDesignerIntegration *designerIntegration = designer(type);
+    TDevDesignerIntegration *designerIntegration = designer(type);
     if (!designerIntegration)
         return;
     designerIntegration->openFunction(formName, functionName);
 }
 
-void KDevLanguageSupport::createAccessMethods( ClassDom // theClass
+void TDevLanguageSupport::createAccessMethods( ClassDom // theClass
                                                , VariableDom // theVariable
                                                )
 {
 }
 
-void KDevLanguageSupport::openSource( DesignerType type, const TQString & formName)
+void TDevLanguageSupport::openSource( DesignerType type, const TQString & formName)
 {
-    KDevDesignerIntegration *designerIntegration = designer(type);
+    TDevDesignerIntegration *designerIntegration = designer(type);
     if (!designerIntegration)
         return;
     designerIntegration->openSource(formName);
 }
 
-#include "kdevlanguagesupport.moc"
+#include "tdevlanguagesupport.moc"
diff --git a/lib/interfaces/kdevlanguagesupport.h b/lib/interfaces/tdevlanguagesupport.h
index 42221868..a1778ff6 100644
--- a/lib/interfaces/kdevlanguagesupport.h
+++ b/lib/interfaces/tdevlanguagesupport.h
@@ -22,23 +22,23 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVLANGUAGESUPPORT_H
-#define KDEVLANGUAGESUPPORT_H
+#ifndef TDEVLANGUAGESUPPORT_H
+#define TDEVLANGUAGESUPPORT_H
 
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <kmimetype.h>
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 #include "codemodel.h"
 #include <designer.h>
 
 /**
-@file kdevlanguagesupport.h
+@file tdevlanguagesupport.h
 Interface to programming language specific features.
 */
 
 class Tag;
-class KDevDesignerIntegration;
+class TDevDesignerIntegration;
 
 using namespace KInterfaceDesigner;
 
@@ -50,15 +50,15 @@ which language support to load.
 
 Language support plugin is a good place for:
 - a language parser which fills memory and persistent symbol store
-(see @ref CodeModel and @ref KDevCodeRepository);
+(see @ref CodeModel and @ref TDevCodeRepository);
 - code wizards specific to a programming language (like new class wizard);
-- GUI designer integration (see @ref KDevLanguageSupport::designer method
-documentation and @ref KDevDesignerIntegration class documentation;
+- GUI designer integration (see @ref TDevLanguageSupport::designer method
+documentation and @ref TDevDesignerIntegration class documentation;
 - symbol (class, function, etc.) name formatting to a human-readable convention (pretty
 formatted name).
 .
 */
-class KDevLanguageSupport: public KDevPlugin
+class TDevLanguageSupport: public TDevPlugin
 {
     Q_OBJECT
   
@@ -91,12 +91,12 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref TDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name);
+    TDevLanguageSupport(const TDevPluginInfo *info, TQObject *parent, const char *name);
     /**Destructor.*/
-    ~KDevLanguageSupport();
+    ~TDevLanguageSupport();
 
     /**@return The feature set of the language. This is e.g. used
     by the class view to decide which organizer items to display and which not.*/
@@ -183,7 +183,7 @@ public:
     /**Reimplement this method if you want to use integrated GUI designer for the language.
     Implementation could look like (in pseudo code):
     @code
-    KDevDesignerIntegration *des = 0;
+    TDevDesignerIntegration *des = 0;
     switch (type)
     {
         case KInterfaceDesigner::TQtDesigner:
@@ -203,25 +203,25 @@ public:
     from designerintegration support library.
     @param type The type of the designer to integrate.
     @return The pointer to designer integration of given type or 0.*/
-    virtual KDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type);
+    virtual TDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type);
 
 public slots:
     /**Adds a function requested by a GUI designer. No need to reimplement this slot
-    unless you want to use specific implementation of KDevDesignerIntegration interface.
+    unless you want to use specific implementation of TDevDesignerIntegration interface.
     @param type The type of integrated designer.
     @param formName The name of a GUI form.
     @param function The function to implement (add).*/
     void addFunction(DesignerType type, const TQString &formName, Function function);
 
     /**Removes a function requested by a GUI designer. No need to reimplement this slot
-    unless you want to use specific implementation of KDevDesignerIntegration interface.
+    unless you want to use specific implementation of TDevDesignerIntegration interface.
     @param type The type of integrated designer.
     @param formName The name of a GUI form.
     @param function The function to remove.*/
     void removeFunction(DesignerType type, const TQString &formName, Function function);
 
     /**Edits a function requested by a GUI designer. No need to reimplement this slot
-    unless you want to use specific implementation of KDevDesignerIntegration interface.
+    unless you want to use specific implementation of TDevDesignerIntegration interface.
     @param type The type of integrated designer.
     @param formName The name of a GUI form.
     @param oldFunction The old function signature before editing.
@@ -229,14 +229,14 @@ public slots:
     void editFunction(DesignerType type, const TQString &formName, Function oldFunction, Function function);
 
     /**Opens a function requested by a GUI designer. No need to reimplement this slot
-    unless you want to use specific implementation of KDevDesignerIntegration interface.
+    unless you want to use specific implementation of TDevDesignerIntegration interface.
     @param type The type of integrated designer.
     @param formName The name of a GUI form.
     @param functionName The name of a function to seek in the code for.*/
     void openFunction(DesignerType type, const TQString &formName, const TQString &functionName);
 
     /**Opens a form source requested by a GUI designer. No need to reimplement this slot
-    unless you want to use specific implementation of KDevDesignerIntegration interface.
+    unless you want to use specific implementation of TDevDesignerIntegration interface.
     @param type The type of integrated designer.
     @param formName The name of a GUI form.*/
     void openSource(DesignerType type, const TQString &formName);
diff --git a/lib/interfaces/kdevmainwindow.cpp b/lib/interfaces/tdevmainwindow.cpp
index 4b95f669..e73250e9 100644
--- a/lib/interfaces/kdevmainwindow.cpp
+++ b/lib/interfaces/tdevmainwindow.cpp
@@ -17,12 +17,12 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevmainwindow.h"
+#include "tdevmainwindow.h"
 
 #include <tdemainwindow.h>
 #include <kstatusbar.h>
 
-KStatusBar *KDevMainWindow::statusBar()
+KStatusBar *TDevMainWindow::statusBar()
 {
   return main()->statusBar();
 }
diff --git a/lib/interfaces/kdevmainwindow.h b/lib/interfaces/tdevmainwindow.h
index 8138ab78..83aef3b0 100644
--- a/lib/interfaces/kdevmainwindow.h
+++ b/lib/interfaces/tdevmainwindow.h
@@ -19,8 +19,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEV_MAINWINDOW_H
-#define KDEV_MAINWINDOW_H
+#ifndef TDEV_MAINWINDOW_H
+#define TDEV_MAINWINDOW_H
 
 #include <tqstring.h>
 
@@ -29,7 +29,7 @@ class KStatusBar;
 class TDEMainWindow;
 
 /**
-@file kdevmainwindow.h
+@file tdevmainwindow.h
 KDevelop main window interface.
 */
 
@@ -37,11 +37,11 @@ KDevelop main window interface.
 KDevelop main window interface.
 Provides methods to control the main window of an application.
 */
-class KDevMainWindow
+class TDevMainWindow
 {
 public:
     /**Destroys the main window*/
-    virtual ~KDevMainWindow() {} // must be virtual!
+    virtual ~TDevMainWindow() {} // must be virtual!
 
     /**Embeds a view of a part into the main window.
     @param view The view to embed. Must be a KPart.
diff --git a/lib/interfaces/kdevpartcontroller.cpp b/lib/interfaces/tdevpartcontroller.cpp
index 58f1dc2a..e718ecf4 100644
--- a/lib/interfaces/kdevpartcontroller.cpp
+++ b/lib/interfaces/tdevpartcontroller.cpp
@@ -16,15 +16,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "KDevPartControllerIface.h"
-#include "kdevpartcontroller.h"
+#include "TDevPartControllerIface.h"
+#include "tdevpartcontroller.h"
 #include "katedocumentmanagerinterface.h"
 
-KDevPartController::KDevPartController(TQWidget *parent)
+TDevPartController::TDevPartController(TQWidget *parent)
   : KParts::PartManager(parent)
 {
-  new KDevPartControllerIface(this);
+  new TDevPartControllerIface(this);
   new KateDocumentManagerInterface(this);
 }
 
-#include "kdevpartcontroller.moc"
+#include "tdevpartcontroller.moc"
diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/tdevpartcontroller.h
index fd8e6830..2bb593e6 100644
--- a/lib/interfaces/kdevpartcontroller.h
+++ b/lib/interfaces/tdevpartcontroller.h
@@ -22,15 +22,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEV_PARTCONTROLLER_H
-#define KDEV_PARTCONTROLLER_H
+#ifndef TDEV_PARTCONTROLLER_H
+#define TDEV_PARTCONTROLLER_H
 
 #include <kurl.h>
 #include <tdeparts/partmanager.h>
 #include <ktrader.h>
 
 /**
-@file kdevpartcontroller.h
+@file tdevpartcontroller.h
 KDevelop part controller interface.
 */
 
@@ -53,7 +53,7 @@ Interface to control loaded parts and other documents.
 Part controller works with embedded into the shell parts. Such parts are usually editors,
 GUI designers, etc.
 */
-class KDevPartController: public KParts::PartManager
+class TDevPartController: public KParts::PartManager
 {
     Q_OBJECT
   
@@ -61,7 +61,7 @@ class KDevPartController: public KParts::PartManager
 public:
     /**Constructor.
     @param parent The parent object.*/
-    KDevPartController(TQWidget *parent);
+    TDevPartController(TQWidget *parent);
     
     /**Call this before a call to @ref editDocument to set the encoding of the
     document to be opened.
diff --git a/lib/interfaces/kdevplugin.cpp b/lib/interfaces/tdevplugin.cpp
index 31717446..42d30cc8 100644
--- a/lib/interfaces/kdevplugin.cpp
+++ b/lib/interfaces/tdevplugin.cpp
@@ -24,13 +24,13 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 
-#include "kdevapi.h"
-#include "kdevcore.h"
-#include "kdevplugininfo.h"
-#include "kdevpartcontroller.h"
-#include "kdevplugincontroller.h"
+#include "tdevapi.h"
+#include "tdevcore.h"
+#include "tdevplugininfo.h"
+#include "tdevpartcontroller.h"
+#include "tdevplugincontroller.h"
 
 #include <tdeaction.h>
 #include <tdeglobal.h>
@@ -42,23 +42,23 @@
 #include <assert.h>
 
 ///////////////////////////////////////////////////////////////////////////////
-// struct KDevPlugin::Private
+// struct TDevPlugin::Private
 ///////////////////////////////////////////////////////////////////////////////
 
-struct KDevPlugin::Private
+struct TDevPlugin::Private
 {
-    const KDevPluginInfo *info;
+    const TDevPluginInfo *info;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-// class KDevPlugin
+// class TDevPlugin
 ///////////////////////////////////////////////////////////////////////////////
 
-KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name)
+TDevPlugin::TDevPlugin(const TDevPluginInfo *info, TQObject *parent, const char *name)
     :TQObject(parent, name), d(new Private)
 {
-    assert(parent->inherits( "KDevApi" ));
-    m_api = static_cast<KDevApi *>( parent );
+    assert(parent->inherits( "TDevApi" ));
+    m_api = static_cast<TDevApi *>( parent );
 
     actionCollection()->setHighlightingEnabled( true );
 
@@ -66,74 +66,74 @@ KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char
     TDEGlobal::iconLoader()->addAppDir("tdevelop");    
 }
 
-KDevPlugin::~KDevPlugin()
+TDevPlugin::~TDevPlugin()
 {
    delete( d );
 }
 
-KDevMainWindow *KDevPlugin::mainWindow()
+TDevMainWindow *TDevPlugin::mainWindow()
 {
     return m_api->mainWindow();
 }
 
-KDevCore *KDevPlugin::core() const
+TDevCore *TDevPlugin::core() const
 {
     return m_api->core();
 }
 
-KDevProject *KDevPlugin::project() const
+TDevProject *TDevPlugin::project() const
 {
     return m_api->project();
 }
 
-CodeModel *KDevPlugin::codeModel() const
+CodeModel *TDevPlugin::codeModel() const
 {
     return m_api->codeModel();
 }
 
-TQDomDocument *KDevPlugin::projectDom() const
+TQDomDocument *TDevPlugin::projectDom() const
 {
     return m_api->projectDom();
 }
 
-KDevLanguageSupport *KDevPlugin::languageSupport() const
+TDevLanguageSupport *TDevPlugin::languageSupport() const
 {
     return m_api->languageSupport();
 }
 
-KDevPartController *KDevPlugin::partController() const
+TDevPartController *TDevPlugin::partController() const
 {
     return m_api->partController();
 }
 
-KDevPluginController *KDevPlugin::pluginController() const
+TDevPluginController *TDevPlugin::pluginController() const
 {
     return m_api->pluginController();
 }
 
-void KDevPlugin::restorePartialProjectSession(const TQDomElement* /*el*/)
+void TDevPlugin::restorePartialProjectSession(const TQDomElement* /*el*/)
 {
     // there's still nothing to do in the base class
 }
 
-void KDevPlugin::savePartialProjectSession(TQDomElement* /*el*/)
+void TDevPlugin::savePartialProjectSession(TQDomElement* /*el*/)
 {
     // there's still nothing to do in the base class
 }
 
-KDevCodeRepository * KDevPlugin::codeRepository() const
+TDevCodeRepository * TDevPlugin::codeRepository() const
 {
     return m_api->codeRepository();
 }
 
-KDevPlugin * KDevPlugin::extension_internal(const TQString &serviceType, const TQString &constraint)
+TDevPlugin * TDevPlugin::extension_internal(const TQString &serviceType, const TQString &constraint)
 {
     return m_api->pluginController()->extension(serviceType, constraint);
 }
 
-const KDevPluginInfo *KDevPlugin::info()
+const TDevPluginInfo *TDevPlugin::info()
 {
     return d->info;
 }
 
-#include "kdevplugin.moc"
+#include "tdevplugin.moc"
diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/tdevplugin.h
index 31cc5550..eaa66146 100644
--- a/lib/interfaces/kdevplugin.h
+++ b/lib/interfaces/tdevplugin.h
@@ -17,26 +17,26 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVPLUGIN_H
-#define KDEVPLUGIN_H
+#ifndef TDEVPLUGIN_H
+#define TDEVPLUGIN_H
 
 #include <tqobject.h>
 #include <kxmlguiclient.h>
-#include "kdevapi.h"
-
-class KDevCore;
-class KDevProject;
-class KDevVersionControl;
-class KDevLanguageSupport;
-class KDevPartController;
-class KDevMainWindow;
-class KDevCodeRepository;
+#include "tdevapi.h"
+
+class TDevCore;
+class TDevProject;
+class TDevVersionControl;
+class TDevLanguageSupport;
+class TDevPartController;
+class TDevMainWindow;
+class TDevCodeRepository;
 class CodeModel;
-class KDevPluginInfo;
+class TDevPluginInfo;
 class TQDomElement;
 
 /**
-@file kdevplugin.h
+@file tdevplugin.h
 TDevelop plugin interface.
 */
 
@@ -92,19 +92,19 @@ Plugin scope can be either:
 - Global
 - Project
 .
-Global plugins are plugins which require only shell to be loaded and do not operate on @ref KDevProject interface and/or do not use project wide information.\n
+Global plugins are plugins which require only shell to be loaded and do not operate on @ref TDevProject interface and/or do not use project wide information.\n
 Core plugins are global plugins which offer some important "core" functionality and thus
 are not selectable by user in plugin configuration pages.\n
 Project plugins require a project to be loaded and are usually loaded/unloaded among with the project.
-If your plugin use @ref KDevProject interface and/or operate on project-related information then this is the project plugin.
+If your plugin use @ref TDevProject interface and/or operate on project-related information then this is the project plugin.
 
-@sa KDevGenericFactory class documentation for an information about plugin instantiation
+@sa TDevGenericFactory class documentation for an information about plugin instantiation
 and writing factories for plugins.
 
-@sa KDevCore class documentation for an information about features which are available to plugins
+@sa TDevCore class documentation for an information about features which are available to plugins
 from shell applications.
 */
-class KDevPlugin: public TQObject, public KXMLGUIClient
+class TDevPlugin: public TQObject, public KXMLGUIClient
 {
     Q_OBJECT
   
@@ -116,30 +116,30 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref TDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name = 0);
+    TDevPlugin(const TDevPluginInfo *info, TQObject *parent, const char *name = 0);
 
     /**Destructs a plugin.*/
-    virtual ~KDevPlugin();
+    virtual ~TDevPlugin();
 
     /**Provides an information about the plugin.
     @return TDEAboutData object which was initialized in the constructor.*/
-    const KDevPluginInfo* info();
+    const TDevPluginInfo* info();
 
     /**@return A reference to the toplevel widget.*/
-    KDevMainWindow *mainWindow();
+    TDevMainWindow *mainWindow();
 
     /**@return A reference to the application core - an object which provides
     basic functionalities for inter-parts communications / cooperation.*/
-    KDevCore *core() const;
+    TDevCore *core() const;
 
     /**@return A reference to the current project component or 0 if no project is loaded.*/
-    KDevProject *project() const;
+    TDevProject *project() const;
 
     /**@return A reference to the language support component or 0 if no support available.*/
-    KDevLanguageSupport *languageSupport() const;
+    TDevLanguageSupport *languageSupport() const;
 
     /**@return A reference to the memory symbol store.*/
     CodeModel *codeModel() const;
@@ -148,13 +148,13 @@ public:
     TQDomDocument *projectDom() const;
 
     /**@return A reference to the part controller which is used to manipulate loaded KParts.*/
-    KDevPartController *partController() const;
+    TDevPartController *partController() const;
 
     /**@return A reference to the plugin controller which is used to manipulate loaded plugin.*/
-    virtual KDevPluginController *pluginController() const;
+    virtual TDevPluginController *pluginController() const;
 
     /**@return A reference to the code repository (accessor to persistent symbol stores).*/
-    KDevCodeRepository* codeRepository() const;
+    TDevCodeRepository* codeRepository() const;
 
     /**Queries for the plugin which supports given service type (such plugins are called extensions in KDevelop).
     All already loaded plugins will be queried and the <b>first loaded one</b> to support
@@ -162,7 +162,7 @@ public:
     entry is required in .desktop file for that plugin.
 
     Template argument is used as a type to cast the result to. This is done because extension
-    is usually derived from a certain base class and not directly from KDevPlugin.
+    is usually derived from a certain base class and not directly from TDevPlugin.
     @param serviceType The service type of an extension (like "TDevelop/SourceFormatter").
     @param constraint The constraint which is applied when quering for the service. This
     constraint is a usual TDETrader constraint statement (like "[X-TDevelop-Foo]=='MyFoo'").
@@ -191,9 +191,9 @@ public:
     virtual void savePartialProjectSession(TQDomElement* el);
 
 private:
-    KDevPlugin *extension_internal(const TQString &serviceType, const TQString &constraint = "");
+    TDevPlugin *extension_internal(const TQString &serviceType, const TQString &constraint = "");
 
-    KDevApi *m_api;
+    TDevApi *m_api;
     class Private;
     Private *d;
 };
diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/tdevplugincontroller.cpp
index 1cc6caa3..bf1eb5e7 100644
--- a/lib/interfaces/kdevplugincontroller.cpp
+++ b/lib/interfaces/tdevplugincontroller.cpp
@@ -16,34 +16,34 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevplugincontroller.h"
+#include "tdevplugincontroller.h"
 
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 
-KDevPluginController::KDevPluginController()
+TDevPluginController::TDevPluginController()
 {
 }
 
-TDETrader::OfferList KDevPluginController::query(const TQString &serviceType,
+TDETrader::OfferList TDevPluginController::query(const TQString &serviceType,
     const TQString &constraint)
 {
     return TDETrader::self()->query(serviceType,
         TQString("%1 and [X-TDevelop-Version] == %2").arg(constraint).arg(TDEVELOP_PLUGIN_VERSION));
 }
 
-TDETrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint)
+TDETrader::OfferList TDevPluginController::queryPlugins(const TQString &constraint)
 {
     return query("TDevelop/Plugin", constraint);
 }
 
-KURL::List KDevPluginController::profileResources(const TQString &/*nameFilter*/)
+KURL::List TDevPluginController::profileResources(const TQString &/*nameFilter*/)
 {
     return KURL::List();
 }
 
-KURL::List KDevPluginController::profileResourcesRecursive(const TQString &/*nameFilter*/)
+KURL::List TDevPluginController::profileResourcesRecursive(const TQString &/*nameFilter*/)
 {
     return KURL::List();
 }
 
-#include "kdevplugincontroller.moc"
+#include "tdevplugincontroller.moc"
diff --git a/lib/interfaces/kdevplugincontroller.h b/lib/interfaces/tdevplugincontroller.h
index 05ee050b..ee44764d 100644
--- a/lib/interfaces/kdevplugincontroller.h
+++ b/lib/interfaces/tdevplugincontroller.h
@@ -16,8 +16,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVPLUGINCONTROLLER_H
-#define KDEVPLUGINCONTROLLER_H
+#ifndef TDEVPLUGINCONTROLLER_H
+#define TDEVPLUGINCONTROLLER_H
 
 #include <tqobject.h>
 
@@ -25,18 +25,18 @@
 #include <ktrader.h>
 
 /**
-@file kdevplugincontroller.h
+@file tdevplugincontroller.h
 TDevelop plugin controller interface.
 */
 
-class KDevPlugin;
+class TDevPlugin;
 class ProfileEngine;
 
 /**
 The base class for TDevelop plugin controller.
 Plugin controller is responsible for quering, loading and unloading available plugins.
 */
-class KDevPluginController: public TQObject
+class TDevPluginController: public TQObject
 {
     Q_OBJECT
   
@@ -46,7 +46,7 @@ public:
      * Returns a uniquely specified plugin. If it isn't already loaded, it will be.
      * Use with caution! See extension for parameter details.
      */
-    virtual KDevPlugin * loadPlugin( const TQString & serviceType, const TQString & constraint ) = 0;
+    virtual TDevPlugin * loadPlugin( const TQString & serviceType, const TQString & constraint ) = 0;
 
     /**
      * Unloads the plugin specified by @p plugin
@@ -60,7 +60,7 @@ public:
     virtual void unloadPlugins(TQStringList const &list) = 0;
 
     /**@return The list of currently loaded plugins.*/
-    virtual const TQValueList<KDevPlugin*> loadedPlugins() = 0;
+    virtual const TQValueList<TDevPlugin*> loadedPlugins() = 0;
 
     /**Queries for the plugin which supports given service type.
     All already loaded plugins will be queried and the first one to support the service type
@@ -70,7 +70,7 @@ public:
     @param constraint The constraint which is applied when quering for the service. This
     constraint is a usual TDETrader constraint statement (like "[X-TDevelop-Foo]=='MyFoo'").
     @return A KDevelop extension plugin for given service type or 0 if no plugin supports it*/
-    virtual KDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "") = 0;
+    virtual TDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "") = 0;
 
     /**Queries KDevelop services. Version is checked automatically
     by adding proper X-TDevelop-Version=N statement into the query.
@@ -82,7 +82,7 @@ public:
     static TDETrader::OfferList query(const TQString &serviceType, const TQString &constraint);
 
     /**Queries TDevelop plugins. Works like
-    KDevPluginController::query with serviceType set to "TDevelop/Plugin".
+    TDevPluginController::query with serviceType set to "TDevelop/Plugin".
     @param constraint A constraint for the service. Do not include plugin version number - it
     is done automatically.
     @return The list of plugin offers.*/
@@ -112,7 +112,7 @@ signals:
 
 protected:
     /**Constructor.*/
-    KDevPluginController();
+    TDevPluginController();
 
 };
 
diff --git a/lib/interfaces/kdevplugininfo.cpp b/lib/interfaces/tdevplugininfo.cpp
index e80385cb..2f607431 100644
--- a/lib/interfaces/kdevplugininfo.cpp
+++ b/lib/interfaces/tdevplugininfo.cpp
@@ -16,16 +16,16 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevplugininfo.h"
+#include "tdevplugininfo.h"
 
 #include <tqvariant.h>
 
 #include <kservice.h>
 #include <kdebug.h>
 
-#include "kdevplugincontroller.h"
+#include "tdevplugincontroller.h"
 
-struct KDevPluginInfo::Private {
+struct TDevPluginInfo::Private {
     TQString m_pluginName;
     TQString m_rawGenericName;
     
@@ -46,7 +46,7 @@ struct KDevPluginInfo::Private {
 };
 
 
-KDevPluginInfo::KDevPluginInfo(const TQString &pluginName)
+TDevPluginInfo::TDevPluginInfo(const TQString &pluginName)
     :d(new Private())
 {
     d->m_pluginName = pluginName;
@@ -89,92 +89,92 @@ KDevPluginInfo::KDevPluginInfo(const TQString &pluginName)
 }
 
 
-KDevPluginInfo::operator TDEAboutData *() const
+TDevPluginInfo::operator TDEAboutData *() const
 {
     return d->m_data;
 }
 
-TQString KDevPluginInfo::pluginName() const
+TQString TDevPluginInfo::pluginName() const
 {
     return d->m_pluginName;
 }
 
-TQString KDevPluginInfo::genericName() const
+TQString TDevPluginInfo::genericName() const
 {
     return d->m_genericName;
 }
 
-TQString KDevPluginInfo::icon() const
+TQString TDevPluginInfo::icon() const
 {
     return d->m_icon;
 }
 
-TQString KDevPluginInfo::description() const
+TQString TDevPluginInfo::description() const
 {
     return d->m_description;
 }
 
-TQString KDevPluginInfo::version() const
+TQString TDevPluginInfo::version() const
 {
     return d->m_version;
 }
 
-int KDevPluginInfo::licenseType() const
+int TDevPluginInfo::licenseType() const
 {
     return d->m_licenseType;
 }
 
-TQString KDevPluginInfo::license() const
+TQString TDevPluginInfo::license() const
 {
-    KDevPluginInfo &info = *const_cast<KDevPluginInfo*>(this);
+    TDevPluginInfo &info = *const_cast<TDevPluginInfo*>(this);
 //    return TDEAboutData(info).license();
     TDEAboutData *data = info;
     return data->license();
 }
 
-TQString KDevPluginInfo::copyrightStatement() const
+TQString TDevPluginInfo::copyrightStatement() const
 {
     return d->m_copyrightStatement;
 }
 
-TQString KDevPluginInfo::homePageAddress() const
+TQString TDevPluginInfo::homePageAddress() const
 {
     return d->m_homePageAddress;
 }
 
-TQString KDevPluginInfo::bugsEmailAddress() const
+TQString TDevPluginInfo::bugsEmailAddress() const
 {
     return d->m_bugsEmailAddress;
 }
 
-TQVariant KDevPluginInfo::property(const TQString &name) const
+TQVariant TDevPluginInfo::property(const TQString &name) const
 {
-    TDETrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
+    TDETrader::OfferList offers = TDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
     if (offers.count() == 1)
         return offers.first()->property(name);
     return TQVariant();
 }
 
-TQVariant KDevPluginInfo::operator [](const TQString &name) const
+TQVariant TDevPluginInfo::operator [](const TQString &name) const
 {
     return property(name);
 }
 
-TQStringList KDevPluginInfo::propertyNames( ) const
+TQStringList TDevPluginInfo::propertyNames( ) const
 {
-    TDETrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
+    TDETrader::OfferList offers = TDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
     if (offers.count() == 1)
         return offers.first()->propertyNames();
     return TQStringList();
 }
 
-void KDevPluginInfo::addAuthor(const char *name, const char *task,
+void TDevPluginInfo::addAuthor(const char *name, const char *task,
     const char *emailAddress, const char *webAddress)
 {
     d->m_authors.append(TDEAboutPerson(name, task, emailAddress, webAddress));
 }
 
-void KDevPluginInfo::addCredit(const char *name, const char *task,
+void TDevPluginInfo::addCredit(const char *name, const char *task,
     const char *emailAddress, const char *webAddress)
 {
     d->m_credits.append(TDEAboutPerson(name, task, emailAddress, webAddress));
diff --git a/lib/interfaces/kdevplugininfo.h b/lib/interfaces/tdevplugininfo.h
index ffd1c46e..419d61aa 100644
--- a/lib/interfaces/kdevplugininfo.h
+++ b/lib/interfaces/tdevplugininfo.h
@@ -16,15 +16,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVPLUGININFO_H
-#define KDEVPLUGININFO_H
+#ifndef TDEVPLUGININFO_H
+#define TDEVPLUGININFO_H
 
 #include <tqvariant.h>
 
 #include <tdeaboutdata.h>
 
 /**
-@file kdevplugininfo.h
+@file tdevplugininfo.h
 TDevelop plugin information container class.
 */
 
@@ -32,20 +32,20 @@ TDevelop plugin information container class.
 Information about TDevelop plugin.
 It uses plugin name to query plugin .desktop files and
 retrieve most information. Names of authors and credits to other people
-must be added manually using KDevPluginInfo::addAuthor and KDevPluginInfo::addCredit
+must be added manually using TDevPluginInfo::addAuthor and TDevPluginInfo::addCredit
 methods.
-@sa KDevPlugin class documentation for more information about .desktop files.
+@sa TDevPlugin class documentation for more information about .desktop files.
 */
-class KDevPluginInfo
+class TDevPluginInfo
 {
 public:
     /**Constructor.
     @param pluginName A name of a plugin. Must be the same as the name of a .desktop file
     and the same as the location of plugin resource files.*/
-    KDevPluginInfo(const TQString &pluginName);
+    TDevPluginInfo(const TQString &pluginName);
     
-    /**Casts KDevPluginInfo to TDEAboutData. Uses KDevPluginInfo::pluginName as TDEAboutData::appName,
-    KDevPluginInfo::rawGenericName as TDEAboutData::programName KDevPluginInfo::licenseType as TDEAboutData::licenseType. Other parameters are ignored.*/
+    /**Casts TDevPluginInfo to TDEAboutData. Uses TDevPluginInfo::pluginName as TDEAboutData::appName,
+    TDevPluginInfo::rawGenericName as TDEAboutData::programName TDevPluginInfo::licenseType as TDEAboutData::licenseType. Other parameters are ignored.*/
     operator TDEAboutData*() const;
     
     /**@return A name of a plugin (always untranslated).*/
diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/tdevproject.cpp
index e8616df1..77136ca0 100644
--- a/lib/interfaces/kdevproject.cpp
+++ b/lib/interfaces/tdevproject.cpp
@@ -24,21 +24,21 @@
 
 #include <kdebug.h>
 
-#include "kdevproject.h"
+#include "tdevproject.h"
 #include <urlutil.h>
 #include <tqfileinfo.h>
 #include <tqtimer.h>
-#include "kdevprojectiface.h"
+#include "tdevprojectiface.h"
 
-struct KDevProject::Private {
+struct TDevProject::Private {
     TQMap<TQString, TQString> m_absToRel;
     TQStringList m_symlinkList;
     TQTimer *m_timer;
-    KDevProjectIface *m_iface;
+    TDevProjectIface *m_iface;
 };
 
-KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name)
-    : KDevPlugin(info, parent, name), d(new KDevProject::Private())
+TDevProject::TDevProject(const TDevPluginInfo *info, TQObject *parent, const char *name)
+    : TDevPlugin(info, parent, name), d(new TDevProject::Private())
 {
     connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) );
     connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) );
@@ -48,10 +48,10 @@ KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const cha
 
     d->m_timer = new TQTimer(this);
     connect(d->m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBuildFileMap()));
-    d->m_iface = new KDevProjectIface(this);
+    d->m_iface = new TDevProjectIface(this);
 }
 
-KDevProject::~KDevProject()
+TDevProject::~TDevProject()
 {
     d->m_timer->stop();
     delete d->m_iface;
@@ -59,7 +59,7 @@ KDevProject::~KDevProject()
     delete d;
 }
 
-void KDevProject::changedFile( const TQString & fileName )
+void TDevProject::changedFile( const TQString & fileName )
 {
     TQStringList fileList;
     fileList.append ( fileName );
@@ -68,35 +68,35 @@ void KDevProject::changedFile( const TQString & fileName )
 
 }
 
-void KDevProject::changedFiles( const TQStringList & fileList )
+void TDevProject::changedFiles( const TQStringList & fileList )
 {
     emit changedFilesInProject( fileList );
 }
 
-KDevProject::Options KDevProject::options() const
+TDevProject::Options TDevProject::options() const
 {
-    return (KDevProject::Options)0;
+    return (TDevProject::Options)0;
 }
 
-bool KDevProject::isProjectFile( const TQString & absFileName )
+bool TDevProject::isProjectFile( const TQString & absFileName )
 {
     return d->m_absToRel.contains( absFileName );
 }
 
-TQString KDevProject::relativeProjectFile( const TQString & absFileName )
+TQString TDevProject::relativeProjectFile( const TQString & absFileName )
 {
     if( isProjectFile(absFileName) )
 	return d->m_absToRel[ absFileName ];
     return TQString();
 }
 
-void KDevProject::buildFileMap()
+void TDevProject::buildFileMap()
 {
     d->m_timer->stop();
     d->m_timer->start(0, true);
 }
 
-void KDevProject::slotBuildFileMap()
+void TDevProject::slotBuildFileMap()
 {
     kdDebug(9000) << k_funcinfo << endl;
 
@@ -115,22 +115,22 @@ void KDevProject::slotBuildFileMap()
     }
 }
 
-void KDevProject::openProject( const TQString & /*dirName*/, const TQString & /*projectName*/ )
+void TDevProject::openProject( const TQString & /*dirName*/, const TQString & /*projectName*/ )
 {
     buildFileMap();
 }
 
-TQStringList KDevProject::symlinkProjectFiles( )
+TQStringList TDevProject::symlinkProjectFiles( )
 {
     return d->m_symlinkList;
 }
 
-TQString KDevProject::defaultRunDirectory(const TQString& projectPluginName) const
+TQString TDevProject::defaultRunDirectory(const TQString& projectPluginName) const
 {
     return DomUtil::readEntry(*projectDom(), "/" + projectPluginName + "/run/globalcwd");
 }
 
-void KDevProject::slotAddFilesToFileMap( const TQStringList & fileList )
+void TDevProject::slotAddFilesToFileMap( const TQStringList & fileList )
 {
 	TQStringList::ConstIterator it = fileList.begin();
 	while( it != fileList.end() )
@@ -147,7 +147,7 @@ void KDevProject::slotAddFilesToFileMap( const TQStringList & fileList )
 	}
 }
 
-void KDevProject::slotRemoveFilesFromFileMap( const TQStringList & fileList )
+void TDevProject::slotRemoveFilesFromFileMap( const TQStringList & fileList )
 {
 	TQStringList::ConstIterator it = fileList.begin();
 	while( it != fileList.end() )
@@ -161,4 +161,4 @@ void KDevProject::slotRemoveFilesFromFileMap( const TQStringList & fileList )
 	}
 }
 
-#include "kdevproject.moc"
+#include "tdevproject.moc"
diff --git a/lib/interfaces/kdevproject.h b/lib/interfaces/tdevproject.h
index 256b0c0c..fa320edf 100644
--- a/lib/interfaces/kdevproject.h
+++ b/lib/interfaces/tdevproject.h
@@ -22,17 +22,17 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVPROJECT_H
-#define KDEVPROJECT_H
+#ifndef TDEVPROJECT_H
+#define TDEVPROJECT_H
 
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 #include "domutil.h"
 
 #include <tqstringlist.h>
 #include <tqmap.h>
 
 /**
-@file kdevproject.h
+@file tdevproject.h
 KDevelop project interface.
 */
 
@@ -40,12 +40,12 @@ class TQTimer;
 
 /**
 KDevelop project interface.
-Plugins implementing the KDevProject interfaces are used to manage projects.
+Plugins implementing the TDevProject interfaces are used to manage projects.
 
 Project can be considered as a way of grouping files (in text editors) or
 as a way of providing support for a build system (like it is done in TDevelop IDE buildtools).
 */
-class KDevProject: public KDevPlugin
+class TDevProject: public TDevPlugin
 {
     Q_OBJECT
     
@@ -56,12 +56,12 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref TDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevProject(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0);
+    TDevProject(const TDevPluginInfo *info, TQObject *parent=0, const char *name=0);
     /**Destructor.*/
-    virtual ~KDevProject();
+    virtual ~TDevProject();
 
     /**Options of the project plugin.*/
     enum Options {
@@ -83,7 +83,7 @@ public:
     virtual void closeProject() = 0;
 
     /**Reimplement this method to set project plugin options. Default implementation
-    returns KDevProject::UsesOtherBuildSystem.*/
+    returns TDevProject::UsesOtherBuildSystem.*/
     virtual Options options() const;
 
     /**@return The canonical absolute directory of the project. Canonical means that
diff --git a/lib/interfaces/kdevprojectiface.cpp b/lib/interfaces/tdevprojectiface.cpp
index 28d4501c..625a4118 100644
--- a/lib/interfaces/kdevprojectiface.cpp
+++ b/lib/interfaces/tdevprojectiface.cpp
@@ -19,168 +19,168 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kdevprojectiface.h"
-#include "kdevproject.h"
+#include "tdevprojectiface.h"
+#include "tdevproject.h"
 #include "domutil.h"
 
-KDevProjectIface::KDevProjectIface(KDevProject *prj)
-  : TQObject(prj), DCOPObject("KDevProject"), m_prj(prj)
+TDevProjectIface::TDevProjectIface(TDevProject *prj)
+  : TQObject(prj), DCOPObject("TDevProject"), m_prj(prj)
 {
 }
 
 
-KDevProjectIface::~KDevProjectIface()
+TDevProjectIface::~TDevProjectIface()
 {
 }
 
-void KDevProjectIface::openProject( const TQString & dirName, const TQString & projectName )
+void TDevProjectIface::openProject( const TQString & dirName, const TQString & projectName )
 {
   m_prj->openProject(dirName,projectName);
 }
 
-void KDevProjectIface::closeProject( )
+void TDevProjectIface::closeProject( )
 {
   m_prj->closeProject();
 }
 
-uint KDevProjectIface::options( ) const
+uint TDevProjectIface::options( ) const
 {
   return (uint)m_prj->options();
 }
 
-TQString KDevProjectIface::projectDirectory( ) const
+TQString TDevProjectIface::projectDirectory( ) const
 {
   return m_prj->projectDirectory();
 }
 
-TQString KDevProjectIface::projectName( ) const
+TQString TDevProjectIface::projectName( ) const
 {
   return m_prj->projectName();
 }
 
-TQString KDevProjectIface::mainProgram() const
+TQString TDevProjectIface::mainProgram() const
 {
   return m_prj->mainProgram();
 }
 
-TQString KDevProjectIface::runDirectory( ) const
+TQString TDevProjectIface::runDirectory( ) const
 {
   return m_prj->runDirectory();
 }
 
-TQString KDevProjectIface::activeDirectory( ) const
+TQString TDevProjectIface::activeDirectory( ) const
 {
   return m_prj->activeDirectory();
 }
 
-TQString KDevProjectIface::buildDirectory( ) const
+TQString TDevProjectIface::buildDirectory( ) const
 {
   return m_prj->buildDirectory();
 }
 
-TQStringList KDevProjectIface::allFiles( ) const
+TQStringList TDevProjectIface::allFiles( ) const
 {
   return m_prj->allFiles();
 }
 
-TQStringList KDevProjectIface::distFiles( ) const
+TQStringList TDevProjectIface::distFiles( ) const
 {
   return m_prj->distFiles();
 }
 
-void KDevProjectIface::addFiles( const TQStringList & fileList )
+void TDevProjectIface::addFiles( const TQStringList & fileList )
 {
   m_prj->addFiles(fileList);
 }
 
-void KDevProjectIface::addFile( const TQString & fileName )
+void TDevProjectIface::addFile( const TQString & fileName )
 {
   m_prj->addFile(fileName);
 }
 
-void KDevProjectIface::removeFiles( const TQStringList & fileList )
+void TDevProjectIface::removeFiles( const TQStringList & fileList )
 {
   m_prj->removeFiles(fileList);
 }
 
-void KDevProjectIface::removeFile( const TQString & fileName )
+void TDevProjectIface::removeFile( const TQString & fileName )
 {
   m_prj->removeFile(fileName);
 }
 
-void KDevProjectIface::changedFiles( const TQStringList & fileList )
+void TDevProjectIface::changedFiles( const TQStringList & fileList )
 {
   m_prj->changedFiles(fileList);
 }
 
-void KDevProjectIface::changedFile( const TQString & fileName )
+void TDevProjectIface::changedFile( const TQString & fileName )
 {
   m_prj->changedFile(fileName);
 }
 
-bool KDevProjectIface::isProjectFile( const TQString & absFileName )
+bool TDevProjectIface::isProjectFile( const TQString & absFileName )
 {
   return m_prj->isProjectFile(absFileName);
 }
 
-TQString KDevProjectIface::relativeProjectFile( const TQString & absFileName )
+TQString TDevProjectIface::relativeProjectFile( const TQString & absFileName )
 {
   return m_prj->relativeProjectFile(absFileName);
 }
 
-TQStringList KDevProjectIface::symlinkProjectFiles( )
+TQStringList TDevProjectIface::symlinkProjectFiles( )
 {
   return m_prj->symlinkProjectFiles();
 }
 
-TQString KDevProjectIface::readEntry( const TQString & path, const TQString & defaultEntry )
+TQString TDevProjectIface::readEntry( const TQString & path, const TQString & defaultEntry )
 {
   return DomUtil::readEntry( *m_prj->projectDom(), path, defaultEntry);
 }
 
-int KDevProjectIface::readIntEntry( const TQString & path, int defaultEntry )
+int TDevProjectIface::readIntEntry( const TQString & path, int defaultEntry )
 {
   return DomUtil::readIntEntry(*m_prj->projectDom(), path,defaultEntry);
 }
 
-bool KDevProjectIface::readBoolEntry( const TQString & path, bool defaultEntry )
+bool TDevProjectIface::readBoolEntry( const TQString & path, bool defaultEntry )
 {
   return DomUtil::readBoolEntry(*m_prj->projectDom(), path, defaultEntry);
 }
 
-TQStringList KDevProjectIface::readListEntry( const TQString & path, const TQString & tag )
+TQStringList TDevProjectIface::readListEntry( const TQString & path, const TQString & tag )
 {
   return DomUtil::readListEntry(*m_prj->projectDom(), path, tag);
 }
 
-TQMap< TQString, TQString > KDevProjectIface::readMapEntry( const TQString & path )
+TQMap< TQString, TQString > TDevProjectIface::readMapEntry( const TQString & path )
 {
   return DomUtil::readMapEntry(*m_prj->projectDom(), path);
 }
 
-void KDevProjectIface::writeEntry( const TQString & path, const TQString & value )
+void TDevProjectIface::writeEntry( const TQString & path, const TQString & value )
 {
   DomUtil::writeEntry(*m_prj->projectDom(), path, value);
 }
 
-void KDevProjectIface::writeIntEntry( const TQString & path, int value )
+void TDevProjectIface::writeIntEntry( const TQString & path, int value )
 {
   DomUtil::writeIntEntry(*m_prj->projectDom(), path, value);
 }
 
-void KDevProjectIface::writeBoolEntry( const TQString & path, bool value )
+void TDevProjectIface::writeBoolEntry( const TQString & path, bool value )
 {
   DomUtil::writeBoolEntry(*m_prj->projectDom(), path, value);
 }
 
-void KDevProjectIface::writeListEntry( const TQString & path, const TQString & tag, const TQStringList & value )
+void TDevProjectIface::writeListEntry( const TQString & path, const TQString & tag, const TQStringList & value )
 {
   DomUtil::writeListEntry(*m_prj->projectDom(), path, tag, value);
 }
 
-void KDevProjectIface::writeMapEntry( const TQString & path, const TQMap< TQString, TQString > & map )
+void TDevProjectIface::writeMapEntry( const TQString & path, const TQMap< TQString, TQString > & map )
 {
   DomUtil::writeMapEntry(*m_prj->projectDom(), path, map);
 }
 
-#include "kdevprojectiface.moc"
+#include "tdevprojectiface.moc"
diff --git a/lib/interfaces/kdevprojectiface.h b/lib/interfaces/tdevprojectiface.h
index e30cd6cc..c3e0ddd4 100644
--- a/lib/interfaces/kdevprojectiface.h
+++ b/lib/interfaces/tdevprojectiface.h
@@ -17,29 +17,29 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KDEVPROJECTIFACE_H
-#define KDEVPROJECTIFACE_H
+#ifndef TDEVPROJECTIFACE_H
+#define TDEVPROJECTIFACE_H
 
 #include <dcopobject.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
 
-class KDevProject;
+class TDevProject;
 
 /**
-DCOP Interface for the @ref KDevProject object.
+DCOP Interface for the @ref TDevProject object.
 
 @author KDevelop Authors
 */
-class KDevProjectIface : public TQObject, public DCOPObject
+class TDevProjectIface : public TQObject, public DCOPObject
 {
   Q_OBJECT
 //  
       K_DCOP
 public:
-  KDevProjectIface(KDevProject *prj);
+  TDevProjectIface(TDevProject *prj);
 
-    ~KDevProjectIface();
+    ~TDevProjectIface();
 k_dcop:
     void openProject(const TQString &dirName, const TQString &projectName);
     void closeProject();
@@ -76,7 +76,7 @@ k_dcop:
     void writeMapEntry(const TQString& path, const TQMap<TQString,TQString> &map);
     
   private:
-    KDevProject *m_prj;
+    TDevProject *m_prj;
 };
 
 #endif
diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt
index 1eb17f35..0114b5ae 100644
--- a/lib/util/CMakeLists.txt
+++ b/lib/util/CMakeLists.txt
@@ -26,13 +26,13 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/util )
 
 
-##### kdevutil (static) #########################
+##### tdevutil (static) #########################
 
-tde_add_library( kdevutil STATIC_PIC AUTOMOC
+tde_add_library( tdevutil STATIC_PIC AUTOMOC
   SOURCES
     blockingkprocess.cpp configwidgetproxy.cpp
     domutil.cpp execcommand.cpp filetemplate.cpp
-    kdeveditorutil.cpp kdevjobtimer.cpp
-    kdevshellwidget.cpp tdescriptactionmanager.cpp
+    tdeveditorutil.cpp tdevjobtimer.cpp
+    tdevshellwidget.cpp tdescriptactionmanager.cpp
     rurl.cpp settings.cpp urlutil.cpp
 )
diff --git a/lib/util/Makefile.am b/lib/util/Makefile.am
index 8bf28091..52ededb0 100644
--- a/lib/util/Makefile.am
+++ b/lib/util/Makefile.am
@@ -1,10 +1,10 @@
 INCLUDES = -I$(top_srcdir)/lib/compat  -I$(top_srcdir)/lib/interfaces  -I$(top_srcdir)/lib/sourceinfo  $(all_includes)
 
-noinst_LTLIBRARIES = libkdevutil.la
+noinst_LTLIBRARIES = libtdevutil.la
 
-libkdevutil_la_SOURCES = blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp \
-	execcommand.cpp filetemplate.cpp kdeveditorutil.cpp kdevjobtimer.cpp \
-	kdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp
+libtdevutil_la_SOURCES = blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp \
+	execcommand.cpp filetemplate.cpp tdeveditorutil.cpp tdevjobtimer.cpp \
+	tdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp
 
 METASOURCES = AUTO
 
@@ -12,10 +12,10 @@ tdevelopincludedir = $(includedir)/tdevelop/util
 tdevelopinclude_HEADERS = domutil.h execcommand.h filetemplate.h urlutil.h \
 	configwidgetproxy.h rurl.h tdescriptactionmanager.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevextensions kdevinterfaces
-DOXYGEN_PROJECTNAME = KDevelop Utility Library
-DOXYGEN_DOCDIRPREFIX = kdev
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevextensions tdevinterfaces
+DOXYGEN_PROJECTNAME = TDevelop Utility Library
+DOXYGEN_DOCDIRPREFIX = tdev
 include ../../Doxyfile.am
 
-noinst_HEADERS = blockingkprocess.h kdeveditorutil.h kdevjobtimer.h \
-	kdevshellwidget.h settings.h
+noinst_HEADERS = blockingkprocess.h tdeveditorutil.h tdevjobtimer.h \
+	tdevshellwidget.h settings.h
diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp
index bea1c79a..c2251158 100644
--- a/lib/util/configwidgetproxy.cpp
+++ b/lib/util/configwidgetproxy.cpp
@@ -26,13 +26,13 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 
-#include <kdevcore.h>
+#include <tdevcore.h>
 
 
 #include "configwidgetproxy.h"
 
 
-ConfigWidgetProxy::ConfigWidgetProxy( KDevCore * core )
+ConfigWidgetProxy::ConfigWidgetProxy( TDevCore * core )
 {
 	connect( core, TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget( KDialogBase*)) );
 	connect( core, TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(slotProjectConfigWidget( KDialogBase*)) );
diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h
index 7881f830..f1ced178 100644
--- a/lib/util/configwidgetproxy.h
+++ b/lib/util/configwidgetproxy.h
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <tqmap.h>
 
-class KDevCore;
+class TDevCore;
 class KDialogBase;
 
 /**
@@ -65,8 +65,8 @@ void MyPart::insertConfigWidget( TQObject const * dlg, TQWidget * page, unsigned
 }
 @endcode
 
-Note that this replaces the functionality of typical KDevCore::configWidget() and
-KDevCore::projectConfigWidget() slots.
+Note that this replaces the functionality of typical TDevCore::configWidget() and
+TDevCore::projectConfigWidget() slots.
 */
 class ConfigWidgetProxy : public TQObject
 {
@@ -76,7 +76,7 @@ Q_OBJECT
 public:
 	/**Constructor.
 	@param core An instance of KDevelop Core.*/
-	ConfigWidgetProxy( KDevCore * core );
+	ConfigWidgetProxy( TDevCore * core );
 	virtual ~ConfigWidgetProxy();
     
 	/**
diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp
index c2454580..4d0facdf 100644
--- a/lib/util/filetemplate.cpp
+++ b/lib/util/filetemplate.cpp
@@ -27,12 +27,12 @@
 
 #include <kstandarddirs.h>
 
-#include "kdevplugin.h"
-#include "kdevproject.h"
+#include "tdevplugin.h"
+#include "tdevproject.h"
 #include "domutil.h"
 
 
-bool FileTemplate::exists(KDevPlugin *part, const TQString &name, Policy p)
+bool FileTemplate::exists(TDevPlugin *part, const TQString &name, Policy p)
 {
     //TQString fileName = (p == Default) ?
     //   (part->project()->projectDirectory() + "/templates/" + name) : name;
@@ -40,17 +40,17 @@ bool FileTemplate::exists(KDevPlugin *part, const TQString &name, Policy p)
     return TQFile::exists( fullPathForName(part,name,p) );
 }
 
-TQString FileTemplate::read(KDevPlugin *part, const TQString &name, Policy p)
+TQString FileTemplate::read(TDevPlugin *part, const TQString &name, Policy p)
 {
     
-  //KDevProject *project = part->project();
+  //TDevProject *project = part->project();
     //TQString fileName = (p == Default) ? (project->projectDirectory() +
 //					 "/templates/" + name) : name;
 
     return readFile(part, fullPathForName(part, name, p) );
 }
 
-TQString FileTemplate::readFile(KDevPlugin *part, const TQString &fileName)
+TQString FileTemplate::readFile(TDevPlugin *part, const TQString &fileName)
 {
     TQDomDocument &dom = *part->projectDom();
 
@@ -87,7 +87,7 @@ TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString &
 }
 
 
-bool FileTemplate::copy(KDevPlugin *part, const TQString &name,
+bool FileTemplate::copy(TDevPlugin *part, const TQString &name,
                         const TQString &dest, Policy p)
 {
     TQString text = read(part, name, p);
@@ -109,7 +109,7 @@ bool FileTemplate::copy(KDevPlugin *part, const TQString &name,
     return true;
 }
 
-TQString FileTemplate::fullPathForName(KDevPlugin *part, const TQString &name,
+TQString FileTemplate::fullPathForName(TDevPlugin *part, const TQString &name,
                                       Policy p) {
     // if Policy is not default, full path is just the name
     if (p!=Default) return name;
@@ -123,6 +123,6 @@ TQString FileTemplate::fullPathForName(KDevPlugin *part, const TQString &name,
     }
 
     // next try global
-    TQString globalName = ::locate("data", "kdevfilecreate/file-templates/" + name);
+    TQString globalName = ::locate("data", "tdevfilecreate/file-templates/" + name);
     return globalName.isNull() ? fileName : globalName;
 }
diff --git a/lib/util/filetemplate.h b/lib/util/filetemplate.h
index 8f863535..7802f9b7 100644
--- a/lib/util/filetemplate.h
+++ b/lib/util/filetemplate.h
@@ -22,7 +22,7 @@
 
 #include <tqstring.h>
 
-class KDevPlugin;
+class TDevPlugin;
 class TQDomDocument;
 
 /**
@@ -49,21 +49,21 @@ public:
      * exists in the current project. File templates
      * are stored in the "templates" subdirectory of a project or in application shared dirs.
      */
-    static bool exists(KDevPlugin *part, const TQString &name, Policy p = Default);
+    static bool exists(TDevPlugin *part, const TQString &name, Policy p = Default);
     
     /**
      * Reads a template with the given name (e.g. "cpp")
      * and makes variable substitutions (like $AUTHOR$ etc.)
      * in it. The resulting string is returned.
      */
-    static TQString read(KDevPlugin *part, const TQString &name, Policy p = Default);
+    static TQString read(TDevPlugin *part, const TQString &name, Policy p = Default);
 
     /**
      * Reads a template with the given URL
      * and makes variable substitutions (like $AUTHOR$ etc.)
      * in it. The resulting string is returned.
      */
-    static TQString readFile(KDevPlugin *part, const TQString &fileName);
+    static TQString readFile(TDevPlugin *part, const TQString &fileName);
 
     /**
      * Makes variable substitutions on a text, based on a specified TQDomDocument 
@@ -76,13 +76,13 @@ public:
      * file with the name dest and - while copying -
      * performs variable substitutions.
      */
-    static bool copy(KDevPlugin *part, const TQString &name,
+    static bool copy(TDevPlugin *part, const TQString &name,
                      const TQString &dest, Policy p = Default);
     /**
      * Translates a template name into a full path, or suggests a full path
      * for the template in the project directory if it doesn't exist.
      */
-    static TQString fullPathForName(KDevPlugin *part, const TQString &name, Policy p = Default);
+    static TQString fullPathForName(TDevPlugin *part, const TQString &name, Policy p = Default);
 };
 
 #endif
diff --git a/lib/util/kdeveditorutil.cpp b/lib/util/tdeveditorutil.cpp
index 198e9a42..455909f8 100644
--- a/lib/util/kdeveditorutil.cpp
+++ b/lib/util/tdeveditorutil.cpp
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "kdeveditorutil.h"
+#include "tdeveditorutil.h"
 
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/view.h>
@@ -17,7 +17,7 @@
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/selectioninterface.h>
 
-bool KDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * col, KTextEditor::Document * doc, KTextEditor::View * view )
+bool TDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * col, KTextEditor::Document * doc, KTextEditor::View * view )
 {
 	if ( !line || !col ) return false;
 
@@ -33,7 +33,7 @@ bool KDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * co
 	return true;
 }
 
-TQString KDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::View * view )
+TQString TDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::View * view )
 {
 	KTextEditor::EditInterface * editIface = dynamic_cast<KTextEditor::EditInterface*>( doc );
 	if ( !editIface ) return TQString();
@@ -50,7 +50,7 @@ TQString KDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::
 	return editIface->textLine(line);
 }
 
-TQString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::View * view )
+TQString TDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::View * view )
 {
 	KTextEditor::EditInterface * editIface = dynamic_cast<KTextEditor::EditInterface*>( doc );
 	if ( !editIface ) return TQString();
@@ -78,7 +78,7 @@ TQString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::
 }
 
 
-TQString KDevEditorUtil::currentSelection( KTextEditor::Document * doc )
+TQString TDevEditorUtil::currentSelection( KTextEditor::Document * doc )
 {
 	KTextEditor::SelectionInterface * selectIface = dynamic_cast<KTextEditor::SelectionInterface*>( doc );
 	return selectIface ? selectIface->selection() : TQString();
diff --git a/lib/util/kdeveditorutil.h b/lib/util/tdeveditorutil.h
index 79a64fe1..d69e914b 100644
--- a/lib/util/kdeveditorutil.h
+++ b/lib/util/tdeveditorutil.h
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KDEVEDITOR_H
-#define KDEVEDITOR_H
+#ifndef TDEVEDITOR_H
+#define TDEVEDITOR_H
 
 namespace KTextEditor
 {
@@ -25,9 +25,9 @@ Class with some common utility operations not currently supported by KTE
 
 	@author Jens Dagerbo <jens.dagerbo@swipnet.se>
 */
-class KDevEditorUtil
+class TDevEditorUtil
 {
-    KDevEditorUtil() {}
+    TDevEditorUtil() {}
 public:
 
 	/**
diff --git a/lib/util/kdevjobtimer.cpp b/lib/util/tdevjobtimer.cpp
index b0b78250..0e1465e0 100644
--- a/lib/util/kdevjobtimer.cpp
+++ b/lib/util/tdevjobtimer.cpp
@@ -9,31 +9,31 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "kdevjobtimer.h"
+#include "tdevjobtimer.h"
 
-KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name)
+TDevJobTimer::TDevJobTimer( void * payload, TQObject *parent, const char *name)
  : TQTimer(parent, name)
 {
 	m_payload = payload;
 	connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) );
 }
 
-KDevJobTimer::~KDevJobTimer()
+TDevJobTimer::~TDevJobTimer()
 {
 }
 
-void KDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member, void * payload)
+void TDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member, void * payload)
 {
-	KDevJobTimer * p = new KDevJobTimer( payload );
+	TDevJobTimer * p = new TDevJobTimer( payload );
 	p->start( msec, true );
 	connect( p, TQT_SIGNAL(timeout(void*)), receiver, member );
 }
 
-void KDevJobTimer::slotTimeout()
+void TDevJobTimer::slotTimeout()
 {
 	emit timeout( m_payload );
 	m_payload = 0;
 	deleteLater();
 }
 
-#include "kdevjobtimer.moc"
+#include "tdevjobtimer.moc"
diff --git a/lib/util/kdevjobtimer.h b/lib/util/tdevjobtimer.h
index b0fa829e..313e56e5 100644
--- a/lib/util/kdevjobtimer.h
+++ b/lib/util/tdevjobtimer.h
@@ -9,12 +9,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KDEVJOBTIMER_H
-#define KDEVJOBTIMER_H
+#ifndef TDEVJOBTIMER_H
+#define TDEVJOBTIMER_H
 
 #include <tqtimer.h>
 
-class KDevJobTimer : public TQTimer
+class TDevJobTimer : public TQTimer
 {
 Q_OBJECT
   
@@ -25,8 +25,8 @@ signals:
 	void timeout(void*);
 
 private:
-	KDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0);
-	~KDevJobTimer();
+	TDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0);
+	~TDevJobTimer();
 
 private slots:
 	void slotTimeout();
diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/tdevshellwidget.cpp
index b9220250..b5b8d195 100644
--- a/lib/util/kdevshellwidget.cpp
+++ b/lib/util/tdevshellwidget.cpp
@@ -18,25 +18,25 @@
 #include <kde_terminal_interface.h>
 #include <kprocess.h>
 
-#include "kdevshellwidget.h"
+#include "tdevshellwidget.h"
 
-KDevShellWidget::KDevShellWidget(TQWidget *parent, const char *name)
+TDevShellWidget::TDevShellWidget(TQWidget *parent, const char *name)
  : TQVBox(parent, name), m_doAutoActivate( false ), m_isRunning( false )
 {
 }
 
 
-KDevShellWidget::~KDevShellWidget()
+TDevShellWidget::~TDevShellWidget()
 {
 }
 
-void KDevShellWidget::setShell( const TQString & shell, const TQStrList & arguments )
+void TDevShellWidget::setShell( const TQString & shell, const TQStrList & arguments )
 {
 	m_shellName = shell;
 	m_shellArguments = arguments;
 }
 
-void KDevShellWidget::activate( )
+void TDevShellWidget::activate( )
 {
 	KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
 	if ( !factory ) return;
@@ -67,7 +67,7 @@ void KDevShellWidget::activate( )
 
 }
 
-void KDevShellWidget::partDestroyed( )
+void TDevShellWidget::partDestroyed( )
 {
 	if ( m_doAutoActivate )
 	{
@@ -75,7 +75,7 @@ void KDevShellWidget::partDestroyed( )
 	}
 }
 
-void KDevShellWidget::processExited( TDEProcess * proc )
+void TDevShellWidget::processExited( TDEProcess * proc )
 {
 	m_isRunning = false;
 
@@ -89,7 +89,7 @@ void KDevShellWidget::processExited( TDEProcess * proc )
 		emit shellSignalled( proc->exitSignal() );
 }
 
-void KDevShellWidget::sendInput( const TQString & text )
+void TDevShellWidget::sendInput( const TQString & text )
 {
 	if ( !m_konsolePart ) return;
 	TerminalInterface* ti = static_cast<TerminalInterface*>( m_konsolePart->tqt_cast( "TerminalInterface" ) );
@@ -98,12 +98,12 @@ void KDevShellWidget::sendInput( const TQString & text )
 	ti->sendInput( text );
 }
 
-bool KDevShellWidget::isRunning( )
+bool TDevShellWidget::isRunning( )
 {
 	return m_isRunning;
 }
 
-void KDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate )
+void TDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate )
 {
 	// to auto reactivate can be dangerous, do it like this to avoid
 	// reactivating with a non-working setting (the partDestroyed()
@@ -114,12 +114,12 @@ void KDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate )
 		m_doAutoActivate = false;
 }
 
-void KDevShellWidget::setAutoReactivateOnCloseDelayed( )
+void TDevShellWidget::setAutoReactivateOnCloseDelayed( )
 {
 	m_doAutoActivate = true;
 }
 
 
-#include "kdevshellwidget.moc"
+#include "tdevshellwidget.moc"
 
 // kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;
diff --git a/lib/util/kdevshellwidget.h b/lib/util/tdevshellwidget.h
index 6bb6a8d7..f6476814 100644
--- a/lib/util/kdevshellwidget.h
+++ b/lib/util/tdevshellwidget.h
@@ -10,8 +10,8 @@
  ***************************************************************************/
 
 
-#ifndef KDEVSHELLWIDGET_H
-#define KDEVSHELLWIDGET_H
+#ifndef TDEVSHELLWIDGET_H
+#define TDEVSHELLWIDGET_H
 
 #include <tqstrlist.h>
 #include <tqvbox.h>
@@ -23,15 +23,15 @@ namespace KParts
 	class ReadOnlyPart;
 }
 
-class KDevShellWidget : public TQVBox
+class TDevShellWidget : public TQVBox
 {
 
 Q_OBJECT
   
 
 public:
-	KDevShellWidget(TQWidget *parent = 0, const char *name = 0);
-	virtual ~KDevShellWidget();
+	TDevShellWidget(TQWidget *parent = 0, const char *name = 0);
+	virtual ~TDevShellWidget();
 
 	/**
 	 * Stores the shell name and arguments, that will be used in @ref activate()
diff --git a/lib/widgets/CMakeLists.txt b/lib/widgets/CMakeLists.txt
index 30e0ba3e..86303b6d 100644
--- a/lib/widgets/CMakeLists.txt
+++ b/lib/widgets/CMakeLists.txt
@@ -28,22 +28,22 @@ link_directories(
 install( FILES
     tdelistviewaction.h qcomboview.h flagboxes.h
     ksavealldialog.h resizablecombo.h kcomboview.h
-    kdevhtmlpart.h processlinemaker.h processwidget.h
+    tdevhtmlpart.h processlinemaker.h processwidget.h
     fancylistviewitem.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/widgets )
 
 
 ##### other data ################################
 
-install( FILES kdevhtml_partui.rc DESTINATION ${DATA_INSTALL_DIR}/tdevelop )
+install( FILES tdevhtml_partui.rc DESTINATION ${DATA_INSTALL_DIR}/tdevelop )
 
 
-##### kdevwidgets (shared) ######################
+##### tdevwidgets (shared) ######################
 
-tde_add_library( kdevwidgets SHARED AUTOMOC
+tde_add_library( tdevwidgets SHARED AUTOMOC
   SOURCES
     flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp
-    kcomboview.cpp resizablecombo.cpp kdevhtmlpart.cpp
+    kcomboview.cpp resizablecombo.cpp tdevhtmlpart.cpp
     processlinemaker.cpp processwidget.cpp ksavealldialog.cpp
     fancylistviewitem.cpp
   VERSION 0.0.0
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index 69be7a11..7181151e 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -2,29 +2,29 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces $(all_inclu
 
 METASOURCES = AUTO
 
-lib_LTLIBRARIES = libkdevwidgets.la
+lib_LTLIBRARIES = libtdevwidgets.la
 
-kdevwidgetsincludedir = $(includedir)/tdevelop/widgets
+tdevwidgetsincludedir = $(includedir)/tdevelop/widgets
 
-libkdevwidgets_la_SOURCES = flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp \
-	kcomboview.cpp resizablecombo.cpp kdevhtmlpart.cpp processlinemaker.cpp \
+libtdevwidgets_la_SOURCES = flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp \
+	kcomboview.cpp resizablecombo.cpp tdevhtmlpart.cpp processlinemaker.cpp \
 	processwidget.cpp ksavealldialog.cpp fancylistviewitem.cpp
 
 
-kdevwidgetsinclude_HEADERS = tdelistviewaction.h qcomboview.h flagboxes.h \
-	ksavealldialog.h resizablecombo.h kcomboview.h kdevhtmlpart.h processlinemaker.h \
+tdevwidgetsinclude_HEADERS = tdelistviewaction.h qcomboview.h flagboxes.h \
+	ksavealldialog.h resizablecombo.h kcomboview.h tdevhtmlpart.h processlinemaker.h \
 	processwidget.h fancylistviewitem.h 
 	
 
 SUBDIRS = propeditor
 
-libkdevwidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la
-libkdevwidgets_la_LDFLAGS = -no-undefined $(all_libraries)
+libtdevwidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la
+libtdevwidgets_la_LDFLAGS = -no-undefined $(all_libraries)
 rcdir = $(kde_datadir)/tdevelop
 
-rc_DATA =  kdevhtml_partui.rc
+rc_DATA =  tdevhtml_partui.rc
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces
-DOXYGEN_PROJECTNAME = KDevelop Widgets Library
-DOXYGEN_DOCDIRPREFIX = kdev
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces
+DOXYGEN_PROJECTNAME = TDevelop Widgets Library
+DOXYGEN_DOCDIRPREFIX = tdev
 include ../../Doxyfile.am
diff --git a/lib/widgets/propeditor/CMakeLists.txt b/lib/widgets/propeditor/CMakeLists.txt
index 2620aaa0..1cffb908 100644
--- a/lib/widgets/propeditor/CMakeLists.txt
+++ b/lib/widgets/propeditor/CMakeLists.txt
@@ -38,9 +38,9 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/propeditor )
 
 
-##### kdevpropertyeditor (shared) ###############
+##### tdevpropertyeditor (shared) ###############
 
-tde_add_library( kdevpropertyeditor SHARED AUTOMOC
+tde_add_library( tdevpropertyeditor SHARED AUTOMOC
   SOURCES
     childproperty.cpp pcombobox.cpp pdummywidget.cpp
     ppointedit.cpp propertymachinefactory.cpp
diff --git a/lib/widgets/propeditor/Makefile.am b/lib/widgets/propeditor/Makefile.am
index e07d5c69..a01eb4d3 100644
--- a/lib/widgets/propeditor/Makefile.am
+++ b/lib/widgets/propeditor/Makefile.am
@@ -1,18 +1,18 @@
 INCLUDES = -I$(top_srcdir)/lib/compat $(all_includes)
 METASOURCES = AUTO
 
-lib_LTLIBRARIES =  libkdevpropertyeditor.la
-libkdevpropertyeditor_la_LIBADD = $(LIB_TDEIO)
-libkdevpropertyeditor_la_LDFLAGS = -no-undefined $(all_libraries)
-libkdevpropertyeditor_la_SOURCES = childproperty.cpp  pcombobox.cpp        pdummywidget.cpp  ppointedit.cpp      propertymachinefactory.cpp  pstringlistedit.cpp\
+lib_LTLIBRARIES =  libtdevpropertyeditor.la
+libtdevpropertyeditor_la_LIBADD = $(LIB_TDEIO)
+libtdevpropertyeditor_la_LDFLAGS = -no-undefined $(all_libraries)
+libtdevpropertyeditor_la_SOURCES = childproperty.cpp  pcombobox.cpp        pdummywidget.cpp  ppointedit.cpp      propertymachinefactory.cpp  pstringlistedit.cpp\
 multiproperty.cpp  pcursoredit.cpp      pfontbutton.cpp   prectedit.cpp       propertywidget.cpp          psymbolcombo.cpp\
 pcheckbox.cpp      pdateedit.cpp        pfontcombo.cpp    property.cpp        psizeedit.cpp               purledit.cpp\
 pcolorbutton.cpp   pdatetimeedit.cpp    plineedit.cpp     propertyeditor.cpp  psizepolicyedit.cpp         pyesnobutton.cpp\
 pcolorcombo.cpp    pdoublenuminput.cpp  ppixmapedit.cpp   propertylist.cpp    pspinbox.cpp propertywidgetproxy.cpp plinestyleedit.cpp qeditlistbox.cpp
 
-kdevpropeditorincludedir = $(includedir)/tdevelop/propeditor
-kdevpropeditorinclude_HEADERS = childproperty.h pcombobox.h pdummywidget.h ppointedit.h propertymachinefactory.h pcursoredit.h pfontbutton.h prectedit.h propertywidget.h pdateedit.h pfontcombo.h property.h psizeedit.h pdatetimeedit.h plineedit.h propertyeditor.h psizepolicyedit.h pdoublenuminput.h ppixmapedit.h propertylist.h pspinbox.h propertywidgetproxy.h multiproperty.h pyesnobutton.h purledit.h psymbolcombo.h pstringlistedit.h pcolorcombo.h pcolorbutton.h pcheckbox.h plinestyleedit.h
+tdevpropeditorincludedir = $(includedir)/tdevelop/propeditor
+tdevpropeditorinclude_HEADERS = childproperty.h pcombobox.h pdummywidget.h ppointedit.h propertymachinefactory.h pcursoredit.h pfontbutton.h prectedit.h propertywidget.h pdateedit.h pfontcombo.h property.h psizeedit.h pdatetimeedit.h plineedit.h propertyeditor.h psizepolicyedit.h pdoublenuminput.h ppixmapedit.h propertylist.h pspinbox.h propertywidgetproxy.h multiproperty.h pyesnobutton.h purledit.h psymbolcombo.h pstringlistedit.h pcolorcombo.h pcolorbutton.h pcheckbox.h plinestyleedit.h
 
 DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils
-DOXYGEN_PROJECTNAME = KDevelop Property Editing Library
+DOXYGEN_PROJECTNAME = TDevelop Property Editing Library
 include ../../../Doxyfile.am
diff --git a/lib/widgets/kdevhtml_partui.rc b/lib/widgets/tdevhtml_partui.rc
index 5a55b7bf..a62fa22f 100644
--- a/lib/widgets/kdevhtml_partui.rc
+++ b/lib/widgets/tdevhtml_partui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui version="3" name="KDevHTMLPart" >
+<kpartgui version="3" name="TDevHTMLPart" >
 
 <MenuBar>
   <Menu name="file" noMerge="0"><text>&amp;File</text>
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/tdevhtmlpart.cpp
index 76697cfa..6ec74651 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/tdevhtmlpart.cpp
@@ -14,15 +14,15 @@
 #include <tdehtml_settings.h>
 #include <tdeconfig.h>
 
-#include <kdevmainwindow.h>
+#include <tdevmainwindow.h>
 
 
-#include "kdevhtmlpart.h"
+#include "tdevhtmlpart.h"
 
-KDevHTMLPart::KDevHTMLPart()
-  : TDEHTMLPart(0L, 0L, 0L, "KDevHTMLPart", DefaultGUI )
+TDevHTMLPart::TDevHTMLPart()
+  : TDEHTMLPart(0L, 0L, 0L, "TDevHTMLPart", DefaultGUI )
 {
-  setXMLFile(locate("data", "tdevelop/kdevhtml_partui.rc"), true);
+  setXMLFile(locate("data", "tdevelop/tdevhtml_partui.rc"), true);
   
   connect(browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)),
           this, TQT_SLOT(openURLRequest(const KURL &)) );
@@ -87,7 +87,7 @@ KDevHTMLPart::KDevHTMLPart()
   setZoomFactor(appConfig->readEntry("Zoom", "100").toInt());
 }
 
-void KDevHTMLPart::popup( const TQString & url, const TQPoint & p )
+void TDevHTMLPart::popup( const TQString & url, const TQPoint & p )
 {
 //  TDEPopupMenu popup( i18n( "Documentation Viewer" ), this->widget() );
   TDEPopupMenu popup(this->widget());
@@ -143,11 +143,11 @@ void KDevHTMLPart::popup( const TQString & url, const TQPoint & p )
         kdDebug() << "processing relative url: " << url << endl;
         if (url.startsWith("#"))
         {
-            kurl = KURL(KDevHTMLPart::url());
+            kurl = KURL(TDevHTMLPart::url());
             kurl.setRef(url.mid(1));
         }
         else
-            kurl = KURL(KDevHTMLPart::url().upURL().url(true)+url);
+            kurl = KURL(TDevHTMLPart::url().upURL().url(true)+url);
     }
     else
         kurl = KURL(url);
@@ -157,13 +157,13 @@ void KDevHTMLPart::popup( const TQString & url, const TQPoint & p )
   }
 }
 
-void KDevHTMLPart::setContext(const TQString &context)
+void TDevHTMLPart::setContext(const TQString &context)
 {
   m_context = context;
 }
 
 
-TQString KDevHTMLPart::context() const
+TQString TDevHTMLPart::context() const
 {
   return m_context;
 }
@@ -250,7 +250,7 @@ done:
 #undef I
 #undef X
 
-TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
+TQString TDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
 {
   // check for environment variables and make necessary translations
   TQString path = url;
@@ -318,7 +318,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
   return path;
 }
 
-bool KDevHTMLPart::openURL(const KURL &url)
+bool TDevHTMLPart::openURL(const KURL &url)
 {
   TQString path = resolveEnvVarsInURL(url.url());
   KURL newUrl(path);
@@ -339,47 +339,47 @@ bool KDevHTMLPart::openURL(const KURL &url)
   return retval;
 }
 
-void KDevHTMLPart::openURLRequest(const KURL &url)
+void TDevHTMLPart::openURLRequest(const KURL &url)
 {
 	openURL( url );
 }
 
-void KDevHTMLPart::slotReload( )
+void TDevHTMLPart::slotReload( )
 {
 	openURL( url() );
 }
 
-void KDevHTMLPart::slotStop( )
+void TDevHTMLPart::slotStop( )
 {
     closeURL();
 }
 
-void KDevHTMLPart::slotStarted( TDEIO::Job * )
+void TDevHTMLPart::slotStarted( TDEIO::Job * )
 {
     stopAction->setEnabled(true);
 }
 
-void KDevHTMLPart::slotCompleted( )
+void TDevHTMLPart::slotCompleted( )
 {
     stopAction->setEnabled(false);
 }
 
-void KDevHTMLPart::slotCancelled( const TQString & /*errMsg*/ )
+void TDevHTMLPart::slotCancelled( const TQString & /*errMsg*/ )
 {
     stopAction->setEnabled(false);
 }
 
-/*void KDevHTMLPart::slotDuplicate( )
+/*void TDevHTMLPart::slotDuplicate( )
 {
     PartController::getInstance()->showDocument(url(), true);
 }*/
 
-void KDevHTMLPart::slotPrint( )
+void TDevHTMLPart::slotPrint( )
 {
     view()->print();
 }
 
-void KDevHTMLPart::slotBack()
+void TDevHTMLPart::slotBack()
 {
 	if ( m_Current != m_history.begin() )
 	{
@@ -390,7 +390,7 @@ void KDevHTMLPart::slotBack()
 	}
 }
 
-void KDevHTMLPart::slotForward()
+void TDevHTMLPart::slotForward()
 {
 	if (  m_Current != m_history.fromLast() )
 	{
@@ -401,7 +401,7 @@ void KDevHTMLPart::slotForward()
 	}
 }
 
-void KDevHTMLPart::slotBackAboutToShow()
+void TDevHTMLPart::slotBackAboutToShow()
 {
 	TDEPopupMenu *popup = m_backAction->popupMenu();
 	popup->clear();
@@ -426,7 +426,7 @@ void KDevHTMLPart::slotBackAboutToShow()
 	} 
 }
 
-void KDevHTMLPart::slotForwardAboutToShow()
+void TDevHTMLPart::slotForwardAboutToShow()
 {
 	TDEPopupMenu *popup = m_forwardAction->popupMenu();
 	popup->clear();
@@ -451,7 +451,7 @@ void KDevHTMLPart::slotForwardAboutToShow()
 	} 
 }
 
-void KDevHTMLPart::slotPopupActivated( int id )
+void TDevHTMLPart::slotPopupActivated( int id )
 {
 	kdDebug(9000) << "id: " << id << endl;
 
@@ -471,7 +471,7 @@ void KDevHTMLPart::slotPopupActivated( int id )
 	}
 }
 
-void KDevHTMLPart::addHistoryEntry()
+void TDevHTMLPart::addHistoryEntry()
 {
 	TQValueList<DocumentationHistoryEntry>::Iterator it = m_Current;
 	
@@ -491,7 +491,7 @@ void KDevHTMLPart::addHistoryEntry()
 	}
 }
 
-void KDevHTMLPart::slotCopy( )
+void TDevHTMLPart::slotCopy( )
 {
     TQString text = selectedText();
     text.replace( TQChar( 0xa0 ), ' ' );
@@ -501,7 +501,7 @@ void KDevHTMLPart::slotCopy( )
     connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
 }
 
-void KDevHTMLPart::slotSelectionChanged( )
+void TDevHTMLPart::slotSelectionChanged( )
 {
     if (selectedText().isEmpty())
         copyAction->setEnabled(false);
@@ -509,4 +509,4 @@ void KDevHTMLPart::slotSelectionChanged( )
         copyAction->setEnabled(true);
 }
 
-#include "kdevhtmlpart.moc"
+#include "tdevhtmlpart.moc"
diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/tdevhtmlpart.h
index 6c8f7dc3..e822488b 100644
--- a/lib/widgets/kdevhtmlpart.h
+++ b/lib/widgets/tdevhtmlpart.h
@@ -1,5 +1,5 @@
-#ifndef __KDEVHTMLPART_H__
-#define __KDEVHTMLPART_H__
+#ifndef __TDEVHTMLPART_H__
+#define __TDEVHTMLPART_H__
 
 #include <stdlib.h>
 
@@ -8,7 +8,7 @@
 #include <tdehtml_part.h>
 
 /**
-@file kdevhtmlpart.h
+@file tdevhtmlpart.h
 Customized TDEHTML part for KDevelop.
 */
 
@@ -41,7 +41,7 @@ Represents customized BrowserViewGUI mode of TDEHTMLPart. Provides also actions
 .
 It has it's own popup menu and font/zoom settings.
 */
-class KDevHTMLPart : public TDEHTMLPart
+class TDevHTMLPart : public TDEHTMLPart
 {
     Q_OBJECT
   
@@ -50,7 +50,7 @@ public:
     
     enum Options { CanDuplicate=1, CanOpenInNewWindow=2 };
 
-    KDevHTMLPart();
+    TDevHTMLPart();
     
     void setContext(const TQString &context);
     TQString context() const;
diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/tdevtabwidget.cpp
index 33c9f733..adfd4566 100644
--- a/lib/widgets/kdevtabwidget.cpp
+++ b/lib/widgets/tdevtabwidget.cpp
@@ -16,9 +16,9 @@
 #include <kicontheme.h>
 #include <kiconloader.h>
 
-#include "kdevtabwidget.h"
+#include "tdevtabwidget.h"
 
-KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(parent,name)
+TDevTabWidget::TDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(parent,name)
 {
   m_pTabBar = new KTabBar(this, "tabbar");
   setTabBar(m_pTabBar);
@@ -55,7 +55,7 @@ void KTabBar::mousePressEvent(TQMouseEvent *e)
     TQTab *tab = selectTab(e->pos() );
     if( tab == 0L ) return;
     
-    m_pPage = ((KDevTabWidget*)parent())->page(indexOf(tab->identifier() ) );
+    m_pPage = ((TDevTabWidget*)parent())->page(indexOf(tab->identifier() ) );
     if(m_pPage == 0L) return;
 
     m_pPopupMenu->exec(mapToGlobal(e->pos()));
@@ -63,4 +63,4 @@ void KTabBar::mousePressEvent(TQMouseEvent *e)
   TQTabBar::mousePressEvent(e);
 }
 
-#include "kdevtabwidget.moc"
+#include "tdevtabwidget.moc"
diff --git a/parts/abbrev/CMakeLists.txt b/parts/abbrev/CMakeLists.txt
index 219ad73d..6a61f9d8 100644
--- a/parts/abbrev/CMakeLists.txt
+++ b/parts/abbrev/CMakeLists.txt
@@ -26,14 +26,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevabbrev.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES qt_classes cpp_keywords DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/sources )
-install( FILES kdevabbrev.rc DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev )
+install( FILES tdevabbrev.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES qt_classes cpp_keywords DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/sources )
+install( FILES tdevabbrev.rc DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev )
 
 
-##### libkdevabbrev (module) ####################
+##### libtdevabbrev (module) ####################
 
-tde_add_kpart( libkdevabbrev AUTOMOC
+tde_add_kpart( libtdevabbrev AUTOMOC
   SOURCES
     abbrevpart.cpp abbrevconfigwidget.cpp
     abbrevconfigwidgetbase.ui addtemplatedlg.cpp
diff --git a/parts/abbrev/Makefile.am b/parts/abbrev/Makefile.am
index f5c3ec2e..1c4f559c 100644
--- a/parts/abbrev/Makefile.am
+++ b/parts/abbrev/Makefile.am
@@ -2,19 +2,19 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevabbrev.la
-libkdevabbrev_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevabbrev_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevabbrev.la
+libtdevabbrev_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevabbrev_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevabbrev_la_SOURCES = abbrevpart.cpp abbrevconfigwidget.cpp abbrevconfigwidgetbase.ui addtemplatedlg.cpp addtemplatedlgbase.ui
+libtdevabbrev_la_SOURCES = abbrevpart.cpp abbrevconfigwidget.cpp abbrevconfigwidgetbase.ui addtemplatedlg.cpp addtemplatedlgbase.ui
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevabbrev.desktop
+service_DATA = tdevabbrev.desktop
 
-sourcesdir = $(kde_datadir)/kdevabbrev/sources
+sourcesdir = $(kde_datadir)/tdevabbrev/sources
 sources_DATA = qt_classes cpp_keywords
 
-rcdir = $(kde_datadir)/kdevabbrev
-rc_DATA = kdevabbrev.rc
+rcdir = $(kde_datadir)/tdevabbrev
+rc_DATA = tdevabbrev.rc
diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index 80d26599..87e44e23 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -24,35 +24,35 @@
 #include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <kstandarddirs.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdeconfig.h>
 #include <tdeio/netaccess.h>
 #include <kiconloader.h>
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/codecompletioninterface.h>
 
-#include "kdevcore.h"
-#include "kdevpartcontroller.h"
+#include "tdevcore.h"
+#include "tdevpartcontroller.h"
 #include "abbrevconfigwidget.h"
-#include "kdeveditorutil.h"
+#include "tdeveditorutil.h"
 
-static const KDevPluginInfo data("kdevabbrev");
+static const TDevPluginInfo data("tdevabbrev");
 
-class AbbrevFactory : public KDevGenericFactory<AbbrevPart>
+class AbbrevFactory : public TDevGenericFactory<AbbrevPart>
 {
 public:
     AbbrevFactory()
-        : KDevGenericFactory<AbbrevPart>( data )
+        : TDevGenericFactory<AbbrevPart>( data )
     { }
 
     virtual TDEInstance *createInstance()
     {
-        TDEInstance *instance = KDevGenericFactory<AbbrevPart>::createInstance();
+        TDEInstance *instance = TDevGenericFactory<AbbrevPart>::createInstance();
         TDEStandardDirs *dirs = instance->dirs();
         dirs->addResourceType( "codetemplates",
                                TDEStandardDirs::kde_default( "data" ) + "kdevabbrev/templates/" );
@@ -63,13 +63,13 @@ public:
     }
 };
 
-K_EXPORT_COMPONENT_FACTORY( libkdevabbrev, AbbrevFactory )
+K_EXPORT_COMPONENT_FACTORY( libtdevabbrev, AbbrevFactory )
 
 AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "AbbrevPart")
+    : TDevPlugin(&data, parent, name ? name : "AbbrevPart")
 {
     setInstance(AbbrevFactory::instance());
-    setXMLFile("kdevabbrev.rc");
+    setXMLFile("tdevabbrev.rc");
 
     connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
     	this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) );
@@ -235,7 +235,7 @@ void AbbrevPart::save()
 
 TQString AbbrevPart::currentWord() const
 {
-    return KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+    return TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 }
 
 
diff --git a/parts/abbrev/abbrevpart.h b/parts/abbrev/abbrevpart.h
index 2b602088..cbb60e50 100644
--- a/parts/abbrev/abbrevpart.h
+++ b/parts/abbrev/abbrevpart.h
@@ -18,7 +18,7 @@
 
 #include <tqmap.h>
 #include <tqptrlist.h>
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 
 #include <tdetexteditor/codecompletioninterface.h>
 
@@ -60,7 +60,7 @@ private:
     TQStringList m_suffixes;
 };
 
-class AbbrevPart : public KDevPlugin
+class AbbrevPart : public TDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/abbrev/kdevabbrev.desktop b/parts/abbrev/tdevabbrev.desktop
index 5c230dd4..f06bf2eb 100644
--- a/parts/abbrev/kdevabbrev.desktop
+++ b/parts/abbrev/tdevabbrev.desktop
@@ -77,7 +77,7 @@ GenericName[zh_CN]=缩写扩展
 GenericName[zh_TW]=縮寫擴展
 ServiceTypes=TDevelop/Plugin
 Icon=fontsizeup
-X-TDE-Library=libkdevabbrev
+X-TDE-Library=libtdevabbrev
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=CodeEditing
diff --git a/parts/abbrev/kdevabbrev.rc b/parts/abbrev/tdevabbrev.rc
index e994ee76..e994ee76 100644
--- a/parts/abbrev/kdevabbrev.rc
+++ b/parts/abbrev/tdevabbrev.rc
diff --git a/parts/appwizard/CMakeLists.txt b/parts/appwizard/CMakeLists.txt
index bdeaf541..8a69f06e 100644
--- a/parts/appwizard/CMakeLists.txt
+++ b/parts/appwizard/CMakeLists.txt
@@ -35,18 +35,18 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevappwizard.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevappwizard.rc DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+install( FILES tdevappwizard.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevappwizard.rc DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
-##### libkdevappwizard (module) #################
+##### libtdevappwizard (module) #################
 
-tde_add_kpart( libkdevappwizard AUTOMOC
+tde_add_kpart( libtdevappwizard AUTOMOC
   SOURCES
     appwizardfactory.cpp appwizardpart.cpp appwizarddlg.cpp
     importdlg.cpp filepropspagebase.ui filepropspage.cpp
     appwizarddlgbase.ui importdlgbase.ui misc.cpp vcs_form.ui
-    kdevfile.cpp kdevlicense.cpp profilesupport.cpp
+    tdevfile.cpp tdevlicense.cpp profilesupport.cpp
   LINK profileengine-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/appwizard/Makefile.am b/parts/appwizard/Makefile.am
index 34af3163..012f6f29 100644
--- a/parts/appwizard/Makefile.am
+++ b/parts/appwizard/Makefile.am
@@ -7,22 +7,22 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extras -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets \
 	-I$(top_srcdir)/src/profileengine/lib $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevappwizard.la
-libkdevappwizard_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevappwizard_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/util/libkdevutil.la \
-	$(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la $(top_builddir)/src/profileengine/lib/libprofileengine.la
+kde_module_LTLIBRARIES = libtdevappwizard.la
+libtdevappwizard_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevappwizard_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/interfaces/extras/libtdevextras.la $(top_builddir)/lib/util/libtdevutil.la \
+	$(top_builddir)/lib/widgets/propeditor/libtdevpropertyeditor.la $(top_builddir)/src/profileengine/lib/libprofileengine.la
 
-libkdevappwizard_la_SOURCES = appwizardfactory.cpp appwizardpart.cpp \
+libtdevappwizard_la_SOURCES = appwizardfactory.cpp appwizardpart.cpp \
 		appwizarddlg.cpp importdlg.cpp filepropspagebase.ui filepropspage.cpp \
 		appwizarddlgbase.ui importdlgbase.ui misc.cpp vcs_form.ui\
-		kdevfile.cpp kdevlicense.cpp profilesupport.cpp
+		tdevfile.cpp tdevlicense.cpp profilesupport.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevappwizard.desktop
+service_DATA = tdevappwizard.desktop
 
-rcdir = $(kde_datadir)/kdevappwizard
-rc_DATA = kdevappwizard.rc
+rcdir = $(kde_datadir)/tdevappwizard
+rc_DATA = tdevappwizard.rc
 noinst_HEADERS = profilesupport.h
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index d5160075..4cbf716d 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -64,14 +64,14 @@
 #include <tqlayout.h>
 
 #include "domutil.h"
-#include "kdevversioncontrol.h"
-#include "kdevmakefrontend.h"
-#include "kdevpartcontroller.h"
-#include "kdevplugincontroller.h"
-#include "kdevappfrontend.h"
-#include "kdevplugininfo.h"
-#include "kdevlicense.h"
-#include "kdevcore.h"
+#include "tdevversioncontrol.h"
+#include "tdevmakefrontend.h"
+#include "tdevpartcontroller.h"
+#include "tdevplugincontroller.h"
+#include "tdevappfrontend.h"
+#include "tdevplugininfo.h"
+#include "tdevlicense.h"
+#include "tdevcore.h"
 #include "appwizardfactory.h"
 #include "appwizardpart.h"
 #include "filepropspage.h"
@@ -309,8 +309,8 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
     appname_edit->setValidator(appname_edit_validator);
 
     // insert the licenses into the license_combo
-    TQDict< KDevLicense > lics( licenses() );
-    TQDictIterator< KDevLicense > dit(lics);
+    TQDict< TDevLicense > lics( licenses() );
+    TQDictIterator< TDevLicense > dit(lics);
     int idx=1;
     for( ; dit.current(); ++dit )
     {
@@ -356,8 +356,8 @@ void AppWizardDialog::loadVcs()
 		}
 		TQStringList args;
 		TQObject *obj = factory->create(0, service->name().latin1(),
-									"KDevVCSIntegrator", args);
-		KDevVCSIntegrator *integrator = (KDevVCSIntegrator*) obj;
+									"TDevVCSIntegrator", args);
+		TDevVCSIntegrator *integrator = (TDevVCSIntegrator*) obj;
 
 		if (!integrator)
 			kdDebug(9010) << "    failed to create vcs integrator " << service->name() << endl;
@@ -418,20 +418,20 @@ void AppWizardDialog::licenseChanged()
 			edit->setText( TQString() );
 		}
 	} else {
-		KDevLicense* lic = licenses()[ license_combo->currentText() ];
+		TDevLicense* lic = licenses()[ license_combo->currentText() ];
 		for (it = m_fileTemplates.begin(); it != m_fileTemplates.end(); ++it) {
 			TQString style = (*it).style;
 			TQMultiLineEdit *edit = (*it).edit;
 
-			KDevFile::CommentingStyle commentStyle = KDevFile::CPPStyle;
+			TDevFile::CommentingStyle commentStyle = TDevFile::CPPStyle;
 			if (style == "PStyle") {
-				commentStyle = KDevFile::PascalStyle;
+				commentStyle = TDevFile::PascalStyle;
 			} else if (style == "AdaStyle") {
-				commentStyle = KDevFile::AdaStyle;
+				commentStyle = TDevFile::AdaStyle;
 			} else if (style == "ShellStyle") {
-				commentStyle = KDevFile::BashStyle;
+				commentStyle = TDevFile::BashStyle;
 			} else if (style == "XMLStyle") {
-				commentStyle = KDevFile::XMLStyle;
+				commentStyle = TDevFile::XMLStyle;
 			}
 
 			TQString text;
@@ -577,7 +577,7 @@ void AppWizardDialog::accept()
     if( license_combo->currentItem() != 0 )
     {
         licenseName = license_combo->currentText();
-        KDevLicense* lic = licenses()[ licenseName ];
+        TDevLicense* lic = licenses()[ licenseName ];
         if( lic )
         {
             TQStringList files( lic->copyFiles() );
@@ -1273,7 +1273,7 @@ void AppWizardDialog::setPermissions(const installFile &file)
 	}
 }
 
-TQDict<KDevLicense> AppWizardDialog::licenses()
+TQDict<TDevLicense> AppWizardDialog::licenses()
 {
 	return m_licenses;
 }
@@ -1291,7 +1291,7 @@ void AppWizardDialog::loadLicenses()
 		TQString licPath( dirs->findResource( "licenses", *it ) );
 		kdDebug(9010) << "Loading license file: " << licPath << endl;
 		TQString licName = licPath.mid( licPath.findRev('/') + 1 );
-		KDevLicense* lic = new KDevLicense( licName, licPath );
+		TDevLicense* lic = new TDevLicense( licName, licPath );
 		m_licenses.insert( licName, lic );
 	}
 	// kdDebug(9010) << "======================== Done loadLicenses" << endl;
diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h
index 392cd1b6..4a160bd2 100644
--- a/parts/appwizard/appwizarddlg.h
+++ b/parts/appwizard/appwizarddlg.h
@@ -32,12 +32,12 @@ class ProfileSupport;
 #include <tqstringlist.h>
 #include <tdelistview.h>
 #include <kiconview.h>
-#include "kdevversioncontrol.h"
-#include "kdevvcsintegrator.h"
+#include "tdevversioncontrol.h"
+#include "tdevvcsintegrator.h"
 #include "appwizarddlgbase.h"
 #include "vcs_form.h"
 //#include "autoform.h"
-#include "kdevlicense.h"
+#include "tdevlicense.h"
 
 namespace PropertyLib {
 	class PropertyList;
@@ -132,7 +132,7 @@ public:
 protected:
     virtual void accept();
 
-	virtual TQDict<KDevLicense> licenses();
+	virtual TQDict<TDevLicense> licenses();
 	void loadLicenses();
 
 protected slots:
@@ -181,7 +181,7 @@ private: //data
     TQDict<TQListViewItem> m_categoryMap;
 	TQValueList<TQListViewItem*> m_categoryItems;
     //! A list of currently available version control systems
-//    TQDict<KDevVersionControl> m_availVcs;
+//    TQDict<TDevVersionControl> m_availVcs;
 
     TQHBoxLayout *m_custom_options_layout;
 	PropertyLib::PropertyEditor *m_customOptions;
@@ -195,8 +195,8 @@ private: //data
 	TDEPopupMenu* m_favouritesMenu;
 	TDEPopupMenu* m_templatesMenu;
 
-	TQDict<KDevLicense> m_licenses;
-	TQDict<KDevVCSIntegrator> m_integrators;
+	TQDict<TDevLicense> m_licenses;
+	TQDict<TDevVCSIntegrator> m_integrators;
 	TQMap<int, VCSDialog*> m_integratorDialogs;
 
 	ProfileSupport *m_profileSupport;
diff --git a/parts/appwizard/appwizardfactory.cpp b/parts/appwizard/appwizardfactory.cpp
index 5288105d..6749add0 100644
--- a/parts/appwizard/appwizardfactory.cpp
+++ b/parts/appwizard/appwizardfactory.cpp
@@ -11,30 +11,30 @@
 
 
 #include <kstandarddirs.h>
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
 #include "appwizardfactory.h"
 
-static const KDevPluginInfo data("kdevappwizard");
-K_EXPORT_COMPONENT_FACTORY( libkdevappwizard, AppWizardFactory )
+static const TDevPluginInfo data("tdevappwizard");
+K_EXPORT_COMPONENT_FACTORY( libtdevappwizard, AppWizardFactory )
 
 AppWizardFactory::AppWizardFactory()
-    : KDevGenericFactory<AppWizardPart>( data )
+    : TDevGenericFactory<AppWizardPart>( data )
 {
 }
 
 TDEInstance *AppWizardFactory::createInstance()
 {
-    TDEInstance *instance = KDevGenericFactory<AppWizardPart>::createInstance();
+    TDEInstance *instance = TDevGenericFactory<AppWizardPart>::createInstance();
     TDEStandardDirs *dirs = instance->dirs();
-    dirs->addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "kdevappwizard/templates/");
-    dirs->addResourceType("appimports", TDEStandardDirs::kde_default("data") + "kdevappwizard/imports/");
-    dirs->addResourceType("appimportfiles", TDEStandardDirs::kde_default("data") + "kdevappwizard/importfiles/");
+    dirs->addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "tdevappwizard/templates/");
+    dirs->addResourceType("appimports", TDEStandardDirs::kde_default("data") + "tdevappwizard/imports/");
+    dirs->addResourceType("appimportfiles", TDEStandardDirs::kde_default("data") + "tdevappwizard/importfiles/");
 
     return instance;
 }
 
-const KDevPluginInfo *AppWizardFactory::info()
+const TDevPluginInfo *AppWizardFactory::info()
 {
     return &data;
 }
diff --git a/parts/appwizard/appwizardfactory.h b/parts/appwizard/appwizardfactory.h
index 3bbc6e1e..3de35631 100644
--- a/parts/appwizard/appwizardfactory.h
+++ b/parts/appwizard/appwizardfactory.h
@@ -12,18 +12,18 @@
 #ifndef _APPWIZARDFACTORY_H_
 #define _APPWIZARDFACTORY_H_
 
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 
 #include "appwizardpart.h"
 
-class KDevPluginInfo;
+class TDevPluginInfo;
 
-class AppWizardFactory : public KDevGenericFactory<AppWizardPart>
+class AppWizardFactory : public TDevGenericFactory<AppWizardPart>
 {
 public:
     AppWizardFactory();
     
-    static const KDevPluginInfo *info();
+    static const TDevPluginInfo *info();
 
 protected:
     virtual TDEInstance *createInstance();
diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp
index dd2fae65..ada3b362 100644
--- a/parts/appwizard/appwizardpart.cpp
+++ b/parts/appwizard/appwizardpart.cpp
@@ -19,7 +19,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kprocess.h>
-#include <kdevcore.h>
+#include <tdevcore.h>
 #include <kgenericfactory.h>
 #include <kstandarddirs.h>
 #include <tdeaction.h>
@@ -28,17 +28,17 @@
 #include "importdlg.h"
 #include "appwizarddlg.h"
 #include "appwizardfactory.h"
-#include <kdevmakefrontend.h>
-#include <kdevpartcontroller.h>
-#include <kdevlanguagesupport.h>
-#include <kdevcore.h>
+#include <tdevmakefrontend.h>
+#include <tdevpartcontroller.h>
+#include <tdevlanguagesupport.h>
+#include <tdevcore.h>
 #include <codemodel.h>
 
 AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart")
+    : TDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart")
 {
     setInstance(AppWizardFactory::instance());
-    setXMLFile("kdevappwizard.rc");
+    setXMLFile("tdevappwizard.rc");
 
     TDEAction *action;
 
diff --git a/parts/appwizard/appwizardpart.h b/parts/appwizard/appwizardpart.h
index 59280631..901d51ad 100644
--- a/parts/appwizard/appwizardpart.h
+++ b/parts/appwizard/appwizardpart.h
@@ -13,7 +13,7 @@
 #define _APPWIZARDPART_H_
 
 #include <tqguardedptr.h>
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <kurl.h>
@@ -21,7 +21,7 @@
 class AppWizardDialog;
 
 
-class AppWizardPart : public KDevPlugin
+class AppWizardPart : public TDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/appwizard/common/CMakeLists.txt b/parts/appwizard/common/CMakeLists.txt
index 62a5b97b..81ee38b4 100644
--- a/parts/appwizard/common/CMakeLists.txt
+++ b/parts/appwizard/common/CMakeLists.txt
@@ -20,7 +20,7 @@ generate_tar( gnome2.tar.gz gnome2 macros )
 generate_tar( gnu.tar.gz gnu AUTHORS COPYING ChangeLog INSTALL NEWS README TODO )
 generate_tar( wxwidgets.tar.gz wx macros )
 generate_tar( incadmin.tar.gz incadmin config.guess config.sub depcomp install-sh ltmain.sh  missing  mkinstalldirs )
-generate_tar( scons.tar.gz scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/kde.py )
+generate_tar( scons.tar.gz scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/tde.py )
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/admin.tar.gz
@@ -29,18 +29,18 @@ install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/gnome.tar.gz
     ${CMAKE_CURRENT_BINARY_DIR}/gnome2.tar.gz
     ${CMAKE_CURRENT_BINARY_DIR}/wxwidgets.tar.gz
-    kde-app.lsm kde-Makefile.am kde-Makefile.cvs
+    tde-app.lsm tde-Makefile.am tde-Makefile.cvs
     tde-configure.in.in tde-index.docbook
-    kde-po-Makefile.am kde-doc-Makefile.am
-    kde-doc-en-Makefile.am hi16-app-app.png
+    tde-po-Makefile.am tde-doc-Makefile.am
+    tde-doc-en-Makefile.am hi16-app-app.png
     hi32-app-app.png tde-app.desktop
     tde-part.desktop gnome-app.lsm
     gnome-Makefile.am gnome-Makefile.cvs
     gnome-pixmaps-Makefile.am gnome-app.png
     wx-configure.in wx-Makefile.am wx-Makefile.cvs
     COPYING COPYING.LIB LICENSE.QPL LICENSE.BSD
-    Artistic admin.kdevtemplate gnu.kdevtemplate
-    dockbook.kdevtemplate incadmin.kdevtemplate
-    gnome2.kdevtemplate scons.kdevtemplate
+    Artistic admin.tdevtemplate gnu.tdevtemplate
+    dockbook.tdevtemplate incadmin.tdevtemplate
+    gnome2.tdevtemplate scons.tdevtemplate
     ${CMAKE_CURRENT_BINARY_DIR}/scons.tar.gz
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/template-common )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/template-common )
diff --git a/parts/appwizard/common/Makefile.am b/parts/appwizard/common/Makefile.am
index 2d6e5278..e068df5b 100644
--- a/parts/appwizard/common/Makefile.am
+++ b/parts/appwizard/common/Makefile.am
@@ -28,19 +28,19 @@ incadmin.tar.gz:
 	gzip incadmin.tar
 
 scons.tar.gz:
-	$(TAR) -cf scons.tar --exclude=.svn -C $(srcdir)/scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/kde.py
+	$(TAR) -cf scons.tar --exclude=.svn -C $(srcdir)/scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/tde.py
 	gzip scons.tar
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 commondatadir = ${appwizarddatadir}/template-common
 commondata_DATA = admin.tar.gz gnu.tar.gz incadmin.tar.gz gnome.tar.gz gnome2.tar.gz wxwidgets.tar.gz \
-	kde-app.lsm kde-Makefile.am kde-Makefile.cvs tde-configure.in.in \
-	tde-index.docbook kde-po-Makefile.am kde-doc-Makefile.am kde-doc-en-Makefile.am \
+	tde-app.lsm tde-Makefile.am tde-Makefile.cvs tde-configure.in.in \
+	tde-index.docbook tde-po-Makefile.am tde-doc-Makefile.am tde-doc-en-Makefile.am \
 	hi16-app-app.png hi32-app-app.png tde-app.desktop tde-part.desktop \
 	gnome-app.lsm gnome-Makefile.am gnome-Makefile.cvs \
 	gnome-pixmaps-Makefile.am gnome-app.png \
 	wx-configure.in wx-Makefile.am wx-Makefile.cvs \
 	COPYING COPYING.LIB LICENSE.QPL LICENSE.BSD Artistic \
-	admin.kdevtemplate gnu.kdevtemplate dockbook.kdevtemplate\
-	incadmin.kdevtemplate gnome2.kdevtemplate scons.kdevtemplate scons.tar.gz
+	admin.tdevtemplate gnu.tdevtemplate dockbook.tdevtemplate\
+	incadmin.tdevtemplate gnome2.tdevtemplate scons.tdevtemplate scons.tar.gz
 
diff --git a/parts/appwizard/common/admin.kdevtemplate b/parts/appwizard/common/admin.tdevtemplate
index 73573b47..73573b47 100644
--- a/parts/appwizard/common/admin.kdevtemplate
+++ b/parts/appwizard/common/admin.tdevtemplate
diff --git a/parts/appwizard/common/dockbook.kdevtemplate b/parts/appwizard/common/dockbook.tdevtemplate
index 41b65f62..41b65f62 100644
--- a/parts/appwizard/common/dockbook.kdevtemplate
+++ b/parts/appwizard/common/dockbook.tdevtemplate
diff --git a/parts/appwizard/common/gnome2.kdevtemplate b/parts/appwizard/common/gnome2.tdevtemplate
index ce4e3f3d..ce4e3f3d 100644
--- a/parts/appwizard/common/gnome2.kdevtemplate
+++ b/parts/appwizard/common/gnome2.tdevtemplate
diff --git a/parts/appwizard/common/gnu.kdevtemplate b/parts/appwizard/common/gnu.tdevtemplate
index e1876440..e1876440 100644
--- a/parts/appwizard/common/gnu.kdevtemplate
+++ b/parts/appwizard/common/gnu.tdevtemplate
diff --git a/parts/appwizard/common/incadmin.kdevtemplate b/parts/appwizard/common/incadmin.tdevtemplate
index d7fbfb61..d7fbfb61 100644
--- a/parts/appwizard/common/incadmin.kdevtemplate
+++ b/parts/appwizard/common/incadmin.tdevtemplate
diff --git a/parts/appwizard/common/scons.kdevtemplate b/parts/appwizard/common/scons.tdevtemplate
index 84ed350f..84ed350f 100644
--- a/parts/appwizard/common/scons.kdevtemplate
+++ b/parts/appwizard/common/scons.tdevtemplate
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/tde.py
index d194fd84..2fe7a4c9 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/tde.py
@@ -1,4 +1,4 @@
-# Made from scons qt.py and (heavily) modified into kde.py
+# Made from scons qt.py and (heavily) modified into tde.py
 # Thomas Nagy, 2004, 2005 <tnagy2^8@yahoo.fr>
 
 """
diff --git a/parts/appwizard/common/kde-Makefile.am b/parts/appwizard/common/tde-Makefile.am
index 06057100..06057100 100644
--- a/parts/appwizard/common/kde-Makefile.am
+++ b/parts/appwizard/common/tde-Makefile.am
diff --git a/parts/appwizard/common/kde-Makefile.cvs b/parts/appwizard/common/tde-Makefile.cvs
index 4c0afd1a..4c0afd1a 100644
--- a/parts/appwizard/common/kde-Makefile.cvs
+++ b/parts/appwizard/common/tde-Makefile.cvs
diff --git a/parts/appwizard/common/kde-app.lsm b/parts/appwizard/common/tde-app.lsm
index 06055a96..06055a96 100644
--- a/parts/appwizard/common/kde-app.lsm
+++ b/parts/appwizard/common/tde-app.lsm
diff --git a/parts/appwizard/common/kde-doc-Makefile.am b/parts/appwizard/common/tde-doc-Makefile.am
index a1f777a1..a1f777a1 100644
--- a/parts/appwizard/common/kde-doc-Makefile.am
+++ b/parts/appwizard/common/tde-doc-Makefile.am
diff --git a/parts/appwizard/common/kde-doc-en-Makefile.am b/parts/appwizard/common/tde-doc-en-Makefile.am
index bdd63b79..bdd63b79 100644
--- a/parts/appwizard/common/kde-doc-en-Makefile.am
+++ b/parts/appwizard/common/tde-doc-en-Makefile.am
diff --git a/parts/appwizard/common/kde-po-Makefile.am b/parts/appwizard/common/tde-po-Makefile.am
index 0fa209cd..0fa209cd 100644
--- a/parts/appwizard/common/kde-po-Makefile.am
+++ b/parts/appwizard/common/tde-po-Makefile.am
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 5f07f5b4..15f432b2 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -37,9 +37,9 @@
 #include <tdeparts/componentfactory.h>
 #include <kprocess.h>
 
-#include "kdevcore.h"
-#include "kdevversioncontrol.h"
-#include "kdevplugincontroller.h"
+#include "tdevcore.h"
+#include "tdevversioncontrol.h"
+#include "tdevplugincontroller.h"
 
 #include "domutil.h"
 #include "settings.h"
@@ -272,7 +272,7 @@ void ImportDialog::dirChanged()
     // KDevelop legacy project?
     TQStringList files = dir.entryList("*.kdevprj");
     if (!files.isEmpty()) {
-        scanLegacyKDevelopProject(dir.absFilePath(files.first()));
+        scanLegacyTDevelopProject(dir.absFilePath(files.first()));
         return;
     }
 
@@ -328,7 +328,7 @@ void ImportDialog::dirChanged()
 }
 
 
-void ImportDialog::scanLegacyKDevelopProject(const TQString &fileName)
+void ImportDialog::scanLegacyTDevelopProject(const TQString &fileName)
 {
     kdDebug(9010) << "Scanning legacy KDevelop project file " << fileName << endl;
 
@@ -524,7 +524,7 @@ void ImportDialog::slotFinishedCheckout( TQString destinationDir )
 void ImportDialog::slotFetchModulesFromRepository()
 {
 
-    KDevVersionControl *vcs = m_part->versionControlByName( vcsCombo->currentText() );
+    TDevVersionControl *vcs = m_part->versionControlByName( vcsCombo->currentText() );
     if (!vcs)
         return;
 
diff --git a/parts/appwizard/importdlg.h b/parts/appwizard/importdlg.h
index 5b334668..af4d3859 100644
--- a/parts/appwizard/importdlg.h
+++ b/parts/appwizard/importdlg.h
@@ -48,7 +48,7 @@ private slots:
     void slotProjectNameChanged( const TQString &_text );
 private:
 //    void scanAvailableVCS();
-    void scanLegacyKDevelopProject(const TQString &fileName);
+    void scanLegacyTDevelopProject(const TQString &fileName);
     void scanLegacyStudioProject(const TQString &fileName);
     void scanAutomakeProject(const TQString &dirName);
     void setProjectType(const TQString &type);
diff --git a/parts/appwizard/imports/CMakeLists.txt b/parts/appwizard/imports/CMakeLists.txt
index e7b303c3..d59750c4 100644
--- a/parts/appwizard/imports/CMakeLists.txt
+++ b/parts/appwizard/imports/CMakeLists.txt
@@ -10,16 +10,16 @@
 #################################################
 
 install( FILES
-    c-auto cpp-auto fortran-auto java-auto kde gnome c cpp
+    c-auto cpp-auto fortran-auto java-auto tde gnome c cpp
     fortran python php perl java java-ant qttmake qtqmake
     qt4qmake ruby pascal ada
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/imports )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/imports )
 
 install( FILES
     c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop
-    java-auto.tdevelop kde.tdevelop gnome.tdevelop
+    java-auto.tdevelop tde.tdevelop gnome.tdevelop
     c.tdevelop cpp.tdevelop fortran.tdevelop python.tdevelop
     php.tdevelop perl.tdevelop java.tdevelop java-ant.tdevelop
     qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop
     ruby.tdevelop pascal.tdevelop ada.tdevelop
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/importfiles )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/importfiles )
diff --git a/parts/appwizard/imports/Makefile.am b/parts/appwizard/imports/Makefile.am
index c7f74dcd..aaefd91f 100644
--- a/parts/appwizard/imports/Makefile.am
+++ b/parts/appwizard/imports/Makefile.am
@@ -1,7 +1,7 @@
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 importsdir = ${appwizarddatadir}/imports
 importfilesdir = ${appwizarddatadir}/importfiles
 
-imports_DATA = c-auto cpp-auto fortran-auto java-auto kde gnome                    c cpp fortran python php perl java java-ant qttmake qtqmake qt4qmake ruby pascal ada
-importfiles_DATA = c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop 		   java-auto.tdevelop kde.tdevelop gnome.tdevelop 		   c.tdevelop cpp.tdevelop fortran.tdevelop 		   python.tdevelop php.tdevelop perl.tdevelop 		   java.tdevelop java-ant.tdevelop qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop ruby.tdevelop 		   pascal.tdevelop ada.tdevelop
+imports_DATA = c-auto cpp-auto fortran-auto java-auto tde gnome                    c cpp fortran python php perl java java-ant qttmake qtqmake qt4qmake ruby pascal ada
+importfiles_DATA = c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop 		   java-auto.tdevelop tde.tdevelop gnome.tdevelop 		   c.tdevelop cpp.tdevelop fortran.tdevelop 		   python.tdevelop php.tdevelop perl.tdevelop 		   java.tdevelop java-ant.tdevelop qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop ruby.tdevelop 		   pascal.tdevelop ada.tdevelop
 
diff --git a/parts/appwizard/imports/ada.tdevelop b/parts/appwizard/imports/ada.tdevelop
index cdb35b40..188fbea6 100644
--- a/parts/appwizard/imports/ada.tdevelop
+++ b/parts/appwizard/imports/ada.tdevelop
@@ -11,12 +11,12 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevadaproject>
+ <tdevadaproject>
   <run>
    <terminal>true</terminal>
   </run>
- </kdevadaproject>
- <kdevdoctreeview>
+ </tdevadaproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -63,11 +63,11 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="adb"/>
    <type ext="ads"/>
   </useglobaltypes>
- </kdevfilecreate>
+ </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/c-auto.tdevelop b/parts/appwizard/imports/c-auto.tdevelop
index 892dd88d..002e6e1d 100644
--- a/parts/appwizard/imports/c-auto.tdevelop
+++ b/parts/appwizard/imports/c-auto.tdevelop
@@ -9,7 +9,7 @@
   <ignoreparts>
   </ignoreparts>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <useconfiguration>debug</useconfiguration>
   </general>
@@ -32,13 +32,13 @@
         <cflags>-O0 -g3</cflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevdebugger>
+ </tdevautoproject>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
- <kdevdoctreeview>
+ </tdevdebugger>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -85,12 +85,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="c" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/c.tdevelop b/parts/appwizard/imports/c.tdevelop
index e0c06089..e578fba4 100644
--- a/parts/appwizard/imports/c.tdevelop
+++ b/parts/appwizard/imports/c.tdevelop
@@ -4,21 +4,21 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>KDevCustomProject</projectmanagement>
+  <projectmanagement>TDevCustomProject</projectmanagement>
   <primarylanguage>C</primarylanguage>
   <ignoreparts>
   </ignoreparts>
  </general>
- <kdevcustomproject>
+ <tdevcustomproject>
   <run>
   </run>
- </kdevcustomproject>
- <kdevdebugger>
+ </tdevcustomproject>
+ <tdevdebugger>
   <general>
    <dbgshell></dbgshell>
   </general>
- </kdevdebugger>
- <kdevdoctreeview>
+ </tdevdebugger>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -65,12 +65,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="c" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/cpp-auto.tdevelop b/parts/appwizard/imports/cpp-auto.tdevelop
index 74de8db0..0a1b05b1 100644
--- a/parts/appwizard/imports/cpp-auto.tdevelop
+++ b/parts/appwizard/imports/cpp-auto.tdevelop
@@ -9,7 +9,7 @@
   <ignoreparts>
   </ignoreparts>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <useconfiguration>debug</useconfiguration>
   </general>
@@ -30,13 +30,13 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevdebugger>
+ </tdevautoproject>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
- <kdevdoctreeview>
+ </tdevdebugger>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -81,13 +81,13 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/cpp.tdevelop b/parts/appwizard/imports/cpp.tdevelop
index b351de38..3eade8de 100644
--- a/parts/appwizard/imports/cpp.tdevelop
+++ b/parts/appwizard/imports/cpp.tdevelop
@@ -4,21 +4,21 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>KDevCustomProject</projectmanagement>
+  <projectmanagement>TDevCustomProject</projectmanagement>
   <primarylanguage>C++</primarylanguage>
   <ignoreparts>
   </ignoreparts>
  </general>
- <kdevcustomproject>
+ <tdevcustomproject>
   <run>
   </run>
- </kdevcustomproject>
- <kdevdebugger>
+ </tdevcustomproject>
+ <tdevdebugger>
   <general>
    <dbgshell></dbgshell>
   </general>
- </kdevdebugger>
- <kdevdoctreeview>
+ </tdevdebugger>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -63,13 +63,13 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/fortran-auto.tdevelop b/parts/appwizard/imports/fortran-auto.tdevelop
index 8fdd5f89..4be630a6 100644
--- a/parts/appwizard/imports/fortran-auto.tdevelop
+++ b/parts/appwizard/imports/fortran-auto.tdevelop
@@ -9,7 +9,7 @@
   <ignoreparts>
   </ignoreparts>
  </general>
- <kdevdoctreeview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -57,15 +57,15 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="f"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/fortran.tdevelop b/parts/appwizard/imports/fortran.tdevelop
index c852870e..e7141b4f 100644
--- a/parts/appwizard/imports/fortran.tdevelop
+++ b/parts/appwizard/imports/fortran.tdevelop
@@ -4,16 +4,16 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>KDevCustomProject</projectmanagement>
+  <projectmanagement>TDevCustomProject</projectmanagement>
   <primarylanguage>Fortran77</primarylanguage>
   <ignoreparts>
   </ignoreparts>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
   </general>
- </kdevautoproject>
- <kdevdoctreeview>
+ </tdevautoproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -61,15 +61,15 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell></dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="f"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/gnome.tdevelop b/parts/appwizard/imports/gnome.tdevelop
index 0b8c5c95..cad92fda 100644
--- a/parts/appwizard/imports/gnome.tdevelop
+++ b/parts/appwizard/imports/gnome.tdevelop
@@ -7,10 +7,10 @@
   <projectmanagement>KDevAutoProject</projectmanagement>
   <primarylanguage>C</primarylanguage>
   <ignoreparts>
-   <part>KDevJavaDebugger</part>
+   <part>TDevJavaDebugger</part>
   </ignoreparts>
  </general>
- <kdevautoproject>
+ <tdevautoproject>
   <general>
    <useconfiguration>debug</useconfiguration>
   </general>
@@ -31,8 +31,8 @@
         <cflags>-O0 -g3</cflags>
       </debug>
     </configurations>
- </kdevautoproject>
- <kdevfileview>
+ </tdevautoproject>
+ <tdevfileview>
   <groups>
    <group pattern="*.c;*.h" name="Sources" />
    <group pattern="*.glade" name="User Interface" />
@@ -40,8 +40,8 @@
    <group pattern="*.po" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -85,16 +85,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="c"/>
       <type ext="h"/>      
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/java-ant.tdevelop b/parts/appwizard/imports/java-ant.tdevelop
index a4db806b..1d64dc64 100644
--- a/parts/appwizard/imports/java-ant.tdevelop
+++ b/parts/appwizard/imports/java-ant.tdevelop
@@ -7,15 +7,15 @@
   <projectmanagement>KDevAntProject</projectmanagement>
   <primarylanguage>Java</primarylanguage>
   <ignoreparts>
-   <part>KDevDebugger</part>
+   <part>TDevDebugger</part>
   </ignoreparts>
  </general>
- <kdevcustomproject>
+ <tdevcustomproject>
   <build>
    <buildtool>ant</buildtool>
   </build>
- </kdevcustomproject>
- <kdevdoctreeview>
+ </tdevcustomproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -59,10 +59,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="java"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/java-auto.tdevelop b/parts/appwizard/imports/java-auto.tdevelop
index 9a42ec82..f5de6138 100644
--- a/parts/appwizard/imports/java-auto.tdevelop
+++ b/parts/appwizard/imports/java-auto.tdevelop
@@ -7,10 +7,10 @@
   <projectmanagement>KDevAutoProject</projectmanagement>
   <primarylanguage>Java</primarylanguage>
   <ignoreparts>
-   <part>KDevDebugger</part>
+   <part>TDevDebugger</part>
   </ignoreparts>
  </general>
- <kdevdoctreeview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -54,10 +54,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="java"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/java.tdevelop b/parts/appwizard/imports/java.tdevelop
index 9a42ec82..f5de6138 100644
--- a/parts/appwizard/imports/java.tdevelop
+++ b/parts/appwizard/imports/java.tdevelop
@@ -7,10 +7,10 @@
   <projectmanagement>KDevAutoProject</projectmanagement>
   <primarylanguage>Java</primarylanguage>
   <ignoreparts>
-   <part>KDevDebugger</part>
+   <part>TDevDebugger</part>
   </ignoreparts>
  </general>
- <kdevdoctreeview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -54,10 +54,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="java"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/pascal.tdevelop b/parts/appwizard/imports/pascal.tdevelop
index 551ac91e..7db5a9d8 100644
--- a/parts/appwizard/imports/pascal.tdevelop
+++ b/parts/appwizard/imports/pascal.tdevelop
@@ -11,12 +11,12 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <kdevpascalproject>
+ <tdevpascalproject>
   <run>
    <terminal>true</terminal>
   </run>
- </kdevpascalproject>
- <kdevdoctreeview>
+ </tdevpascalproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -64,12 +64,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
+ </tdevdoctreeview>
+ <tdevfilecreate>
   <useglobaltypes>
    <type ext="pp"/>
    <type ext="pas"/>
    <type ext="dpr"/>
   </useglobaltypes>
- </kdevfilecreate>
+ </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/perl.tdevelop b/parts/appwizard/imports/perl.tdevelop
index bbf18ee3..0b4f4fba 100644
--- a/parts/appwizard/imports/perl.tdevelop
+++ b/parts/appwizard/imports/perl.tdevelop
@@ -9,11 +9,11 @@
   <ignoreparts>
   </ignoreparts>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <run>
   </run>
- </kdevscriptproject>
- <kdevdoctreeview>
+ </tdevscriptproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -60,10 +60,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="perl"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/php.tdevelop b/parts/appwizard/imports/php.tdevelop
index 64651d3b..4135828b 100644
--- a/parts/appwizard/imports/php.tdevelop
+++ b/parts/appwizard/imports/php.tdevelop
@@ -11,11 +11,11 @@
    <part>KDevdistpart</part>
   </ignoreparts>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <general>
   </general>
- </kdevscriptproject>
- <kdevdoctreeview>
+ </tdevscriptproject>
+ <tdevdoctreeview>
   <ignoretocs>
    <toc>gtk</toc>
    <toc>kde</toc>
@@ -23,15 +23,15 @@
    <toc>python</toc>
    <toc>perl</toc>
   </ignoretocs>
- </kdevdoctreeview>
-<kdevphpsupport>
+ </tdevdoctreeview>
+<tdevphpsupport>
 	<codeHelp>
 	   <codeCompletion>true</codeCompletion>
 	   <codeHinting>true</codeHinting>
 	   <realtimeParsing>false</realtimeParsing>
 	  </codeHelp>
-</kdevphpsupport>
- <kdevdoctreeview>
+</tdevphpsupport>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -75,10 +75,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="php"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/python.tdevelop b/parts/appwizard/imports/python.tdevelop
index 3c6ece1a..d85480b9 100644
--- a/parts/appwizard/imports/python.tdevelop
+++ b/parts/appwizard/imports/python.tdevelop
@@ -7,15 +7,15 @@
   <projectmanagement>KDevScriptProject</projectmanagement>
   <primarylanguage>Python</primarylanguage>
   <ignoreparts>
-   <part>KDevDebugger</part>
-   <part>KDevJavaDebugger</part>
+   <part>TDevDebugger</part>
+   <part>TDevJavaDebugger</part>
   </ignoreparts>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <run>
   </run>
- </kdevscriptproject>
- <kdevdoctreeview>
+ </tdevscriptproject>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -60,10 +60,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="py"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qt-auto.tdevelop b/parts/appwizard/imports/qt-auto.tdevelop
index b4bba39e..a8ac37de 100644
--- a/parts/appwizard/imports/qt-auto.tdevelop
+++ b/parts/appwizard/imports/qt-auto.tdevelop
@@ -10,7 +10,7 @@
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <kdevfileview>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -18,8 +18,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
   <ignoretocs>
    <toc>gtk</toc>
    <toc>gnustep</toc>
@@ -27,17 +27,17 @@
    <toc>php</toc>
    <toc>perl</toc>
   </ignoretocs>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qt.tdevelop b/parts/appwizard/imports/qt.tdevelop
index 6b716a7b..713510e0 100644
--- a/parts/appwizard/imports/qt.tdevelop
+++ b/parts/appwizard/imports/qt.tdevelop
@@ -4,13 +4,13 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>KDevCustomProject</projectmanagement>
+  <projectmanagement>TDevCustomProject</projectmanagement>
   <primarylanguage>C++</primarylanguage>
   <keywords>
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <kdevfileview>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -18,21 +18,21 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevcustomproject>
+ </tdevfileview>
+ <tdevcustomproject>
   <run>
   </run>
- </kdevcustomproject>
- <kdevdebugger>
+ </tdevcustomproject>
+ <tdevdebugger>
   <general>
    <dbgshell></dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qt4qmake.tdevelop b/parts/appwizard/imports/qt4qmake.tdevelop
index 3be6c94c..e211a470 100644
--- a/parts/appwizard/imports/qt4qmake.tdevelop
+++ b/parts/appwizard/imports/qt4qmake.tdevelop
@@ -10,15 +10,15 @@
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <kdevfileview>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
    <group pattern="*.png" name="Icons" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -55,26 +55,26 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell/>
   </general>
- </kdevdebugger>
- <kdevcppsupport>
+ </tdevdebugger>
+ <tdevcppsupport>
    <qt>
      <version>4</version>
      <used>true</used>
      <includestyle>4</includestyle>
      <designerintegration>ExternalDesigner</designerintegration>
    </qt>
- </kdevcppsupport>
-  <kdevfilecreate>
+ </tdevcppsupport>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
       <type ext="qrc" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qtqmake.tdevelop b/parts/appwizard/imports/qtqmake.tdevelop
index 2e9b089a..8a9d6b17 100644
--- a/parts/appwizard/imports/qtqmake.tdevelop
+++ b/parts/appwizard/imports/qtqmake.tdevelop
@@ -10,15 +10,15 @@
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <kdevfileview>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
    <group pattern="*.png" name="Icons" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -55,25 +55,25 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell/>
   </general>
- </kdevdebugger>
- <kdevcppsupport>
+ </tdevdebugger>
+ <tdevcppsupport>
    <qt>
      <version>3</version>
      <used>true</used>
      <includestyle>3</includestyle>
      <designerintegration>KDevEmbeddedDesigner</designerintegration>
    </qt>
- </kdevcppsupport>
-  <kdevfilecreate>
+ </tdevcppsupport>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qttmake.tdevelop b/parts/appwizard/imports/qttmake.tdevelop
index 713655b6..015f4278 100644
--- a/parts/appwizard/imports/qttmake.tdevelop
+++ b/parts/appwizard/imports/qttmake.tdevelop
@@ -10,15 +10,15 @@
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <kdevfileview>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
    <group pattern="*.png" name="Icons" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -58,17 +58,17 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell/>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/ruby.tdevelop b/parts/appwizard/imports/ruby.tdevelop
index 90dbe34a..0a29b0a7 100644
--- a/parts/appwizard/imports/ruby.tdevelop
+++ b/parts/appwizard/imports/ruby.tdevelop
@@ -13,22 +13,22 @@
    <part>KDevDoxygen</part>
    <part>KDevdistpart</part>
    <part>KDevVisualBoyAdvance</part>
-   <part>KDevDebugger</part>
+   <part>TDevDebugger</part>
   </ignoreparts>
  </general>
- <kdevscriptproject>
+ <tdevscriptproject>
   <general>
 		<activedir>src</activedir>
 		<includepatterns>*.rb</includepatterns>
 		<excludepatterns>*~</excludepatterns>
   </general>
- </kdevscriptproject>
- <kdevfileview>
+ </tdevscriptproject>
+ <tdevfileview>
 	 <groups>
 	   <group pattern="*.rb" name="Scripts" />
 	 </groups>
- </kdevfileview>											 
- <kdevdoctreeview>
+ </tdevfileview>											 
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -73,10 +73,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
+ </tdevdoctreeview>
+  <tdevfilecreate>
     <useglobaltypes>
 			<type ext="rb"/>
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/kde b/parts/appwizard/imports/tde
index 13614802..13614802 100644
--- a/parts/appwizard/imports/kde
+++ b/parts/appwizard/imports/tde
diff --git a/parts/appwizard/imports/kde.tdevelop b/parts/appwizard/imports/tde.tdevelop
index 5bff727f..fe54fadc 100644
--- a/parts/appwizard/imports/kde.tdevelop
+++ b/parts/appwizard/imports/tde.tdevelop
@@ -11,7 +11,7 @@
    <keyword>KDE</keyword>
   </keywords>
  </general>
- <kdevfileview>
+ <tdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -19,8 +19,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -57,17 +57,17 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
+ </tdevdoctreeview>
+ <tdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </kdevdebugger>
-  <kdevfilecreate>
+ </tdevdebugger>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp
index ac5da870..3c5a5a35 100644
--- a/parts/appwizard/profilesupport.cpp
+++ b/parts/appwizard/profilesupport.cpp
@@ -24,9 +24,9 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 
-#include <kdevplugincontroller.h>
+#include <tdevplugincontroller.h>
 
-ProfileSupport::ProfileSupport(KDevPlugin *parent)
+ProfileSupport::ProfileSupport(TDevPlugin *parent)
 {
     KURL::List resources = parent->pluginController()->profileResourcesRecursive("*.appwizard");
     
diff --git a/parts/appwizard/profilesupport.h b/parts/appwizard/profilesupport.h
index b18a9620..11e9b201 100644
--- a/parts/appwizard/profilesupport.h
+++ b/parts/appwizard/profilesupport.h
@@ -20,11 +20,11 @@
 #ifndef PROFILESUPPORT_H
 #define PROFILESUPPORT_H
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 class ProfileSupport{
 public:
-    ProfileSupport(KDevPlugin *parent);
+    ProfileSupport(TDevPlugin *parent);
     bool isInTemplateList(const TQString &templateUrl);
     
 private:
diff --git a/parts/appwizard/kdevappwizard.desktop b/parts/appwizard/tdevappwizard.desktop
index fa9dd541..bda84ba5 100644
--- a/parts/appwizard/kdevappwizard.desktop
+++ b/parts/appwizard/tdevappwizard.desktop
@@ -36,7 +36,7 @@ Comment[tg]=Устои сохтани гузориш
 Comment[tr]=Uygulama Sihirbazı
 Comment[zh_CN]=应用程序向导
 Comment[zh_TW]=應用程式精靈
-Name=KDevAppWizard
+Name=TDevAppWizard
 Name[da]=TDevelop Programguide
 Name[de]=Anwendungs-Assistent (TDevelop)
 Name[hi]=के-डेव-एप-विज़ार्ड
@@ -81,7 +81,7 @@ GenericName[tr]=Uygulama Sihirbazı
 GenericName[zh_CN]=应用程序向导
 GenericName[zh_TW]=應用程式精靈
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevappwizard
+X-TDE-Library=libtdevappwizard
 X-TDevelop-Scope=Core
 X-TDevelop-Version=5
 X-TDevelop-Properties=ProjectCreation
diff --git a/parts/appwizard/kdevappwizard.rc b/parts/appwizard/tdevappwizard.rc
index c86e0f44..2705a29f 100644
--- a/parts/appwizard/kdevappwizard.rc
+++ b/parts/appwizard/tdevappwizard.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KDevAppWizard" version="1">
+<kpartgui name="TDevAppWizard" version="1">
 <MenuBar>
   <Menu name="project" >
     <Action name="project_new" group="project_new"/>
diff --git a/parts/appwizard/kdevfile.cpp b/parts/appwizard/tdevfile.cpp
index 4edb62c7..4a748d47 100644
--- a/parts/appwizard/kdevfile.cpp
+++ b/parts/appwizard/tdevfile.cpp
@@ -16,31 +16,31 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevfile.h"
+#include "tdevfile.h"
 
 static struct MimeTypeMapping
 {
 	const char* szMimeType;
-	KDevFile::CommentingStyle commentStyle;
+	TDevFile::CommentingStyle commentStyle;
 } mimeTypeMapping[] = {
-{	"text/x-c++hdr",            KDevFile::CPPStyle           },
-{	"text/x-c++src",            KDevFile::CPPStyle           },
-{	"text/x-chdr",              KDevFile::CStyle             },
-{	"text/x-csrc",              KDevFile::CStyle             },
-{	"text/adasrc",              KDevFile::AdaStyle           },
-{	"text/x-pascal",            KDevFile::PascalStyle        },
-{	"text/x-perl",              KDevFile::BashStyle          },
-{	"text/xml",                 KDevFile::XMLStyle           },
-{	"text/x-xslt",              KDevFile::XMLStyle           },
-{	"text/x-xslfo",             KDevFile::XMLStyle           },
-{	"text/html",                KDevFile::XMLStyle           },
-{	"text/docbook",             KDevFile::XMLStyle           },
-{	"application/x-php",        KDevFile::CPPStyle           },
-{	"application/x-shellscript",KDevFile::BashStyle          },
-{	NULL,                       KDevFile::NoCommenting       }
+{	"text/x-c++hdr",            TDevFile::CPPStyle           },
+{	"text/x-c++src",            TDevFile::CPPStyle           },
+{	"text/x-chdr",              TDevFile::CStyle             },
+{	"text/x-csrc",              TDevFile::CStyle             },
+{	"text/adasrc",              TDevFile::AdaStyle           },
+{	"text/x-pascal",            TDevFile::PascalStyle        },
+{	"text/x-perl",              TDevFile::BashStyle          },
+{	"text/xml",                 TDevFile::XMLStyle           },
+{	"text/x-xslt",              TDevFile::XMLStyle           },
+{	"text/x-xslfo",             TDevFile::XMLStyle           },
+{	"text/html",                TDevFile::XMLStyle           },
+{	"text/docbook",             TDevFile::XMLStyle           },
+{	"application/x-php",        TDevFile::CPPStyle           },
+{	"application/x-shellscript",TDevFile::BashStyle          },
+{	NULL,                       TDevFile::NoCommenting       }
 };
 
-KDevFile::CommentingStyle KDevFile::commentingStyleFromMimeType( const TQString& mimeType )
+TDevFile::CommentingStyle TDevFile::commentingStyleFromMimeType( const TQString& mimeType )
 {
 	int idx = 0;
 	while( mimeTypeMapping[idx].szMimeType )
@@ -49,10 +49,10 @@ KDevFile::CommentingStyle KDevFile::commentingStyleFromMimeType( const TQString&
 			return mimeTypeMapping[idx].commentStyle;
 		idx++;
 	}
-	return KDevFile::NoCommenting;
+	return TDevFile::NoCommenting;
 }
 
-KDevFile::CommentingStyle KDevFile::commentingStyleFromMimeType( KMimeType::Ptr mimeType )
+TDevFile::CommentingStyle TDevFile::commentingStyleFromMimeType( KMimeType::Ptr mimeType )
 {
 	return commentingStyleFromMimeType( mimeType->name() );
 }
diff --git a/parts/appwizard/kdevfile.h b/parts/appwizard/tdevfile.h
index 6b2e2699..b1280f54 100644
--- a/parts/appwizard/kdevfile.h
+++ b/parts/appwizard/tdevfile.h
@@ -18,18 +18,18 @@
 */
 
 /**
-@file kdevfile.h
+@file tdevfile.h
 File abstraction layer.
 */
-#ifndef KDEVFILE_H
-#define KDEVFILE_H
+#ifndef TDEVFILE_H
+#define TDEVFILE_H
 
 #include <kmimetype.h>
 
 /**
 File abstraction.
 */
-class KDevFile
+class TDevFile
 {
 public:
     /**Styles of comment-formats a source file can have.*/
diff --git a/parts/appwizard/kdevlicense.cpp b/parts/appwizard/tdevlicense.cpp
index 5e189422..a720c6c3 100644
--- a/parts/appwizard/kdevlicense.cpp
+++ b/parts/appwizard/tdevlicense.cpp
@@ -16,19 +16,19 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevlicense.h"
+#include "tdevlicense.h"
 
 #include <tqfile.h>
 #include <tqdatetime.h>
 #include <tqregexp.h>
 
-KDevLicense::KDevLicense( const TQString& name, const TQString& fileName )
+TDevLicense::TDevLicense( const TQString& name, const TQString& fileName )
 	: m_name( name )
 {
 	readFile( fileName );
 }
 
-void KDevLicense::readFile( const TQString& fileName )
+void TDevLicense::readFile( const TQString& fileName )
 {
 	TQFile f(fileName);
 	if (!f.open(IO_ReadOnly))
@@ -57,7 +57,7 @@ void KDevLicense::readFile( const TQString& fileName )
 
 }
 
-TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces )
+TQString TDevLicense::assemble( TDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces )
 {
 	// first, build a CPP Style license
 	
@@ -82,29 +82,29 @@ TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const
 
 	switch( commentingStyle )
 	{
-		case KDevFile::CPPStyle:
-		case KDevFile::CStyle:
+		case TDevFile::CPPStyle:
+		case TDevFile::CStyle:
 			return str;
 			
-		case KDevFile::PascalStyle:
+		case TDevFile::PascalStyle:
 			str.replace(TQRegExp("/\\**\n \\*"), "{\n  ");
 			str.replace(TQRegExp("\\*\n \\*"), " \n  ");
 			str.replace(TQRegExp(" *\\**/\n"), "}\n");
 			return str;
 			
-		case KDevFile::AdaStyle:
+		case TDevFile::AdaStyle:
 			str.replace(TQRegExp("/\\*"), "--");
 			str.replace(TQRegExp(" \\*"), "--");
 			str.replace(TQRegExp("\\*/"), "*");
 			return str;
 			
-		case KDevFile::BashStyle:
+		case TDevFile::BashStyle:
 			str.replace(TQRegExp("\\*|/"), "#");
 			str.replace(TQRegExp("\n ##"), "\n##");
 			str.replace(TQRegExp("\n #"), "\n# ");
 			return str;
 
-		case KDevFile::XMLStyle:
+		case TDevFile::XMLStyle:
 			str.replace(TQRegExp("/\\*"), "<!--");
 			str.replace(TQRegExp("\n \\*"), "\n<!--");
 			str.replace(TQRegExp("\\*/?\n"), "-->\n");
diff --git a/parts/appwizard/kdevlicense.h b/parts/appwizard/tdevlicense.h
index 2e81c9ec..d61aebc3 100644
--- a/parts/appwizard/kdevlicense.h
+++ b/parts/appwizard/tdevlicense.h
@@ -16,30 +16,30 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVLICENSE_H
-#define KDEVLICENSE_H
+#ifndef TDEVLICENSE_H
+#define TDEVLICENSE_H
 
 /**
-@file kdevfile.h
+@file tdevfile.h
 The interface to installed licenses.
 */
 
 #include <tqstringlist.h>
 
-#include "kdevfile.h"
+#include "tdevfile.h"
 
 /*The interface to installed licenses.*/
-class KDevLicense
+class TDevLicense
 {
 public:
-    /**Constructs a KDevLicense and loads the given license template file.
+    /**Constructs a TDevLicense and loads the given license template file.
     @param name The name of this license.
     @param fileName The file name where license template text is kept.*/
-    KDevLicense(const TQString& name, const TQString& fileName);
+    TDevLicense(const TQString& name, const TQString& fileName);
 
 public:
     /**Assembles the license to a string suitable for replacement of a %{LICENSE} .*/
-    TQString assemble(KDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces );
+    TQString assemble(TDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces );
 
     /**
     * returns the name of this license.
diff --git a/parts/astyle/CMakeLists.txt b/parts/astyle/CMakeLists.txt
index bac3e50a..aba6c00f 100644
--- a/parts/astyle/CMakeLists.txt
+++ b/parts/astyle/CMakeLists.txt
@@ -28,13 +28,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevastyle.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpart_astyle.rc DESTINATION ${DATA_INSTALL_DIR}/kdevastyle )
+install( FILES tdevastyle.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpart_astyle.rc DESTINATION ${DATA_INSTALL_DIR}/tdevastyle )
 
 
-##### libkdevastyle (module) ####################
+##### libtdevastyle (module) ####################
 
-tde_add_kpart( libkdevastyle AUTOMOC
+tde_add_kpart( libtdevastyle AUTOMOC
   SOURCES
     astyle_part.cpp astyleconfig.ui astyle_widget.cpp
     astyle_adaptor.cpp
diff --git a/parts/astyle/Makefile.am b/parts/astyle/Makefile.am
index 739ba2b8..4247625d 100644
--- a/parts/astyle/Makefile.am
+++ b/parts/astyle/Makefile.am
@@ -1,16 +1,16 @@
 INCLUDES = -I$(top_srcdir)/lib/astyle -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevastyle.la
-libkdevastyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevastyle_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+kde_module_LTLIBRARIES = libtdevastyle.la
+libtdevastyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevastyle_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/lib/astyle/libastyle.la 
 
-libkdevastyle_la_SOURCES = astyle_part.cpp astyleconfig.ui astyle_widget.cpp astyle_adaptor.cpp
+libtdevastyle_la_SOURCES = astyle_part.cpp astyleconfig.ui astyle_widget.cpp astyle_adaptor.cpp
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevastyle.desktop
+service_DATA = tdevastyle.desktop
 
-rc_DATA = kdevpart_astyle.rc
-rcdir = $(kde_datadir)/kdevastyle
+rc_DATA = tdevpart_astyle.rc
+rcdir = $(kde_datadir)/tdevastyle
diff --git a/parts/astyle/astyle_adaptor.cpp b/parts/astyle/astyle_adaptor.cpp
index 05fb0901..6f6bed50 100644
--- a/parts/astyle/astyle_adaptor.cpp
+++ b/parts/astyle/astyle_adaptor.cpp
@@ -38,7 +38,7 @@ string ASStringIterator::nextLine()
 }
 
 
-KDevFormatter::KDevFormatter(const TQMap<TQString, TQVariant>& options)
+TDevFormatter::TDevFormatter(const TQMap<TQString, TQVariant>& options)
 {
 // 	for ( TQMap<TQString, TQVariant>::ConstIterator iter = options.begin();iter != options.end();iter++ )
 // 	{
@@ -116,7 +116,7 @@ KDevFormatter::KDevFormatter(const TQMap<TQString, TQVariant>& options)
   setSingleStatementsMode(!options["KeepStatements"].toBool());
 }
 
-KDevFormatter::KDevFormatter( AStyleWidget * widget )
+TDevFormatter::TDevFormatter( AStyleWidget * widget )
 {
 	setCStyle();
 
@@ -215,7 +215,7 @@ KDevFormatter::KDevFormatter( AStyleWidget * widget )
 	setSingleStatementsMode( !widget->Keep_Statements->isChecked() );
 }
 
-bool KDevFormatter::predefinedStyle( const TQString & style )
+bool TDevFormatter::predefinedStyle( const TQString & style )
 {
 	if (style == "ANSI")
 	{
diff --git a/parts/astyle/astyle_adaptor.h b/parts/astyle/astyle_adaptor.h
index 21398fbb..df2ab818 100644
--- a/parts/astyle/astyle_adaptor.h
+++ b/parts/astyle/astyle_adaptor.h
@@ -33,12 +33,12 @@ private:
 
 class AStyleWidget;
 
-class KDevFormatter : public astyle::ASFormatter
+class TDevFormatter : public astyle::ASFormatter
 {
 public:
 
-  KDevFormatter(const TQMap<TQString, TQVariant>& options);
-  KDevFormatter( AStyleWidget * widget );
+  TDevFormatter(const TQMap<TQString, TQVariant>& options);
+  TDevFormatter( AStyleWidget * widget );
   TQString indentString() const
   {
 	  return m_indentString;
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index 16d590ab..57d032c8 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -7,7 +7,7 @@
 #include <tdeversion.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdeparts/part.h>
@@ -17,10 +17,10 @@
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/selectioninterface.h>
 #include <kprogress.h>
-#include <kdevcore.h>
-#include <kdevapi.h>
-#include <kdevpartcontroller.h>
-#include <kdevplugininfo.h>
+#include <tdevcore.h>
+#include <tdevapi.h>
+#include <tdevpartcontroller.h>
+#include <tdevplugininfo.h>
 #include <configwidgetproxy.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
@@ -33,22 +33,22 @@
 #include "astyle_widget.h"
 #include "astyle_adaptor.h"
 
-static const KDevPluginInfo data("kdevastyle");
+static const TDevPluginInfo data("tdevastyle");
 
 namespace {
     const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm";
 }
 
 
-typedef KDevGenericFactory<AStylePart> AStyleFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) )
+typedef TDevGenericFactory<AStylePart> AStyleFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevastyle, AStyleFactory( data ) )
 
 AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &)
   : KDevSourceFormatter(&data, parent, name ? name : "AStylePart")
 {
   setInstance(AStyleFactory::instance());
 
-  setXMLFile("kdevpart_astyle.rc");
+  setXMLFile("tdevpart_astyle.rc");
 
   formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQT_SLOT(beautifySource()), actionCollection(), "edit_astyle");
   formatTextAction->setEnabled(false);
@@ -161,7 +161,7 @@ void AStylePart::beautifySource()
 
   //if there is a selection, we only format it.
   ASStringIterator is(has_selection ? sel_iface->selection() : iface->text());
-  KDevFormatter formatter(m_project);
+  TDevFormatter formatter(m_project);
 
   formatter.init(&is);
 
@@ -346,7 +346,7 @@ void AStylePart::activePartChanged ( KParts::Part *part )
 TQString AStylePart::formatSource( const TQString text, AStyleWidget * widget, const TQMap<TQString, TQVariant>& options  )
 {
 	ASStringIterator is(text);
-	KDevFormatter * formatter = ( widget)? new KDevFormatter( widget ) : new KDevFormatter(options);
+	TDevFormatter * formatter = ( widget)? new TDevFormatter( widget ) : new TDevFormatter(options);
 
 	formatter->init(&is);
 
@@ -390,7 +390,7 @@ TQString AStylePart::formatSource( const TQString text )
 
 TQString AStylePart::indentString( ) const
 {
-  KDevFormatter formatter(m_project);
+  TDevFormatter formatter(m_project);
   return formatter.indentString();
 }
 
diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h
index 61b5a382..675bada5 100644
--- a/parts/astyle/astyle_part.h
+++ b/parts/astyle/astyle_part.h
@@ -3,14 +3,14 @@
  */
 
 
-#ifndef __KDEVPART_ASTYLE_H__
-#define __KDEVPART_ASTYLE_H__
+#ifndef __TDEVPART_ASTYLE_H__
+#define __TDEVPART_ASTYLE_H__
 
 class KDialogBase;
-#include <kdevsourceformatter.h>
+#include <tdevsourceformatter.h>
 #include <tdeaction.h>
 #include <tdeparts/part.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include <kdebug.h>
 #include <tqmap.h>
 #include <tqvariant.h>
diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp
index a70c6771..bcb810e5 100644
--- a/parts/astyle/astyle_widget.cpp
+++ b/parts/astyle/astyle_widget.cpp
@@ -10,7 +10,7 @@
 #include <tqspinbox.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kdevcore.h>
+#include <tdevcore.h>
 
 
 AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, const char *name)
diff --git a/parts/astyle/astyle_widget.h b/parts/astyle/astyle_widget.h
index 91963e54..89b3f2cd 100644
--- a/parts/astyle/astyle_widget.h
+++ b/parts/astyle/astyle_widget.h
@@ -4,7 +4,7 @@
 #include "astyleconfig.h"
 
 class AStylePart;
-class KDevPart;
+class TDevPart;
 
 
 class AStyleWidget : public AStyleConfig
diff --git a/parts/astyle/kdevastyle.desktop b/parts/astyle/tdevastyle.desktop
index ceeaabfc..b77c4745 100644
--- a/parts/astyle/kdevastyle.desktop
+++ b/parts/astyle/tdevastyle.desktop
@@ -76,7 +76,7 @@ GenericName[zh_CN]=源代码格式化
 GenericName[zh_TW]=程式源碼格式器
 Icon=tdevelop
 ServiceTypes=TDevelop/SourceFormatter
-X-TDE-Library=libkdevastyle
+X-TDE-Library=libtdevastyle
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=CDevelopment,CPPDevelopment,JavaDevelopment
diff --git a/parts/astyle/kdevpart_astyle.rc b/parts/astyle/tdevpart_astyle.rc
index 69037425..69037425 100644
--- a/parts/astyle/kdevpart_astyle.rc
+++ b/parts/astyle/tdevpart_astyle.rc
diff --git a/parts/bookmarks/CMakeLists.txt b/parts/bookmarks/CMakeLists.txt
index 0422965c..98022378 100644
--- a/parts/bookmarks/CMakeLists.txt
+++ b/parts/bookmarks/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevbookmarks (module) #################
+##### libtdevbookmarks (module) #################
 
-tde_add_kpart( libkdevbookmarks AUTOMOC
+tde_add_kpart( libtdevbookmarks AUTOMOC
   SOURCES
     bookmarks_part.cpp bookmarks_widget.cpp bookmarks_settings_base.ui
     bookmarks_settings.cpp bookmarks_config.cpp
diff --git a/parts/bookmarks/Makefile.am b/parts/bookmarks/Makefile.am
index 2ac7b233..6f2e6b8d 100644
--- a/parts/bookmarks/Makefile.am
+++ b/parts/bookmarks/Makefile.am
@@ -1,14 +1,14 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevbookmarks.la
-libkdevbookmarks_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevbookmarks_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevbookmarks.la
+libtdevbookmarks_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevbookmarks_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevbookmarks_la_SOURCES = bookmarks_part.cpp bookmarks_widget.cpp bookmarks_settings_base.ui bookmarks_settings.cpp bookmarks_config.cpp
+libtdevbookmarks_la_SOURCES = bookmarks_part.cpp bookmarks_widget.cpp bookmarks_settings_base.ui bookmarks_settings.cpp bookmarks_config.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevbookmarks.desktop
+service_DATA = tdevbookmarks.desktop
 
 noinst_HEADERS =  bookmarks_settings.h bookmarks_config.h
diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
index f7ac78cb..50672642 100644
--- a/parts/bookmarks/bookmarks_part.cpp
+++ b/parts/bookmarks/bookmarks_part.cpp
@@ -18,16 +18,16 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <tdetexteditor/markinterface.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/document.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 
-#include <kdevpartcontroller.h>
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
+#include <tdevpartcontroller.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
 #include "domutil.h"
 
 #include "bookmarks_widget.h"
@@ -36,16 +36,16 @@
 #include "bookmarks_config.h"
 
 #include <configwidgetproxy.h>
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
 #define BOOKMARKSETTINGSPAGE 1
 
-typedef KDevGenericFactory<BookmarksPart> BookmarksFactory;
-static const KDevPluginInfo data("kdevbookmarks");
-K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) )
+typedef TDevGenericFactory<BookmarksPart> BookmarksFactory;
+static const TDevPluginInfo data("tdevbookmarks");
+K_EXPORT_COMPONENT_FACTORY( libtdevbookmarks, BookmarksFactory( data ) )
 
 BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& )
-	: KDevPlugin(&data, parent, name ? name : "BookmarksPart" )
+	: TDevPlugin(&data, parent, name ? name : "BookmarksPart" )
 {
 	setInstance(BookmarksFactory::instance());
 
diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h
index f51603d7..b8015f54 100644
--- a/parts/bookmarks/bookmarks_part.h
+++ b/parts/bookmarks/bookmarks_part.h
@@ -10,8 +10,8 @@
  ***************************************************************************/
 
 
-#ifndef __KDEVPART_BOOKMARKS_H__
-#define __KDEVPART_BOOKMARKS_H__
+#ifndef __TDEVPART_BOOKMARKS_H__
+#define __TDEVPART_BOOKMARKS_H__
 
 
 #include <tqguardedptr.h>
@@ -22,7 +22,7 @@
 #include <tdeparts/part.h>
 #include <kurl.h>
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 class TQTimer;
 class KDialogBase;
@@ -38,7 +38,7 @@ struct EditorData
 class BookmarksWidget;
 class TQDomElement;
 
-class BookmarksPart : public KDevPlugin
+class BookmarksPart : public TDevPlugin
 {
 	Q_OBJECT
   
@@ -48,7 +48,7 @@ public:
 	BookmarksPart(TQObject *parent, const char *name, const TQStringList &);
 	~BookmarksPart();
 
-	// reimplemented from KDevPlugin
+	// reimplemented from TDevPlugin
 	void restorePartialProjectSession( const TQDomElement * el );
 	void savePartialProjectSession( TQDomElement * el );
 	
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index cc7316c8..dbf892fe 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -23,8 +23,8 @@
 #include <tdepopupmenu.h>
 #include <tdelocale.h>
 
-#include <kdevpartcontroller.h>
-#include <kdevcore.h>
+#include <tdevpartcontroller.h>
+#include <tdevcore.h>
 
 
 #include "bookmarks_part.h"
diff --git a/parts/bookmarks/kdevbookmarks.desktop b/parts/bookmarks/tdevbookmarks.desktop
index 3cbdb233..0ec9ae11 100644
--- a/parts/bookmarks/kdevbookmarks.desktop
+++ b/parts/bookmarks/tdevbookmarks.desktop
@@ -80,6 +80,6 @@ GenericName[zh_TW]=書籤
 Icon=bookmark
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Project
-X-TDE-Library=libkdevbookmarks
+X-TDE-Library=libtdevbookmarks
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeEditing
diff --git a/parts/classview/CMakeLists.txt b/parts/classview/CMakeLists.txt
index 2d19388a..a5ec68dc 100644
--- a/parts/classview/CMakeLists.txt
+++ b/parts/classview/CMakeLists.txt
@@ -30,17 +30,17 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevclassview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevclassview.rc DESTINATION ${DATA_INSTALL_DIR}/kdevclassview )
+install( FILES tdevclassview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevclassview.rc DESTINATION ${DATA_INSTALL_DIR}/tdevclassview )
 
 
-##### libkdevclassview (module) #################
+##### libtdevclassview (module) #################
 
-tde_add_kpart( libkdevclassview AUTOMOC
+tde_add_kpart( libtdevclassview AUTOMOC
   SOURCES
     classviewpart.cpp classviewwidget.cpp digraphview.cpp
     hierarchydlg.cpp navigator.cpp viewcombos.cpp
   LINK
-    kdevextensions-static tdevelop-shared kdevwidgets-shared
+    tdevextensions-static tdevelop-shared tdevwidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/classview/Makefile.am b/parts/classview/Makefile.am
index 3041259e..ccc02078 100644
--- a/parts/classview/Makefile.am
+++ b/parts/classview/Makefile.am
@@ -3,20 +3,20 @@
 INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions \
 	-I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevclassview.la
-libkdevclassview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevclassview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
+kde_module_LTLIBRARIES = libtdevclassview.la
+libtdevclassview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevclassview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
 
-libkdevclassview_la_SOURCES = classviewpart.cpp classviewwidget.cpp \
+libtdevclassview_la_SOURCES = classviewpart.cpp classviewwidget.cpp \
 	digraphview.cpp hierarchydlg.cpp navigator.cpp viewcombos.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevclassview.desktop
+service_DATA = tdevclassview.desktop
 
-rcdir = $(kde_datadir)/kdevclassview
-rc_DATA = kdevclassview.rc
+rcdir = $(kde_datadir)/tdevclassview
+rc_DATA = tdevclassview.rc
 
 
 QTDIR = /home/bernd/kdesrc/qt-copy
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index c0cc21a2..f0c49d46 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -20,7 +20,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 #include "classstore.h"
 #include "parsedclass.h"
 #include "classviewpart.h"
@@ -119,8 +119,8 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
     connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods()));
     connect( attributes_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewAttributes()));
 
-    connect( part, TQT_SIGNAL(setLanguageSupport(KDevLanguageSupport*)),
-             this, TQT_SLOT(setLanguageSupport(KDevLanguageSupport*)) );
+    connect( part, TQT_SIGNAL(setLanguageSupport(TDevLanguageSupport*)),
+             this, TQT_SLOT(setLanguageSupport(TDevLanguageSupport*)) );
 
     m_part->registerClassToolDialog(this);
 }
@@ -132,7 +132,7 @@ ClassToolDialog::~ClassToolDialog()
 }
 
 
-void ClassToolDialog::setLanguageSupport(KDevLanguageSupport *ls)
+void ClassToolDialog::setLanguageSupport(TDevLanguageSupport *ls)
 {
     if (ls) {
         disconnect(ls, 0, this, 0);
diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h
index d143e66e..c4b2e79a 100644
--- a/parts/classview/classtooldlg.h
+++ b/parts/classview/classtooldlg.h
@@ -59,7 +59,7 @@ public slots:
     void viewAttributes();
 
 private slots:
-    void setLanguageSupport(KDevLanguageSupport *ls);
+    void setLanguageSupport(TDevLanguageSupport *ls);
     void refresh();
 
     void delayedClose();
@@ -85,7 +85,7 @@ private:
     
     /** Store that holds all classes in the system. */
     ClassStore *m_store;
-    KDevLanguageSupport *m_ls;
+    TDevLanguageSupport *m_ls;
     ClassViewPart *m_part;
     
     /** The class we are currently viewing. */
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index 9e052418..66e23173 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -22,10 +22,10 @@
 #include <tdelocale.h>
 #include <kiconloader.h>
 
-#include "kdevcore.h"
-#include "kdevlanguagesupport.h"
-#include "kdevmainwindow.h"
-#include "kdevpartcontroller.h"
+#include "tdevcore.h"
+#include "tdevlanguagesupport.h"
+#include "tdevmainwindow.h"
+#include "tdevpartcontroller.h"
 #include "classstore.h"
 
 #include "classviewpart.h"
@@ -36,10 +36,10 @@ TDEPopupMenu *ClassTreeItem::createPopup()
     if (!m_item || m_item->itemType() == PIT_SCOPE)
         return 0;
 
-    KDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
+    TDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
 
     TDEPopupMenu *popup = new TDEPopupMenu();
-    if (features & KDevLanguageSupport::Declarations)
+    if (features & TDevLanguageSupport::Declarations)
         popup->insertItem( i18n("Go to Declaration"), classTree(), TQT_SLOT(slotGotoDeclaration()) );
     if (m_item->itemType() == PIT_METHOD)
         popup->insertItem( i18n("Go to Definition"), classTree(), TQT_SLOT(slotGotoImplementation()) );
@@ -49,8 +49,8 @@ TDEPopupMenu *ClassTreeItem::createPopup()
     case PIT_CLASS:
         {
             title = i18n("Class");
-            bool hasAddMethod = features & KDevLanguageSupport::AddMethod;
-            bool hasAddAttribute = features & KDevLanguageSupport::AddAttribute;
+            bool hasAddMethod = features & TDevLanguageSupport::AddMethod;
+            bool hasAddAttribute = features & TDevLanguageSupport::AddAttribute;
             if (hasAddMethod)
                 popup->insertItem( i18n("Add Method..."), classTree(), TQT_SLOT(slotAddMethod()));
             if (hasAddAttribute)
@@ -168,7 +168,7 @@ void ClassTreeScopeItem::setOpen(bool o)
         ClassTreeItem *lastItem = 0;
 
         // Ok, this is a hack...
-        KDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
+        TDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
         
         // Add namespaces
         TQValueList<ParsedScopeContainer*> scopeList = pScope->getSortedScopeList();
@@ -176,7 +176,7 @@ void ClassTreeScopeItem::setOpen(bool o)
         for (it = scopeList.begin(); it != scopeList.end(); ++it)
             lastItem = new ClassTreeScopeItem(this, lastItem, *it);
 
-        if (features & KDevLanguageSupport::Classes) {
+        if (features & TDevLanguageSupport::Classes) {
             // Add classes
             TQValueList<ParsedClass*> classList = pScope->getSortedClassList();
             TQValueList<ParsedClass*>::ConstIterator it;
@@ -184,7 +184,7 @@ void ClassTreeScopeItem::setOpen(bool o)
                 lastItem = new ClassTreeClassItem(this, lastItem, *it);
         }
             
-        if (features & KDevLanguageSupport::Structs) {
+        if (features & TDevLanguageSupport::Structs) {
             // Add structs
             TQValueList<ParsedClass*> structList = pScope->getSortedStructList();
             TQValueList<ParsedClass*>::ConstIterator it;
@@ -192,7 +192,7 @@ void ClassTreeScopeItem::setOpen(bool o)
                 lastItem = new ClassTreeClassItem(this, lastItem, *it, true);
         }
 
-        if (features & KDevLanguageSupport::Functions) {
+        if (features & TDevLanguageSupport::Functions) {
             // Add functions
             TQValueList<ParsedMethod*> methodList = pScope->getSortedMethodList();
             TQValueList<ParsedMethod*>::ConstIterator it;
@@ -200,7 +200,7 @@ void ClassTreeScopeItem::setOpen(bool o)
                 lastItem = new ClassTreeMethodItem(this, lastItem, *it);
         }
 
-        if (features & KDevLanguageSupport::Variables) {
+        if (features & TDevLanguageSupport::Variables) {
             // Add attributes
             TQValueList<ParsedAttribute*> attrList = pScope->getSortedAttributeList();
             TQValueList<ParsedAttribute*>::ConstIterator it;
diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index 92e26bd0..7cdf8cbd 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -26,19 +26,19 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kmimetype.h>
 
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
-#include <kdevlanguagesupport.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
+#include <tdevlanguagesupport.h>
 #include <kcomboview.h>
-#include <kdevpartcontroller.h>
-#include <kdevproject.h>
+#include <tdevpartcontroller.h>
+#include <tdevproject.h>
 #include <urlutil.h>
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
 #include <codemodel.h>
 #include <codemodel_utils.h>
@@ -138,17 +138,17 @@ class FunctionCompletion : public CustomCompleter {
 };
 
 
-typedef KDevGenericFactory<ClassViewPart> ClassViewFactory;
-static const KDevPluginInfo data("kdevclassview");
-K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) )
+typedef TDevGenericFactory<ClassViewPart> ClassViewFactory;
+static const TDevPluginInfo data("tdevclassview");
+K_EXPORT_COMPONENT_FACTORY( libtdevclassview, ClassViewFactory( data ) )
 
 ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& )
-    :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ),
-    KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ),
+    :/// TDevPlugin( &data, parent, name ? name : "ClassViewPart" ),
+    TDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ),
     m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0)
 {
     setInstance(ClassViewFactory::instance());
-    setXMLFile("kdevclassview.rc");
+    setXMLFile("tdevclassview.rc");
     
     navigator = new Navigator(this);
 
@@ -207,7 +207,7 @@ void ClassViewPart::setupActions( )
 
     new TDEAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" );
 
-    if (langHasFeature(KDevLanguageSupport::Classes))
+    if (langHasFeature(TDevLanguageSupport::Classes))
     {
         TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia");
         ac->setToolTip(i18n("Class inheritance diagram"));
@@ -216,7 +216,7 @@ void ClassViewPart::setupActions( )
     }
 }
 
-bool ClassViewPart::langHasFeature(KDevLanguageSupport::Features feature)
+bool ClassViewPart::langHasFeature(TDevLanguageSupport::Features feature)
 {
     bool result = false;
     if (languageSupport())
diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h
index 16e18def..70d00cc9 100644
--- a/parts/classview/classviewpart.h
+++ b/parts/classview/classviewpart.h
@@ -18,16 +18,16 @@
  *
  */
 
-#ifndef __KDEVPART_CLASSVIEW_H__
-#define __KDEVPART_CLASSVIEW_H__
+#ifndef __TDEVPART_CLASSVIEW_H__
+#define __TDEVPART_CLASSVIEW_H__
 
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 #include "viewcombos.h"
 
 #include <tqguardedptr.h>
 #include <tqmap.h>
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 #include <codemodel.h>
 #include <codebrowserfrontend.h>
@@ -52,7 +52,7 @@ class TDEToolBarPopupAction;
 class NamespaceItem;
 class Navigator;
 class HierarchyDialog;
-class ClassViewPart : public Extensions::KDevCodeBrowserFrontend
+class ClassViewPart : public Extensions::TDevCodeBrowserFrontend
 {
     Q_OBJECT
   
@@ -60,7 +60,7 @@ public:
     ClassViewPart(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ClassViewPart();
 
-    bool langHasFeature(KDevLanguageSupport::Features feature);
+    bool langHasFeature(TDevLanguageSupport::Features feature);
     
     TDEListViewAction *m_functionsnav;
     Navigator *navigator;
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 22b865ef..cede06f3 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -31,10 +31,10 @@
 #include <tdeconfig.h>
 
 #include <urlutil.h>
-#include <kdevcore.h>
-#include <kdevlanguagesupport.h>
-#include <kdevproject.h>
-#include <kdevpartcontroller.h>
+#include <tdevcore.h>
+#include <tdevlanguagesupport.h>
+#include <tdevproject.h>
+#include <tdevpartcontroller.h>
 #include <codemodel.h>
 #include <codemodel_utils.h>
 
@@ -252,7 +252,7 @@ void ClassViewWidget::insertFile( const TQString& fileName )
 	}
 	break;
 
-    case KDevelop2ViewMode:
+    case TDevelop2ViewMode:
 	{
 	}
 	break;
@@ -293,7 +293,7 @@ void ClassViewWidget::removeFile( const TQString& fileName )
 	}
 	break;
 
-    case KDevelop2ViewMode:
+    case TDevelop2ViewMode:
 	{
 	}
 	break;
@@ -332,19 +332,19 @@ void ClassViewWidget::contentsContextMenuEvent( TQContextMenuEvent * ev )
 
     bool sep = false;
     if( item && item->isClass() ){
-        if( m_part->langHasFeature(KDevLanguageSupport::AddMethod) ) {
+        if( m_part->langHasFeature(TDevLanguageSupport::AddMethod) ) {
             m_actionAddMethod->plug( &menu );
             sep = true;
         }
 	
-        if( m_part->langHasFeature(KDevLanguageSupport::AddAttribute) ) {
+        if( m_part->langHasFeature(TDevLanguageSupport::AddAttribute) ) {
 	    m_actionAddAttribute->plug( &menu );
             sep = true;
         }	
     }
 	
 	if (item && item->isVariable()){
-		if( m_part->langHasFeature(KDevLanguageSupport::CreateAccessMethods) ) 
+		if( m_part->langHasFeature(TDevLanguageSupport::CreateAccessMethods) ) 
 				m_actionCreateAccessMethods->plug( &menu );
 	}
 
@@ -1108,7 +1108,7 @@ TQString VariableDomBrowserItem::key( int , bool ) const
 
 void ClassViewWidget::slotNewClass( )
 {
-    if( m_part->languageSupport()->features() & KDevLanguageSupport::NewClass )
+    if( m_part->languageSupport()->features() & TDevLanguageSupport::NewClass )
 	m_part->languageSupport()->addClass();
 }
 
@@ -1116,7 +1116,7 @@ void ClassViewWidget::slotAddMethod( )
 {
     if ( !selectedItem() ) return;
 
-    if( m_part->languageSupport()->features() & KDevLanguageSupport::AddMethod )
+    if( m_part->languageSupport()->features() & TDevLanguageSupport::AddMethod )
         m_part->languageSupport()->addMethod( static_cast<ClassDomBrowserItem*>( selectedItem() )->dom() );
 }
 
@@ -1124,7 +1124,7 @@ void ClassViewWidget::slotAddAttribute( )
 {
     if ( !selectedItem() ) return;
     
-    if( m_part->languageSupport()->features() & KDevLanguageSupport::AddAttribute )
+    if( m_part->languageSupport()->features() & TDevLanguageSupport::AddAttribute )
         m_part->languageSupport()->addAttribute( static_cast<ClassDomBrowserItem*>( selectedItem() )->dom() );
 }
 
@@ -1271,7 +1271,7 @@ void ClassViewWidget::slotCreateAccessMethods( )
 {
 	if ( !selectedItem() ) return;
 
-    if( m_part->languageSupport()->features() & KDevLanguageSupport::CreateAccessMethods )
+    if( m_part->languageSupport()->features() & TDevLanguageSupport::CreateAccessMethods )
 	{
         VariableDomBrowserItem* item = dynamic_cast<VariableDomBrowserItem*>( selectedItem() );
 		if (item == 0)
diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h
index d74448f5..1d17efec 100644
--- a/parts/classview/classviewwidget.h
+++ b/parts/classview/classviewwidget.h
@@ -31,7 +31,7 @@
 #include <fancylistviewitem.h>
 #include <navigator.h>
 
-class KDevProject;
+class TDevProject;
 class ClassViewPart;
 class ClassViewItem;
 class FolderBrowserItem;
@@ -51,7 +51,7 @@ public:
     enum ViewMode
     {
 	KDevelop3ViewMode = 0,
-	KDevelop2ViewMode,
+	TDevelop2ViewMode,
 	JavaLikeViewMode
     };
 
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index c8761861..6901926b 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -28,7 +28,7 @@
 #include <tqapplication.h>
 #include <tqsplitter.h>
 
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 #include "kcomboview.h"
 
 #include "classviewpart.h"
@@ -105,7 +105,7 @@ void HierarchyDialog::save()
     {
 	TQFileInfo fi(dlg.selectedURL().pathOrURL());
         TQApplication::setOverrideCursor( TQt::waitCursor );
-        KDevLanguageSupport *ls = m_part->languageSupport();
+        TDevLanguageSupport *ls = m_part->languageSupport();
         for (TQMap<TQString, ClassDom>::const_iterator it = classes.begin(); it != classes.end(); ++it)
         {
             kdDebug(9003) << "Adding class to graph: " << it.key() << endl;
@@ -134,7 +134,7 @@ void HierarchyDialog::refresh()
     ViewCombosOp::refreshNamespaces(m_part, namespace_combo);
     processNamespace("", m_part->codeModel()->globalNamespace());
 
-    KDevLanguageSupport *ls = m_part->languageSupport();
+    TDevLanguageSupport *ls = m_part->languageSupport();
 
     for (TQMap<TQString, ClassDom>::const_iterator it = classes.begin(); it != classes.end(); ++it)
     {
@@ -154,7 +154,7 @@ void HierarchyDialog::refresh()
     digraph->process();
 }
 
-void HierarchyDialog::setLanguageSupport(KDevLanguageSupport *ls)
+void HierarchyDialog::setLanguageSupport(TDevLanguageSupport *ls)
 {
     if (ls)
         connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh()));
@@ -169,7 +169,7 @@ void HierarchyDialog::slotClassComboChoice(TQListViewItem * item)
     if (!ci)
         return;
 
-    KDevLanguageSupport *ls = m_part->languageSupport();
+    TDevLanguageSupport *ls = m_part->languageSupport();
 
     TQString className = ls->formatClassName(uclasses[item->text(0)]);
     digraph->setSelected(className);
@@ -188,7 +188,7 @@ void HierarchyDialog::slotClassComboChoice( const TQString& itemText )
             if (!ci)
                 return;
         
-            KDevLanguageSupport *ls = m_part->languageSupport();
+            TDevLanguageSupport *ls = m_part->languageSupport();
         
             TQString className = ls->formatClassName(uclasses[item->text(0)]);
             digraph->setSelected(className);
@@ -205,10 +205,10 @@ void HierarchyDialog::classSelected(const TQString &/*className*/)
 /*    ParsedClass *currentClass = m_part->classStore()->getClassByName(className);
     member_tree->clear();
     if (currentClass) {
-        KDevLanguageSupport::Features features = m_part->languageSupport()->features();
-        if (features & KDevLanguageSupport::Functions)
+        TDevLanguageSupport::Features features = m_part->languageSupport()->features();
+        if (features & TDevLanguageSupport::Functions)
             member_tree->insertAllClassMethods(currentClass, (PIAccess)-1);
-        if (features & KDevLanguageSupport::Variables)
+        if (features & TDevLanguageSupport::Variables)
             member_tree->insertAllClassAttributes(currentClass, (PIAccess)-1);
     }*/
 }
diff --git a/parts/classview/hierarchydlg.h b/parts/classview/hierarchydlg.h
index 1c41a8f0..9d26ebd0 100644
--- a/parts/classview/hierarchydlg.h
+++ b/parts/classview/hierarchydlg.h
@@ -17,7 +17,7 @@
 #include "codemodel.h"
 
 class ClassViewPart;
-class KDevLanguageSupport;
+class TDevLanguageSupport;
 class DigraphView;
 class ClassToolWidget;
 class KComboView;
@@ -35,7 +35,7 @@ public slots:
     void refresh();
 
 private slots:
-    void setLanguageSupport(KDevLanguageSupport *ls);
+    void setLanguageSupport(TDevLanguageSupport *ls);
     void slotClassComboChoice(TQListViewItem *item);
     void slotNamespaceComboChoice(TQListViewItem *item);
     void slotClassComboChoice(const TQString&);
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index 694aa0d4..a7e3ac85 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -31,9 +31,9 @@
 
 #include <kcomboview.h>
 #include <tdelistviewaction.h>
-#include <kdevpartcontroller.h>
-#include <kdevlanguagesupport.h>
-#include <kdevmainwindow.h>
+#include <tdevpartcontroller.h>
+#include <tdevlanguagesupport.h>
+#include <tdevmainwindow.h>
 #include <codemodel_utils.h>
 #include "classviewpart.h"
 #include "classviewwidget.h"
diff --git a/parts/classview/kdevclassview.desktop b/parts/classview/tdevclassview.desktop
index 49bfa43c..10200b50 100644
--- a/parts/classview/kdevclassview.desktop
+++ b/parts/classview/tdevclassview.desktop
@@ -76,7 +76,7 @@ GenericName[tr]=Sınıf Görünümü
 GenericName[zh_CN]=类查看器
 GenericName[zh_TW]=類別檢視
 ServiceTypes=TDevelop/CodeBrowserFrontend
-X-TDE-Library=libkdevclassview
+X-TDE-Library=libtdevclassview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=CodeNavigation
diff --git a/parts/classview/kdevclassview.rc b/parts/classview/tdevclassview.rc
index b5f7a9fb..b5f7a9fb 100644
--- a/parts/classview/kdevclassview.rc
+++ b/parts/classview/tdevclassview.rc
diff --git a/parts/ctags2/CMakeLists.txt b/parts/ctags2/CMakeLists.txt
index a8f4b582..a88415d6 100644
--- a/parts/ctags2/CMakeLists.txt
+++ b/parts/ctags2/CMakeLists.txt
@@ -27,13 +27,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevctags2.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpart_ctags2.rc DESTINATION ${DATA_INSTALL_DIR}/kdevctags2 )
+install( FILES tdevctags2.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpart_ctags2.rc DESTINATION ${DATA_INSTALL_DIR}/tdevctags2 )
 
 
-##### libkdevctags2 (module) ####################
+##### libtdevctags2 (module) ####################
 
-tde_add_kpart( libkdevctags2 AUTOMOC
+tde_add_kpart( libtdevctags2 AUTOMOC
   SOURCES
     ctags2_part.cpp readtags.c ctags2_widgetbase.ui
     ctags2_widget.cpp tags.cpp ctagskinds.cpp
diff --git a/parts/ctags2/Makefile.am b/parts/ctags2/Makefile.am
index f92a819c..f12fdada 100644
--- a/parts/ctags2/Makefile.am
+++ b/parts/ctags2/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevctags2.la
-libkdevctags2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevctags2_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevctags2.la
+libtdevctags2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevctags2_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevctags2_la_SOURCES = ctags2_part.cpp readtags.c ctags2_widgetbase.ui \
+libtdevctags2_la_SOURCES = ctags2_part.cpp readtags.c ctags2_widgetbase.ui \
 	ctags2_widget.cpp tags.cpp ctagskinds.cpp ctags2_settingswidgetbase.ui \
 	ctags2_settingswidget.cpp ctags2_selecttagfilebase.ui ctags2_selecttagfile.cpp \
 	ctags2_createtagfilebase.ui ctags2_createtagfile.cpp
@@ -13,10 +13,10 @@ libkdevctags2_la_SOURCES = ctags2_part.cpp readtags.c ctags2_widgetbase.ui \
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevctags2.desktop
+service_DATA = tdevctags2.desktop
 
-rc_DATA = kdevpart_ctags2.rc
-rcdir = $(kde_datadir)/kdevctags2
+rc_DATA = tdevpart_ctags2.rc
+rcdir = $(kde_datadir)/tdevctags2
 
 noinst_HEADERS = ctags2_widget.h tags.h readtags.h ctagskinds.h \
 	ctags2_settingswidget.h
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index 324ded8a..371ff7e5 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -31,16 +31,16 @@
 #include <tdeconfig.h>
 #include <tdeaction.h>
 
-#include "kdevappfrontend.h"
-#include <kdevgenericfactory.h>
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
-#include <kdevproject.h>
-#include <kdevpartcontroller.h>
-#include <kdevplugininfo.h>
+#include "tdevappfrontend.h"
+#include <tdevgenericfactory.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
+#include <tdevproject.h>
+#include <tdevpartcontroller.h>
+#include <tdevplugininfo.h>
 #include "configwidgetproxy.h"
 #include "domutil.h"
-#include "kdeveditorutil.h"
+#include "tdeveditorutil.h"
 
 #include "ctags2_settingswidget.h"
 #include "ctags2_widget.h"
@@ -54,15 +54,15 @@ namespace ctags
 #include "readtags.h"
 }
 
-typedef KDevGenericFactory<CTags2Part> CTags2Factory;
-static const KDevPluginInfo data("kdevctags2");
-K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) )
+typedef TDevGenericFactory<CTags2Part> CTags2Factory;
+static const TDevPluginInfo data("tdevctags2");
+K_EXPORT_COMPONENT_FACTORY( libtdevctags2, CTags2Factory( data ) )
 
 CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& )
-  : KDevPlugin(&data, parent, name ? name : "ctags2Part" )
+  : TDevPlugin(&data, parent, name ? name : "ctags2Part" )
 {
 	setInstance(CTags2Factory::instance());
-	setXMLFile("kdevpart_ctags2.rc");
+	setXMLFile("tdevpart_ctags2.rc");
 
 	TQDomDocument & dom = *projectDom();
 	TQString customTagFile = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" );
@@ -164,7 +164,7 @@ bool CTags2Part::createTagsFile(const TQString& tagFile, const TQString& dir)
 	commandline += " ";
 	commandline += dir;
 
-	if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
+	if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
 		appFrontend->startAppCommand(dir, commandline, false);
 
 	return true;
@@ -330,7 +330,7 @@ int CTags2Part::getFileLineFromPattern( KURL const & url, TQString const & patte
 
 void CTags2Part::slotLookupDeclaration( )
 {
- 	m_contextString = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+ 	m_contextString = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 	if ( !m_contextString.isEmpty() )
 	{
 		slotGotoDeclaration();
@@ -339,7 +339,7 @@ void CTags2Part::slotLookupDeclaration( )
 
 void CTags2Part::slotLookupDefinition( )
 {
- 	m_contextString = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+ 	m_contextString = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 	if ( !m_contextString.isEmpty() )
 	{
 		slotGotoDefinition();
@@ -348,7 +348,7 @@ void CTags2Part::slotLookupDefinition( )
 
 void CTags2Part::slotLookup( )
 {
- 	m_contextString = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+ 	m_contextString = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 	if ( !m_contextString.isEmpty() )
 	{
 		slotGotoTag();
diff --git a/parts/ctags2/ctags2_part.h b/parts/ctags2/ctags2_part.h
index 93af5f7f..ca33e801 100644
--- a/parts/ctags2/ctags2_part.h
+++ b/parts/ctags2/ctags2_part.h
@@ -9,13 +9,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __KDEVPART_CTAGS2_H__
-#define __KDEVPART_CTAGS2_H__
+#ifndef __TDEVPART_CTAGS2_H__
+#define __TDEVPART_CTAGS2_H__
 
 #include <tqguardedptr.h>
 #include <tqstring.h>
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include "tags.h"
 
 class TQPopupMenu;
@@ -26,7 +26,7 @@ class CTags2Widget;
 class ConfigWidgetProxy;
 class KDialogBase;
 
-class CTags2Part : public KDevPlugin
+class CTags2Part : public TDevPlugin
 {
   Q_OBJECT
   
diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp
index b45a41be..c44f91d6 100644
--- a/parts/ctags2/ctags2_settingswidget.cpp
+++ b/parts/ctags2/ctags2_settingswidget.cpp
@@ -15,13 +15,13 @@
 
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <kdevproject.h>
+#include <tdevproject.h>
 #include <tdeapplication.h>
 #include <kurlcompletion.h>
 #include <kurlrequester.h>
 #include <tdeconfig.h>
 #include <kurl.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include <domutil.h>
 
 #include "ctags2_settingswidget.h"
diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp
index bd1b138d..cb44937d 100644
--- a/parts/ctags2/ctags2_widget.cpp
+++ b/parts/ctags2/ctags2_widget.cpp
@@ -22,8 +22,8 @@
 #include <kurl.h>
 #include <tdeapplication.h>
 
-#include <kdevproject.h>
-#include <kdevpartcontroller.h>
+#include <tdevproject.h>
+#include <tdevpartcontroller.h>
 
 #include "ctags2_widget.h"
 #include "tags.h"
diff --git a/parts/ctags2/kdevctags2.desktop b/parts/ctags2/tdevctags2.desktop
index db79f503..86720c8e 100644
--- a/parts/ctags2/kdevctags2.desktop
+++ b/parts/ctags2/tdevctags2.desktop
@@ -77,6 +77,6 @@ GenericName[zh_CN]=CTags前端
 GenericName[zh_TW]=CTags 前端介面
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Project
-X-TDE-Library=libkdevctags2
+X-TDE-Library=libtdevctags2
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeNavigation
diff --git a/parts/ctags2/kdevpart_ctags2.rc b/parts/ctags2/tdevpart_ctags2.rc
index e8745b3b..c217c256 100644
--- a/parts/ctags2/kdevpart_ctags2.rc
+++ b/parts/ctags2/tdevpart_ctags2.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="ctags" library="libkdevctags2" version="3">
+<kpartplugin name="ctags" library="libtdevctags2" version="3">
 	<MenuBar>
 	</MenuBar>
 	<Menu name="hidden">
diff --git a/parts/diff/CMakeLists.txt b/parts/diff/CMakeLists.txt
index 09987fd7..a4135dc6 100644
--- a/parts/diff/CMakeLists.txt
+++ b/parts/diff/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevdiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevdiff.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdiff )
+install( FILES tdevdiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevdiff.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdiff )
 
 
-##### libkdevdiff (module) ######################
+##### libtdevdiff (module) ######################
 
-tde_add_kpart( libkdevdiff AUTOMOC
+tde_add_kpart( libtdevdiff AUTOMOC
   SOURCES diffpart.cpp diffwidget.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/diff/Makefile.am b/parts/diff/Makefile.am
index ea521442..3d9396eb 100644
--- a/parts/diff/Makefile.am
+++ b/parts/diff/Makefile.am
@@ -3,16 +3,16 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevdiff.la
-libkdevdiff_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevdiff_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevdiff.la
+libtdevdiff_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevdiff_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevdiff_la_SOURCES = diffpart.cpp diffwidget.cpp
+libtdevdiff_la_SOURCES = diffpart.cpp diffwidget.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevdiff.desktop
+service_DATA = tdevdiff.desktop
 
-rcdir = $(kde_datadir)/kdevdiff
-rc_DATA = kdevdiff.rc
+rcdir = $(kde_datadir)/tdevdiff
+rc_DATA = tdevdiff.rc
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index a0dbafdd..b48e8136 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -16,7 +16,7 @@
 #include <tqpopupmenu.h>
 
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdefiledialog.h>
 #include <kprocess.h>
@@ -28,24 +28,24 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
-#include "kdevpartcontroller.h"
-#include "kdevplugininfo.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
+#include "tdevpartcontroller.h"
+#include "tdevplugininfo.h"
 
 #include "diffdlg.h"
 #include "diffwidget.h"
 
-static const KDevPluginInfo data("kdevdiff");
+static const TDevPluginInfo data("tdevdiff");
 
-typedef KDevGenericFactory<DiffPart> DiffFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) )
+typedef TDevGenericFactory<DiffPart> DiffFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevdiff, DiffFactory( data ) )
 
 DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0)
+    : TDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0)
 {
   setInstance(DiffFactory::instance());
-  setXMLFile("kdevdiff.rc");
+  setXMLFile("tdevdiff.rc");
 
   diffWidget = new DiffWidget(this, 0, "diffWidget");
   diffWidget->setIcon( SmallIcon("editcopy") );
@@ -83,7 +83,7 @@ static bool urlIsEqual(const KURL &a, const KURL &b)
   return a == b;
 }
 
-static KParts::ReadWritePart* partForURL(const KURL &url, KDevPartController* pc)
+static KParts::ReadWritePart* partForURL(const KURL &url, TDevPartController* pc)
 {
   if ( !pc )
     return 0;
diff --git a/parts/diff/diffpart.h b/parts/diff/diffpart.h
index 6fe89efe..984c2c06 100644
--- a/parts/diff/diffpart.h
+++ b/parts/diff/diffpart.h
@@ -15,8 +15,8 @@
 #include <tqguardedptr.h>
 #include <tqcstring.h>
 
-#include "kdevplugin.h"
-#include "kdevdifffrontend.h"
+#include "tdevplugin.h"
+#include "tdevdifffrontend.h"
 
 class TQPopupMenu;
 class Context;
@@ -24,7 +24,7 @@ class TDEProcess;
 class DiffWidget;
 class TQCString;
 
-class DiffPart : public KDevDiffFrontend
+class DiffPart : public TDevDiffFrontend
 {
     Q_OBJECT
   
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 51dabcaf..24435611 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -31,7 +31,7 @@
 #include <tdeio/jobclasses.h>
 #include <tdeio/job.h>
 
-#include <kdevmainwindow.h>
+#include <tdevmainwindow.h>
 
 #include "diffpart.h"
 #include "diffwidget.h"
diff --git a/parts/diff/kdevdiff.desktop b/parts/diff/tdevdiff.desktop
index 13b22e9f..db2d0428 100644
--- a/parts/diff/kdevdiff.desktop
+++ b/parts/diff/tdevdiff.desktop
@@ -35,7 +35,7 @@ Comment[tg]=Намоишгари фарқкунанда
 Comment[tr]=Fark Görüntüleyicisi
 Comment[zh_CN]=差别查看器
 Comment[zh_TW]=比較檢視器
-Name=KDevDiff
+Name=TDevDiff
 Name[da]=TDevelop diff-fremviser
 Name[de]=Abweichungsansicht (TDevelop)
 Name[hi]=के-डेव-डिफ़
@@ -78,7 +78,7 @@ GenericName[tr]=Fark Görüntüleyicisi
 GenericName[zh_CN]=差别查看器
 GenericName[zh_TW]=比較檢視器
 ServiceTypes=TDevelop/DiffFrontend
-X-TDE-Library=libkdevdiff
+X-TDE-Library=libtdevdiff
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeEditing
 X-TDevelop-Scope=Core
diff --git a/parts/diff/kdevdiff.rc b/parts/diff/tdevdiff.rc
index 37059573..ca944508 100644
--- a/parts/diff/kdevdiff.rc
+++ b/parts/diff/tdevdiff.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KDevDiff" version="1">
+<kpartgui name="TDevDiff" version="1">
 <MenuBar>
   <Menu name="tools" >
     <Action name="tools_diff" group="tools_file_operations"/>
diff --git a/parts/distpart/CMakeLists.txt b/parts/distpart/CMakeLists.txt
index 15fcb85e..586b5346 100644
--- a/parts/distpart/CMakeLists.txt
+++ b/parts/distpart/CMakeLists.txt
@@ -27,13 +27,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevdistpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpart_distpart.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdistpart )
+install( FILES tdevdistpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpart_distpart.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdistpart )
 
 
-##### libkdevdistpart (module) ##################
+##### libtdevdistpart (module) ##################
 
-tde_add_kpart( libkdevdistpart AUTOMOC
+tde_add_kpart( libtdevdistpart AUTOMOC
   SOURCES
     distpart_ui.ui distpart_part.cpp distpart_widget.cpp
     packagebase.cpp lsmsupport.cpp specsupport.cpp
diff --git a/parts/distpart/Makefile.am b/parts/distpart/Makefile.am
index 52f4a5ba..8b5e69db 100644
--- a/parts/distpart/Makefile.am
+++ b/parts/distpart/Makefile.am
@@ -1,16 +1,16 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevdistpart.la
-libkdevdistpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevdistpart_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevdistpart.la
+libtdevdistpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevdistpart_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevdistpart_la_SOURCES = distpart_ui.ui distpart_part.cpp distpart_widget.cpp packagebase.cpp lsmsupport.cpp specsupport.cpp
+libtdevdistpart_la_SOURCES = distpart_ui.ui distpart_part.cpp distpart_widget.cpp packagebase.cpp lsmsupport.cpp specsupport.cpp
 
 METASOURCES = AUTO
 KDEICON = AUTO
 servicedir = $(kde_servicesdir)
-service_DATA = kdevdistpart.desktop
+service_DATA = tdevdistpart.desktop
 
-rc_DATA = kdevpart_distpart.rc
-rcdir = $(kde_datadir)/kdevdistpart
+rc_DATA = tdevpart_distpart.rc
+rcdir = $(kde_datadir)/tdevdistpart
diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp
index e8a3e11a..01ef30b0 100644
--- a/parts/distpart/distpart_part.cpp
+++ b/parts/distpart/distpart_part.cpp
@@ -23,27 +23,27 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kdebug.h>
 
-#include "kdevcore.h"
-#include <kdevplugininfo.h>
+#include "tdevcore.h"
+#include <tdevplugininfo.h>
 
 #include "distpart_widget.h"
 
 #include <kdialogbase.h>
 
-typedef KDevGenericFactory<DistpartPart> DistpartFactory;
-static const KDevPluginInfo data("kdevdistpart");
-K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) )
+typedef TDevGenericFactory<DistpartPart> DistpartFactory;
+static const TDevPluginInfo data("tdevdistpart");
+K_EXPORT_COMPONENT_FACTORY( libtdevdistpart, DistpartFactory( data ) )
 
 DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name ? name : "DistpartPart") {
+  : TDevPlugin(&data, parent, name ? name : "DistpartPart") {
 
     kdDebug(9007) << "DistpartPart::DistpartPart()" << endl;
     setInstance(DistpartFactory::instance());
 
-    setXMLFile("kdevpart_distpart.rc");
+    setXMLFile("tdevpart_distpart.rc");
 
     m_action =  new TDEAction( i18n("Distribution && Publishing"), "package", 0,
                              this, TQT_SLOT(show()),
diff --git a/parts/distpart/distpart_part.h b/parts/distpart/distpart_part.h
index aa019c4d..d1d05a24 100644
--- a/parts/distpart/distpart_part.h
+++ b/parts/distpart/distpart_part.h
@@ -19,12 +19,12 @@
  ***************************************************************************/
 
 
-#ifndef __KDEVPART_DISTPART_H__
-#define __KDEVPART_DISTPART_H__
+#ifndef __TDEVPART_DISTPART_H__
+#define __TDEVPART_DISTPART_H__
 
 
 #include <tqguardedptr.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include <tdeaction.h>
 
 #include "packagebase.h"
@@ -32,7 +32,7 @@
 class DistpartDialog;
 class KDialogBase;
 
-class DistpartPart : public KDevPlugin {
+class DistpartPart : public TDevPlugin {
     Q_OBJECT
   
 
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index c628fe26..0999ca72 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -27,12 +27,12 @@
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
 #include <tdelocale.h>
-#include "kdevproject.h"
+#include "tdevproject.h"
 #include "domutil.h"
 #include <ktar.h>
 #include <tdemessagebox.h>
 
-#include <kdevcore.h>
+#include <tdevcore.h>
 #include <tqgroupbox.h>
 #include <tqlayout.h>
 #include <tqnetwork.h>
@@ -44,7 +44,7 @@
 #include <tqregexp.h>
 #include <tqstringlist.h>
 #include <tqtabwidget.h>
-#include "kdevmakefrontend.h"
+#include "tdevmakefrontend.h"
 #include <kprogress.h>
 
 #include <tqerrormessage.h>
diff --git a/parts/distpart/distpart_widget.h b/parts/distpart/distpart_widget.h
index 7a684a5a..1e5bf68f 100644
--- a/parts/distpart/distpart_widget.h
+++ b/parts/distpart/distpart_widget.h
@@ -32,7 +32,7 @@
 #include <tqcombobox.h>
 #include <tqprogressbar.h>
 
-class KDevProject;
+class TDevProject;
 class DistpartPart;
 class TQUrlOperator;
 class TDEProcess;
diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp
index 06a0bb67..38f8f385 100644
--- a/parts/distpart/specsupport.cpp
+++ b/parts/distpart/specsupport.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 
 #include "specsupport.h"
-#include "kdevproject.h"
-#include "kdevmakefrontend.h"
+#include "tdevproject.h"
+#include "tdevmakefrontend.h"
 #include "distpart_widget.h"
 
 #include <kdebug.h>
@@ -79,11 +79,11 @@ void SpecSupport::slotbuildAllPushButtonPressed() {
 	    return;
 	}
 	else
-            if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+            if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
                 makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote(dir) +
 		" && cp " + TDEProcess::quote(getAppSource()) + " " + TDEProcess::quote(*(map.find("_sourcedir"))));
     }
-    if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
 		 " && rpmbuild -ba " + m_part->project()->projectName() + ".spec");
 }
@@ -178,11 +178,11 @@ void SpecSupport::slotsrcPackagePushButtonPressed() {
 	    return;
 	}
 	else
-            if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+            if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
 	        makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote(dir) +
 		" && cp " + TDEProcess::quote(getAppSource()) + " " + TDEProcess::quote(*(map.find("_sourcedir"))));
     }
-    if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
 		 " && rpmbuild -bs " + m_part->project()->projectName() + ".spec");
 }
diff --git a/parts/distpart/kdevdistpart.desktop b/parts/distpart/tdevdistpart.desktop
index 1b3d095d..290a0a8d 100644
--- a/parts/distpart/kdevdistpart.desktop
+++ b/parts/distpart/tdevdistpart.desktop
@@ -64,7 +64,7 @@ GenericName[zh_CN]=最终打包支持
 GenericName[zh_TW]=最終包裝支援
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevdistpart
+X-TDE-Library=libtdevdistpart
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=ProjectPackaging
diff --git a/parts/distpart/kdevpart_distpart.rc b/parts/distpart/tdevpart_distpart.rc
index 8b142d04..8b142d04 100644
--- a/parts/distpart/kdevpart_distpart.rc
+++ b/parts/distpart/tdevpart_distpart.rc
diff --git a/parts/documentation/CMakeLists.txt b/parts/documentation/CMakeLists.txt
index accc3401..4b13b342 100644
--- a/parts/documentation/CMakeLists.txt
+++ b/parts/documentation/CMakeLists.txt
@@ -33,13 +33,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevdocumentation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpart_documentation.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation )
+install( FILES tdevdocumentation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpart_documentation.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation )
 
 
-##### libkdevdocumentation (module) #############
+##### libtdevdocumentation (module) #############
 
-tde_add_kpart( libkdevdocumentation AUTOMOC
+tde_add_kpart( libtdevdocumentation AUTOMOC
   SOURCES
     documentation_part.cpp documentation_widget.cpp
     contentsview.cpp indexview.cpp docglobalconfigwidgetbase.ui
@@ -50,8 +50,8 @@ tde_add_kpart( libkdevdocumentation AUTOMOC
     find_documentation.cpp find_documentation_optionsbase.ui
     find_documentation_options.cpp selecttopicbase.ui
     selecttopic.cpp docprojectconfigwidgetbase.ui
-    docprojectconfigwidget.cpp KDevDocumentationIface.cpp
-    KDevDocumentationIface.skel addcatalogdlgbase.ui
+    docprojectconfigwidget.cpp TDevDocumentationIface.cpp
+    TDevDocumentationIface.skel addcatalogdlgbase.ui
     addcatalogdlg.cpp
   LINK documentation_interfaces-shared tdevelop-shared tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/documentation/Makefile.am b/parts/documentation/Makefile.am
index 13c4db3f..118c8041 100644
--- a/parts/documentation/Makefile.am
+++ b/parts/documentation/Makefile.am
@@ -1,31 +1,31 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
 	-I$(top_srcdir)/parts/documentation/interfaces $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevdocumentation.la
-libkdevdocumentation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevdocumentation_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+kde_module_LTLIBRARIES = libtdevdocumentation.la
+libtdevdocumentation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevdocumentation_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la $(LIB_TDEHTML)
 
-libkdevdocumentation_la_SOURCES = documentation_part.cpp \
+libtdevdocumentation_la_SOURCES = documentation_part.cpp \
 			documentation_widget.cpp contentsview.cpp indexview.cpp docglobalconfigwidgetbase.ui \
 			docglobalconfigwidget.cpp docconfiglistview.cpp editcatalogdlgbase.ui editcatalogdlg.cpp \
 			docutils.cpp searchview.cpp bookmarkview.cpp editbookmarkdlg.ui \
 			find_documentationbase.ui find_documentation.cpp find_documentation_optionsbase.ui \
 			find_documentation_options.cpp selecttopicbase.ui selecttopic.cpp docprojectconfigwidgetbase.ui \
-			docprojectconfigwidget.cpp KDevDocumentationIface.cpp KDevDocumentationIface.skel \
+			docprojectconfigwidget.cpp TDevDocumentationIface.cpp TDevDocumentationIface.skel \
 	addcatalogdlgbase.ui addcatalogdlg.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevdocumentation.desktop
+service_DATA = tdevdocumentation.desktop
 
-rcdir = $(kde_datadir)/kdevdocumentation
-rc_DATA = kdevpart_documentation.rc
+rcdir = $(kde_datadir)/tdevdocumentation
+rc_DATA = tdevpart_documentation.rc
 
 noinst_HEADERS = contentsview.h indexview.h docglobalconfigwidget.h \
 					docconfiglistview.h editcatalogdlg.h docutils.h searchview.h bookmarkview.h selecttopic.h \
-			docprojectconfigwidget.h KDevDocumentationIface.h addcatalogdlg.h
+			docprojectconfigwidget.h TDevDocumentationIface.h addcatalogdlg.h
 SUBDIRS = interfaces plugins tools data protocols
 
 DOXYGEN_EMPTY = YES
diff --git a/parts/documentation/KDevDocumentationIface.cpp b/parts/documentation/TDevDocumentationIface.cpp
index 329b8474..0441eb4a 100644
--- a/parts/documentation/KDevDocumentationIface.cpp
+++ b/parts/documentation/TDevDocumentationIface.cpp
@@ -17,67 +17,67 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include "KDevDocumentationIface.h"
+#include "TDevDocumentationIface.h"
 
 #include "documentation_part.h"
 
-KDevDocumentationIface::KDevDocumentationIface(DocumentationPart *part)
-    :TQObject(part), DCOPObject("KDevDocumentation"), m_part(part)
+TDevDocumentationIface::TDevDocumentationIface(DocumentationPart *part)
+    :TQObject(part), DCOPObject("TDevDocumentation"), m_part(part)
 {
 }
 
-KDevDocumentationIface::~KDevDocumentationIface()
+TDevDocumentationIface::~TDevDocumentationIface()
 {
 }
 
-void KDevDocumentationIface::lookupInIndex(TQString term)
+void TDevDocumentationIface::lookupInIndex(TQString term)
 {
     m_part->lookInDocumentationIndex(term);
 }
 
-void KDevDocumentationIface::findInFinder(TQString term)
+void TDevDocumentationIface::findInFinder(TQString term)
 {
     m_part->findInDocumentation(term);
 }
 
-void KDevDocumentationIface::searchInDocumentation(TQString term)
+void TDevDocumentationIface::searchInDocumentation(TQString term)
 {
     m_part->searchInDocumentation(term);
 }
 
-void KDevDocumentationIface::lookupInIndex()
+void TDevDocumentationIface::lookupInIndex()
 {
     m_part->lookInDocumentationIndex();
 }
 
-void KDevDocumentationIface::searchInDocumentation()
+void TDevDocumentationIface::searchInDocumentation()
 {
     m_part->searchInDocumentation();
 }
 
-void KDevDocumentationIface::manPage(TQString term)
+void TDevDocumentationIface::manPage(TQString term)
 {
     m_part->manPage(term);
 }
 
-void KDevDocumentationIface::infoPage(TQString term)
+void TDevDocumentationIface::infoPage(TQString term)
 {
     m_part->infoPage(term);
 }
 
-void KDevDocumentationIface::manPage()
+void TDevDocumentationIface::manPage()
 {
     m_part->manPage();
 }
 
-void KDevDocumentationIface::infoPage()
+void TDevDocumentationIface::infoPage()
 {
     m_part->infoPage();
 }
 
-void KDevDocumentationIface::findInFinder( )
+void TDevDocumentationIface::findInFinder( )
 {
     m_part->findInDocumentation();
 }
 
-#include "KDevDocumentationIface.moc"
+#include "TDevDocumentationIface.moc"
diff --git a/parts/documentation/KDevDocumentationIface.h b/parts/documentation/TDevDocumentationIface.h
index c55143e7..565070f3 100644
--- a/parts/documentation/KDevDocumentationIface.h
+++ b/parts/documentation/TDevDocumentationIface.h
@@ -17,21 +17,21 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef KDEVDOCUMENTATIONIFACE_H
-#define KDEVDOCUMENTATIONIFACE_H
+#ifndef TDEVDOCUMENTATIONIFACE_H
+#define TDEVDOCUMENTATIONIFACE_H
 
 #include <tqobject.h>
 #include <dcopobject.h>
 
 class DocumentationPart;
 
-class KDevDocumentationIface : public TQObject, public DCOPObject {
+class TDevDocumentationIface : public TQObject, public DCOPObject {
     Q_OBJECT
 //    
     K_DCOP
 public:
-    KDevDocumentationIface(DocumentationPart *part);
-    ~KDevDocumentationIface();
+    TDevDocumentationIface(DocumentationPart *part);
+    ~TDevDocumentationIface();
 
 k_dcop:
     void lookupInIndex(TQString term);
diff --git a/parts/documentation/addcatalogdlg.cpp b/parts/documentation/addcatalogdlg.cpp
index 21913089..51e6fe96 100644
--- a/parts/documentation/addcatalogdlg.cpp
+++ b/parts/documentation/addcatalogdlg.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 
 #include "docutils.h"
-#include "kdevdocumentationplugin.h"
+#include "tdevdocumentationplugin.h"
 
 AddCatalogDlg::AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, 
 	TQWidget* parent, const char* name, bool modal, WFlags fl)
diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp
index f626e246..9e6f85df 100644
--- a/parts/documentation/bookmarkview.cpp
+++ b/parts/documentation/bookmarkview.cpp
@@ -34,8 +34,8 @@
 #include <tdehtml_part.h>
 #include <dom/html_document.h>
 
-#include <kdevpartcontroller.h>
-#include <kdevdocumentationplugin.h>
+#include <tdevpartcontroller.h>
+#include <tdevdocumentationplugin.h>
 
 #include "documentation_part.h"
 #include "documentation_widget.h"
@@ -44,7 +44,7 @@
 
 DocBookmarkManager::DocBookmarkManager(DocumentationPart */*part*/)
     :KBookmarkManager(locateLocal("data",
-    "kdevdocumentation/bookmarks/bookmarks.xml"), false)
+    "tdevdocumentation/bookmarks/bookmarks.xml"), false)
 {
     setEditorOptions(i18n("Documentation"), false);
 }
diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp
index 532feefd..ff3c9a31 100644
--- a/parts/documentation/contentsview.cpp
+++ b/parts/documentation/contentsview.cpp
@@ -26,8 +26,8 @@
 #include <tdelistview.h>
 #include <tdelocale.h>
 
-#include <kdevpartcontroller.h>
-#include <kdevdocumentationplugin.h>
+#include <tdevpartcontroller.h>
+#include <tdevdocumentationplugin.h>
 
 #include "documentation_widget.h"
 #include "documentation_part.h"
diff --git a/parts/documentation/data/CMakeLists.txt b/parts/documentation/data/CMakeLists.txt
index 77d380d4..5bb6d766 100644
--- a/parts/documentation/data/CMakeLists.txt
+++ b/parts/documentation/data/CMakeLists.txt
@@ -11,8 +11,8 @@
 
 install( FILES
     long.html nomatch.html short.html syntax.html wrapper.html
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/en )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/en )
 
 install( FILES
     checked.xpm htdig.png star.png star_blank.png unchecked.xpm
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/pics )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/pics )
diff --git a/parts/documentation/data/Makefile.am b/parts/documentation/data/Makefile.am
index 920c492a..ae52bf11 100644
--- a/parts/documentation/data/Makefile.am
+++ b/parts/documentation/data/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 METASOURCES = AUTO
-htmldir = $(kde_datadir)/kdevdocumentation/en
-picsdir = $(kde_datadir)/kdevdocumentation/pics
+htmldir = $(kde_datadir)/tdevdocumentation/en
+picsdir = $(kde_datadir)/tdevdocumentation/pics
 html_DATA =  long.html nomatch.html short.html syntax.html wrapper.html
 pics_DATA =  checked.xpm htdig.png star.png star_blank.png unchecked.xpm
diff --git a/parts/documentation/data/nomatch.html b/parts/documentation/data/nomatch.html
index 8951a604..5cbd5c49 100644
--- a/parts/documentation/data/nomatch.html
+++ b/parts/documentation/data/nomatch.html
@@ -1,6 +1,6 @@
 <html><head><title>No match for '$&(LOGICAL_WORDS)'</title></head>
 <body bgcolor="#ffffff" text="#000000" link="#aa0000">
-<h1><img src="$(PICDIR)kdevdocumentation/pics/htdig.png">
+<h1><img src="$(PICDIR)tdevdocumentation/pics/htdig.png">
 Search results</h1>
 <hr noshade size="4">
 <h2>No matches were found for '$&(LOGICAL_WORDS)'</h2>
@@ -17,5 +17,5 @@ word with "<b>All</b>," try using one or more of the same words
 with "<b>Any</b>."</p>
 <hr noshade size="4">
 <a href="http://www.htdig.org/">
-<img src="$(PICDIR)kdevdocumentation/pics/htdig.png" border="0">ht://Dig $(VERSION)</a>
+<img src="$(PICDIR)tdevdocumentation/pics/htdig.png" border="0">ht://Dig $(VERSION)</a>
 </body></html>
diff --git a/parts/documentation/data/syntax.html b/parts/documentation/data/syntax.html
index 9701c37f..21a2ab2a 100644
--- a/parts/documentation/data/syntax.html
+++ b/parts/documentation/data/syntax.html
@@ -1,6 +1,6 @@
 <html><head><title>Error in Boolean search for '$&(WORDS)'</title></head>
 <body bgcolor="#ffffff" text="#000000" link="#aa0000">
-<h1><img src="$(PICDIR)kdevdocumentation/pics/htdig.png">
+<h1><img src="$(PICDIR)tdevdocumentation/pics/htdig.png">
 Error in Boolean search for '$&(LOGICAL_WORDS)'</h1>
 <hr noshade size="4">
 Boolean expressions need to be 'correct' in order for the search
@@ -14,6 +14,6 @@ $(SYNTAXERROR)
 </b></blockquote>
 <hr noshade size="4">
 <a href="http://www.htdig.org/">
-<img src="$(PICDIR)kdevdocumentation/pics/htdig.png" border="0">ht://Dig $(VERSION)</a>
+<img src="$(PICDIR)tdevdocumentation/pics/htdig.png" border="0">ht://Dig $(VERSION)</a>
 </body></html>
 
diff --git a/parts/documentation/data/wrapper.html b/parts/documentation/data/wrapper.html
index 20c1bbf2..187ffd61 100644
--- a/parts/documentation/data/wrapper.html
+++ b/parts/documentation/data/wrapper.html
@@ -1,10 +1,10 @@
 <html><head><title>Search results for '$&(WORDS)'</title></head>
 <body bgcolor="#ffffff" text="#000000" link="#aa0000">
-<h2><img src=$(PICDIR)kdevdocumentation/pics/htdig.png>
+<h2><img src=$(PICDIR)tdevdocumentation/pics/htdig.png>
 Search results for '$&(LOGICAL_WORDS)'</h2>
 <hr noshade size="4">
 <b>
-More <img src=$(PICDIR)kdevdocumentation/pics/star.png alt="*">'s indicate a better match.
+More <img src=$(PICDIR)tdevdocumentation/pics/star.png alt="*">'s indicate a better match.
 </b>
 <hr noshade size="1">
 $(HTSEARCH_RESULTS)
@@ -12,5 +12,5 @@ $(PAGEHEADER)
 $(PREVPAGE) $(PAGELIST) $(NEXTPAGE)
 <hr noshade size="4">
 <a href="http://www.htdig.org/">
-<img src=$(PICDIR)kdevdocumentation/pics/htdig.png border="0">ht://Dig $(VERSION)</a>
+<img src=$(PICDIR)tdevdocumentation/pics/htdig.png border="0">ht://Dig $(VERSION)</a>
 </body></html>
diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp
index d2753653..ba6f30fb 100644
--- a/parts/documentation/docconfiglistview.cpp
+++ b/parts/documentation/docconfiglistview.cpp
@@ -21,7 +21,7 @@
 
 #include <tdelocale.h>
 
-#include "kdevdocumentationplugin.h"
+#include "tdevdocumentationplugin.h"
 
 DocConfigListView::DocConfigListView(TQWidget *parent, const char *name)
      :TDEListView(parent, name)
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index cb6c3776..5f66ef4a 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -38,8 +38,8 @@
 #include <tdehtml_part.h>
 #include <tdehtml_settings.h>
 
-#include "kdevdocumentationplugin.h"
-#include "kdevpartcontroller.h"
+#include "tdevdocumentationplugin.h"
+#include "tdevpartcontroller.h"
 
 #include "docconfiglistview.h"
 #include "documentation_part.h"
@@ -67,7 +67,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
     //read full text search settings
     config->setGroup("htdig");
     TQString databaseDir = kapp->dirs()->saveLocation("data",
-        "kdevdocumentation/search");
+        "tdevdocumentation/search");
     databaseDirEdit->setURL(config->readPathEntry("databaseDir", databaseDir));
     htdigbinEdit->setURL(config->readPathEntry("htdigbin", kapp->dirs()->findExe("htdig")));
     htmergebinEdit->setURL(config->readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge")));
@@ -99,8 +99,8 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
 
     useAssistant_box->setChecked(m_part->isAssistantUsed());
 
-    // Having app-specific settings isn't pretty, but this setting is nonsensical in kdevassistant
-    if ( kapp->instanceName().find("kdevassistant") != -1 )
+    // Having app-specific settings isn't pretty, but this setting is nonsensical in tdevassistant
+    if ( kapp->instanceName().find("tdevassistant") != -1 )
         useAssistant_box->hide();
 
     //font sizes and zoom levels
@@ -182,7 +182,7 @@ void DocGlobalConfigWidget::accept()
     config->writePathEntry("htsearchbin", DocUtils::envURL(htsearchbinEdit));
 
     //write full text search locations file
-    TQString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt");
+    TQString ftsLocationsFile = locateLocal("data", "tdevdocumentation/search/locations.txt");
     TQFile f(ftsLocationsFile);
     TQStringList locs;
     if (f.open(IO_ReadWrite | IO_Truncate))
diff --git a/parts/documentation/docprojectconfigwidget.cpp b/parts/documentation/docprojectconfigwidget.cpp
index a37ad5cb..1d6678d7 100644
--- a/parts/documentation/docprojectconfigwidget.cpp
+++ b/parts/documentation/docprojectconfigwidget.cpp
@@ -27,8 +27,8 @@
 
 #include "domutil.h"
 #include "urlutil.h"
-#include "kdevproject.h"
-#include "kdevdocumentationplugin.h"
+#include "tdevproject.h"
+#include "tdevdocumentationplugin.h"
 
 #include "documentation_part.h"
 #include "documentation_widget.h"
@@ -45,7 +45,7 @@ DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget
             m_plugins[(*it)->pluginName()] = *it;
         }
     }
-    TQString projectDocSystem = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docsystem");
+    TQString projectDocSystem = DomUtil::readEntry(*(m_part->projectDom()), "/tdevdocumentation/projectdoc/docsystem");
     
     bool hasProjectDoc = false;
     for (int i = 0; i < docSystemCombo->count(); ++i)
@@ -64,7 +64,7 @@ DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget
         changeDocSystem(docSystemCombo->currentText());
     }
 
-    manualURL->setURL(DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/usermanualurl"));
+    manualURL->setURL(DomUtil::readEntry(*(m_part->projectDom()), "/tdevdocumentation/projectdoc/usermanualurl"));
 }
 
 void DocProjectConfigWidget::changeDocSystem(const TQString &text)
@@ -79,7 +79,7 @@ void DocProjectConfigWidget::changeDocSystem(const TQString &text)
     catalogURL->setMode(plugin->catalogLocatorProps().first);
     catalogURL->setFilter(plugin->catalogLocatorProps().second);
     
-    TQString projectDocURL = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docurl");
+    TQString projectDocURL = DomUtil::readEntry(*(m_part->projectDom()), "/tdevdocumentation/projectdoc/docurl");
     if (!projectDocURL.isEmpty())
         projectDocURL = TQDir::cleanDirPath(m_part->project()->projectDirectory() + "/" + projectDocURL);
 
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 75bb7c13..9515fad7 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -48,17 +48,17 @@
 #include <twin.h>
 #include <tdetexteditor/document.h>
 
-#include "kdevplugininfo.h"
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevmainwindow.h"
-#include "kdevgenericfactory.h"
-#include "kdevdocumentationplugin.h"
+#include "tdevplugininfo.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevmainwindow.h"
+#include "tdevgenericfactory.h"
+#include "tdevdocumentationplugin.h"
 #include "configwidgetproxy.h"
-#include "kdevpartcontroller.h"
+#include "tdevpartcontroller.h"
 #include "domutil.h"
 #include "urlutil.h"
-#include "kdeveditorutil.h"
+#include "tdeveditorutil.h"
 
 #include "documentation_widget.h"
 #include "docglobalconfigwidget.h"
@@ -66,22 +66,22 @@
 #include "contentsview.h"
 #include "find_documentation.h"
 
-#include "KDevDocumentationIface.h"
+#include "TDevDocumentationIface.h"
 
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-static const KDevPluginInfo data("kdevdocumentation");
+static const TDevPluginInfo data("tdevdocumentation");
 
-typedef KDevGenericFactory<DocumentationPart> DocumentationFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) )
+typedef TDevGenericFactory<DocumentationPart> DocumentationFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevdocumentation, DocumentationFactory( data ) )
 
 DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& )
-    :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ),
+    :TDevPlugin(&data, parent, name ? name : "DocumentationPart" ),
     m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false)
 {
     setInstance(DocumentationFactory::instance());
-    setXMLFile("kdevpart_documentation.rc");
+    setXMLFile("tdevpart_documentation.rc");
 
     m_configProxy = new ConfigWidgetProxy(core());
 	m_configProxy->createGlobalConfigPage(i18n("Documentation"), GLOBALDOC_OPTIONS, info()->icon() );
@@ -109,7 +109,7 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T
     
     TQTimer::singleShot(0, this, TQT_SLOT(init()));
     
-    new KDevDocumentationIface(this);
+    new TDevDocumentationIface(this);
 }
 
 DocumentationPart::~DocumentationPart()
@@ -250,6 +250,12 @@ void DocumentationPart::setupActions()
                                     "all possible sources of documentation like "
                                     "table of contents, index, man and info databases, "
                                     "Google, etc."));
+    action = new TDEAction(i18n("TDevelop Programming Handbook"), 0,
+                         this, TQT_SLOT(programmingHandbook()),
+                         actionCollection(), "help_programming_handbook" );
+    action->setToolTip(i18n("Open the TDevelop Programming Handbook"));
+    action->setWhatsThis(i18n("<b>Open the TDevelop Programming Handbook</b><p>Opens Open the TDevelop Programming Handbook."));
+
 }
 
 void DocumentationPart::emitBookmarkLocation(const TQString &title, const KURL &url)
@@ -259,12 +265,12 @@ void DocumentationPart::emitBookmarkLocation(const TQString &title, const KURL &
 
 void DocumentationPart::searchInDocumentation()
 {
-     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 
     if ( word.isEmpty() )
     {
         if ( isAssistantUsed() )
-            callAssistant ( "KDevDocumentation", "searchInDocumentation()" );
+            callAssistant ( "TDevDocumentation", "searchInDocumentation()" );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -274,7 +280,7 @@ void DocumentationPart::searchInDocumentation()
     else
     {
         if ( isAssistantUsed() )
-            callAssistant ( "KDevDocumentation", "searchInDocumentation(TQString)", word );
+            callAssistant ( "TDevDocumentation", "searchInDocumentation(TQString)", word );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -292,24 +298,29 @@ void DocumentationPart::searchInDocumentation(const TQString &term)
 void DocumentationPart::contextSearchInDocumentation()
 {
     if (isAssistantUsed())
-        callAssistant("KDevDocumentation", "searchInDocumentation(TQString)", m_contextStr);
+        callAssistant("TDevDocumentation", "searchInDocumentation(TQString)", m_contextStr);
     else
         searchInDocumentation(m_contextStr);
 }
 
+void DocumentationPart::programmingHandbook()
+{
+  kapp->invokeHelp (TQString::null, "tde_app_devel");
+}
+
 void DocumentationPart::manPage()
 {
-     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 
     if ( isAssistantUsed() )
     {
         if ( word.isEmpty() )
         {
-            callAssistant ( "KDevDocumentation", "manPage()" );
+            callAssistant ( "TDevDocumentation", "manPage()" );
         }
         else
         {
-            callAssistant ( "KDevDocumentation", "manPage(TQString)", word );
+            callAssistant ( "TDevDocumentation", "manPage(TQString)", word );
         }
     }
     else
@@ -323,17 +334,17 @@ void DocumentationPart::manPage()
 
 void DocumentationPart::infoPage()
 {
-     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
  
     if ( isAssistantUsed() )
     {
         if ( word.isEmpty() )
         {
-            callAssistant ( "KDevDocumentation", "infoPage()" );
+            callAssistant ( "TDevDocumentation", "infoPage()" );
         }
         else
         {
-            callAssistant ( "KDevDocumentation", "infoPage(TQString)", word );
+            callAssistant ( "TDevDocumentation", "infoPage(TQString)", word );
         }
     }
     else
@@ -360,7 +371,7 @@ void DocumentationPart::infoPage(const TQString &term)
 void DocumentationPart::contextManPage()
 {
     if (isAssistantUsed())
-        callAssistant("KDevDocumentation", "manPage(TQString)", m_contextStr);
+        callAssistant("TDevDocumentation", "manPage(TQString)", m_contextStr);
     else
         manPage(m_contextStr);
 }
@@ -368,7 +379,7 @@ void DocumentationPart::contextManPage()
 void DocumentationPart::contextInfoPage()
 {
     if (isAssistantUsed())
-        callAssistant("KDevDocumentation", "infoPage(TQString)", m_contextStr);
+        callAssistant("TDevDocumentation", "infoPage(TQString)", m_contextStr);
     else
         infoPage(m_contextStr);
 }
@@ -376,19 +387,19 @@ void DocumentationPart::contextInfoPage()
 void DocumentationPart::contextFindDocumentation()
 {
     if (isAssistantUsed())
-        callAssistant("KDevDocumentation", "findInFinder(TQString)", m_contextStr);
+        callAssistant("TDevDocumentation", "findInFinder(TQString)", m_contextStr);
     else
         findInDocumentation(m_contextStr);
 }
 
 void DocumentationPart::findInDocumentation()
 {
-     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
     
     if ( word.isEmpty() )
     {
         if ( isAssistantUsed() )
-            callAssistant ( "KDevDocumentation", "findInFinder()" );
+            callAssistant ( "TDevDocumentation", "findInFinder()" );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -398,7 +409,7 @@ void DocumentationPart::findInDocumentation()
     else
     {
         if ( isAssistantUsed() )
-            callAssistant ( "KDevDocumentation", "findInFinder(TQString)", word );
+            callAssistant ( "TDevDocumentation", "findInFinder(TQString)", word );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -415,12 +426,12 @@ void DocumentationPart::findInDocumentation(const TQString &term)
 
 void DocumentationPart::lookInDocumentationIndex()
 {
-     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
     
     if ( word.isEmpty() )
     {
         if ( isAssistantUsed() )
-            callAssistant ( "KDevDocumentation", "lookupInIndex()" );
+            callAssistant ( "TDevDocumentation", "lookupInIndex()" );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -430,7 +441,7 @@ void DocumentationPart::lookInDocumentationIndex()
     else
     {
         if ( isAssistantUsed() )
-            callAssistant ( "KDevDocumentation", "lookupInIndex(TQString)", word );
+            callAssistant ( "TDevDocumentation", "lookupInIndex(TQString)", word );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -448,7 +459,7 @@ void DocumentationPart::lookInDocumentationIndex(const TQString &term)
 void DocumentationPart::contextLookInDocumentationIndex()
 {
     if (isAssistantUsed())
-        callAssistant("KDevDocumentation", "lookupInIndex(TQString)", m_contextStr);
+        callAssistant("TDevDocumentation", "lookupInIndex(TQString)", m_contextStr);
     else
         lookInDocumentationIndex(m_contextStr);
 }
@@ -564,11 +575,11 @@ void DocumentationPart::setContextFeature(ContextFeature feature, bool b)
 
 void DocumentationPart::projectOpened()
 {
-    TQString projectDocSystem = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem");
-    TQString projectDocURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl");
+    TQString projectDocSystem = DomUtil::readEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docsystem");
+    TQString projectDocURL = DomUtil::readEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docurl");
     if (!projectDocURL.isEmpty())
         projectDocURL = TQDir::cleanDirPath(project()->projectDirectory() + "/" + projectDocURL);
-    TQString userManualURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl");
+    TQString userManualURL = DomUtil::readEntry(*(projectDom()), "/tdevdocumentation/projectdoc/usermanualurl");
     
     for (TQValueList<DocumentationPlugin*>::const_iterator it = m_plugins.constBegin();
         it != m_plugins.constEnd(); ++it)
@@ -602,21 +613,21 @@ void DocumentationPart::saveProjectDocumentationInfo()
 {
     if (m_projectDocumentationPlugin)
     {
-        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem", m_projectDocumentationPlugin->pluginName());
+        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docsystem", m_projectDocumentationPlugin->pluginName());
 
         TQString relPath = URLUtil::extractPathNameRelative(project()->projectDirectory(),
             m_projectDocumentationPlugin->catalogURL());
-        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl", relPath);
+        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docurl", relPath);
     }
     else
     {
-        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem", "");
-        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl", "");
+        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docsystem", "");
+        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docurl", "");
     }
     if (m_userManualPlugin)
-        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl", m_userManualPlugin->catalogURL());
+        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/usermanualurl", m_userManualPlugin->catalogURL());
     else
-        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl", "");
+        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/usermanualurl", "");
 }
 
 TQCString DocumentationPart::startAssistant()
@@ -627,7 +638,7 @@ TQCString DocumentationPart::startAssistant()
         return lastAssistant;
     
     const char *function = 0;
-    TQString app = "kdevassistant";
+    TQString app = "tdevassistant";
     function = "start_service_by_desktop_name(TQString,TQStringList)";
     TQStringList URLs;
 
@@ -665,7 +676,7 @@ TQCString DocumentationPart::startAssistant()
             kdDebug() << dcopName.data() << endl;
             
             //@fixme: is there another way to wait for the remote object to be loaded
-            while (!TDEApplication::dcopClient()->remoteObjects(dcopName).contains("KDevDocumentation"))
+            while (!TDEApplication::dcopClient()->remoteObjects(dcopName).contains("TDevDocumentation"))
                 usleep(500);
         }
     }
@@ -674,8 +685,8 @@ TQCString DocumentationPart::startAssistant()
 
 bool DocumentationPart::isAssistantUsed() const
 {
-	// hack to solve BR #90334 - don't call kdevassistant via DCOP if we ARE kdevassistant
-	if ( kapp->instanceName().find("kdevassistant") != -1 )
+	// hack to solve BR #90334 - don't call tdevassistant via DCOP if we ARE tdevassistant
+	if ( kapp->instanceName().find("tdevassistant") != -1 )
 	{
 		return false;
 	}
@@ -686,7 +697,7 @@ bool DocumentationPart::isAssistantUsed() const
 void DocumentationPart::setAssistantUsed(bool b)
 {
     m_assistantUsed = b;
-    //use global config to store different settings for kdevassistant and tdevelop
+    //use global config to store different settings for tdevassistant and tdevelop
     TDEConfig *config = kapp->config();
     config->setGroup("Documentation");
     config->writeEntry("UseAssistant", isAssistantUsed());
@@ -739,7 +750,7 @@ void DocumentationPart::loadSettings()
     config->setGroup("Documentation");
     m_assistantUsed = config->readBoolEntry("UseAssistant", false);
     
-    if (TQString(TDEGlobal::instance()->aboutData()->appName()) == "kdevassistant")
+    if (TQString(TDEGlobal::instance()->aboutData()->appName()) == "tdevassistant")
     {
         int page = config->readNumEntry("LastPage", 0);
         switch (page)
diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h
index 722ad4bd..aafe1669 100644
--- a/parts/documentation/documentation_part.h
+++ b/parts/documentation/documentation_part.h
@@ -17,11 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef __KDEVPART_DOCUMENTATION_H__
-#define __KDEVPART_DOCUMENTATION_H__
+#ifndef __TDEVPART_DOCUMENTATION_H__
+#define __TDEVPART_DOCUMENTATION_H__
 
 #include <tqguardedptr.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 
 class FindDocumentation;
@@ -39,7 +39,7 @@ class TQPopupMenu;
 /*
  Please read the README.dox file for more info about this part
  */
-class DocumentationPart : public KDevPlugin
+class DocumentationPart : public TDevPlugin
 {
     Q_OBJECT
   
@@ -69,6 +69,7 @@ public slots:
     void searchInDocumentation();
     void searchInDocumentation(const TQString &term);
     void contextSearchInDocumentation();
+    void programmingHandbook();
     void manPage();
     void manPage(const TQString &term);
     void contextManPage();
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index b1ab69ca..b69e80a5 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -31,8 +31,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 
-#include <kdevcore.h>
-#include <kdevdocumentationplugin.h>
+#include <tdevcore.h>
+#include <tdevdocumentationplugin.h>
 
 #include "documentation_part.h"
 #include "contentsview.h"
diff --git a/parts/documentation/documentation_widget.h b/parts/documentation/documentation_widget.h
index a813b393..fccd03b9 100644
--- a/parts/documentation/documentation_widget.h
+++ b/parts/documentation/documentation_widget.h
@@ -23,7 +23,7 @@
 #include <tqwidget.h>
 
 class FindDocumentation;
-class KDevProject;
+class TDevProject;
 class DocumentationPart;
 class ContentsView;
 class IndexView;
diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp
index 5360a73f..ba00ea83 100644
--- a/parts/documentation/docutils.cpp
+++ b/parts/documentation/docutils.cpp
@@ -27,9 +27,9 @@
 #include <tdelocale.h>
 #include <kstringhandler.h>
 
-#include <kdevpartcontroller.h>
+#include <tdevpartcontroller.h>
 
-#include "kdevdocumentationplugin.h"
+#include "tdevdocumentationplugin.h"
 #include "documentation_part.h"
 
 TQString DocUtils::noEnvURL(const TQString &url)
diff --git a/parts/documentation/editcatalogdlg.cpp b/parts/documentation/editcatalogdlg.cpp
index 8bdc19d5..2fb81fec 100644
--- a/parts/documentation/editcatalogdlg.cpp
+++ b/parts/documentation/editcatalogdlg.cpp
@@ -26,7 +26,7 @@
 #include <kurlcompletion.h>
 
 #include "docutils.h"
-#include "kdevdocumentationplugin.h"
+#include "tdevdocumentationplugin.h"
 
 EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* parent,
     const char* name, bool modal, WFlags fl)
diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp
index ebddcd4c..2f730b81 100644
--- a/parts/documentation/find_documentation.cpp
+++ b/parts/documentation/find_documentation.cpp
@@ -29,8 +29,8 @@
 #include <kprocess.h>
 #include <tdelistbox.h>
 
-#include <kdevpartcontroller.h>
-#include <kdevdocumentationplugin.h>
+#include <tdevpartcontroller.h>
+#include <tdevdocumentationplugin.h>
 
 #include "documentation_widget.h"
 #include "documentation_part.h"
diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp
index cae33db5..25762451 100644
--- a/parts/documentation/indexview.cpp
+++ b/parts/documentation/indexview.cpp
@@ -30,8 +30,8 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-#include <kdevpartcontroller.h>
-#include <kdevdocumentationplugin.h>
+#include <tdevpartcontroller.h>
+#include <tdevdocumentationplugin.h>
 
 #include "docutils.h"
 #include "selecttopic.h"
diff --git a/parts/documentation/interfaces/CMakeLists.txt b/parts/documentation/interfaces/CMakeLists.txt
index f4a2ff08..2e1f0ae3 100644
--- a/parts/documentation/interfaces/CMakeLists.txt
+++ b/parts/documentation/interfaces/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kdevdocumentationplugin.h
+    tdevdocumentationplugin.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/parts/documentation )
 
 
@@ -37,7 +37,7 @@ install( FILES
 ##### documentation_interfaces (shared) #########
 
 tde_add_library( documentation_interfaces SHARED AUTOMOC
-  SOURCES kdevdocumentationplugin.cpp
+  SOURCES tdevdocumentationplugin.cpp
   VERSION 0.0.0
   LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
diff --git a/parts/documentation/interfaces/Makefile.am b/parts/documentation/interfaces/Makefile.am
index f128dabc..b0feb598 100644
--- a/parts/documentation/interfaces/Makefile.am
+++ b/parts/documentation/interfaces/Makefile.am
@@ -5,12 +5,12 @@ partincludedirdir = $(includedir)/tdevelop/parts/documentation
 lib_LTLIBRARIES = libdocumentation_interfaces.la
 libdocumentation_interfaces_la_LDFLAGS = $(all_libraries)
 libdocumentation_interfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
-libdocumentation_interfaces_la_SOURCES = kdevdocumentationplugin.cpp
-partincludedir_HEADERS = kdevdocumentationplugin.h
+libdocumentation_interfaces_la_SOURCES = tdevdocumentationplugin.cpp
+partincludedir_HEADERS = tdevdocumentationplugin.h
 servicetypedir = $(kde_servicetypesdir)
 servicetype_DATA = tdevelopdocumentationplugins.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces
-DOXYGEN_PROJECTNAME = KDevelop Documentation Part Interfaces Library
-DOXYGEN_DOCDIRPREFIX = kdevdoc
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces
+DOXYGEN_PROJECTNAME = TDevelop Documentation Part Interfaces Library
+DOXYGEN_DOCDIRPREFIX = tdevdoc
 include ../../../Doxyfile.am
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/tdevdocumentationplugin.cpp
index afc9abad..f3c20841 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/tdevdocumentationplugin.cpp
@@ -16,7 +16,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "kdevdocumentationplugin.h"
+#include "tdevdocumentationplugin.h"
 
 #include <tqfile.h>
 #include <tqpainter.h>
@@ -334,7 +334,7 @@ void DocumentationPlugin::cacheIndex(DocumentationCatalogItem *item)
 {
     kdDebug() << "Creating index cache for " << item->text(0) << endl;
     
-    TQString cacheName = locateLocal("data", TQString("kdevdocumentation/index/cache_") + item->text(0));
+    TQString cacheName = locateLocal("data", TQString("tdevdocumentation/index/cache_") + item->text(0));
     TQFile cacheFile(cacheName);
     if (!cacheFile.open(IO_WriteOnly))
         return;
@@ -357,7 +357,7 @@ void DocumentationPlugin::cacheIndex(DocumentationCatalogItem *item)
 
 bool DocumentationPlugin::loadCachedIndex(IndexBox *index, DocumentationCatalogItem *item)
 {
-    TQString cacheName = locateLocal("data", TQString("kdevdocumentation/index/cache_") + item->cacheVersion() + item->text(0));
+    TQString cacheName = locateLocal("data", TQString("tdevdocumentation/index/cache_") + item->cacheVersion() + item->text(0));
     TQFile cacheFile(cacheName);
     if (!cacheFile.open(IO_ReadOnly))
         return false;
@@ -718,4 +718,4 @@ TQString ProjectDocumentationPlugin::catalogURL() const
     return m_url;
 }
 
-#include "kdevdocumentationplugin.moc"
+#include "tdevdocumentationplugin.moc"
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/tdevdocumentationplugin.h
index a5dbe458..ed18a86a 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.h
+++ b/parts/documentation/interfaces/tdevdocumentationplugin.h
@@ -16,8 +16,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEV_DOC_PLUGIN_H
-#define KDEV_DOC_PLUGIN_H
+#ifndef TDEV_DOC_PLUGIN_H
+#define TDEV_DOC_PLUGIN_H
 
 #include <tqmap.h>
 #include <tqvaluelist.h>
diff --git a/parts/documentation/plugins/CMakeLists.txt b/parts/documentation/plugins/CMakeLists.txt
index 281c40f8..116e7674 100644
--- a/parts/documentation/plugins/CMakeLists.txt
+++ b/parts/documentation/plugins/CMakeLists.txt
@@ -12,6 +12,6 @@
 add_subdirectory( qt )
 add_subdirectory( doxygen )
 add_subdirectory( devhelp )
-add_subdirectory( kdevtoc )
+add_subdirectory( tdevtoc )
 add_subdirectory( chm )
 add_subdirectory( custom )
diff --git a/parts/documentation/plugins/Makefile.am b/parts/documentation/plugins/Makefile.am
index c2002f78..253a0193 100644
--- a/parts/documentation/plugins/Makefile.am
+++ b/parts/documentation/plugins/Makefile.am
@@ -1,3 +1,3 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 METASOURCES = AUTO
-SUBDIRS = qt doxygen devhelp kdevtoc chm custom
+SUBDIRS = qt doxygen devhelp tdevtoc chm custom
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index 5acecce3..f3287540 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -28,14 +28,14 @@
 #include <iostream>
 #include <fstream>
 #include <tqvaluevector.h>
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 #include <tqregexp.h>
 
 #include "../../../../config.h"
 
-static const KDevPluginInfo data("docchmplugin");
-typedef KDevGenericFactory<DocCHMPlugin> DocCHMPluginFactory;
+static const TDevPluginInfo data("docchmplugin");
+typedef TDevGenericFactory<DocCHMPlugin> DocCHMPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocchmplugin, DocCHMPluginFactory(data) )
 
 DocCHMPlugin::DocCHMPlugin(TQObject* parent, const char* name, TQStringList // args
diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h
index 452e1c09..e814248f 100644
--- a/parts/documentation/plugins/chm/docchmplugin.h
+++ b/parts/documentation/plugins/chm/docchmplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCCHMPLUGIN_H
 #define DOCCHMPLUGIN_H
 
-#include <kdevdocumentationplugin.h>
+#include <tdevdocumentationplugin.h>
 
 class DocCHMPlugin :public DocumentationPlugin
 {
diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp
index dd141eba..55d6c9c6 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.cpp
+++ b/parts/documentation/plugins/custom/doccustomplugin.cpp
@@ -25,11 +25,11 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 
-static const KDevPluginInfo data("doccustomplugin");
-typedef KDevGenericFactory<DocCustomPlugin> DocCustomPluginFactory;
+static const TDevPluginInfo data("doccustomplugin");
+typedef TDevGenericFactory<DocCustomPlugin> DocCustomPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdoccustomplugin, DocCustomPluginFactory(data) )
 
 DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStringList // args
diff --git a/parts/documentation/plugins/custom/doccustomplugin.h b/parts/documentation/plugins/custom/doccustomplugin.h
index f83daf1a..315e0864 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.h
+++ b/parts/documentation/plugins/custom/doccustomplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCCUSTOMPLUGIN_H
 #define DOCCUSTOMPLUGIN_H
 
-#include <kdevdocumentationplugin.h>
+#include <tdevdocumentationplugin.h>
 
 class DocCustomPlugin : public DocumentationPlugin {
 public:
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
index 4f2d50d6..d644df4f 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
@@ -32,8 +32,8 @@
 #include <tdelocale.h>
 #include <kstandarddirs.h>
 
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 
 #include "../../../../config.h"
 
@@ -69,8 +69,8 @@ private:
 };
 
 
-static const KDevPluginInfo data("docdevhelpplugin");
-typedef KDevGenericFactory<DocDevHelpPlugin> DocDevHelpPluginFactory;
+static const TDevPluginInfo data("docdevhelpplugin");
+typedef TDevGenericFactory<DocDevHelpPlugin> DocDevHelpPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdevhelpplugin, DocDevHelpPluginFactory(data) )
 
 DocDevHelpPlugin::DocDevHelpPlugin(TQObject* parent, const char* name,
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h
index 6436a1d8..11339098 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h
@@ -23,7 +23,7 @@
 #include <tqvaluestack.h>
 #include <tqdom.h>
 
-#include <kdevdocumentationplugin.h>
+#include <tdevdocumentationplugin.h>
 
 class DocDevHelpPlugin: public DocumentationPlugin
 {
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
index 7851a516..dafdfa1f 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
@@ -25,10 +25,10 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 
 static const TDEAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plugin"), "1.0");
-typedef KDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory;
+typedef TDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) )
 
 DocDjvuPlugin::DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args)
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.h b/parts/documentation/plugins/djvu/docdjvuplugin.h
index 6bff409c..15415c65 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.h
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCDJVUPLUGIN_H
 #define DOCDVJUPLUGIN_H
 
-#include <kdevdocumentationplugin.h>
+#include <tdevdocumentationplugin.h>
 
 class DocDjvuPlugin : public DocumentationPlugin {
 public:
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
index 9a5a6912..e5a7da93 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
@@ -35,8 +35,8 @@
 #include <kstandarddirs.h>
 
 #include <urlutil.h>
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 
 #include "../../../../config.h"
 
@@ -60,8 +60,8 @@ private:
 };
 
 
-static const KDevPluginInfo data("docdoxygenplugin");
-typedef KDevGenericFactory<DocDoxygenPlugin> DocDoxygenPluginFactory;
+static const TDevPluginInfo data("docdoxygenplugin");
+typedef TDevGenericFactory<DocDoxygenPlugin> DocDoxygenPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdoxygenplugin, DocDoxygenPluginFactory(data) )
 
 DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList)
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h
index ebd4a540..8382f98e 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCDOXYGENPLUGIN_H
 #define DOCDOXYGENPLUGIN_H
 
-#include <kdevdocumentationplugin.h>
+#include <tdevdocumentationplugin.h>
 
 class TQDomDocument;
 class TQDomElement;
diff --git a/parts/documentation/plugins/kdevtoc/Makefile.am b/parts/documentation/plugins/kdevtoc/Makefile.am
deleted file mode 100644
index 22dab380..00000000
--- a/parts/documentation/plugins/kdevtoc/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
-	-I$(top_srcdir)/parts/documentation/interfaces $(all_includes)
-METASOURCES = AUTO
-kde_module_LTLIBRARIES =  libdockdevtocplugin.la
-libdockdevtocplugin_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
-kde_services_DATA =  dockdevtocplugin.desktop
-noinst_HEADERS =  dockdevtocplugin.h
-libdockdevtocplugin_la_SOURCES =  dockdevtocplugin.cpp
-libdockdevtocplugin_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp
index fc647d34..b0ebd29d 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.cpp
+++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp
@@ -25,10 +25,10 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 
 static const TDEAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation plugin"), "1.0");
-typedef KDevGenericFactory<DocPDBPlugin> DocPDBPluginFactory;
+typedef TDevGenericFactory<DocPDBPlugin> DocPDBPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) )
 
 DocPDBPlugin::DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args)
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.h b/parts/documentation/plugins/pdb/docpdbplugin.h
index 40dd3a15..d1319012 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.h
+++ b/parts/documentation/plugins/pdb/docpdbplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCPDBPLUGIN_H
 #define DOCPDBPLUGIN_H
 
-#include <kdevdocumentationplugin.h>
+#include <tdevdocumentationplugin.h>
 
 class DocPDBPlugin : public DocumentationPlugin {
 public:
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp
index 65bddd1b..322a33d3 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.cpp
+++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp
@@ -25,10 +25,10 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 
 static const TDEAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin"), "1.0");
-typedef KDevGenericFactory<DocPDFPlugin> DocPDFPluginFactory;
+typedef TDevGenericFactory<DocPDFPlugin> DocPDFPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) )
 
 DocPDFPlugin::DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args)
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.h b/parts/documentation/plugins/pdf/docpdfplugin.h
index d5ecc7eb..a5410196 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.h
+++ b/parts/documentation/plugins/pdf/docpdfplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCPDFPLUGIN_H
 #define DOCPDFPLUGIN_H
 
-#include <kdevdocumentationplugin.h>
+#include <tdevdocumentationplugin.h>
 
 class DocPDFPlugin : public DocumentationPlugin {
 public:
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index 10271524..301859ca 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -32,8 +32,8 @@
 #include <tdelistview.h>
 
 #include <urlutil.h>
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 
 #include "../../../../config.h"
 
@@ -56,8 +56,8 @@ private:
     TQString m_dcfFile;
 };
 
-static const KDevPluginInfo data("docqtplugin");
-typedef KDevGenericFactory<DocQtPlugin> DocQtPluginFactory;
+static const TDevPluginInfo data("docqtplugin");
+typedef TDevGenericFactory<DocQtPlugin> DocQtPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) )
 
 DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList)
diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h
index 8eac8456..964ef844 100644
--- a/parts/documentation/plugins/qt/docqtplugin.h
+++ b/parts/documentation/plugins/qt/docqtplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCTQTPLUGIN_H
 #define DOCTQTPLUGIN_H
 
-#include <kdevdocumentationplugin.h>
+#include <tdevdocumentationplugin.h>
 #include <tqdom.h>
 
 class TDEConfig;
diff --git a/parts/documentation/plugins/kdevtoc/CMakeLists.txt b/parts/documentation/plugins/tdevtoc/CMakeLists.txt
index c12c26e3..f3d1efc2 100644
--- a/parts/documentation/plugins/kdevtoc/CMakeLists.txt
+++ b/parts/documentation/plugins/tdevtoc/CMakeLists.txt
@@ -27,13 +27,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES dockdevtocplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES doctdevtocplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libdockdevtocplugin (module) ##############
+##### libdoctdevtocplugin (module) ##############
 
-tde_add_kpart( libdockdevtocplugin AUTOMOC
-  SOURCES dockdevtocplugin.cpp
+tde_add_kpart( libdoctdevtocplugin AUTOMOC
+  SOURCES doctdevtocplugin.cpp
   LINK documentation_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/documentation/plugins/tdevtoc/Makefile.am b/parts/documentation/plugins/tdevtoc/Makefile.am
new file mode 100644
index 00000000..4baaaa86
--- /dev/null
+++ b/parts/documentation/plugins/tdevtoc/Makefile.am
@@ -0,0 +1,10 @@
+INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
+	-I$(top_srcdir)/parts/documentation/interfaces $(all_includes)
+METASOURCES = AUTO
+kde_module_LTLIBRARIES =  libdoctdevtocplugin.la
+libdoctdevtocplugin_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
+kde_services_DATA =  doctdevtocplugin.desktop
+noinst_HEADERS =  doctdevtocplugin.h
+libdoctdevtocplugin_la_SOURCES =  doctdevtocplugin.cpp
+libdoctdevtocplugin_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/tdevtoc/doctdevtocplugin.cpp
index fa17549b..aa603fbd 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
+++ b/parts/documentation/plugins/tdevtoc/doctdevtocplugin.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include "dockdevtocplugin.h"
+#include "doctdevtocplugin.h"
 
 #include <unistd.h>
 
@@ -34,8 +34,8 @@
 #include <kstandarddirs.h>
 
 #include <urlutil.h>
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 
 #include "../../../../config.h"
 
@@ -59,38 +59,38 @@ private:
 };
 
 
-static const KDevPluginInfo data("dockdevtocplugin");
-typedef KDevGenericFactory<DocKDevTOCPlugin> DocKDevTOCPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libdockdevtocplugin, DocKDevTOCPluginFactory(data) )
+static const TDevPluginInfo data("doctdevtocplugin");
+typedef TDevGenericFactory<DocTDevTOCPlugin> DocTDevTOCPluginFactory;
+K_EXPORT_COMPONENT_FACTORY( libdoctdevtocplugin, DocTDevTOCPluginFactory(data) )
 
-DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* parent, const char* name,
+DocTDevTOCPlugin::DocTDevTOCPlugin(TQObject* parent, const char* name,
     const TQStringList /*args*/)
-    :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), parent, name)
+    :DocumentationPlugin(DocTDevTOCPluginFactory::instance()->config(), parent, name)
 {
     setCapabilities(Index);
     autoSetup();
 }
 
-DocKDevTOCPlugin::~DocKDevTOCPlugin()
+DocTDevTOCPlugin::~DocTDevTOCPlugin()
 {
 }
 
-TQString DocKDevTOCPlugin::pluginName() const
+TQString DocTDevTOCPlugin::pluginName() const
 {
     return i18n("TDevelopTOC Documentation Collection");
 }
 
-DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url)
+DocumentationCatalogItem* DocTDevTOCPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url)
 {
     return new TOCDocumentationCatalogItem(url, this, contents, title);
 }
 
-TQPair<KFile::Mode, TQString> DocKDevTOCPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocTDevTOCPlugin::catalogLocatorProps()
 {
     return TQPair<KFile::Mode, TQString>(KFile::File, "*.toc");
 }
 
-TQString DocKDevTOCPlugin::catalogTitle(const TQString& url)
+TQString DocTDevTOCPlugin::catalogTitle(const TQString& url)
 {
     TQFileInfo fi(url);
     if (!fi.exists())
@@ -111,19 +111,19 @@ TQString DocKDevTOCPlugin::catalogTitle(const TQString& url)
 }
 
 
-TQStringList DocKDevTOCPlugin::fullTextSearchLocations()
+TQStringList DocTDevTOCPlugin::fullTextSearchLocations()
 {
     return TQStringList();
 }
 
-bool DocKDevTOCPlugin::needRefreshIndex(DocumentationCatalogItem* /*item*/)
+bool DocTDevTOCPlugin::needRefreshIndex(DocumentationCatalogItem* /*item*/)
 {
     return false;
 }
 
-void DocKDevTOCPlugin::autoSetupPlugin()
+void DocTDevTOCPlugin::autoSetupPlugin()
 {
-    TQStringList tocsDir = DocKDevTOCPluginFactory::instance()->dirs()->findAllResources("data", "kdevdocumentation/tocs/*.toc");
+    TQStringList tocsDir = DocTDevTOCPluginFactory::instance()->dirs()->findAllResources("data", "tdevdocumentation/tocs/*.toc");
     
     for (TQStringList::const_iterator it = tocsDir.begin(); it != tocsDir.end(); ++it)
     {
@@ -132,7 +132,7 @@ void DocKDevTOCPlugin::autoSetupPlugin()
     }
 }
 
-void DocKDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* item)
+void DocTDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* item)
 {
     TOCDocumentationCatalogItem *tocItem = dynamic_cast<TOCDocumentationCatalogItem *>(item);
     if (!tocItem)
@@ -177,7 +177,7 @@ void DocKDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it
     }
 }
 
-void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item)
+void DocTDevTOCPlugin::createTOC(DocumentationCatalogItem* item)
 {
     TOCDocumentationCatalogItem *tocItem = dynamic_cast<TOCDocumentationCatalogItem *>(item);
     if (!tocItem)
@@ -210,7 +210,7 @@ void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item)
     addTocSect(tocItem, childEl, base, 1);
 }
 
-void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level)
+void DocTDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level)
 {
     while (!childEl.isNull())
     {
@@ -229,7 +229,7 @@ void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childE
     }
 }
 
-void DocKDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item)
+void DocTDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item)
 {
     TOCDocumentationCatalogItem *tocItem = dynamic_cast<TOCDocumentationCatalogItem *>(item);
     if (!tocItem)
@@ -264,7 +264,7 @@ void DocKDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item)
     }
 }
 
-TQString DocKDevTOCPlugin::constructURL(const TQString &base, const TQString &url)
+TQString DocTDevTOCPlugin::constructURL(const TQString &base, const TQString &url)
 {
     if (base.isEmpty() && !url.isEmpty())
         return url;
@@ -274,4 +274,4 @@ TQString DocKDevTOCPlugin::constructURL(const TQString &base, const TQString &ur
         return base;
 }
 
-#include "dockdevtocplugin.moc"
+#include "doctdevtocplugin.moc"
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop b/parts/documentation/plugins/tdevtoc/doctdevtocplugin.desktop
index 1cae3582..5f89e8d7 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop
+++ b/parts/documentation/plugins/tdevtoc/doctdevtocplugin.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Service
-Name=DocKDevTOCPlugin
-Name[da]=DocKDevTOC-plugin
-Name[sk]=Doc KDevTOC modul
+Name=DocTDevTOCPlugin
+Name[da]=DocTDevTOC-plugin
+Name[sk]=Doc TDevTOC modul
 Name[sv]=TDevelop innehållsförteckning-dokumentationsinsticksmodul
-Name[ta]=DocKDevTOC  சொருகு
+Name[ta]=DocTDevTOC  சொருகு
 Name[zh_TW]=TDevelop 目錄文件外掛程式
 Exec=blubb
 Comment=Documentation plugin for TDevelopTOC documentation
@@ -40,4 +40,4 @@ Comment[zh_CN]=TDevelopTOC 文档的文档插件
 Comment[zh_TW]=TDevelop 目錄文件外掛程式
 ServiceTypes=TDevelop/DocumentationPlugins
 X-TDevelop-Version=5
-X-TDE-Library=libdockdevtocplugin
+X-TDE-Library=libdoctdevtocplugin
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h b/parts/documentation/plugins/tdevtoc/doctdevtocplugin.h
index 7205cc4c..266efb94 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h
+++ b/parts/documentation/plugins/tdevtoc/doctdevtocplugin.h
@@ -17,20 +17,20 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef DOCKDEVTOCPLUGIN_H
-#define DOCKDEVTOCPLUGIN_H
+#ifndef DOCTDEVTOCPLUGIN_H
+#define DOCTDEVTOCPLUGIN_H
 
 #include <tqdom.h>
 
-#include <kdevdocumentationplugin.h>
+#include <tdevdocumentationplugin.h>
 
-class DocKDevTOCPlugin : public DocumentationPlugin
+class DocTDevTOCPlugin : public DocumentationPlugin
 {
     Q_OBJECT
   
 public:
-    DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
-    ~DocKDevTOCPlugin();
+    DocTDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    ~DocTDevTOCPlugin();
 
     virtual TQString pluginName() const;
     
diff --git a/parts/documentation/protocols/chm/CMakeLists.txt b/parts/documentation/protocols/chm/CMakeLists.txt
index c444c226..8d97053e 100644
--- a/parts/documentation/protocols/chm/CMakeLists.txt
+++ b/parts/documentation/protocols/chm/CMakeLists.txt
@@ -43,6 +43,6 @@ tde_add_kpart( tdeio_chm
 
 tde_add_kpart( libkchmpart AUTOMOC
   SOURCES kchmpart.cpp
-  LINK kdevwidgets-shared
+  LINK tdevwidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/documentation/protocols/chm/Makefile.am b/parts/documentation/protocols/chm/Makefile.am
index 5a1092a2..de7e0929 100644
--- a/parts/documentation/protocols/chm/Makefile.am
+++ b/parts/documentation/protocols/chm/Makefile.am
@@ -9,7 +9,7 @@ tdeio_chm_la_LIBADD = $(LIB_TDEIO)
 tdeio_chm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 libkchmpart_la_SOURCES = kchmpart.cpp
-libkchmpart_la_LIBADD = -ltdehtml $(LIB_TDEPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la
+libkchmpart_la_LIBADD = -ltdehtml $(LIB_TDEPARTS) $(top_builddir)/lib/widgets/libtdevwidgets.la
 libkchmpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
 noinst_HEADERS = chm.h chmfile.h decompress.h kchmpart.h
diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp
index 952228c4..ab688ff7 100644
--- a/parts/documentation/protocols/chm/kchmpart.cpp
+++ b/parts/documentation/protocols/chm/kchmpart.cpp
@@ -67,7 +67,7 @@ TDEInstance* KChmPartFactory::instance()
 
 
 KChmPart::KChmPart( TQWidget * parent, const char * name )
-	: KDevHTMLPart(  ), m_job(0)
+	: TDevHTMLPart(  ), m_job(0)
 {
    TDEInstance * instance = new TDEInstance( "kchmpart" );
    setInstance( instance );
@@ -80,7 +80,7 @@ bool KChmPart::openURL( const KURL &url )
    KURL chmURL = url;
    chmURL.setProtocol("ms-its");
    chmURL.addPath("/");
-   return KDevHTMLPart::openURL(chmURL);
+   return TDevHTMLPart::openURL(chmURL);
 }
 
 void KChmPart::slotDuplicate()
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index 9d1812b1..a3c8d9ec 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -23,7 +23,7 @@
 #include <tdehtml_part.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <kdevhtmlpart.h>
+#include <tdevhtmlpart.h>
 
 #include <tqcstring.h>
 
@@ -52,7 +52,7 @@ class KChmPartFactory: public KParts::Factory
 };
 
 
-class KChmPart : public KDevHTMLPart
+class KChmPart : public TDevHTMLPart
 {
    Q_OBJECT
   
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index 67dca0ed..2893d574 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -43,8 +43,8 @@
 #include <tdemessagebox.h>
 #include <kdebug.h>
 
-#include <kdevpartcontroller.h>
-#include <kdevdocumentationplugin.h>
+#include <tdevpartcontroller.h>
+#include <tdevdocumentationplugin.h>
 
 #include "documentation_part.h"
 #include "docutils.h"
@@ -160,7 +160,7 @@ void SearchView::search()
         return;
     }
 
-    TQString indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
+    TQString indexdir = kapp->dirs()->saveLocation("data", "tdevdocumentation/search");
     TQDir d;
     if (indexdir.isEmpty() || !TQFile::exists(indexdir + "/htdig.conf"))
     {
@@ -177,7 +177,7 @@ void SearchView::search()
         }
     }
 
-    TQString savedir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
+    TQString savedir = kapp->dirs()->saveLocation("data", "tdevdocumentation/search");
     if (!d.exists(savedir))
         d.mkdir(savedir);
 
@@ -191,7 +191,7 @@ void SearchView::search()
     kdDebug(9002) << "starting kprocess" << endl;
     kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query <<  endl;
     TDEProcess *proc = new TDEProcess;
-    TQString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png");
+    TQString picdir = kapp->dirs()->findResourceDir("data", "tdevdocumentation/pics/htdig.png");
     proc->setEnvironment("PICDIR", picdir);
     *proc << exe << "-c" << (indexdir + "/htdig.conf") << query;
 
diff --git a/parts/documentation/selecttopic.h b/parts/documentation/selecttopic.h
index 6ca5ad8b..e7e850bf 100644
--- a/parts/documentation/selecttopic.h
+++ b/parts/documentation/selecttopic.h
@@ -22,7 +22,7 @@
 
 #include "selecttopicbase.h"
 
-#include "kdevdocumentationplugin.h"
+#include "tdevdocumentationplugin.h"
 
 class SelectTopic: public SelectTopicBase{
 Q_OBJECT
diff --git a/parts/documentation/kdevdocumentation.desktop b/parts/documentation/tdevdocumentation.desktop
index 674812f4..721970e7 100644
--- a/parts/documentation/kdevdocumentation.desktop
+++ b/parts/documentation/tdevdocumentation.desktop
@@ -29,10 +29,10 @@ Comment[sv]=Dokumentationsinsticksprogrammet erbjuder bläddring och sökning i
 Comment[tr]=Belgelendirme eklentisi, çoklu belgelendirme sistemlerine destek ile, yerel ve çevrimiçi belgelere gözatma ve bu belgelerde arama yapılmasına izin verir.
 Comment[zh_CN]=文档插件提供了本地和在线文档中提供浏览和搜索功能，支持多种文档系统
 Comment[zh_TW]=文件外掛程式提供對本地與線上文件的瀏覽與搜尋功能，並支援多重文件系統。
-Name=KDevDocumentation
+Name=TDevDocumentation
 Name[da]=TDevelop dokumentation
 Name[nds]=TDevelop-Dokmentatschoon
-Name[pt_BR]=KDevDocumentação
+Name[pt_BR]=TDevDocumentação
 Name[sk]=KDev dokumentácia
 Name[sv]=TDevelop dokumentation
 Name[ta]=KDev ஆவணமாக்கல்
@@ -76,7 +76,7 @@ GenericName[zh_TW]=文件
 Icon=khelpcenter
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
-X-TDE-Library=libkdevdocumentation
+X-TDE-Library=libtdevdocumentation
 X-TDevelop-Version=5
 X-TDevelop-Mode=AssistantMode
 X-TDevelop-Properties=Documentation
diff --git a/parts/documentation/kdevpart_documentation.rc b/parts/documentation/tdevpart_documentation.rc
index f8dac85a..6fd8b488 100644
--- a/parts/documentation/kdevpart_documentation.rc
+++ b/parts/documentation/tdevpart_documentation.rc
@@ -6,6 +6,7 @@
   <Action name="plugin_action"/>
  </Menu> -->
  <Menu name="help">
+  <Action name="help_programming_handbook"/>
   <Action name="help_look_in_index"/>
   <Action name="help_search_in_doc"/>
   <Action name="help_manpage"/>
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index c99c4a2c..d422826c 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -45,10 +45,10 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name)
 {
     proc = 0;
 
-    indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
+    indexdir = kapp->dirs()->saveLocation("data", "tdevdocumentation/search");
     TQDir d; d.mkdir(indexdir);
 
-    TDEConfig config("kdevdocumentation", true);
+    TDEConfig config("tdevdocumentation", true);
     config.setGroup("htdig");
     databaseDir = config.readPathEntry("databaseDir", indexdir);
 
@@ -137,8 +137,8 @@ void ProgressDialog::setFilesDigged(int n)
 
 void ProgressDialog::setState(int n)
 {
-    TQPixmap unchecked = TQPixmap(locate("data", "kdevdocumentation/pics/unchecked.xpm"));
-    TQPixmap checked = TQPixmap(locate("data", "kdevdocumentation/pics/checked.xpm"));
+    TQPixmap unchecked = TQPixmap(locate("data", "tdevdocumentation/pics/unchecked.xpm"));
+    TQPixmap checked = TQPixmap(locate("data", "tdevdocumentation/pics/checked.xpm"));
 
     check1->setPixmap( n > 0 ? checked : unchecked);
     check2->setPixmap( n > 1 ? checked : unchecked);
@@ -182,7 +182,7 @@ void ProgressDialog::addDir(const TQString &dir)
 
 void ProgressDialog::scanDirectories()
 {
-    TQString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt");
+    TQString ftsLocationsFile = locateLocal("data", "tdevdocumentation/search/locations.txt");
 
     TQFile f(ftsLocationsFile);
     if (!f.open(IO_ReadOnly))
@@ -214,15 +214,15 @@ bool ProgressDialog::createConfig()
     if (language == "C")
         language = "en";
 
-    TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").arg(language));
+    TQString wrapper = locate("data", TQString("tdevdocumentation/%1/wrapper.html").arg(language));
     if (wrapper.isEmpty())
-        wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html"));
+        wrapper = locate("data", TQString("tdevdocumentation/en/wrapper.html"));
     if (wrapper.isEmpty())
         return false;
     wrapper = wrapper.left(wrapper.length()-12);
 
     // locate the image dir
-    TQString images = locate("data", "kdevdocumentation/pics/star.png");
+    TQString images = locate("data", "tdevdocumentation/pics/star.png");
     if (images.isEmpty())
         return false;
     images = images.left(images.length()-8);
@@ -300,7 +300,7 @@ bool ProgressDialog::generateIndex()
     setState(1);
     procdone = false;
     // run htdig
-    TDEConfig config("kdevdocumentation", true);
+    TDEConfig config("tdevdocumentation", true);
     config.setGroup("htdig");
     exe = config.readPathEntry("htdigbin", kapp->dirs()->findExe("htdig"));
     if (exe.isEmpty())
@@ -365,7 +365,7 @@ void ProgressDialog::htdigExited(TDEProcess *proc)
         setFilesDigged(filesToDig);
         setState(2);
 
-        TDEConfig config("kdevdocumentation", true);
+        TDEConfig config("tdevdocumentation", true);
         config.setGroup("htdig");
         // run htmerge -----------------------------------------------------
         exe = config.readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge"));
diff --git a/parts/doxygen/CMakeLists.txt b/parts/doxygen/CMakeLists.txt
index 00a18675..ed4bfeb9 100644
--- a/parts/doxygen/CMakeLists.txt
+++ b/parts/doxygen/CMakeLists.txt
@@ -28,13 +28,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevdoxygen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevdoxygen.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdoxygen )
+install( FILES tdevdoxygen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevdoxygen.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdoxygen )
 
 
-##### libkdevdoxygen (module) ###################
+##### libtdevdoxygen (module) ###################
 
-tde_add_kpart( libkdevdoxygen AUTOMOC
+tde_add_kpart( libtdevdoxygen AUTOMOC
   SOURCES
     doxygenpart.cpp doxygenconfigwidget.cpp input.cpp
     config.cpp version.cpp messages.cpp
diff --git a/parts/doxygen/Makefile.am b/parts/doxygen/Makefile.am
index 703760cb..e01fa6eb 100644
--- a/parts/doxygen/Makefile.am
+++ b/parts/doxygen/Makefile.am
@@ -4,16 +4,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/src -DDOXYWIZARD \
 	$(all_includes)
 
-kde_module_LTLIBRARIES = libkdevdoxygen.la
-libkdevdoxygen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevdoxygen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevdoxygen.la
+libtdevdoxygen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevdoxygen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevdoxygen_la_SOURCES = doxygenpart.cpp doxygenconfigwidget.cpp input.cpp config.cpp version.cpp messages.cpp
+libtdevdoxygen_la_SOURCES = doxygenpart.cpp doxygenconfigwidget.cpp input.cpp config.cpp version.cpp messages.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevdoxygen.desktop
+service_DATA = tdevdoxygen.desktop
 
-rcdir = $(kde_datadir)/kdevdoxygen
-rc_DATA = kdevdoxygen.rc
+rcdir = $(kde_datadir)/tdevdoxygen
+rc_DATA = tdevdoxygen.rc
diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
index d965d98b..960eef41 100644
--- a/parts/doxygen/doxygenpart.cpp
+++ b/parts/doxygen/doxygenpart.cpp
@@ -15,19 +15,19 @@
 #include "doxygenconfigwidget.h"
 #include "configwidgetproxy.h"
 #include "config.h"
-#include "kdevappfrontend.h"
+#include "tdevappfrontend.h"
 
-#include <kdevmainwindow.h>
-#include <kdevproject.h>
-#include <kdevmakefrontend.h>
-#include <kdevcore.h>
+#include <tdevmainwindow.h>
+#include <tdevproject.h>
+#include <tdevmakefrontend.h>
+#include <tdevcore.h>
 #include <codemodel.h>
 #include <codemodel_utils.h>
 #include <domutil.h>
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdemessagebox.h>
 #include <tdemainwindow.h>
@@ -37,7 +37,7 @@
 #include <tdetexteditor/editinterface.h>
 #include <partcontroller.h>
 #include <kdialogbase.h>
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
 #include <tqvbox.h>
 #include <tqfile.h>
@@ -47,15 +47,15 @@
 
 #define PROJECTOPTIONS 1
 
-typedef KDevGenericFactory<DoxygenPart> DoxygenFactory;
-static const KDevPluginInfo data("kdevdoxygen");
-K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) )
+typedef TDevGenericFactory<DoxygenPart> DoxygenFactory;
+static const TDevPluginInfo data("tdevdoxygen");
+K_EXPORT_COMPONENT_FACTORY( libtdevdoxygen, DoxygenFactory( data ) )
 
 DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0)
+    : TDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0)
 {
     setInstance(DoxygenFactory::instance());
-    setXMLFile("kdevdoxygen.rc");
+    setXMLFile("tdevdoxygen.rc");
 
     TDEAction *action;
     action = new TDEAction( i18n("Build API Documentation"), 0,
@@ -272,7 +272,7 @@ void DoxygenPart::slotDoxygen()
 
     kdDebug(9026) << "Doxygen command line: " << cmdline << endl;
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, cmdline);
 }
 
@@ -340,7 +340,7 @@ void DoxygenPart::slotDoxClean()
 
     if (could_be_dirty) {
         kdDebug(9026) << "Cleaning Doxygen generated API documentation using: " << cmdline << endl;
-        if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+        if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
             makeFrontend->queueCommand(KShellProcess::quote(project()->projectDirectory()), cmdline);
     }
     else
@@ -350,7 +350,7 @@ void DoxygenPart::slotDoxClean()
 
 void DoxygenPart::slotPreviewProcessExited( )
 {
-    KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend");
+    TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend");
     if ( appFrontend != 0 )
         disconnect(appFrontend, 0, this, 0);
     partController()->showDocument(KURL(m_tmpDir.name()+"html/index.html"));
@@ -361,7 +361,7 @@ void DoxygenPart::slotRunPreview( )
     if (m_file.isNull())
         return;
 
-    KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend");
+    TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend");
     if ( appFrontend == 0 )
         return;
 
diff --git a/parts/doxygen/doxygenpart.h b/parts/doxygen/doxygenpart.h
index aaa438de..77bafe46 100644
--- a/parts/doxygen/doxygenpart.h
+++ b/parts/doxygen/doxygenpart.h
@@ -20,7 +20,7 @@
 #include <ktempdir.h>
 #include <tqstring.h>
 
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 
 class DoxygenDialog;
 class TQPopupMenu;
@@ -37,7 +37,7 @@ namespace KTextEditor{
     class EditInterface;
 }
 
-class DoxygenPart : public KDevPlugin
+class DoxygenPart : public TDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/doxygen/kdevdoxygen.desktop b/parts/doxygen/tdevdoxygen.desktop
index 7d50f15b..a69635ab 100644
--- a/parts/doxygen/kdevdoxygen.desktop
+++ b/parts/doxygen/tdevdoxygen.desktop
@@ -75,7 +75,7 @@ GenericName[zh_CN]=Doxygen 支持
 GenericName[zh_TW]=Doxygen 支援
 ServiceTypes=TDevelop/Plugin
 Icon=tdevelop
-X-TDE-Library=libkdevdoxygen
+X-TDE-Library=libtdevdoxygen
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=CProjectDocumentation,CPPProjectDocumentation,JavaProjectDocumentation,PHPProjectDocumentation
diff --git a/parts/doxygen/kdevdoxygen.rc b/parts/doxygen/tdevdoxygen.rc
index 9faa6cd5..9faa6cd5 100644
--- a/parts/doxygen/kdevdoxygen.rc
+++ b/parts/doxygen/tdevdoxygen.rc
diff --git a/parts/filecreate/CMakeLists.txt b/parts/filecreate/CMakeLists.txt
index a562f8e1..5655e7b9 100644
--- a/parts/filecreate/CMakeLists.txt
+++ b/parts/filecreate/CMakeLists.txt
@@ -31,13 +31,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevfilecreate.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpart_filecreate.rc template-info.xml DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate )
+install( FILES tdevfilecreate.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpart_filecreate.rc template-info.xml DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate )
 
 
-##### libkdevfilecreate (module) ################
+##### libtdevfilecreate (module) ################
 
-tde_add_kpart( libkdevfilecreate AUTOMOC
+tde_add_kpart( libtdevfilecreate AUTOMOC
   SOURCES
     filecreate_part.cpp filecreate_listitem.cpp
     filecreate_filetype.cpp filecreate_filedialog.cpp
diff --git a/parts/filecreate/Makefile.am b/parts/filecreate/Makefile.am
index efe204d9..ca0f1790 100644
--- a/parts/filecreate/Makefile.am
+++ b/parts/filecreate/Makefile.am
@@ -5,11 +5,11 @@ SUBDIRS = file-templates
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevfilecreate.la
-libkdevfilecreate_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevfilecreate_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevfilecreate.la
+libtdevfilecreate_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevfilecreate_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevfilecreate_la_SOURCES = filecreate_part.cpp filecreate_listitem.cpp \
+libtdevfilecreate_la_SOURCES = filecreate_part.cpp filecreate_listitem.cpp \
 	filecreate_filetype.cpp filecreate_filedialog.cpp fcconfigwidgetbase.ui fcconfigwidget.cpp \
 	fctypeeditbase.ui fctypeedit.cpp fctemplateeditbase.ui fctemplateedit.cpp \
 	filecreate_newfile.cpp
@@ -17,7 +17,7 @@ libkdevfilecreate_la_SOURCES = filecreate_part.cpp filecreate_listitem.cpp \
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevfilecreate.desktop
+service_DATA = tdevfilecreate.desktop
 
-rcdir = $(kde_datadir)/kdevfilecreate
-rc_DATA = kdevpart_filecreate.rc template-info.xml
+rcdir = $(kde_datadir)/tdevfilecreate
+rc_DATA = tdevpart_filecreate.rc template-info.xml
diff --git a/parts/filecreate/README.dox b/parts/filecreate/README.dox
index 34a7882d..fc0fbc76 100644
--- a/parts/filecreate/README.dox
+++ b/parts/filecreate/README.dox
@@ -20,7 +20,7 @@ Example XML:
 
 <code>
 \verbatim
-  <kdevfilecreate>
+  <tdevfilecreate>
     <filetypes>
       <type ext="py" name="Python" create="template"/>
       <type ext="ui" name="QT Designer" create="template">
@@ -28,7 +28,7 @@ Example XML:
          <subtype ref="mainwin" name="Main window"/>
       </type>
     </filetypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 \endverbatim
 </code>
 
@@ -36,14 +36,14 @@ You can also use global template definitions supplied with the FileCreate part:
 
 <code>
 \verbatim
-  <kdevfilecreate>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
     </useglobaltypes>
     <filetypes>
       <type ext="py" name="Python" create="template"/>
     </filetypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 \endverbatim
 </code>
 
diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp
index 7c6fabc4..14066c11 100644
--- a/parts/filecreate/fcconfigwidget.cpp
+++ b/parts/filecreate/fcconfigwidget.cpp
@@ -35,8 +35,8 @@
 #include "fcconfigwidget.h"
 #include "filecreate_part.h"
 #include "filecreate_filetype.h"
-#include "kdevproject.h"
-#include "kdevpartcontroller.h"
+#include "tdevproject.h"
+#include "tdevpartcontroller.h"
 
 
 FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name):
@@ -90,7 +90,7 @@ void FCConfigWidget::accept()
 
 void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks)
 {
-    TQString globalXMLFile = ::locate("data", "kdevfilecreate/template-info.xml");
+    TQString globalXMLFile = ::locate("data", "tdevfilecreate/template-info.xml");
     TQDomDocument globalDom;
     if (!globalXMLFile.isNull() &&
         DomUtil::openDOMFile(globalDom,globalXMLFile)) {
@@ -103,7 +103,7 @@ void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks)
     if (checkmarks)
     {
         TQDomElement useGlobalTypes =
-            DomUtil::elementByPath(*(m_part->projectDom()),"/kdevfilecreate/useglobaltypes");
+            DomUtil::elementByPath(*(m_part->projectDom()),"/tdevfilecreate/useglobaltypes");
         for(TQDomNode node = useGlobalTypes.firstChild(); !node.isNull();node=node.nextSibling())
         {
             if (node.isElement() && node.nodeName()=="type")
@@ -171,14 +171,14 @@ void FCConfigWidget::saveGlobalConfig()
     TQDomDocument globalDom;
     TQDomElement  element = globalDom.createElement("tdevelop" );
     globalDom.appendChild(element);
-    TQDomElement  apPart  = globalDom.createElement("kdevfilecreate");
+    TQDomElement  apPart  = globalDom.createElement("tdevfilecreate");
     element.appendChild(apPart);
     TQDomElement fileTypes = globalDom.createElement( "filetypes" );
     apPart.appendChild( fileTypes );
 
     saveConfiguration(globalDom, fileTypes, true);
 
-    TQFile config( TDEGlobal::dirs()->saveLocation("data", "kdevfilecreate/", true) + "template-info.xml" );
+    TQFile config( TDEGlobal::dirs()->saveLocation("data", "tdevfilecreate/", true) + "template-info.xml" );
     config.open(IO_WriteOnly | IO_Truncate);
     TQTextStream stream(&config);
     stream << "<?xml version = '1.0'?>";
@@ -190,10 +190,10 @@ void FCConfigWidget::saveProjectConfig()
 {
     TQDomDocument dom     = *m_part->projectDom( );
     TQDomElement  element = dom.documentElement( );
-    TQDomElement  apPart  = element.namedItem( "kdevfilecreate" ).toElement( );
+    TQDomElement  apPart  = element.namedItem( "tdevfilecreate" ).toElement( );
     if( apPart.isNull( ) )
     {
-        apPart = dom.createElement( "kdevfilecreate" );
+        apPart = dom.createElement( "tdevfilecreate" );
         element.appendChild( apPart );
     }
 
@@ -291,7 +291,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element
             {
                 TQString dest;
                 if (global)
-                    dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
+                    dest = TDEGlobal::dirs()->saveLocation("data", "/tdevfilecreate/file-templates/", true);
                 else
                     dest = m_part->project()->projectDirectory() + "/templates/";
                 if (it.current()->text(4) == "create")
@@ -318,7 +318,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element
                 {
                     TQString dest;
                     if (global)
-                        dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
+                        dest = TDEGlobal::dirs()->saveLocation("data", "/tdevfilecreate/file-templates/", true);
                     else
                         dest = m_part->project()->projectDirectory() + "/templates/";
                     if (lastChild->text(4) == "create")
@@ -440,7 +440,7 @@ void FCConfigWidget::copyToProject_button_clicked()
                 it->parent()->text(1),
                 it->parent()->text(2),
                 it->parent()->text(3),
-                locate("data", "kdevfilecreate/file-templates/"+ it->parent()->text(0)));
+                locate("data", "tdevfilecreate/file-templates/"+ it->parent()->text(0)));
             destParent += it->parent()->text(0) + "-";
             TQCheckListItem *chk = dynamic_cast<TQCheckListItem*>(it->parent());
             if (chk)
@@ -452,13 +452,13 @@ void FCConfigWidget::copyToProject_button_clicked()
                 it->text(1),
                 it->text(2),
                 it->text(3),
-                locate("data", "kdevfilecreate/file-templates/"+destParent + it->text(0)));
+                locate("data", "tdevfilecreate/file-templates/"+destParent + it->text(0)));
         else
             it_copy = new TQListViewItem(fc_view, it->text(0),
                 it->text(1),
                 it->text(2),
                 it->text(3),
-                locate("data", "kdevfilecreate/file-templates/" +destParent+ it->text(0)));
+                locate("data", "tdevfilecreate/file-templates/" +destParent+ it->text(0)));
         TQCheckListItem *chk = dynamic_cast<TQCheckListItem*>(it);
         if (chk)
             chk->setOn(false);
@@ -470,7 +470,7 @@ void FCConfigWidget::copyToProject_button_clicked()
                 it_child->text(1),
                 it_child->text(2),
                 it_child->text(3),
-                locate("data", "kdevfilecreate/file-templates/"+ it_copy->text(0) + "-" + it_child->text(0)));
+                locate("data", "tdevfilecreate/file-templates/"+ it_copy->text(0) + "-" + it_child->text(0)));
             TQCheckListItem *chk_child = dynamic_cast<TQCheckListItem*>(it_child);
             if (chk_child)
                 chk_child->setOn(false);
@@ -683,7 +683,7 @@ void FCConfigWidget::edit_type_content_button_clicked( )
     }
     else
     {
-        TQString dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
+        TQString dest = TDEGlobal::dirs()->saveLocation("data", "/tdevfilecreate/file-templates/", true);
         TQString typePath = dest + type_name;
         KURL content;
         content.setPath(typePath);
@@ -691,7 +691,7 @@ void FCConfigWidget::edit_type_content_button_clicked( )
         {
             TQFileInfo fi(dest+type_name);
             if (!fi.exists())
-                copyTemplate(locate("data", "kdevfilecreate/file-templates/" + type_name), dest, type_name);
+                copyTemplate(locate("data", "tdevfilecreate/file-templates/" + type_name), dest, type_name);
             m_part->partController()->editDocument(content);
         }
         else
diff --git a/parts/filecreate/file-templates/CMakeLists.txt b/parts/filecreate/file-templates/CMakeLists.txt
index 04405e1a..37b9a309 100644
--- a/parts/filecreate/file-templates/CMakeLists.txt
+++ b/parts/filecreate/file-templates/CMakeLists.txt
@@ -14,4 +14,4 @@ install( FILES
     ui-dialogr ui-tabdialog ui-wizard dox ts ui-mainwin-qt4
     ui-widget-qt4 ui-dialogb-qt4 ui-dialogr-qt4 ui-dialog-qt4
     qrc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates )
diff --git a/parts/filecreate/file-templates/Makefile.am b/parts/filecreate/file-templates/Makefile.am
index 672a1cfa..631e3554 100644
--- a/parts/filecreate/file-templates/Makefile.am
+++ b/parts/filecreate/file-templates/Makefile.am
@@ -1,2 +1,2 @@
-rcdir = $(kde_datadir)/kdevfilecreate/file-templates
+rcdir = $(kde_datadir)/tdevfilecreate/file-templates
 rc_DATA = ui ui-dialog ui-mainwin ui-confdialog ui-dialogb ui-widget ui-dialogr ui-tabdialog ui-wizard dox ts ui-mainwin-qt4 ui-widget-qt4 ui-dialogb-qt4 ui-dialogr-qt4 ui-dialog-qt4 qrc
diff --git a/parts/filecreate/filecreate_filedialog.h b/parts/filecreate/filecreate_filedialog.h
index 54365717..616e9c2d 100644
--- a/parts/filecreate/filecreate_filedialog.h
+++ b/parts/filecreate/filecreate_filedialog.h
@@ -10,8 +10,8 @@
 
 
 
-#ifndef __KDEVPART_FILECREATE_FILEDIALOG_H__
-#define __KDEVPART_FILECREATE_FILEDIALOG_H__
+#ifndef __TDEVPART_FILECREATE_FILEDIALOG_H__
+#define __TDEVPART_FILECREATE_FILEDIALOG_H__
 
 #include <tdefiledialog.h>
 
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index 19deeb66..11fcfa6c 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -19,7 +19,7 @@
 #include <tdeversion.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
@@ -30,10 +30,10 @@
 #include <tdepopupmenu.h>
 #include <tdemessagebox.h>
 
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
-#include "kdevproject.h"
-#include "kdevpartcontroller.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
+#include "tdevproject.h"
+#include "tdevpartcontroller.h"
 #include "configwidgetproxy.h"
 
 #include "filetemplate.h"
@@ -50,23 +50,23 @@
 #define PROJECTSETTINGSPAGE 1
 #define GLOBALSETTINGSPAGE 2
 
-#include "kdevplugininfo.h"
+#include "tdevplugininfo.h"
 
 #include "config.h"
 
-static const KDevPluginInfo data("kdevfilecreate");
+static const TDevPluginInfo data("tdevfilecreate");
 
-typedef KDevGenericFactory<FileCreatePart> FileCreateFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) )
+typedef TDevGenericFactory<FileCreatePart> FileCreateFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevfilecreate, FileCreateFactory( data ) )
 
 using namespace FileCreate;
 
 FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & )
-//    : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
-    : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0)
+//    : TDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0)
+    : TDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0)
 {
   setInstance(FileCreateFactory::instance());
-  setXMLFile("kdevpart_filecreate.rc");
+  setXMLFile("tdevpart_filecreate.rc");
 
   connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
   connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
@@ -179,10 +179,10 @@ void FileCreatePart::slotNewFilePopup( int pFileType )
 }
 
 void FileCreatePart::slotNewFile() {
-  KDevCreateFile::CreatedFile createdFile = createNewFile();
-  if (createdFile.status == KDevCreateFile::CreatedFile::STATUS_NOTCREATED)
+  TDevCreateFile::CreatedFile createdFile = createNewFile();
+  if (createdFile.status == TDevCreateFile::CreatedFile::STATUS_NOTCREATED)
     KMessageBox::error(0, i18n("Cannot create file. Check whether the directory and filename are valid."));
-  else if (createdFile.status != KDevCreateFile::CreatedFile::STATUS_CANCELED)
+  else if (createdFile.status != TDevCreateFile::CreatedFile::STATUS_CANCELED)
     openCreatedFile(createdFile);
 }
 
@@ -209,7 +209,7 @@ void FileCreatePart::slotProjectClosed() {
 
 void FileCreatePart::slotFiletypeSelected(const FileType * filetype) {
 
-  KDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(),
+  TDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(),
                                                           TQString(),
                                                           TQString(),
                                                           filetype->subtypeRef());
@@ -217,9 +217,9 @@ void FileCreatePart::slotFiletypeSelected(const FileType * filetype) {
   openCreatedFile(createdFile);
 }
 
-void FileCreatePart::openCreatedFile(const KDevCreateFile::CreatedFile & createdFile)
+void FileCreatePart::openCreatedFile(const TDevCreateFile::CreatedFile & createdFile)
 {
-  if ( createdFile.status == KDevCreateFile::CreatedFile::STATUS_OK )
+  if ( createdFile.status == TDevCreateFile::CreatedFile::STATUS_OK )
   {
     KURL uu( createdFile.dir + "/" + createdFile.filename );
     partController()->editDocument ( uu );
@@ -228,7 +228,7 @@ void FileCreatePart::openCreatedFile(const KDevCreateFile::CreatedFile & created
 
 int FileCreatePart::readTypes(const TQDomDocument & dom, TQPtrList<FileType> &m_filetypes, bool enable) {
   int numRead = 0;
-  TQDomElement fileTypes = DomUtil::elementByPath(dom,"/kdevfilecreate/filetypes");
+  TQDomElement fileTypes = DomUtil::elementByPath(dom,"/tdevfilecreate/filetypes");
   if (!fileTypes.isNull()) {
     for(TQDomNode node = fileTypes.firstChild();!node.isNull();node=node.nextSibling()) {
 
@@ -324,16 +324,16 @@ FileType * FileCreatePart::getEnabledType(const TQString & ex, const TQString su
   return NULL;
 }
 
-// KDevFileCreate interface
+// TDevFileCreate interface
 
-KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString dir, TQString name, TQString subtype)
+TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString dir, TQString name, TQString subtype)
 {
-  KDevCreateFile::CreatedFile result;
+  TDevCreateFile::CreatedFile result;
 
   KURL projectURL;
   if ( !project() )
   {
-    //result.status = KDevCreateFile::CreatedFile::STATUS_NOTCREATED;
+    //result.status = TDevCreateFile::CreatedFile::STATUS_NOTCREATED;
     //return result;
   }
   else
@@ -373,7 +373,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
   int dialogResult = dialog.exec();
 
   if (dialogResult == KDialogBase::Rejected) {
-    result.status = KDevCreateFile::CreatedFile::STATUS_CANCELED;
+    result.status = TDevCreateFile::CreatedFile::STATUS_CANCELED;
     return result;
   }
 
@@ -383,8 +383,8 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
   selectedURL = dialog.url();
   const FileType *selectedFileType = dialog.selectedType();
 
-  if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & KDevProject::UsesTQMakeBuildSystem) ) {
-    result.status = KDevCreateFile::CreatedFile::STATUS_NOTWITHINPROJECT;
+  if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & TDevProject::UsesTQMakeBuildSystem) ) {
+    result.status = TDevCreateFile::CreatedFile::STATUS_NOTWITHINPROJECT;
     return result;
   }
 
@@ -416,7 +416,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
   }
   if (!created)
   {
-      result.status = KDevCreateFile::CreatedFile::STATUS_NOTCREATED;
+      result.status = TDevCreateFile::CreatedFile::STATUS_NOTCREATED;
       return result;
   }
 
@@ -425,7 +425,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
     // work out the path relative to the project directory
 //    TQString relToProj = URLUtil::relativePath(projectURL, selectedURL, URLUtil::SLASH_PREFIX );
 	  TQString relToProj;
-	  if( project()->options() & KDevProject::UsesTQMakeBuildSystem )
+	  if( project()->options() & TDevProject::UsesTQMakeBuildSystem )
 	  {
 		relToProj = URLUtil::relativePathToFile( project()->projectDirectory(), fullPath );
 		  project()->addFile(relToProj);
@@ -445,7 +445,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
 
   result.filename = fileName;
   result.dir = URLUtil::directory(fullPath);
-  result.status = KDevCreateFile::CreatedFile::STATUS_OK;
+  result.status = TDevCreateFile::CreatedFile::STATUS_OK;
 
   return result;
 }
@@ -464,7 +464,7 @@ void FileCreatePart::slotInitialize( )
 
   // read in which global templates are to be used for this project
   TQDomElement useGlobalTypes =
-    DomUtil::elementByPath(*projectDom(),"/kdevfilecreate/useglobaltypes");
+    DomUtil::elementByPath(*projectDom(),"/tdevfilecreate/useglobaltypes");
   for(TQDomNode node = useGlobalTypes.firstChild();
       !node.isNull();node=node.nextSibling()) {
 
@@ -524,7 +524,7 @@ TQString FileCreatePart::findGlobalXMLFile() const
 {
   int version = 0;
   TQString filename;
-  TQStringList filenames = TDEGlobal::instance()->dirs()->findAllResources("data", "kdevfilecreate/template-info.xml");
+  TQStringList filenames = TDEGlobal::instance()->dirs()->findAllResources("data", "tdevfilecreate/template-info.xml");
   for( TQStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it )
   {
     TQDomDocument globalDom;
diff --git a/parts/filecreate/filecreate_part.h b/parts/filecreate/filecreate_part.h
index 9d090493..0b6e5a01 100644
--- a/parts/filecreate/filecreate_part.h
+++ b/parts/filecreate/filecreate_part.h
@@ -10,16 +10,16 @@
 
 
 
-#ifndef __KDEVPART_FILECREATE_H__
-#define __KDEVPART_FILECREATE_H__
+#ifndef __TDEVPART_FILECREATE_H__
+#define __TDEVPART_FILECREATE_H__
 
 
 #include <tqguardedptr.h>
 #include <tqptrlist.h>
 
 #include <tqwidget.h>
-#include <kdevplugin.h>
-#include <kdevcreatefile.h>
+#include <tdevplugin.h>
+#include <tdevcreatefile.h>
 
 #include "filecreate_typechooser.h"
 
@@ -36,7 +36,7 @@ class ConfigWidgetProxy;
 
 using namespace FileCreate;
 
-class FileCreatePart : public KDevCreateFile
+class FileCreatePart : public TDevCreateFile
 {
   Q_OBJECT
   
@@ -57,7 +57,7 @@ public:
    * The user will be prompted as necessary for the missing information, and the
    * file created, and added to the project as necessary.
    */
-  virtual KDevCreateFile::CreatedFile createNewFile(TQString ext = TQString(),
+  virtual TDevCreateFile::CreatedFile createNewFile(TQString ext = TQString(),
                      TQString dir = TQString(),
                      TQString name = TQString(),
                      TQString subtype = TQString());
@@ -106,7 +106,7 @@ private:
   /**
    * If a file has been successfully created, open it
    */
-  void openCreatedFile(const KDevCreateFile::CreatedFile & createdFile);
+  void openCreatedFile(const TDevCreateFile::CreatedFile & createdFile);
 
   /**
    * Reads in file type definitions from a config DOM and adds them
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index 4638725c..d57fbf48 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -19,9 +19,9 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-#include <kdevcore.h>
+#include <tdevcore.h>
 
-#include "kdevproject.h"
+#include "tdevproject.h"
 #include "filecreate_part.h"
 #include "filecreate_widget2.h"
 #include "filecreate_filetype.h"
diff --git a/parts/filecreate/filecreate_widget2.h b/parts/filecreate/filecreate_widget2.h
index 217d37ce..3e4df801 100644
--- a/parts/filecreate/filecreate_widget2.h
+++ b/parts/filecreate/filecreate_widget2.h
@@ -21,7 +21,7 @@
 #include "filecreate_typechooser.h"
 
 class TDEIconLoader;
-class KDevProject;
+class TDevProject;
 class FileCreatePart;
 
 namespace FileCreate {
diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp
index caf1ac74..e541038c 100644
--- a/parts/filecreate/filecreate_widget3.cpp
+++ b/parts/filecreate/filecreate_widget3.cpp
@@ -18,11 +18,11 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kdevcore.h>
+#include <tdevcore.h>
 
 #include "filecreate_widget3.h"
 
-#include "kdevproject.h"
+#include "tdevproject.h"
 #include "filecreate_part.h"
 #include "filecreate_filetype.h"
 #include "filecreate_listitem.h"
@@ -30,7 +30,7 @@
 namespace FileCreate {
 
   ListWidget::ListWidget(FileCreatePart *part)
-    : TDEListView(0, "KDevFileCreate"), TypeChooser(part)
+    : TDEListView(0, "TDevFileCreate"), TypeChooser(part)
   {
     setIcon( SmallIcon("filenew2") );
     setCaption(i18n("File Create"));
diff --git a/parts/filecreate/filecreate_widget3.h b/parts/filecreate/filecreate_widget3.h
index ac8b866e..244bf78d 100644
--- a/parts/filecreate/filecreate_widget3.h
+++ b/parts/filecreate/filecreate_widget3.h
@@ -19,7 +19,7 @@
 
 #include "filecreate_typechooser.h"
 
-class KDevProject;
+class TDevProject;
 class FileCreatePart;
 class TQResizeEvent;
 
diff --git a/parts/filecreate/kdevfilecreate.desktop b/parts/filecreate/tdevfilecreate.desktop
index 1861090d..d9accc3c 100644
--- a/parts/filecreate/kdevfilecreate.desktop
+++ b/parts/filecreate/tdevfilecreate.desktop
@@ -30,7 +30,7 @@ Comment[ta]= கோப்பு உருவாக்கப்பட்டது
 Comment[tg]=Устои бунёд кардани файлҳо
 Comment[zh_CN]=文件创建
 Comment[zh_TW]=檔案建立
-Name=KDevFileCreate
+Name=TDevFileCreate
 Name[da]=TDevelop filoprettelse
 Name[de]=Dateierstellungs-Komponente (TDevelop)
 Name[hi]=के-डेव-फ़ाइल-क्रिएट
@@ -71,7 +71,7 @@ GenericName[zh_CN]=文件创建
 GenericName[zh_TW]=檔案建立
 Icon=wizard
 ServiceTypes=TDevelop/CreateFile
-X-TDE-Library=libkdevfilecreate
+X-TDE-Library=libtdevfilecreate
 X-TDevelop-Version=5
 X-TDevelop-Properties=FileCreation
 X-TDevelop-Scope=Core
diff --git a/parts/filecreate/kdevpart_filecreate.rc b/parts/filecreate/tdevpart_filecreate.rc
index 401a1378..09a293ee 100644
--- a/parts/filecreate/kdevpart_filecreate.rc
+++ b/parts/filecreate/tdevpart_filecreate.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="KDevFileCreate" library="libfilecreateplugin" version="3">
+<kpartplugin name="TDevFileCreate" library="libfilecreateplugin" version="3">
 <MenuBar>
  <Menu name="file">
     <Action name="file_new" group="new_merge" />
diff --git a/parts/filecreate/template-info.xml b/parts/filecreate/template-info.xml
index 664fa376..9afd9825 100644
--- a/parts/filecreate/template-info.xml
+++ b/parts/filecreate/template-info.xml
@@ -1,6 +1,6 @@
 <?xml version = '1.0'?>
 <tdevelop version="1">
-  <kdevfilecreate>
+  <tdevfilecreate>
     <sidetab active="no">
     </sidetab>
     <filetypes>
@@ -177,5 +177,5 @@
         <descr>A new empty Qt Linguist translation source file.</descr>
       </type>
     </filetypes>
-  </kdevfilecreate>
+  </tdevfilecreate>
 </tdevelop>
diff --git a/parts/filelist/CMakeLists.txt b/parts/filelist/CMakeLists.txt
index ac227b5e..7feb3ae1 100644
--- a/parts/filelist/CMakeLists.txt
+++ b/parts/filelist/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevfilelist.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevfilelist.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfilelist )
+install( FILES tdevfilelist.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevfilelist.rc DESTINATION ${DATA_INSTALL_DIR}/tdevfilelist )
 
 
-##### libkdevfilelist (module) ##################
+##### libtdevfilelist (module) ##################
 
-tde_add_kpart( libkdevfilelist AUTOMOC
+tde_add_kpart( libtdevfilelist AUTOMOC
   SOURCES
     filelist_widget.cpp filelist_item.cpp
     projectviewprojectconfigbase.ui
diff --git a/parts/filelist/Makefile.am b/parts/filelist/Makefile.am
index 83e36d19..8652a240 100644
--- a/parts/filelist/Makefile.am
+++ b/parts/filelist/Makefile.am
@@ -1,20 +1,20 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevfilelist.la
-libkdevfilelist_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevfilelist_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevfilelist.la
+libtdevfilelist_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevfilelist_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevfilelist_la_SOURCES = filelist_widget.cpp filelist_item.cpp \
+libtdevfilelist_la_SOURCES = filelist_widget.cpp filelist_item.cpp \
 			projectviewprojectconfigbase.ui projectviewprojectconfig.cpp projectviewpart.cpp toolbarguibuilder.cpp \
 	projectviewconfigbase.ui projectviewconfig.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevfilelist.desktop
+service_DATA = tdevfilelist.desktop
 
-rcdir = $(kde_datadir)/kdevfilelist
+rcdir = $(kde_datadir)/tdevfilelist
 
 noinst_HEADERS = filelist_item.h filelist_widget.h projectviewprojectconfig.h \
 				projectviewpart.h toolbarguibuilder.h projectviewconfig.h fileinfo.h
-rc_DATA = kdevfilelist.rc
+rc_DATA = tdevfilelist.rc
diff --git a/parts/filelist/filelist_item.h b/parts/filelist/filelist_item.h
index 6b88b09e..2d9322c9 100644
--- a/parts/filelist/filelist_item.h
+++ b/parts/filelist/filelist_item.h
@@ -18,7 +18,7 @@
 
 #include <kurl.h>
 
-#include <kdevpartcontroller.h>
+#include <tdevpartcontroller.h>
 
 class FileListItem : public TQListViewItem
 {
diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp
index 2e415dcd..4b0b2b48 100644
--- a/parts/filelist/filelist_widget.cpp
+++ b/parts/filelist/filelist_widget.cpp
@@ -21,8 +21,8 @@
 #include <tdelocale.h>
 #include <tdepopupmenu.h>
 
-#include <kdevcore.h>
-#include <kdevpartcontroller.h>
+#include <tdevcore.h>
+#include <tdevpartcontroller.h>
 
 #include "projectviewpart.h"
 #include "filelist_widget.h"
diff --git a/parts/filelist/filelist_widget.h b/parts/filelist/filelist_widget.h
index b582a309..f1b4de97 100644
--- a/parts/filelist/filelist_widget.h
+++ b/parts/filelist/filelist_widget.h
@@ -17,7 +17,7 @@
 
 #include <tdelistview.h>
 #include <kurl.h>
-#include <kdevpartcontroller.h> // for DocumentState
+#include <tdevpartcontroller.h> // for DocumentState
 
 #include <tqstring.h>
 #include <tqtooltip.h>
@@ -25,7 +25,7 @@
 
 #include "projectviewpart.h"
 		 
-class KDevProject;
+class TDevProject;
 class FileListItem;
 
 namespace KParts { class Part; }
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index 517d2f98..76f0c102 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -51,28 +51,28 @@
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 
-#include <kdevplugininfo.h>
-#include <kdevgenericfactory.h>
-#include <kdevpartcontroller.h>
-#include <kdevproject.h>
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
+#include <tdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevpartcontroller.h>
+#include <tdevproject.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
 #include <configwidgetproxy.h>
 
 
 
-typedef KDevGenericFactory<ProjectviewPart> projectviewFactory;
-KDevPluginInfo data("kdevfilelist");
-K_EXPORT_COMPONENT_FACTORY(libkdevfilelist, projectviewFactory(data))
+typedef TDevGenericFactory<ProjectviewPart> projectviewFactory;
+TDevPluginInfo data("tdevfilelist");
+K_EXPORT_COMPONENT_FACTORY(libtdevfilelist, projectviewFactory(data))
 
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
 ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : KDevPlugin(&data, parent, name ? name : "FileListPart")
+    : TDevPlugin(&data, parent, name ? name : "FileListPart")
 {
     setInstance(projectviewFactory::instance());
-    setXMLFile("kdevfilelist.rc");
+    setXMLFile("tdevfilelist.rc");
     setupActions();
     
     m_configProxy = new ConfigWidgetProxy(core());
diff --git a/parts/filelist/projectviewpart.h b/parts/filelist/projectviewpart.h
index 392a9cdf..72c6efcd 100644
--- a/parts/filelist/projectviewpart.h
+++ b/parts/filelist/projectviewpart.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef KDEVPROJECTVIEW_H
-#define KDEVPROJECTVIEW_H
+#ifndef TDEVPROJECTVIEW_H
+#define TDEVPROJECTVIEW_H
 
 #include "fileinfo.h" 
 
@@ -27,7 +27,7 @@
 #include <tqmap.h>
 #include <tqguardedptr.h>
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include <kurl.h>
 
 
@@ -53,7 +53,7 @@ this is a reimplementation of the project views in Quanta
 @TODO save html parts too
 FIXME at project open I get the default view and the open files at last close
 */
-class ProjectviewPart: public KDevPlugin
+class ProjectviewPart: public TDevPlugin
 {
   Q_OBJECT
   
@@ -66,7 +66,7 @@ public:
   ProjectviewPart(TQObject *parent, const char *name, const TQStringList &args);
   ~ProjectviewPart();
   
-  // reimplemented from KDevPlugin
+  // reimplemented from TDevPlugin
   void restorePartialProjectSession(const TQDomElement * el);
   void savePartialProjectSession(TQDomElement * el);
   
diff --git a/parts/filelist/kdevfilelist.desktop b/parts/filelist/tdevfilelist.desktop
index da37f14b..17a20ad6 100644
--- a/parts/filelist/kdevfilelist.desktop
+++ b/parts/filelist/tdevfilelist.desktop
@@ -71,6 +71,6 @@ GenericName[zh_TW]=檔案列表
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
-X-TDE-Library=libkdevfilelist
+X-TDE-Library=libtdevfilelist
 X-TDevelop-Version=5
 X-TDevelop-Properties=OpenFileNavigation
diff --git a/parts/filelist/kdevfilelist.rc b/parts/filelist/tdevfilelist.rc
index 5ab5de7c..5ab5de7c 100644
--- a/parts/filelist/kdevfilelist.rc
+++ b/parts/filelist/tdevfilelist.rc
diff --git a/parts/fileselector/CMakeLists.txt b/parts/fileselector/CMakeLists.txt
index 8f18792e..b310f791 100644
--- a/parts/fileselector/CMakeLists.txt
+++ b/parts/fileselector/CMakeLists.txt
@@ -27,12 +27,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevfileselector.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevfileselector.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevfileselector (module) ##############
+##### libtdevfileselector (module) ##############
 
-tde_add_kpart( libkdevfileselector AUTOMOC
+tde_add_kpart( libtdevfileselector AUTOMOC
   SOURCES
     fileselector_part.cpp fileselector_widget.cpp
     tdeactionselector.cpp kbookmarkhandler.cpp
diff --git a/parts/fileselector/Makefile.am b/parts/fileselector/Makefile.am
index f0c2fc35..43ee404b 100644
--- a/parts/fileselector/Makefile.am
+++ b/parts/fileselector/Makefile.am
@@ -2,17 +2,17 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/sourceinfo $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevfileselector.la
-libkdevfileselector_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevfileselector_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevfileselector.la
+libtdevfileselector_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevfileselector_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp
+libtdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevfileselector.desktop
+service_DATA = tdevfileselector.desktop
 
 # not used currently
-#rcdir = $(kde_datadir)/kdevfileselector
-#rc_DATA = kdevfileselector.rc
+#rcdir = $(kde_datadir)/tdevfileselector
+#rc_DATA = tdevfileselector.rc
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
index a6b4a6bb..331bb639 100644
--- a/parts/fileselector/fileselector_part.cpp
+++ b/parts/fileselector/fileselector_part.cpp
@@ -13,33 +13,33 @@
 #include <ktextbrowser.h>
 #include <tdeconfig.h>
 #include <tdefileitem.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <tdediroperator.h>
 #include <kdialogbase.h>
 #include <tdemessagebox.h>
 
-#include <kdevapi.h>
-#include <kdevcore.h>
-#include <kdevproject.h>
-#include <kdevmainwindow.h>
-#include <kdevpartcontroller.h>
-#include <kdevplugininfo.h>
-#include <kdevcreatefile.h>
+#include <tdevapi.h>
+#include <tdevcore.h>
+#include <tdevproject.h>
+#include <tdevmainwindow.h>
+#include <tdevpartcontroller.h>
+#include <tdevplugininfo.h>
+#include <tdevcreatefile.h>
 
 #include <ktip.h>
 
 #include "fileselector_widget.h"
 
-typedef KDevGenericFactory<FileSelectorPart> FileSelectorFactory;
-static const KDevPluginInfo data("kdevfileselector");
-K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) )
+typedef TDevGenericFactory<FileSelectorPart> FileSelectorFactory;
+static const TDevPluginInfo data("tdevfileselector");
+K_EXPORT_COMPONENT_FACTORY( libtdevfileselector, FileSelectorFactory( data ) )
 
 FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "FileSelectorPart")
+    : TDevPlugin(&data, parent, name ? name : "FileSelectorPart")
 {
     setInstance(FileSelectorFactory::instance());
 
-    m_filetree = new KDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" );
+    m_filetree = new TDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" );
 
     connect( m_filetree->dirOperator(), TQT_SIGNAL(fileSelected(const KFileItem*)),
 	     this, TQT_SLOT(fileSelected(const KFileItem*)));
@@ -63,7 +63,7 @@ FileSelectorPart::~FileSelectorPart()
 	mainWindow()->removeView( m_filetree );
     }
 
-    delete (KDevFileSelector*) m_filetree;
+    delete (TDevFileSelector*) m_filetree;
 }
 
 void FileSelectorPart::fileSelected( const KFileItem * file )
@@ -90,14 +90,14 @@ void FileSelectorPart::slotConfigWidget( KDialogBase * dlg )
 
 void FileSelectorPart::newFile()
 {
-    KDevCreateFile *creator = extension<KDevCreateFile>("TDevelop/CreateFile");
+    TDevCreateFile *creator = extension<TDevCreateFile>("TDevelop/CreateFile");
     if (creator)
     {
-        KDevCreateFile::CreatedFile file = creator->createNewFile("",
+        TDevCreateFile::CreatedFile file = creator->createNewFile("",
             m_filetree->dirOperator()->url().path());
-        if (file.status == KDevCreateFile::CreatedFile::STATUS_NOTCREATED)
+        if (file.status == TDevCreateFile::CreatedFile::STATUS_NOTCREATED)
             KMessageBox::error(0, i18n("Cannot create file. Check whether the directory and filename are valid."));
-        else if (file.status != KDevCreateFile::CreatedFile::STATUS_CANCELED)
+        else if (file.status != TDevCreateFile::CreatedFile::STATUS_CANCELED)
         {
             partController()->editDocument(KURL::fromPathOrURL(
                 file.dir + "/" + file.filename));
diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h
index f415444d..80841deb 100644
--- a/parts/fileselector/fileselector_part.h
+++ b/parts/fileselector/fileselector_part.h
@@ -1,17 +1,17 @@
-#ifndef __KDEVPART_FILESELECTOR_H__
-#define __KDEVPART_FILESELECTOR_H__
+#ifndef __TDEVPART_FILESELECTOR_H__
+#define __TDEVPART_FILESELECTOR_H__
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 #include <kdialogbase.h>
 #include <tdefileitem.h>
 
 #include <tqguardedptr.h>
 
-class KDevFileSelector;
+class TDevFileSelector;
 class KDialogBase;
 
-class FileSelectorPart : public KDevPlugin
+class FileSelectorPart : public TDevPlugin
 {
     Q_OBJECT
   
@@ -33,7 +33,7 @@ private slots:
     void slotConfigWidget( KDialogBase * );
 
 private:
-    TQGuardedPtr<KDevFileSelector> m_filetree;
+    TQGuardedPtr<TDevFileSelector> m_filetree;
     TDEAction *m_newFileAction;
 };
 
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 894bf185..1d6fb154 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -26,9 +26,9 @@
 #include "tdeactionselector.h"
 #include "kbookmarkhandler.h"
 
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
-#include <kdevpartcontroller.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
+#include <tdevpartcontroller.h>
 
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
@@ -76,32 +76,32 @@ static void silenceTQToolBar(TQtMsgType, const char *)
 {}
 
 
-KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *parent)
+TDevFileSelectorToolBar::TDevFileSelectorToolBar(TQWidget *parent)
         : TDEToolBar( parent, "KDev FileSelector Toolbar", true )
 {
     setMinimumWidth(10);
 }
 
-KDevFileSelectorToolBar::~KDevFileSelectorToolBar()
+TDevFileSelectorToolBar::~TDevFileSelectorToolBar()
 {}
 
-void KDevFileSelectorToolBar::setMovingEnabled( bool)
+void TDevFileSelectorToolBar::setMovingEnabled( bool)
 {
     TDEToolBar::setMovingEnabled(false);
 }
 
 
-KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(TQWidget *parent)
+TDevFileSelectorToolBarParent::TDevFileSelectorToolBarParent(TQWidget *parent)
         :TQFrame(parent),m_tb(0)
 {}
-KDevFileSelectorToolBarParent::~KDevFileSelectorToolBarParent()
+TDevFileSelectorToolBarParent::~TDevFileSelectorToolBarParent()
 {}
-void KDevFileSelectorToolBarParent::setToolBar(KDevFileSelectorToolBar *tb)
+void TDevFileSelectorToolBarParent::setToolBar(TDevFileSelectorToolBar *tb)
 {
     m_tb=tb;
 }
 
-void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
+void TDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
 {
     if (m_tb)
     {
@@ -113,8 +113,8 @@ void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
 
 //BEGIN Constructor/destructor
 
-KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow,
-                                    KDevPartController *partController,
+TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *mainWindow,
+                                    TDevPartController *partController,
                                     TQWidget * parent, const char * name )
         : TQWidget(parent, name),
         m_part(part),
@@ -127,8 +127,8 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
 
     TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar );
 
-    KDevFileSelectorToolBarParent *tbp=new KDevFileSelectorToolBarParent(this);
-    toolbar = new KDevFileSelectorToolBar(tbp);
+    TDevFileSelectorToolBarParent *tbp=new TDevFileSelectorToolBarParent(this);
+    toolbar = new TDevFileSelectorToolBar(tbp);
     tbp->setToolBar(toolbar);
     lo->addWidget(tbp);
     toolbar->setMovingEnabled(false);
@@ -142,7 +142,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
     lo->addWidget(cmbPath);
     cmbPath->listBox()->installEventFilter( this );
 
-    dir = new KDevDirOperator(m_part, KURL(), this, "operator");
+    dir = new TDevDirOperator(m_part, KURL(), this, "operator");
     dir->setView(KFile::/*Simple*/Detail);
 
     TDEActionCollection *coll = dir->actionCollection();
@@ -229,7 +229,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
                      "reapplies the last filter used when toggled on.") );
 }
 
-KDevFileSelector::~KDevFileSelector()
+TDevFileSelector::~TDevFileSelector()
 {
 	writeConfig( m_part->instance()->config(), "fileselector" );
 }
@@ -237,7 +237,7 @@ KDevFileSelector::~KDevFileSelector()
 
 //BEGIN Public Methods
 
-void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name)
+void TDevFileSelector::readConfig(TDEConfig *config, const TQString & name)
 {
     dir->readConfig(config, name + ":dir");
     dir->setView( KFile::Default );
@@ -283,12 +283,12 @@ void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name)
 
 }
 
-void KDevFileSelector::initialDirChangeHack()
+void TDevFileSelector::initialDirChangeHack()
 {
     setDir( waitingDir );
 }
 
-void KDevFileSelector::setupToolbar( TDEConfig *config )
+void TDevFileSelector::setupToolbar( TDEConfig *config )
 {
     toolbar->clear();
     TQStringList tbactions = config->readListEntry( "toolbar actions", ',' );
@@ -311,7 +311,7 @@ void KDevFileSelector::setupToolbar( TDEConfig *config )
     }
 }
 
-void KDevFileSelector::writeConfig(TDEConfig *config, const TQString & name)
+void TDevFileSelector::writeConfig(TDEConfig *config, const TQString & name)
 {
     dir->writeConfig(config,name + ":dir");
 
@@ -332,7 +332,7 @@ void KDevFileSelector::writeConfig(TDEConfig *config, const TQString & name)
     config->writeEntry( "AutoSyncEvents", autoSyncEvents );
 }
 
-void KDevFileSelector::setView(KFile::FileView view)
+void TDevFileSelector::setView(KFile::FileView view)
 {
     dir->setView(view);
 }
@@ -341,7 +341,7 @@ void KDevFileSelector::setView(KFile::FileView view)
 
 //BEGIN Public Slots
 
-void KDevFileSelector::slotFilterChange( const TQString & nf )
+void TDevFileSelector::slotFilterChange( const TQString & nf )
 {
     TQToolTip::remove( btnFilter );
     TQString f = nf.stripWhiteSpace();
@@ -371,7 +371,7 @@ void KDevFileSelector::slotFilterChange( const TQString & nf )
     btnFilter->setEnabled( !( empty && lastFilter.isEmpty() ) );
 
 }
-void KDevFileSelector::setDir( KURL u )
+void TDevFileSelector::setDir( KURL u )
 {
     dir->setURL(u, true);
 }
@@ -380,12 +380,12 @@ void KDevFileSelector::setDir( KURL u )
 
 //BEGIN Private Slots
 
-void KDevFileSelector::cmbPathActivated( const KURL& u )
+void TDevFileSelector::cmbPathActivated( const KURL& u )
 {
     cmbPathReturnPressed( u.url() );
 }
 
-void KDevFileSelector::cmbPathReturnPressed( const TQString& u )
+void TDevFileSelector::cmbPathReturnPressed( const TQString& u )
 {
     TQStringList urls = cmbPath->urls();
     urls.remove( u );
@@ -395,12 +395,12 @@ void KDevFileSelector::cmbPathReturnPressed( const TQString& u )
     dir->setURL( KURL(u), true );
 }
 
-void KDevFileSelector::dirUrlEntered( const KURL& u )
+void TDevFileSelector::dirUrlEntered( const KURL& u )
 {
     cmbPath->setURL( u );
 }
 
-void KDevFileSelector::dirFinishedLoading()
+void TDevFileSelector::dirFinishedLoading()
 {}
 
 
@@ -411,7 +411,7 @@ void KDevFileSelector::dirFinishedLoading()
    If on:
    Set last filter.
 */
-void KDevFileSelector::btnFilterClick()
+void TDevFileSelector::btnFilterClick()
 {
     if ( !btnFilter->isOn() )
     {
@@ -425,9 +425,9 @@ void KDevFileSelector::btnFilterClick()
 }
 
 
-void KDevFileSelector::autoSync()
+void TDevFileSelector::autoSync()
 {
-    kdDebug()<<"KDevFileSelector::autoSync()"<<endl;
+    kdDebug()<<"TDevFileSelector::autoSync()"<<endl;
     // if visible, sync
     if ( isVisible() )
     {
@@ -443,14 +443,14 @@ void KDevFileSelector::autoSync()
     }
 }
 
-void KDevFileSelector::autoSync( KParts::Part *part )
+void TDevFileSelector::autoSync( KParts::Part *part )
 {
     KTextEditor::Document* doc = dynamic_cast<KTextEditor::Document*>( part );
     if( !doc )
 	return;
 
     // as above, but using document url.
-    kdDebug()<<"KDevFileSelector::autoSync( KTextEditor::Document )"<<endl;
+    kdDebug()<<"TDevFileSelector::autoSync( KTextEditor::Document )"<<endl;
     KURL u ( doc->url() );
     if ( u.isEmpty() )
     {
@@ -468,15 +468,15 @@ void KDevFileSelector::autoSync( KParts::Part *part )
     }
 }
 /// \FIXME crash on shutdown
-void KDevFileSelector::setActiveDocumentDir()
+void TDevFileSelector::setActiveDocumentDir()
 {
-    //kdDebug()<<"KDevFileSelector::setActiveDocumentDir()"<<endl;
+    //kdDebug()<<"TDevFileSelector::setActiveDocumentDir()"<<endl;
     KURL u = activeDocumentUrl();
     if (!u.isEmpty())
         setDir( u.upURL() );
 }
 
-void KDevFileSelector::viewChanged()
+void TDevFileSelector::viewChanged()
 {
     /// @todo make sure the button is disabled if the directory is unreadable, eg
     ///       the document URL has protocol http
@@ -487,12 +487,12 @@ void KDevFileSelector::viewChanged()
 
 //BEGIN Protected
 
-void KDevFileSelector::focusInEvent( TQFocusEvent * )
+void TDevFileSelector::focusInEvent( TQFocusEvent * )
 {
     dir->setFocus();
 }
 
-void KDevFileSelector::showEvent( TQShowEvent * )
+void TDevFileSelector::showEvent( TQShowEvent * )
 {
     // sync if we should
     if ( autoSyncEvents & GotVisible )
@@ -509,7 +509,7 @@ void KDevFileSelector::showEvent( TQShowEvent * )
     }
 }
 
-bool KDevFileSelector::eventFilter( TQObject* o, TQEvent *e )
+bool TDevFileSelector::eventFilter( TQObject* o, TQEvent *e )
 {
     /*
         This is rather unfortunate, but:
@@ -559,7 +559,7 @@ private:
     TQString _str;
 };
 
-KURL KDevFileSelector::activeDocumentUrl( )
+KURL TDevFileSelector::activeDocumentUrl( )
 {
 	KParts::ReadOnlyPart * part = dynamic_cast<KParts::ReadOnlyPart*>( partController->activePart() );
 	if ( part )
@@ -575,7 +575,7 @@ KURL KDevFileSelector::activeDocumentUrl( )
 ////////////////////////////////////////////////////////////////////////////////
 // KFSConfigPage implementation
 ////////////////////////////////////////////////////////////////////////////////
-KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelector *kfs )
+KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, TDevFileSelector *kfs )
         : TQWidget( parent, name ),
         fileSelector( kfs ),
         bDirty( false )
@@ -706,20 +706,20 @@ void KFSConfigPage::apply()
     // sync
     int s = 0;
     if ( cbSyncActive->isChecked() )
-        s |= KDevFileSelector::DocumentChanged;
+        s |= TDevFileSelector::DocumentChanged;
     if ( cbSyncOpen->isChecked() )
-        s |= KDevFileSelector::DocumentOpened;
+        s |= TDevFileSelector::DocumentOpened;
     if ( cbSyncShow->isChecked() )
-        s |= KDevFileSelector::GotVisible;
+        s |= TDevFileSelector::GotVisible;
     fileSelector->autoSyncEvents = s;
     // reset connections
     disconnect( fileSelector->partController, 0, fileSelector, TQT_SLOT( autoSync() ) );
     disconnect( fileSelector->partController, 0,
                 fileSelector, TQT_SLOT( autoSync( KParts::Part *) ) );
-    if ( s & KDevFileSelector::DocumentChanged )
+    if ( s & TDevFileSelector::DocumentChanged )
         connect( fileSelector->partController, TQT_SIGNAL( viewChanged() ),
                  fileSelector, TQT_SLOT( autoSync() ) );
-    if ( s & KDevFileSelector::DocumentOpened )
+    if ( s & TDevFileSelector::DocumentOpened )
         connect( fileSelector->partController,
                  TQT_SIGNAL( partAdded(KParts::Part *) ),
                  fileSelector, TQT_SLOT( autoSync(KParts::Part *) ) );
@@ -773,9 +773,9 @@ void KFSConfigPage::init()
 
     // sync
     int s = fileSelector->autoSyncEvents;
-    cbSyncActive->setChecked( s & KDevFileSelector::DocumentChanged );
-    cbSyncOpen->setChecked( s & KDevFileSelector::DocumentOpened );
-    cbSyncShow->setChecked( s & KDevFileSelector::GotVisible );
+    cbSyncActive->setChecked( s & TDevFileSelector::DocumentChanged );
+    cbSyncOpen->setChecked( s & TDevFileSelector::DocumentOpened );
+    cbSyncShow->setChecked( s & TDevFileSelector::GotVisible );
     // histories
     sbPathHistLength->setValue( fileSelector->cmbPath->maxItems() );
     sbFilterHistLength->setValue( fileSelector->filter->maxCount() );
@@ -791,9 +791,9 @@ void KFSConfigPage::slotChanged()
 //END KFSConfigPage
 
 
-//BEGIN KDevDirOperator
+//BEGIN TDevDirOperator
 
-void KDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos )
+void TDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos )
 {
     setupMenu();
     updateSelectionDependentActions();
@@ -816,6 +816,6 @@ void KDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos )
     popup->popup(pos);
 }
 
-//END KDevDirOperator
+//END TDevDirOperator
 
 #include "fileselector_widget.moc"
diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h
index ef64f88c..1c30eadd 100644
--- a/parts/fileselector/fileselector_widget.h
+++ b/parts/fileselector/fileselector_widget.h
@@ -29,8 +29,8 @@
 #include <tqframe.h>
 #include <tdediroperator.h>
 
-class KDevMainWindow;
-class KDevPartController;
+class TDevMainWindow;
+class TDevPartController;
 class FileSelectorPart;
 class TDEActionCollection;
 class TDEActionSelector;
@@ -57,39 +57,39 @@ namespace KTextEditor
 */
 
 /* I think this fix for not moving toolbars is better */
-class KDevFileSelectorToolBar: public TDEToolBar
+class TDevFileSelectorToolBar: public TDEToolBar
 {
     Q_OBJECT
   
 public:
-    KDevFileSelectorToolBar(TQWidget *parent);
-    virtual ~KDevFileSelectorToolBar();
+    TDevFileSelectorToolBar(TQWidget *parent);
+    virtual ~TDevFileSelectorToolBar();
 
     virtual void setMovingEnabled( bool b );
 };
 
-class KDevFileSelectorToolBarParent: public TQFrame
+class TDevFileSelectorToolBarParent: public TQFrame
 {
     Q_OBJECT
   
 public:
-    KDevFileSelectorToolBarParent(TQWidget *parent);
-    ~KDevFileSelectorToolBarParent();
-    void setToolBar(KDevFileSelectorToolBar *tb);
+    TDevFileSelectorToolBarParent(TQWidget *parent);
+    ~TDevFileSelectorToolBarParent();
+    void setToolBar(TDevFileSelectorToolBar *tb);
 
 private:
-    KDevFileSelectorToolBar *m_tb;
+    TDevFileSelectorToolBar *m_tb;
 
 protected:
     virtual void resizeEvent ( TQResizeEvent * );
 };
 
-class KDevDirOperator: public KDirOperator
+class TDevDirOperator: public KDirOperator
 {
     Q_OBJECT
   
 public:
-    KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0)
+    TDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0)
         :KDirOperator(urlName, parent, name), m_part(part)
     {
     }
@@ -101,7 +101,7 @@ private:
     FileSelectorPart *m_part;
 };
 
-class KDevFileSelector : public TQWidget
+class TDevFileSelector : public TQWidget
 {
     Q_OBJECT
   
@@ -112,15 +112,15 @@ public:
     /* When to sync to current document directory */
     enum AutoSyncEvent { DocumentChanged=1, DocumentOpened=2, GotVisible=4 };
 
-    KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow=0, KDevPartController *partController=0,
+    TDevFileSelector( FileSelectorPart *part, TDevMainWindow *mainWindow=0, TDevPartController *partController=0,
                       TQWidget * parent = 0, const char * name = 0 );
-    ~KDevFileSelector();
+    ~TDevFileSelector();
 
     void readConfig( TDEConfig *, const TQString & );
     void writeConfig( TDEConfig *, const TQString & );
     void setupToolbar( TDEConfig * );
     void setView( KFile::FileView );
-    KDevDirOperator *dirOperator(){ return dir; }
+    TDevDirOperator *dirOperator(){ return dir; }
     TDEActionCollection *actionCollection() { return mActionCollection; };
 
 public slots:
@@ -146,18 +146,18 @@ protected:
     KURL activeDocumentUrl();
 
 private:
-    class KDevFileSelectorToolBar *toolbar;
+    class TDevFileSelectorToolBar *toolbar;
     TDEActionCollection *mActionCollection;
     class KBookmarkHandler *bookmarkHandler;
     KURLComboBox *cmbPath;
-    KDevDirOperator * dir;
+    TDevDirOperator * dir;
     class TDEAction *acSyncDir;
     KHistoryCombo * filter;
     class TQToolButton *btnFilter;
 
     FileSelectorPart *m_part;
-    KDevMainWindow *mainwin;
-    KDevPartController *partController;
+    TDevMainWindow *mainwin;
+    TDevPartController *partController;
 
     TQString lastFilter;
     int autoSyncEvents; // enabled autosync events
@@ -183,7 +183,7 @@ class KFSConfigPage : public TQWidget
     Q_OBJECT
   
 public:
-    KFSConfigPage( TQWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0);
+    KFSConfigPage( TQWidget* parent=0, const char *name=0, TDevFileSelector *kfs=0);
     virtual ~KFSConfigPage() {};
 
 public slots:
@@ -194,7 +194,7 @@ public slots:
 private:
     void init();
 
-    KDevFileSelector *fileSelector;
+    TDevFileSelector *fileSelector;
     bool bDirty;
     //class TQListBox *lbAvailableActions, *lbUsedActions;
     TDEActionSelector *acSel;
diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp
index 935b9d86..059f0d78 100644
--- a/parts/fileselector/kbookmarkhandler.cpp
+++ b/parts/fileselector/kbookmarkhandler.cpp
@@ -35,7 +35,7 @@
 #include "kbookmarkhandler.moc"
 
 
-KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu* tdepopupmenu )
+KBookmarkHandler::KBookmarkHandler( TDevFileSelector *parent, TDEPopupMenu* tdepopupmenu )
     : TQObject( parent, "KBookmarkHandler" ),
       KBookmarkOwner(),
       mParent( parent ),
@@ -45,9 +45,9 @@ KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu* tdep
     if (!m_menu)
       m_menu = new TDEPopupMenu( parent, "bookmark menu" );
 
-    TQString file = locate( "data", "kdevfileselector/fsbookmarks.xml" );
+    TQString file = locate( "data", "tdevfileselector/fsbookmarks.xml" );
     if ( file.isEmpty() )
-        file = locateLocal( "data", "kdevfileselector/fsbookmarks.xml" );
+        file = locateLocal( "data", "tdevfileselector/fsbookmarks.xml" );
 
     KBookmarkManager *manager = KBookmarkManager::managerForFile( file, false);
     manager->setUpdate( true );
diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h
index 4ec065aa..7d232107 100644
--- a/parts/fileselector/kbookmarkhandler.h
+++ b/parts/fileselector/kbookmarkhandler.h
@@ -34,7 +34,7 @@ class KBookmarkHandler : public TQObject, public KBookmarkOwner
   
 
 public:
-    KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 );
+    KBookmarkHandler( TDevFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 );
     ~KBookmarkHandler();
 
     // KBookmarkOwner interface:
@@ -58,7 +58,7 @@ protected:
     virtual void virtual_hook( int id, void* data );
 
 private:
-    KDevFileSelector *mParent;
+    TDevFileSelector *mParent;
     TDEPopupMenu *m_menu;
     KBookmarkMenu *m_bookmarkMenu;
 
diff --git a/parts/fileselector/kdevfileselector.desktop b/parts/fileselector/tdevfileselector.desktop
index 785db621..a1d13627 100644
--- a/parts/fileselector/kdevfileselector.desktop
+++ b/parts/fileselector/tdevfileselector.desktop
@@ -33,7 +33,7 @@ Comment[tg]=Воситаи намоиши файлҳо бо тарафдории
 Comment[tr]=Güçlü, ağdan saydam, dosya gözatma yardımcı programı
 Comment[zh_CN]=强有力的网络文件浏览工具。
 Comment[zh_TW]=強大的網路檔案瀏覽工具。
-Name=KDevFileSelector
+Name=TDevFileSelector
 Name[da]=TDevelop filvælger
 Name[de]=Datei-Selektor (TDevelop)
 Name[hi]=के-डेव-फ़ाइल-चयनक
@@ -82,7 +82,7 @@ GenericName[zh_CN]=文件选择器
 GenericName[zh_TW]=檔案選擇器
 Icon=fileopen
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevfileselector
+X-TDE-Library=libtdevfileselector
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Mode=AssistantMode
diff --git a/parts/fileselector/kdevpart_fileselector.rc b/parts/fileselector/tdevpart_fileselector.rc
index 940e2ab2..940e2ab2 100644
--- a/parts/fileselector/kdevpart_fileselector.rc
+++ b/parts/fileselector/tdevpart_fileselector.rc
diff --git a/parts/fileview/CMakeLists.txt b/parts/fileview/CMakeLists.txt
index 4f5f87dc..49539df2 100644
--- a/parts/fileview/CMakeLists.txt
+++ b/parts/fileview/CMakeLists.txt
@@ -28,13 +28,13 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    kdevfileview.desktop kdevfilegroups.desktop
+    tdevfileview.desktop tdevfilegroups.desktop
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevfileview (module) ##################
+##### libtdevfileview (module) ##################
 
-tde_add_kpart( libkdevfileview AUTOMOC
+tde_add_kpart( libtdevfileview AUTOMOC
   SOURCES
     fileviewpart.cpp filetreewidget.cpp partwidget.cpp
     vcscolorsconfigwidgetbase.ui vcscolorsconfigwidget.cpp
@@ -45,9 +45,9 @@ tde_add_kpart( libkdevfileview AUTOMOC
 )
 
 
-##### libkdevfilegroups (module) ################
+##### libtdevfilegroups (module) ################
 
-tde_add_kpart( libkdevfilegroups AUTOMOC
+tde_add_kpart( libtdevfilegroups AUTOMOC
   SOURCES
     filegroupswidget.cpp addfilegroupdlg.cpp
     filegroupsconfigwidget.cpp filegroupsconfigwidgetbase.ui
diff --git a/parts/fileview/Makefile.am b/parts/fileview/Makefile.am
index 3211d736..76f1460b 100644
--- a/parts/fileview/Makefile.am
+++ b/parts/fileview/Makefile.am
@@ -3,24 +3,24 @@
 INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevfileview.la libkdevfilegroups.la
+kde_module_LTLIBRARIES = libtdevfileview.la libtdevfilegroups.la
 
-libkdevfileview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevfileview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+libtdevfileview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevfileview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevfilegroups_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevfilegroups_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+libtdevfilegroups_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevfilegroups_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevfileview_la_SOURCES = fileviewpart.cpp filetreewidget.cpp partwidget.cpp vcscolorsconfigwidgetbase.ui vcscolorsconfigwidget.cpp stdfiletreewidgetimpl.cpp filetreeviewwidgetimpl.cpp vcsfiletreewidgetimpl.cpp fileitemfactory.cpp
+libtdevfileview_la_SOURCES = fileviewpart.cpp filetreewidget.cpp partwidget.cpp vcscolorsconfigwidgetbase.ui vcscolorsconfigwidget.cpp stdfiletreewidgetimpl.cpp filetreeviewwidgetimpl.cpp vcsfiletreewidgetimpl.cpp fileitemfactory.cpp
                              
-libkdevfilegroups_la_SOURCES = filegroupswidget.cpp addfilegroupdlg.cpp filegroupsconfigwidget.cpp filegroupsconfigwidgetbase.ui filegroupspart.cpp
+libtdevfilegroups_la_SOURCES = filegroupswidget.cpp addfilegroupdlg.cpp filegroupsconfigwidget.cpp filegroupsconfigwidgetbase.ui filegroupspart.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevfileview.desktop kdevfilegroups.desktop
+service_DATA = tdevfileview.desktop tdevfilegroups.desktop
 
 # not used currently
-#rcdir = $(kde_datadir)/kdevfileview
-#rc_DATA = kdevfileview.rc
+#rcdir = $(kde_datadir)/tdevfileview
+#rc_DATA = tdevfileview.rc
 noinst_HEADERS = vcscolorsconfigwidget.h stdfiletreewidgetimpl.h filetreeviewwidgetimpl.h vcsfiletreewidgetimpl.h fileitemfactory.h
diff --git a/parts/fileview/filegroupsconfigwidget.cpp b/parts/fileview/filegroupsconfigwidget.cpp
index 4f8fe422..bf8d39a6 100644
--- a/parts/fileview/filegroupsconfigwidget.cpp
+++ b/parts/fileview/filegroupsconfigwidget.cpp
@@ -39,7 +39,7 @@ FileGroupsConfigWidget::~FileGroupsConfigWidget()
 void FileGroupsConfigWidget::readConfig()
 {
     TQDomDocument &dom = *m_part->projectDom();
-    DomUtil::PairList list = DomUtil::readPairListEntry(dom, "/kdevfileview/groups",
+    DomUtil::PairList list = DomUtil::readPairListEntry(dom, "/tdevfileview/groups",
                                                         "group", "name", "pattern");
 
     TQListViewItem *lastItem = 0;
@@ -64,7 +64,7 @@ void FileGroupsConfigWidget::storeConfig()
         item = item->nextSibling();
     }
 
-    DomUtil::writePairListEntry(*m_part->projectDom(), "/kdevfileview/groups",
+    DomUtil::writePairListEntry(*m_part->projectDom(), "/tdevfileview/groups",
                                 "group", "name", "pattern", list);
 }
 
diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp
index 77fc9646..7b83b8ef 100644
--- a/parts/fileview/filegroupspart.cpp
+++ b/parts/fileview/filegroupspart.cpp
@@ -19,25 +19,25 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kdialogbase.h>
 
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevmainwindow.h"
-#include "kdevplugininfo.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevmainwindow.h"
+#include "tdevplugininfo.h"
 
 #include "filegroupswidget.h"
 #include "filegroupsconfigwidget.h"
 
 #define FILEGROUPS_OPTIONS 1
 
-typedef KDevGenericFactory<FileGroupsPart> FileGroupsFactory;
-static const KDevPluginInfo data("kdevfilegroups");
-K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) )
+typedef TDevGenericFactory<FileGroupsPart> FileGroupsFactory;
+static const TDevPluginInfo data("tdevfilegroups");
+K_EXPORT_COMPONENT_FACTORY( libtdevfilegroups, FileGroupsFactory( data ) )
 
 FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "FileGroupsPart")
+    : TDevPlugin(&data, parent, name ? name : "FileGroupsPart")
 {
     deleteRequested = false;
     setInstance(FileGroupsFactory::instance());
diff --git a/parts/fileview/filegroupspart.h b/parts/fileview/filegroupspart.h
index 314f1663..88bed704 100644
--- a/parts/fileview/filegroupspart.h
+++ b/parts/fileview/filegroupspart.h
@@ -15,12 +15,12 @@
 #include <tqguardedptr.h>
 //#include <kdialogbase.h>
 #include <configwidgetproxy.h>
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 
 class FileGroupsWidget;
 class KDialogBase;
 
-class FileGroupsPart : public KDevPlugin
+class FileGroupsPart : public TDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index 8a3e19b4..3c1c348f 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -27,10 +27,10 @@
 #include <tdeaction.h>
 #include <tdeversion.h>
 
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevmainwindow.h"
-#include "kdevpartcontroller.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevmainwindow.h"
+#include "tdevpartcontroller.h"
 #include "domutil.h"
 
 #include "filegroupspart.h"
@@ -191,16 +191,16 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part)
     (void) translations; // supress compiler warning
 
     TQDomDocument &dom = *m_part->projectDom();
-    m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/groups/hidenonprojectfiles") );
-    m_actionToggleDisplayLocation->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/groups/hidenonlocation") );
+    m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/tdevfileview/groups/hidenonprojectfiles") );
+    m_actionToggleDisplayLocation->setChecked( !DomUtil::readBoolEntry(dom, "/tdevfileview/groups/hidenonlocation") );
 }
 
 
 FileGroupsWidget::~FileGroupsWidget()
 {
     TQDomDocument &dom = *m_part->projectDom();
-    DomUtil::writeBoolEntry( dom, "/kdevfileview/groups/hidenonprojectfiles", !m_actionToggleShowNonProjectFiles->isChecked() );
-    DomUtil::writeBoolEntry( dom, "/kdevfileview/groups/hidenonlocation", !m_actionToggleDisplayLocation->isChecked() );
+    DomUtil::writeBoolEntry( dom, "/tdevfileview/groups/hidenonprojectfiles", !m_actionToggleShowNonProjectFiles->isChecked() );
+    DomUtil::writeBoolEntry( dom, "/tdevfileview/groups/hidenonlocation", !m_actionToggleDisplayLocation->isChecked() );
 }
 
 
@@ -319,7 +319,7 @@ void FileGroupsWidget::refresh()
     }
     TQDomDocument &dom = *m_part->projectDom();
     DomUtil::PairList list =
-        DomUtil::readPairListEntry(dom, "/kdevfileview/groups", "group", "name", "pattern");
+        DomUtil::readPairListEntry(dom, "/tdevfileview/groups", "group", "name", "pattern");
 
     FileViewFolderItem *lastGroup = 0;
 
diff --git a/parts/fileview/filegroupswidget.h b/parts/fileview/filegroupswidget.h
index 3294db32..62ec5d6f 100644
--- a/parts/fileview/filegroupswidget.h
+++ b/parts/fileview/filegroupswidget.h
@@ -15,7 +15,7 @@
 #include <tdelistview.h>
 
 class FileGroupsPart;
-class KDevProject;
+class TDevProject;
 
 
 class FileGroupsWidget : public TDEListView
diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp
index af6f9e1f..3764a3f2 100644
--- a/parts/fileview/filetreeviewwidgetimpl.cpp
+++ b/parts/fileview/filetreeviewwidgetimpl.cpp
@@ -16,7 +16,7 @@
 #include <tdelocale.h>
 #include <tdeversion.h>
 
-#include <kdevproject.h>
+#include <tdevproject.h>
 
 #include "fileviewpart.h"
 #include "filetreewidget.h"
@@ -44,7 +44,7 @@ FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const ch
 
     // Reload good ol' settings
     TQDomDocument &dom = *m_part->projectDom();
-    m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/tree/hidenonprojectfiles") );
+    m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/tdevfileview/tree/hidenonprojectfiles") );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -56,7 +56,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl()
     delete m_branchItemFactory;
 
     TQDomDocument &dom = *m_part->projectDom();
-    DomUtil::writeBoolEntry( dom, "/kdevfileview/tree/hidenonprojectfiles", !showNonProjectFiles() );
+    DomUtil::writeBoolEntry( dom, "/tdevfileview/tree/hidenonprojectfiles", !showNonProjectFiles() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp
index f89bf71d..0a1c5346 100644
--- a/parts/fileview/filetreewidget.cpp
+++ b/parts/fileview/filetreewidget.cpp
@@ -26,11 +26,11 @@
 #include <kurl.h>
 #include <tdeaction.h>
 
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevpartcontroller.h"
-#include "kdevmainwindow.h"
-#include "kdevversioncontrol.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevpartcontroller.h"
+#include "tdevmainwindow.h"
+#include "tdevversioncontrol.h"
 #include "domutil.h"
 #include "urlutil.h"
 
@@ -51,7 +51,7 @@ using namespace filetreeview;
 // class FileTreeWidget
 ///////////////////////////////////////////////////////////////////////////////
 
-FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider )
+FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, TDevVCSFileInfoProvider *infoProvider )
     : KFileTreeView( parent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 )
 {
     kdDebug(9017) << "Requested FileTree for: " << projectDirectory() << endl;
@@ -87,7 +87,7 @@ FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFil
     // Hide pattern for files
     TQDomDocument &dom = *m_part->projectDom();
     TQString defaultHidePattern = "*.o,*.lo,CVS";
-    TQString hidePattern = DomUtil::readEntry( dom, "/kdevfileview/tree/hidepatterns", defaultHidePattern );
+    TQString hidePattern = DomUtil::readEntry( dom, "/tdevfileview/tree/hidepatterns", defaultHidePattern );
     m_hidePatterns = TQStringList::split( ",", hidePattern );
 }
 
@@ -98,7 +98,7 @@ FileTreeWidget::~FileTreeWidget()
     kdDebug(9017) << "FileTreeWidget::~FileTreeWidget()" << endl;
 
     TQDomDocument &dom = *m_part->projectDom();
-    DomUtil::writeEntry( dom, "/kdevfileview/tree/hidepatterns", hidePatterns() );
+    DomUtil::writeEntry( dom, "/tdevfileview/tree/hidepatterns", hidePatterns() );
 
 //    delete m_impl;
 }
@@ -343,7 +343,7 @@ TQString FileTreeWidget::hidePatterns() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-KDevVersionControl *FileTreeWidget::versionControl() const
+TDevVersionControl *FileTreeWidget::versionControl() const
 {
     if (part() && part()->versionControl())
         return part()->versionControl();
diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h
index f6abb0c6..a8d3e2bf 100644
--- a/parts/fileview/filetreewidget.h
+++ b/parts/fileview/filetreewidget.h
@@ -17,11 +17,11 @@
 #include <tqguardedptr.h>
 #include <tdefiletreeview.h>
 
-#include <kdevversioncontrol.h>
+#include <tdevversioncontrol.h>
 
 class FileViewPart;
 class FileTreeViewWidgetImpl;
-class KDevVersionControl;
+class TDevVersionControl;
 
 /**
 * This is FileTree widget for listing files belonging to the project. It does feature:
@@ -33,8 +33,8 @@ class KDevVersionControl;
 * Design notes
 * The class uses two different implementations (referred by m_impl data member):
 * - @see VCSFileTreeWidgetImpl for VCS support
-*   VCS support is detencted by the constructor looking for the @see KDevPlugin::versionControl() member:
-*   if the current VCS plug-in does offer a @see KDevVCSFileInfoProvider object than this will be used for
+*   VCS support is detencted by the constructor looking for the @see TDevPlugin::versionControl() member:
+*   if the current VCS plug-in does offer a @see TDevVCSFileInfoProvider object than this will be used for
 *   querying about files' data. If neither VCS plugin nor valid info provider is found then the filetreeview
 *   will fallback to the standard implementation
 * - @see StdFileTreeWidgetImpl for standard visualization, just like the KFileTreeView
@@ -49,7 +49,7 @@ class FileTreeWidget : public KFileTreeView
     Q_OBJECT
   
 public:
-    FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider );
+    FileTreeWidget( FileViewPart *part, TQWidget *parent, TDevVCSFileInfoProvider *infoProvider );
     virtual ~FileTreeWidget();
 
     void openDirectory(const TQString &dirName);
@@ -60,7 +60,7 @@ public:
 
     FileViewPart *part() const { return m_part; }
 
-    //KDevVCSFileInfoProvider *vcsFileInfoProvider() const;
+    //TDevVCSFileInfoProvider *vcsFileInfoProvider() const;
     void applyHidePatterns( const TQString &hidePatterns );
     TQString hidePatterns() const;
 
@@ -85,7 +85,7 @@ private slots:
 
 private:
     bool matchesHidePattern(const TQString &fileName);
-    KDevVersionControl *versionControl() const;
+    TDevVersionControl *versionControl() const;
 
     TQStringList m_hidePatterns;
     /**
diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp
index 414cea52..7da44996 100644
--- a/parts/fileview/fileviewpart.cpp
+++ b/parts/fileview/fileviewpart.cpp
@@ -23,19 +23,19 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kdialogbase.h>
 
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevmainwindow.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevmainwindow.h"
 
 #include "partwidget.h"
 #include "domutil.h"
 #include "filetreewidget.h"
 #include "vcscolorsconfigwidget.h"
-#include "kdevversioncontrol.h"
-#include "kdevplugininfo.h"
+#include "tdevversioncontrol.h"
+#include "tdevplugininfo.h"
 
 #define FILETREE_OPTIONS 1
 
@@ -49,20 +49,20 @@ VCSColors FileViewPart::vcsColors;
 // class factory
 ///////////////////////////////////////////////////////////////////////////////
 
-typedef KDevGenericFactory<FileViewPart> FileViewFactory;
-static const KDevPluginInfo data("kdevfileview");
-K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) )
+typedef TDevGenericFactory<FileViewPart> FileViewFactory;
+static const TDevPluginInfo data("tdevfileview");
+K_EXPORT_COMPONENT_FACTORY( libtdevfileview, FileViewFactory( data ) )
 
 ///////////////////////////////////////////////////////////////////////////////
 // class FileTreeWidget
 ///////////////////////////////////////////////////////////////////////////////
 
 FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &)
-	: KDevPlugin(&data, parent, name ? name : "FileViewPart"),
+	: TDevPlugin(&data, parent, name ? name : "FileViewPart"),
     m_widget( 0 )
 {
     setInstance( FileViewFactory::instance() );
-    //    setXMLFile("kdevfileview.rc");
+    //    setXMLFile("tdevfileview.rc");
 
 	_configProxy = new ConfigWidgetProxy( core() );
 	_configProxy->createProjectConfigPage( i18n("File Tree"), FILETREE_OPTIONS, info()->icon() );
@@ -153,9 +153,9 @@ void FileViewPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * page,
 	}
 }
 
-KDevVersionControl *FileViewPart::versionControl()
+TDevVersionControl *FileViewPart::versionControl()
 {
-   return extension<KDevVersionControl>("TDevelop/VersionControl");
+   return extension<TDevVersionControl>("TDevelop/VersionControl");
 }
 
 #include "fileviewpart.moc"
diff --git a/parts/fileview/fileviewpart.h b/parts/fileview/fileviewpart.h
index 68eb6a56..c1c8c776 100644
--- a/parts/fileview/fileviewpart.h
+++ b/parts/fileview/fileviewpart.h
@@ -14,14 +14,14 @@
 
 #include <tqguardedptr.h>
 #include <configwidgetproxy.h>
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 #include "vcscolorsconfigwidget.h"
 
 class PartWidget;
 class KDialogBase;
-class KDevVersionControl;
+class TDevVersionControl;
 
-class FileViewPart : public KDevPlugin
+class FileViewPart : public TDevPlugin
 {
     Q_OBJECT
   
@@ -33,7 +33,7 @@ public:
     //! Colors to use for VCS visual feed-back
     static VCSColors vcsColors;
     
-    KDevVersionControl *versionControl();
+    TDevVersionControl *versionControl();
 
 private slots:
 	void insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int );
diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp
index bf68de83..49cfe7d5 100644
--- a/parts/fileview/partwidget.cpp
+++ b/parts/fileview/partwidget.cpp
@@ -22,10 +22,10 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-#include "kdevversioncontrol.h"
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevmainwindow.h"
+#include "tdevversioncontrol.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevmainwindow.h"
 
 #include "fileviewpart.h"
 #include "filetreewidget.h"
@@ -40,7 +40,7 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent )
 {
     Q_ASSERT( part && parent );
 
-    KDevVCSFileInfoProvider *infoProvider = 0;
+    TDevVCSFileInfoProvider *infoProvider = 0;
     if (part && part->versionControl() && part->versionControl()->fileInfoProvider())
         infoProvider = part->versionControl()->fileInfoProvider();
 
diff --git a/parts/fileview/kdevfilegroups.desktop b/parts/fileview/tdevfilegroups.desktop
index bfa3e699..4c04c274 100644
--- a/parts/fileview/kdevfilegroups.desktop
+++ b/parts/fileview/tdevfilegroups.desktop
@@ -33,7 +33,7 @@ Comment[tg]=Барои файлҳои дар номҳои қолиб имкон
 Comment[tr]=Dosya adı desenlerine göre proje dosyalarının gruplanmasını sağlar.
 Comment[zh_CN]=允许你根据文件名模式规类工程文件。
 Comment[zh_TW]=允許專案檔案根據檔名樣式來分群組。
-Name=KDevFileGroups
+Name=TDevFileGroups
 Name[da]=TDevelop filgrupper
 Name[de]=Dateigruppen-Komponente (TDevelop)
 Name[hi]=के-डेव-फ़ाइल-ग्रुप्स
@@ -80,7 +80,7 @@ GenericName[zh_CN]=文件分组
 GenericName[zh_TW]=檔案群組
 ServiceTypes=TDevelop/Plugin
 Icon=attach
-X-TDE-Library=libkdevfilegroups
+X-TDE-Library=libtdevfilegroups
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=ProjectFileGroupsManagement
diff --git a/parts/fileview/kdevfileview.desktop b/parts/fileview/tdevfileview.desktop
index 6a702e1b..b589b5ef 100644
--- a/parts/fileview/kdevfileview.desktop
+++ b/parts/fileview/tdevfileview.desktop
@@ -32,7 +32,7 @@ Comment[tg]=Тариқи навигатсияро ва ҳангоми ҳамко
 Comment[tr]=Geçerli projenin kaynak dosyalarında gezinme ve onlarla etkileşime geçme yolu sunar.
 Comment[zh_CN]=提供当前工程源文件的浏览和相互关系。
 Comment[zh_TW]=提供目前專案的程式源碼檔的導覽與互動。
-Name=KDevFileView
+Name=TDevFileView
 Name[da]=TDevelop filvisning
 Name[de]=Dateibaum (TDevelop)
 Name[hi]=के-डेव-फ़ाइल-व्यू
@@ -79,7 +79,7 @@ GenericName[zh_CN]=文件树
 GenericName[zh_TW]=檔案樹
 ServiceTypes=TDevelop/Plugin
 Icon=folder
-X-TDE-Library=libkdevfileview
+X-TDE-Library=libtdevfileview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=ProjectFileManagement
diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp
index 450a6a58..e08068db 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.cpp
+++ b/parts/fileview/vcsfiletreewidgetimpl.cpp
@@ -18,7 +18,7 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 
-//#include <kdevproject.h>
+//#include <tdevproject.h>
 #include <urlutil.h>
 #include <domutil.h>
 
@@ -127,13 +127,13 @@ class VCSFileTreeBranchItem : public filetreeview::FileTreeBranchItem
 {
 public:
     VCSFileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix,
-        KDevVCSFileInfoProvider *vcsInfoProvider )
+        TDevVCSFileInfoProvider *vcsInfoProvider )
         : FileTreeBranchItem( view, url, name, pix ), m_vcsInfoProvider( vcsInfoProvider ) {}
 //    virtual ~VCSFileTreeBranchItem() {}
     virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem );
 
 private:
-    KDevVCSFileInfoProvider *m_vcsInfoProvider;
+    TDevVCSFileInfoProvider *m_vcsInfoProvider;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -169,20 +169,20 @@ KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem*
 class VCSBranchItemFactory : public filetreeview::BranchItemFactory
 {
 public:
-    VCSBranchItemFactory( KDevVCSFileInfoProvider *vcsInfoProvider ) : m_vcsInfoProvider( vcsInfoProvider ) {}
+    VCSBranchItemFactory( TDevVCSFileInfoProvider *vcsInfoProvider ) : m_vcsInfoProvider( vcsInfoProvider ) {}
     virtual filetreeview::FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix )
     {
         return new VCSFileTreeBranchItem( view, url, name, pix, m_vcsInfoProvider );
     }
 private:
-    KDevVCSFileInfoProvider *m_vcsInfoProvider;
+    TDevVCSFileInfoProvider *m_vcsInfoProvider;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // class VCSFileTreeWidgetImpl
 ///////////////////////////////////////////////////////////////////////////////
 
-VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider )
+VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, TDevVCSFileInfoProvider *infoProvider )
     : FileTreeViewWidgetImpl( parent, "vcsfiletreewidgetimpl" ),
     m_actionToggleShowVCSFields( 0 ), m_actionSyncWithRepository( 0 ), m_vcsInfoProvider( infoProvider ),
     m_isSyncingWithRepository( false ), m_vcsStatusRequestedItem( 0 )
@@ -216,7 +216,7 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil
     m_actionSyncWithRepository->setWhatsThis( aboutAction );
 
     TQDomDocument &dom = projectDom();
-    m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") );
+    m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/tdevfileview/tree/showvcsfields") );
     slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings
     connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*)));
 }
@@ -228,7 +228,7 @@ VCSFileTreeWidgetImpl::~VCSFileTreeWidgetImpl()
     kdDebug(9017) << "VCSFileTreeWidgetImpl::~VCSFileTreeWidgetImpl()" << endl;
 
     TQDomDocument &dom = projectDom();
-    DomUtil::writeBoolEntry( dom, "/kdevfileview/tree/showvcsfields", showVCSFields() );
+    DomUtil::writeBoolEntry( dom, "/tdevfileview/tree/showvcsfields", showVCSFields() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/parts/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h
index 00a38b32..928fe544 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.h
+++ b/parts/fileview/vcsfiletreewidgetimpl.h
@@ -14,7 +14,7 @@
 
 #include "filetreeviewwidgetimpl.h"
 
-class KDevVCSFileInfoProvider;
+class TDevVCSFileInfoProvider;
 class TDEAction;
 class TDEToggleAction;
 
@@ -27,7 +27,7 @@ class VCSFileTreeWidgetImpl : public FileTreeViewWidgetImpl
     Q_OBJECT
   
 public:
-    VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider );
+    VCSFileTreeWidgetImpl( FileTreeWidget *parent, TDevVCSFileInfoProvider *infoProvider );
     virtual ~VCSFileTreeWidgetImpl();
 
     /*
@@ -44,7 +44,7 @@ private slots:
     //! show/hide the header and the additional fields (status and versions)
     void slotToggleShowVCSFields( bool checked );
     //! start a sync operation with the remote repository: this may take a while so we use
-    //! the async interface provided by the KDevVCSFileInfoProvider interface
+    //! the async interface provided by the TDevVCSFileInfoProvider interface
     void slotSyncWithRepository();
     //! when the requested info are ready the infoProvider object will be so kind the
     //! to give them to us in a ready-to-use format: we'll use that info to update all
@@ -58,7 +58,7 @@ private:
 
     TDEToggleAction *m_actionToggleShowVCSFields;
     TDEAction *m_actionSyncWithRepository;
-    KDevVCSFileInfoProvider *m_vcsInfoProvider;
+    TDevVCSFileInfoProvider *m_vcsInfoProvider;
     //! We use this guard to avoid enabling the "reload tree" action when performing
     //! syncing with remote repositories.
     bool m_isSyncingWithRepository;
diff --git a/parts/filter/CMakeLists.txt b/parts/filter/CMakeLists.txt
index 095144d3..7665f6f1 100644
--- a/parts/filter/CMakeLists.txt
+++ b/parts/filter/CMakeLists.txt
@@ -26,16 +26,16 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevfilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevfilter.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfilter )
+install( FILES tdevfilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevfilter.rc DESTINATION ${DATA_INSTALL_DIR}/tdevfilter )
 
 
-##### libkdevfilter (module) ####################
+##### libtdevfilter (module) ####################
 
-tde_add_kpart( libkdevfilter AUTOMOC
+tde_add_kpart( libtdevfilter AUTOMOC
   SOURCES
     filterpart.cpp shellfilterdlg.cpp shellinsertdlg.cpp
-    kdevfilterIface.cpp kdevfilterIface.skel
+    tdevfilterIface.cpp tdevfilterIface.skel
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/filter/Makefile.am b/parts/filter/Makefile.am
index f68b0cf6..4a3fe722 100644
--- a/parts/filter/Makefile.am
+++ b/parts/filter/Makefile.am
@@ -2,16 +2,16 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces 	   -I$(top_srcdir)/lib/util 	   $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevfilter.la
-libkdevfilter_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevfilter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevfilter.la
+libtdevfilter_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevfilter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevfilter_la_SOURCES = filterpart.cpp shellfilterdlg.cpp shellinsertdlg.cpp kdevfilterIface.cpp kdevfilterIface.skel
+libtdevfilter_la_SOURCES = filterpart.cpp shellfilterdlg.cpp shellinsertdlg.cpp tdevfilterIface.cpp tdevfilterIface.skel
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevfilter.desktop
+service_DATA = tdevfilter.desktop
 
-rcdir = $(kde_datadir)/kdevfilter
-rc_DATA = kdevfilter.rc
+rcdir = $(kde_datadir)/tdevfilter
+rc_DATA = tdevfilter.rc
diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp
index 5ebd265e..3ee5029a 100644
--- a/parts/filter/filterpart.cpp
+++ b/parts/filter/filterpart.cpp
@@ -19,21 +19,21 @@
 #include <tdetexteditor/selectioninterface.h>
 #include <tdetexteditor/viewcursorinterface.h>
 
-#include "kdevcore.h"
-#include "kdevpartcontroller.h"
-#include "kdevplugininfo.h"
+#include "tdevcore.h"
+#include "tdevpartcontroller.h"
+#include "tdevplugininfo.h"
 #include "shellfilterdlg.h"
 #include "shellinsertdlg.h"
-#include "kdevfilterIface.h"
+#include "tdevfilterIface.h"
 
-static const KDevPluginInfo data("kdevfilter");
-K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) )
+static const TDevPluginInfo data("tdevfilter");
+K_EXPORT_COMPONENT_FACTORY( libtdevfilter, FilterFactory( data ) )
 
 FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "FilterPart")
+    : TDevPlugin(&data, parent, name ? name : "FilterPart")
 {
     setInstance(FilterFactory::instance());
-    setXMLFile("kdevfilter.rc");
+    setXMLFile("tdevfilter.rc");
 
     TDEAction *action;
 
@@ -52,7 +52,7 @@ FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &)
     m_insertDialog = 0;
     m_filterDialog = 0;
 
-    new KDevFilterIface( this );
+    new TDevFilterIface( this );
     // (void) dcopClient();
 }
 
diff --git a/parts/filter/filterpart.h b/parts/filter/filterpart.h
index b8322425..b1eac334 100644
--- a/parts/filter/filterpart.h
+++ b/parts/filter/filterpart.h
@@ -12,14 +12,14 @@
 #ifndef _FILTERPART_H_
 #define _FILTERPART_H_
 
-#include <kdevgenericfactory.h>
-#include "kdevplugin.h"
+#include <tdevgenericfactory.h>
+#include "tdevplugin.h"
 
 class ShellInsertDialog;
 class ShellFilterDialog;
 
 
-class FilterPart : public KDevPlugin
+class FilterPart : public TDevPlugin
 {
     Q_OBJECT
   
@@ -37,6 +37,6 @@ private:
     ShellFilterDialog *m_filterDialog;
 };
 
-typedef KDevGenericFactory<FilterPart> FilterFactory;
+typedef TDevGenericFactory<FilterPart> FilterFactory;
 
 #endif
diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp
index a5100d5b..7d3d0ff5 100644
--- a/parts/filter/shellfilterdlg.cpp
+++ b/parts/filter/shellfilterdlg.cpp
@@ -23,7 +23,7 @@
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 #include "domutil.h"
 #include "filterpart.h"
 
diff --git a/parts/filter/shellfilterdlg.h b/parts/filter/shellfilterdlg.h
index 87657501..cf9812ab 100644
--- a/parts/filter/shellfilterdlg.h
+++ b/parts/filter/shellfilterdlg.h
@@ -16,7 +16,7 @@
 
 class TQComboBox;
 class TQPushButton;
-class KDevPlugin;
+class TDevPlugin;
 class TDEProcess;
 
 
diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp
index 057e8121..f9d24c19 100644
--- a/parts/filter/shellinsertdlg.cpp
+++ b/parts/filter/shellinsertdlg.cpp
@@ -24,7 +24,7 @@
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 #include "domutil.h"
 #include "filterpart.h"
 
diff --git a/parts/filter/shellinsertdlg.h b/parts/filter/shellinsertdlg.h
index fda59678..df3085a1 100644
--- a/parts/filter/shellinsertdlg.h
+++ b/parts/filter/shellinsertdlg.h
@@ -16,7 +16,7 @@
 
 class TQComboBox;
 class TQPushButton;
-class KDevPlugin;
+class TDevPlugin;
 class TDEProcess;
 
 
diff --git a/parts/filter/kdevfilter.desktop b/parts/filter/tdevfilter.desktop
index 1ce8122a..36854737 100644
--- a/parts/filter/kdevfilter.desktop
+++ b/parts/filter/tdevfilter.desktop
@@ -32,7 +32,7 @@ Comment[tg]=Вазифаи корҳо бо матнҳои дар муҳарри�
 Comment[tr]=Komut satırı araçlarını kullanarak düzenleyici metni işlemek için bir yol sunar. Araçlar menüsünde durur.
 Comment[zh_CN]=使用命令行工具操作编辑器文字。显示在工具菜单中。
 Comment[zh_TW]=提供使用命令列工具操作編輯器文字的方法。會出現在工具選單中。
-Name=KDevFilter
+Name=TDevFilter
 Name[da]=TDevelop filter
 Name[de]=Filter (TDevelop)
 Name[hi]=के-डेव-फ़िल्टर
@@ -76,7 +76,7 @@ GenericName[tr]=Kabuk filtreleme ve Ekleme
 GenericName[zh_CN]=Shell 过滤和插入
 GenericName[zh_TW]=Shell 過濾與插入
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevfilter
+X-TDE-Library=libtdevfilter
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=OptionalCodeEditing
diff --git a/parts/filter/kdevfilter.rc b/parts/filter/tdevfilter.rc
index 6f7f9053..4f3d82d9 100644
--- a/parts/filter/kdevfilter.rc
+++ b/parts/filter/tdevfilter.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KDevFilter" version="1">
+<kpartgui name="TDevFilter" version="1">
 <MenuBar>
   <Menu name="tools" >
     <Action name="tools_insertshell" group="tools_file_operations"/>
diff --git a/parts/filter/kdevfilterIface.cpp b/parts/filter/tdevfilterIface.cpp
index 3df749a4..e0c15687 100644
--- a/parts/filter/kdevfilterIface.cpp
+++ b/parts/filter/tdevfilterIface.cpp
@@ -10,26 +10,26 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include "kdevfilterIface.h"
+#include "tdevfilterIface.h"
 #include "filterpart.h"
 
-KDevFilterIface::KDevFilterIface( FilterPart* part )
-    : TQObject( part ), DCOPObject( "KDevFilter" ), m_part( part )
+TDevFilterIface::TDevFilterIface( FilterPart* part )
+    : TQObject( part ), DCOPObject( "TDevFilter" ), m_part( part )
 {
 }
 
-KDevFilterIface::~KDevFilterIface()
+TDevFilterIface::~TDevFilterIface()
 {
 }
 
-void KDevFilterIface::shellInsert()
+void TDevFilterIface::shellInsert()
 {
     m_part->slotShellInsert();
 }
 
-void KDevFilterIface::shellFilter()
+void TDevFilterIface::shellFilter()
 {
     m_part->slotShellFilter();
 }
 
-#include "kdevfilterIface.moc"
+#include "tdevfilterIface.moc"
diff --git a/parts/filter/kdevfilterIface.h b/parts/filter/tdevfilterIface.h
index fae74022..56d2aebf 100644
--- a/parts/filter/kdevfilterIface.h
+++ b/parts/filter/tdevfilterIface.h
@@ -1,20 +1,20 @@
 
-#ifndef KDEVFILTERIFACE_H
-#define KDEVFILTERIFACE_H
+#ifndef TDEVFILTERIFACE_H
+#define TDEVFILTERIFACE_H
 
 #include <tqobject.h>
 #include <dcopobject.h>
 
 class FilterPart;
 
-class KDevFilterIface : public TQObject, public DCOPObject
+class TDevFilterIface : public TQObject, public DCOPObject
 {
     Q_OBJECT
 //    
     K_DCOP
 public:
-    KDevFilterIface( FilterPart* part );
-    ~KDevFilterIface();
+    TDevFilterIface( FilterPart* part );
+    ~TDevFilterIface();
     
 k_dcop:
     void shellInsert();
diff --git a/parts/fullscreen/CMakeLists.txt b/parts/fullscreen/CMakeLists.txt
index 84b45df9..548e4f40 100644
--- a/parts/fullscreen/CMakeLists.txt
+++ b/parts/fullscreen/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevfullscreen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpart_fullscreen.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfullscreen )
+install( FILES tdevfullscreen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpart_fullscreen.rc DESTINATION ${DATA_INSTALL_DIR}/tdevfullscreen )
 
 
-##### libkdevfullscreen (module) ################
+##### libtdevfullscreen (module) ################
 
-tde_add_kpart( libkdevfullscreen AUTOMOC
+tde_add_kpart( libtdevfullscreen AUTOMOC
   SOURCES fullscreen_part.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/fullscreen/Makefile.am b/parts/fullscreen/Makefile.am
index 3f039ef6..a05b0bd1 100644
--- a/parts/fullscreen/Makefile.am
+++ b/parts/fullscreen/Makefile.am
@@ -1,15 +1,15 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevfullscreen.la
-libkdevfullscreen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevfullscreen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevfullscreen.la
+libtdevfullscreen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevfullscreen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevfullscreen_la_SOURCES = fullscreen_part.cpp
+libtdevfullscreen_la_SOURCES = fullscreen_part.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevfullscreen.desktop
+service_DATA = tdevfullscreen.desktop
 
-rcdir = $(kde_datadir)/kdevfullscreen
-rc_DATA = kdevpart_fullscreen.rc
+rcdir = $(kde_datadir)/tdevfullscreen
+rc_DATA = tdevpart_fullscreen.rc
diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp
index 22cecb42..a73f33f1 100644
--- a/parts/fullscreen/fullscreen_part.cpp
+++ b/parts/fullscreen/fullscreen_part.cpp
@@ -11,32 +11,32 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kstdaction.h>
 #include <tdemainwindow.h>
 #include <tdemenubar.h>
 
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
-#include <kdevplugininfo.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
+#include <tdevplugininfo.h>
 
 #include "fullscreen_part.h"
 
-static const KDevPluginInfo data("kdevfullscreen");
+static const TDevPluginInfo data("tdevfullscreen");
 
-typedef KDevGenericFactory<FullScreenPart> FullScreenFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) )
+typedef TDevGenericFactory<FullScreenPart> FullScreenFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevfullscreen, FullScreenFactory( data ) )
 
 FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& )
-  : KDevPlugin(&data, parent, name ? name : "FullScreenPart" )
+  : TDevPlugin(&data, parent, name ? name : "FullScreenPart" )
 {
   setInstance(FullScreenFactory::instance());
 //  const TDEAboutData &abdata1 = *(info());
 //  kdDebug() << abdata1.appName() << endl;
-  const KDevPluginInfo &_info = *info();
+  const TDevPluginInfo &_info = *info();
   const TDEAboutData *abdata = _info;
   kdDebug() << abdata->appName() << endl;
-  setXMLFile("kdevpart_fullscreen.rc");
+  setXMLFile("tdevpart_fullscreen.rc");
 
   m_bFullScreen = false;
 
diff --git a/parts/fullscreen/fullscreen_part.h b/parts/fullscreen/fullscreen_part.h
index fcb566e8..2964b5d9 100644
--- a/parts/fullscreen/fullscreen_part.h
+++ b/parts/fullscreen/fullscreen_part.h
@@ -9,15 +9,15 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __KDEVPART_FULLSCREEN_H__
-#define __KDEVPART_FULLSCREEN_H__
+#ifndef __TDEVPART_FULLSCREEN_H__
+#define __TDEVPART_FULLSCREEN_H__
 
 #include <tqguardedptr.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 class TDEAction;
 
-class FullScreenPart : public KDevPlugin
+class FullScreenPart : public TDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/fullscreen/kdevfullscreen.desktop b/parts/fullscreen/tdevfullscreen.desktop
index 6f935c85..4974af20 100644
--- a/parts/fullscreen/kdevfullscreen.desktop
+++ b/parts/fullscreen/tdevfullscreen.desktop
@@ -81,6 +81,6 @@ GenericName[zh_TW]=全螢幕
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Core
-X-TDE-Library=libkdevfullscreen
+X-TDE-Library=libtdevfullscreen
 X-TDevelop-Version=5
 X-TDevelop-Properties=ViewManagement
diff --git a/parts/fullscreen/kdevpart_fullscreen.rc b/parts/fullscreen/tdevpart_fullscreen.rc
index 3bd67c9d..3bd67c9d 100644
--- a/parts/fullscreen/kdevpart_fullscreen.rc
+++ b/parts/fullscreen/tdevpart_fullscreen.rc
diff --git a/parts/grepview/CMakeLists.txt b/parts/grepview/CMakeLists.txt
index 5ad23e4f..96d4042b 100644
--- a/parts/grepview/CMakeLists.txt
+++ b/parts/grepview/CMakeLists.txt
@@ -27,16 +27,16 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevgrepview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevgrepview.rc DESTINATION ${DATA_INSTALL_DIR}/kdevgrepview )
+install( FILES tdevgrepview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevgrepview.rc DESTINATION ${DATA_INSTALL_DIR}/tdevgrepview )
 
 
-##### libkdevgrepview (module) ##################
+##### libtdevgrepview (module) ##################
 
-tde_add_kpart( libkdevgrepview AUTOMOC
+tde_add_kpart( libtdevgrepview AUTOMOC
   SOURCES
     grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp
   LINK
-    kdevwidgets-shared tdevelop-shared
+    tdevwidgets-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/grepview/Makefile.am b/parts/grepview/Makefile.am
index dc5f5fed..8ae4725c 100644
--- a/parts/grepview/Makefile.am
+++ b/parts/grepview/Makefile.am
@@ -3,17 +3,17 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
 	-I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevgrepview.la
-libkdevgrepview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevgrepview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML)
+kde_module_LTLIBRARIES = libtdevgrepview.la
+libtdevgrepview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevgrepview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML)
 
-libkdevgrepview_la_SOURCES = grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp
+libtdevgrepview_la_SOURCES = grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevgrepview.desktop
+service_DATA = tdevgrepview.desktop
 
-rcdir = $(kde_datadir)/kdevgrepview
-rc_DATA = kdevgrepview.rc
+rcdir = $(kde_datadir)/tdevgrepview
+rc_DATA = tdevgrepview.rc
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index 6333805f..8e8b0eb3 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -34,7 +34,7 @@
 #include <kurlrequester.h>
 #include <kstdguiitem.h>
 #include <tdeparts/part.h>
-#include <kdevpartcontroller.h>
+#include <tdevpartcontroller.h>
 #include <klineedit.h>
 
 #include "grepviewpart.h"
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 92f4ebb6..9d6b08c5 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -23,26 +23,26 @@
 #include <kstringhandler.h>
 #include <tdetexteditor/document.h>
 
-#include "kdevcore.h"
-#include "kdevpartcontroller.h"
-#include "kdevmainwindow.h"
-#include "kdevplugininfo.h"
-#include "kdeveditorutil.h"
+#include "tdevcore.h"
+#include "tdevpartcontroller.h"
+#include "tdevmainwindow.h"
+#include "tdevplugininfo.h"
+#include "tdeveditorutil.h"
 #include "grepviewwidget.h"
 
-static const KDevPluginInfo data("kdevgrepview");
+static const TDevPluginInfo data("tdevgrepview");
 
-K_EXPORT_COMPONENT_FACTORY(libkdevgrepview, GrepViewFactory(data))
+K_EXPORT_COMPONENT_FACTORY(libtdevgrepview, GrepViewFactory(data))
 
 GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringList & )
-    : KDevPlugin( &data, parent, name ? name : "GrepViewPart" )
+    : TDevPlugin( &data, parent, name ? name : "GrepViewPart" )
 {
     setInstance(GrepViewFactory::instance());
 
-    setXMLFile("kdevgrepview.rc");
+    setXMLFile("tdevgrepview.rc");
 
-    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
-             this, TQT_SLOT(stopButtonClicked(KDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
+             this, TQT_SLOT(stopButtonClicked(TDevPlugin*)) );
     connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
     connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
     connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
@@ -83,7 +83,7 @@ GrepViewPart::~GrepViewPart()
 }
 
 
-void GrepViewPart::stopButtonClicked(KDevPlugin* which)
+void GrepViewPart::stopButtonClicked(TDevPlugin* which)
 {
     if ( which != 0 && which != this )
         return;
@@ -129,10 +129,10 @@ void GrepViewPart::slotGrep()
 {
 	if ( !m_widget->isRunning() )
 	{
-		TQString contextString = KDevEditorUtil::currentSelection( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+		TQString contextString = TDevEditorUtil::currentSelection( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 		if ( contextString.isEmpty() )
 		{
-			contextString = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+			contextString = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 		}
 		m_widget->showDialogWithPattern( contextString );
 	}
diff --git a/parts/grepview/grepviewpart.h b/parts/grepview/grepviewpart.h
index 4ebd7638..68c4a574 100644
--- a/parts/grepview/grepviewpart.h
+++ b/parts/grepview/grepviewpart.h
@@ -13,8 +13,8 @@
 #define _GREPVIEWPART_H_
 
 #include <tqguardedptr.h>
-#include <kdevgenericfactory.h>
-#include "kdevplugin.h"
+#include <tdevgenericfactory.h>
+#include "tdevplugin.h"
 
 class KDialogBase;
 class TQPopupMenu;
@@ -22,7 +22,7 @@ class Context;
 class GrepViewWidget;
 
 
-class GrepViewPart : public KDevPlugin
+class GrepViewPart : public TDevPlugin
 {
     Q_OBJECT
   
@@ -32,7 +32,7 @@ public:
     ~GrepViewPart();
 
 private slots:
-    void stopButtonClicked(KDevPlugin *which);
+    void stopButtonClicked(TDevPlugin *which);
     void projectOpened();
     void projectClosed();
     void contextMenu(TQPopupMenu *popup, const Context *context);
@@ -46,6 +46,6 @@ private:
     friend class GrepViewWidget;
 };
 
-typedef KDevGenericFactory<GrepViewPart> GrepViewFactory;
+typedef TDevGenericFactory<GrepViewPart> GrepViewFactory;
 
 #endif
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index 1d709dff..edcdaa7c 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -27,10 +27,10 @@
 #include <tdemessagebox.h>
 using namespace KTextEditor;
 
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevmainwindow.h"
-#include "kdevpartcontroller.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevmainwindow.h"
+#include "tdevpartcontroller.h"
 
 #include "grepdlg.h"
 #include "grepviewpart.h"
@@ -181,7 +181,7 @@ void GrepViewWidget::showDialog()
 		}
 	}
 	// Determine if we have a list of project files
-	KDevProject *openProject = m_part->project();
+	TDevProject *openProject = m_part->project();
 	if (openProject)
 	{
 		grepdlg->setEnableProjectBox(!openProject->allFiles().isEmpty());
@@ -225,7 +225,7 @@ void GrepViewWidget::showDialogWithPattern(TQString pattern)
 	grepdlg->setPattern( pattern );
 
 	// Determine if we have a list of project files
-	KDevProject *openProject = m_part->project();
+	TDevProject *openProject = m_part->project();
 	if (openProject)
 	{
 		grepdlg->setEnableProjectBox(!openProject->allFiles().isEmpty());
@@ -255,7 +255,7 @@ void GrepViewWidget::searchActivated()
 
 	if (grepdlg->useProjectFilesFlag())
 	{
-		KDevProject *openProject = m_part->project();
+		TDevProject *openProject = m_part->project();
 		if (openProject)
 		{
 			TQString tmpFilePath;
@@ -430,7 +430,7 @@ void GrepViewProcessWidget::insertStdoutLine(const TQCString &line)
 }
 
 
-void GrepViewWidget::projectChanged(KDevProject *project)
+void GrepViewWidget::projectChanged(TDevProject *project)
 {
 	TQString dir = project? project->projectDirectory() : TQDir::homeDirPath();
 	grepdlg->setDirectory(dir);
diff --git a/parts/grepview/grepviewwidget.h b/parts/grepview/grepviewwidget.h
index 3bf803b5..0f05c136 100644
--- a/parts/grepview/grepviewwidget.h
+++ b/parts/grepview/grepviewwidget.h
@@ -18,7 +18,7 @@
 
 class GrepDialog;
 class GrepViewPart;
-class KDevProject;
+class TDevProject;
 class KTabWidget;
 class TQHBoxLayout;
 class TQToolButton;
@@ -66,7 +66,7 @@ public:
 	GrepViewWidget(GrepViewPart *part);
 	~GrepViewWidget();
 
-	void projectChanged(KDevProject *project);
+	void projectChanged(TDevProject *project);
 	void killJob( int signo = SIGTERM );
 	bool isRunning() const;
 
diff --git a/parts/grepview/kdevgrepview.desktop b/parts/grepview/tdevgrepview.desktop
index 0521c804..c7b98916 100644
--- a/parts/grepview/kdevgrepview.desktop
+++ b/parts/grepview/tdevgrepview.desktop
@@ -80,7 +80,7 @@ GenericName[zh_CN]=Grep 前端
 GenericName[zh_TW]=Grep 前端介面
 Icon=find
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevgrepview
+X-TDE-Library=libtdevgrepview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=FileSearch
diff --git a/parts/grepview/kdevgrepview.rc b/parts/grepview/tdevgrepview.rc
index 80b20389..80b20389 100644
--- a/parts/grepview/kdevgrepview.rc
+++ b/parts/grepview/tdevgrepview.rc
diff --git a/parts/konsole/CMakeLists.txt b/parts/konsole/CMakeLists.txt
index e6b51296..37cd0687 100644
--- a/parts/konsole/CMakeLists.txt
+++ b/parts/konsole/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevkonsoleview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevkonsoleview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevkonsoleview (module) ###############
+##### libtdevkonsoleview (module) ###############
 
-tde_add_kpart( libkdevkonsoleview AUTOMOC
+tde_add_kpart( libtdevkonsoleview AUTOMOC
   SOURCES konsoleviewpart.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/konsole/Makefile.am b/parts/konsole/Makefile.am
index 085f8e7a..1cc781d4 100644
--- a/parts/konsole/Makefile.am
+++ b/parts/konsole/Makefile.am
@@ -2,15 +2,15 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevkonsoleview.la
-libkdevkonsoleview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevkonsoleview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/util/libkdevutil.la
+kde_module_LTLIBRARIES = libtdevkonsoleview.la
+libtdevkonsoleview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevkonsoleview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/util/libtdevutil.la
 
-libkdevkonsoleview_la_SOURCES = konsoleviewpart.cpp
+libtdevkonsoleview_la_SOURCES = konsoleviewpart.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevkonsoleview.desktop
+service_DATA = tdevkonsoleview.desktop
 
diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp
index 873ab790..63f720d9 100644
--- a/parts/konsole/konsoleviewpart.cpp
+++ b/parts/konsole/konsoleviewpart.cpp
@@ -13,27 +13,27 @@
 
 #include <tqwhatsthis.h>
 
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevmainwindow.h"
-#include "kdevplugininfo.h"
-#include "kdevshellwidget.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevmainwindow.h"
+#include "tdevplugininfo.h"
+#include "tdevshellwidget.h"
 
 
-typedef KDevGenericFactory<KonsoleViewPart> KonsoleViewFactory;
-static const KDevPluginInfo data("kdevkonsoleview");
-K_EXPORT_COMPONENT_FACTORY(libkdevkonsoleview, KonsoleViewFactory(data))
+typedef TDevGenericFactory<KonsoleViewPart> KonsoleViewFactory;
+static const TDevPluginInfo data("tdevkonsoleview");
+K_EXPORT_COMPONENT_FACTORY(libtdevkonsoleview, KonsoleViewFactory(data))
 
 KonsoleViewPart::KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name ? name : "KonsoleViewPart")
+  : TDevPlugin(&data, parent, name ? name : "KonsoleViewPart")
 {
     setInstance( KonsoleViewFactory::instance() );
 
-    m_widget = new KDevShellWidget( 0, "konsole widget" );
+    m_widget = new TDevShellWidget( 0, "konsole widget" );
 
     TQWhatsThis::add(m_widget, i18n("<b>Konsole</b><p>"
         "This window contains an embedded konsole window. It will try to follow you when "
diff --git a/parts/konsole/konsoleviewpart.h b/parts/konsole/konsoleviewpart.h
index 9bcecb38..912e00b4 100644
--- a/parts/konsole/konsoleviewpart.h
+++ b/parts/konsole/konsoleviewpart.h
@@ -14,12 +14,12 @@
 
 
 #include <tqguardedptr.h>
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 
 
-class KDevShellWidget;
+class TDevShellWidget;
 
-class KonsoleViewPart : public KDevPlugin
+class KonsoleViewPart : public TDevPlugin
 {
     Q_OBJECT
   
@@ -31,7 +31,7 @@ private slots:
     void projectOpened();
 
 private:
-    TQGuardedPtr<KDevShellWidget> m_widget;
+    TQGuardedPtr<TDevShellWidget> m_widget;
 };
 
 #endif
diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp
index 7c21cab2..26ac9e29 100644
--- a/parts/konsole/konsoleviewwidget.cpp
+++ b/parts/konsole/konsoleviewwidget.cpp
@@ -20,10 +20,10 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 
-#include "kdevcore.h"
-#include "kdevproject.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
 #include "konsoleviewpart.h"
-#include "kdevpartcontroller.h"
+#include "tdevpartcontroller.h"
 
 #include "konsoleviewwidget.h"
 
diff --git a/parts/konsole/konsoleviewwidget.h b/parts/konsole/konsoleviewwidget.h
index 2bf3160a..6a7f6a9f 100644
--- a/parts/konsole/konsoleviewwidget.h
+++ b/parts/konsole/konsoleviewwidget.h
@@ -17,7 +17,7 @@
 #include <tqstring.h>
 
 
-class KDevProject;
+class TDevProject;
 class KonsoleWidgetPrivate;
 class KonsoleViewPart;
 namespace KParts {
diff --git a/parts/konsole/kdevkonsoleview.desktop b/parts/konsole/tdevkonsoleview.desktop
index 4a9fa14e..edc9018f 100644
--- a/parts/konsole/kdevkonsoleview.desktop
+++ b/parts/konsole/tdevkonsoleview.desktop
@@ -80,7 +80,7 @@ GenericName[zh_CN]=嵌入的 Konsole
 GenericName[zh_TW]=嵌入式主控台
 Icon=konsole
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevkonsoleview
+X-TDE-Library=libtdevkonsoleview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=Console
diff --git a/parts/openwith/CMakeLists.txt b/parts/openwith/CMakeLists.txt
index 8384bdaa..d870a3e0 100644
--- a/parts/openwith/CMakeLists.txt
+++ b/parts/openwith/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevopenwith.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevopenwith.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevopenwith (module) ##################
+##### libtdevopenwith (module) ##################
 
-tde_add_kpart( libkdevopenwith AUTOMOC
+tde_add_kpart( libtdevopenwith AUTOMOC
   SOURCES openwithpart.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/openwith/Makefile.am b/parts/openwith/Makefile.am
index 57503a0e..316572ef 100644
--- a/parts/openwith/Makefile.am
+++ b/parts/openwith/Makefile.am
@@ -2,14 +2,14 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevopenwith.la
-libkdevopenwith_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevopenwith_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevopenwith.la
+libtdevopenwith_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevopenwith_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevopenwith_la_SOURCES = openwithpart.cpp
+libtdevopenwith_la_SOURCES = openwithpart.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevopenwith.desktop
+service_DATA = tdevopenwith.desktop
 
diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp
index 63fcc6d9..a223f193 100644
--- a/parts/openwith/openwithpart.cpp
+++ b/parts/openwith/openwithpart.cpp
@@ -3,7 +3,7 @@
 #include <tqfile.h>
 
 #include <tdepopupmenu.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <ktrader.h>
@@ -11,18 +11,18 @@
 #include <tdeaction.h>
 #include <kcharsets.h>
 
-#include "kdevpartcontroller.h"
-#include "kdevcore.h"
-#include "kdevplugininfo.h"
+#include "tdevpartcontroller.h"
+#include "tdevcore.h"
+#include "tdevplugininfo.h"
 #include "urlutil.h"
 
-typedef KDevGenericFactory<OpenWithPart> OpenWithFactory;
+typedef TDevGenericFactory<OpenWithPart> OpenWithFactory;
 
-static const KDevPluginInfo data("kdevopenwith");
-K_EXPORT_COMPONENT_FACTORY(libkdevopenwith, OpenWithFactory(data))
+static const TDevPluginInfo data("tdevopenwith");
+K_EXPORT_COMPONENT_FACTORY(libtdevopenwith, OpenWithFactory(data))
 
 OpenWithPart::OpenWithPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name ? name : "OpenWithPart")
+  : TDevPlugin(&data, parent, name ? name : "OpenWithPart")
 {
   setInstance( OpenWithFactory::instance() );
 
diff --git a/parts/openwith/openwithpart.h b/parts/openwith/openwithpart.h
index bd338a3f..0c9a20ac 100644
--- a/parts/openwith/openwithpart.h
+++ b/parts/openwith/openwithpart.h
@@ -3,13 +3,13 @@
 
 #include <kurl.h>
 
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 
 class TQPopupMenu;
 class Context;
 
 
-class OpenWithPart : public KDevPlugin
+class OpenWithPart : public TDevPlugin
 {
 	Q_OBJECT
   
diff --git a/parts/openwith/kdevopenwith.desktop b/parts/openwith/tdevopenwith.desktop
index 0108daaa..fa1be30d 100644
--- a/parts/openwith/kdevopenwith.desktop
+++ b/parts/openwith/tdevopenwith.desktop
@@ -76,7 +76,7 @@ GenericName[zh_CN]=“打开方式”菜单项
 GenericName[zh_TW]="開啟方式"選單
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevopenwith
+X-TDE-Library=libtdevopenwith
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=GlobalFileManagement,FileOpenWith
diff --git a/parts/outputviews/CMakeLists.txt b/parts/outputviews/CMakeLists.txt
index 48cf38ec..18effab8 100644
--- a/parts/outputviews/CMakeLists.txt
+++ b/parts/outputviews/CMakeLists.txt
@@ -30,40 +30,40 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    kdevappoutputview.desktop kdevmakeview.desktop
+    tdevappoutputview.desktop tdevmakeview.desktop
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 install( FILES
-    kdevmakeview.rc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappoutputview )
+    tdevmakeview.rc
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappoutputview )
 
 install( FILES
-    kdevmakeview.rc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevmakeview )
+    tdevmakeview.rc
+  DESTINATION ${DATA_INSTALL_DIR}/tdevmakeview )
 
 
-##### libkdevmakeview (module) ##################
+##### libtdevmakeview (module) ##################
 
-tde_add_kpart( libkdevmakeview AUTOMOC
+tde_add_kpart( libtdevmakeview AUTOMOC
   SOURCES
     makeviewpart.cpp makewidget.cpp
     directorystatusmessagefilter.cpp outputfilter.cpp
     compileerrorfilter.cpp commandcontinuationfilter.cpp
     makeitem.cpp makeactionfilter.cpp otherfilter.cpp
   LINK
-    kdevdcopextensions-static kdevextensions-static
-    kdevwidgets-shared tdevelop-shared
+    tdevdcopextensions-static tdevextensions-static
+    tdevwidgets-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
-##### libkdevappview (module) ###################
+##### libtdevappview (module) ###################
 
-tde_add_kpart( libkdevappview AUTOMOC
+tde_add_kpart( libtdevappview AUTOMOC
   SOURCES
     appoutputviewpart.cpp appoutputwidget.cpp filterdlg.ui
   LINK
-    kdevdcopextensions-static kdevextensions-static
-    kdevwidgets-shared tdevelop-shared
+    tdevdcopextensions-static tdevextensions-static
+    tdevwidgets-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/outputviews/Makefile.am b/parts/outputviews/Makefile.am
index 6a890586..6536d0f2 100644
--- a/parts/outputviews/Makefile.am
+++ b/parts/outputviews/Makefile.am
@@ -4,32 +4,32 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/extensions/dcop -I$(top_srcdir)/lib/util \
 	-I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevmakeview.la libkdevappview.la
+kde_module_LTLIBRARIES = libtdevmakeview.la libtdevappview.la
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevappoutputview.desktop kdevmakeview.desktop
+service_DATA = tdevappoutputview.desktop tdevmakeview.desktop
 
-rc1dir = $(kde_datadir)/kdevappoutputview
-rc1_DATA = kdevmakeview.rc
+rc1dir = $(kde_datadir)/tdevappoutputview
+rc1_DATA = tdevmakeview.rc
 
-rc2dir = $(kde_datadir)/kdevmakeview
-rc2_DATA = kdevmakeview.rc
+rc2dir = $(kde_datadir)/tdevmakeview
+rc2_DATA = tdevmakeview.rc
 
 noinst_HEADERS = filterdlg.h
 
-libkdevmakeview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevmakeview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \
-	$(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \
-	$(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
-libkdevmakeview_la_SOURCES = makeviewpart.cpp makewidget.cpp \
+libtdevmakeview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevmakeview_la_LIBADD = $(top_builddir)/lib/widgets/libtdevwidgets.la \
+	$(top_builddir)/lib/interfaces/extensions/dcop/libtdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \
+	$(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
+libtdevmakeview_la_SOURCES = makeviewpart.cpp makewidget.cpp \
 	directorystatusmessagefilter.cpp outputfilter.cpp compileerrorfilter.cpp commandcontinuationfilter.cpp \
 	makeitem.cpp makeactionfilter.cpp otherfilter.cpp
 
-libkdevappview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevappview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \
-	$(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \
-	$(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
-libkdevappview_la_SOURCES = appoutputviewpart.cpp appoutputwidget.cpp \
+libtdevappview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevappview_la_LIBADD = $(top_builddir)/lib/widgets/libtdevwidgets.la \
+	$(top_builddir)/lib/interfaces/extensions/dcop/libtdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \
+	$(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
+libtdevappview_la_SOURCES = appoutputviewpart.cpp appoutputwidget.cpp \
 	filterdlg.ui
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index 3a0e0e7d..223d3855 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -18,27 +18,27 @@
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <tdeparts/part.h>
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 #include <tdeapplication.h>
 
-#include "kdevproject.h"
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
+#include "tdevproject.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
 #include "appoutputwidget.h"
-#include "kdevpartcontroller.h"
+#include "tdevpartcontroller.h"
 #include "settings.h"
 
-static const KDevPluginInfo data("kdevappoutputview");
-typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) )
+static const TDevPluginInfo data("tdevappoutputview");
+typedef TDevGenericFactory< AppOutputViewPart > AppViewFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevappview, AppViewFactory( data ) )
 
 AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart")
+    : TDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart")
 {
     setInstance(AppViewFactory::instance());
 
-    m_dcop = new KDevAppFrontendIface(this);
+    m_dcop = new TDevAppFrontendIface(this);
 
     m_widget = new AppOutputWidget(this);
     m_widget->setIcon( SmallIcon("openterm") );
@@ -51,8 +51,8 @@ AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const T
     mainWindow()->embedOutputView(m_widget, i18n("Application"), i18n("Output of the executed user program"));
     hideView();
 
-    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
-             this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
+             this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) );
     connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited()));
     connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SIGNAL(processExited()));
 }
@@ -66,7 +66,7 @@ AppOutputViewPart::~AppOutputViewPart()
     delete m_dcop;
 }
 
-void AppOutputViewPart::slotStopButtonClicked( KDevPlugin* which )
+void AppOutputViewPart::slotStopButtonClicked( TDevPlugin* which )
 {
     if ( which != 0 && which != this )
         return;
diff --git a/parts/outputviews/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h
index 1067af97..306108cd 100644
--- a/parts/outputviews/appoutputviewpart.h
+++ b/parts/outputviews/appoutputviewpart.h
@@ -14,13 +14,13 @@
 
 #include <tqguardedptr.h>
 
-#include "kdevappfrontend.h"
-#include "KDevAppFrontendIface.h"
+#include "tdevappfrontend.h"
+#include "TDevAppFrontendIface.h"
 
 
 class AppOutputWidget;
 
-class AppOutputViewPart : public KDevAppFrontend
+class AppOutputViewPart : public TDevAppFrontend
 {
     Q_OBJECT
   
@@ -45,12 +45,12 @@ signals:
     void processExited();
 
 private slots:
-    void slotStopButtonClicked(KDevPlugin*);
+    void slotStopButtonClicked(TDevPlugin*);
     void slotProcessExited();
 
 private:
     TQGuardedPtr<AppOutputWidget> m_widget;
-    KDevAppFrontendIface *m_dcop;
+    TDevAppFrontendIface *m_dcop;
     bool m_viewIsVisible;
 };
 
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index 50060339..0201ce5c 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -33,9 +33,9 @@
 
 #include "appoutputviewpart.h"
 #include "filterdlg.h"
-#include "kdevpartcontroller.h"
-#include "kdevmainwindow.h"
-#include "kdevproject.h"
+#include "tdevpartcontroller.h"
+#include "tdevmainwindow.h"
+#include "tdevproject.h"
 
 AppOutputWidget::AppOutputWidget(AppOutputViewPart* part)
     : ProcessWidget(0, "app output widget"), m_part(part)
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index ee38d144..157a2c2e 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -184,11 +184,11 @@ void MakeActionFilter::test()
 		"-I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W "
 		"-Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion "
 		"-Wchar-subscripts -fno-builtin -g3 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new "
-		"-fno-common -MT kdevcore.lo -MD -MP -MF \".deps/kdevcore.Tpo\" -c -o kdevcore.lo `test -f "
-		"'/home/john/src/kde/tdevelop/lib/interfaces/kdevcore.cpp' || echo "
-		"'/home/john/src/kde/tdevelop/lib/interfaces/'`/home/john/src/kde/tdevelop/lib/interfaces/kdevcore.cpp; then mv "
-		"\".deps/kdevcore.Tpo\" \".deps/kdevcore.Plo\"; else rm -f \".deps/kdevcore.Tpo\"; exit 1; fi",
-		"compiling", "g++", "kdevcore.cpp" )
+		"-fno-common -MT tdevcore.lo -MD -MP -MF \".deps/tdevcore.Tpo\" -c -o tdevcore.lo `test -f "
+		"'/home/john/src/kde/tdevelop/lib/interfaces/tdevcore.cpp' || echo "
+		"'/home/john/src/kde/tdevelop/lib/interfaces/'`/home/john/src/kde/tdevelop/lib/interfaces/tdevcore.cpp; then mv "
+		"\".deps/tdevcore.Tpo\" \".deps/tdevcore.Plo\"; else rm -f \".deps/tdevcore.Tpo\"; exit 1; fi",
+		"compiling", "g++", "tdevcore.cpp" )
 	<< TestItem( // automake 1.7, srcdir != builddir
 		"if g++ -DHAVE_CONFIG_H -I. -I/home/john/src/kde/tdevelop/src -I.. -I/home/john/src/kde/tdevelop/lib/interfaces "
 		"-I/home/john/src/kde/tdevelop/lib/sourceinfo -I/home/john/src/kde/tdevelop/lib/util -I/home/john/src/kde/tdevelop/lib "
@@ -222,12 +222,12 @@ void MakeActionFilter::test()
 		"/bin/sh ../../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic "
 		"-W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align "
 		"-Wconversion -Wchar-subscripts -fno-builtin -g3 -Wformat-security -Wmissing-format-attribute -fno-exceptions "
-		"-fno-check-new -fno-common -o libkdevoutputviews.la.closure libkdevoutputviews_la_closure.lo -L/usr/X11R6/lib "
+		"-fno-check-new -fno-common -o libtdevoutputviews.la.closure libtdevoutputviews_la_closure.lo -L/usr/X11R6/lib "
 		"-L/home/john/src/kde/qt-copy/lib -L/usr/local/kde/lib -avoid-version -module -no-undefined -R /usr/local/kde/lib "
 		"-R /home/john/src/kde/qt-copy/lib -R /usr/X11R6/lib outputviewsfactory.lo makeviewpart.lo makewidget.lo "
 		"appoutputviewpart.lo appoutputwidget.lo directorystatusmessagefilter.lo outputfilter.lo compileerrorfilter.lo "
 		"commandcontinuationfilter.lo makeitem.lo makeactionfilter.lo otherfilter.lo ../../lib/libtdevelop.la",
-		"linking", "libtool", "libkdevoutputviews.la.closure" )
+		"linking", "libtool", "libtdevoutputviews.la.closure" )
 	<< TestItem( //libtool, linking 2
 		"/bin/sh ../libtool --silent --mode=link --tag=CXX g++  -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic "
 		"-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts "
@@ -254,12 +254,12 @@ void MakeActionFilter::test()
 		"echo '/home/andris/cvs-developement/head/quanta/quanta/project/'`/home/andris/cvs-developement/head/quanta/quanta/project/project.cpp	",
 		"compiling", "g++", "project.cpp")
 	<< TestItem(
-		"/usr/local/kde/bin/dcopidl /home/john/src/kde/tdevelop/lib/interfaces/KDevAppFrontendIface.h > KDevAppFrontendIface.kidl "
-		"|| ( rm -f KDevAppFrontendIface.kidl ; /bin/false )",
-		"generating", "dcopidl", "KDevAppFrontendIface.kidl" )
+		"/usr/local/kde/bin/dcopidl /home/john/src/kde/tdevelop/lib/interfaces/TDevAppFrontendIface.h > TDevAppFrontendIface.kidl "
+		"|| ( rm -f TDevAppFrontendIface.kidl ; /bin/false )",
+		"generating", "dcopidl", "TDevAppFrontendIface.kidl" )
 	<< TestItem(
-		"/usr/local/kde/bin/dcopidl2cpp --c++-suffix cpp --no-signals --no-stub KDevAppFrontendIface.kidl",
-		"compiling", "dcopidl2cpp", "KDevAppFrontendIface.kidl" )
+		"/usr/local/kde/bin/dcopidl2cpp --c++-suffix cpp --no-signals --no-stub TDevAppFrontendIface.kidl",
+		"compiling", "dcopidl2cpp", "TDevAppFrontendIface.kidl" )
 	<< TestItem( //install
 		"/usr/bin/install -c -p -m 644 /home/andris/development/quanta/quanta/kommander/editor/kmdr-editor.desktop "
 		"/opt/trinity/share/applnk/Editors/kmdr-editor.desktop", "installing", "", "/opt/trinity/share/applnk/Editors/kmdr-editor.desktop")
diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp
index 9324bcb0..e8eb6a75 100644
--- a/parts/outputviews/makeviewpart.cpp
+++ b/parts/outputviews/makeviewpart.cpp
@@ -17,27 +17,27 @@
 #include <tdelocale.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 
-#include "kdevproject.h"
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
+#include "tdevproject.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
 
 #include "makewidget.h"
 
-static const KDevPluginInfo data("kdevmakeview");
-typedef KDevGenericFactory< MakeViewPart > MakeViewFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) )
+static const TDevPluginInfo data("tdevmakeview");
+typedef TDevGenericFactory< MakeViewPart > MakeViewFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevmakeview, MakeViewFactory( data ) )
 
 MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevMakeFrontend(&data, parent, name)
+    : TDevMakeFrontend(&data, parent, name)
 {
     setInstance(MakeViewFactory::instance());
 
-    setXMLFile("kdevmakeview.rc");
+    setXMLFile("tdevmakeview.rc");
 
-    m_dcop = new KDevMakeFrontendIface(this);
+    m_dcop = new TDevMakeFrontendIface(this);
 
     m_widget = new MakeWidget(this);
     m_widget->setIcon( SmallIcon("exec") );
@@ -61,8 +61,8 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis
     action->setToolTip( i18n("Go to the previous error") );
     action->setWhatsThis(i18n("<b>Previous error</b><p>Switches to the file and line where the previous error was reported from."));
 
-    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
-             this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
+             this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) );
 }
 
 
@@ -74,7 +74,7 @@ MakeViewPart::~MakeViewPart()
     delete m_dcop;
 }
 
-void MakeViewPart::slotStopButtonClicked(KDevPlugin* which)
+void MakeViewPart::slotStopButtonClicked(TDevPlugin* which)
 {
     if ( which != 0 && which != this )
         return;
diff --git a/parts/outputviews/makeviewpart.h b/parts/outputviews/makeviewpart.h
index 89f2a8bd..420eebcb 100644
--- a/parts/outputviews/makeviewpart.h
+++ b/parts/outputviews/makeviewpart.h
@@ -14,13 +14,13 @@
 
 #include <tqguardedptr.h>
 
-#include "kdevmakefrontend.h"
-#include "KDevMakeFrontendIface.h"
+#include "tdevmakefrontend.h"
+#include "TDevMakeFrontendIface.h"
 
 
 class MakeWidget;
 
-class MakeViewPart : public KDevMakeFrontend
+class MakeViewPart : public TDevMakeFrontend
 {
     Q_OBJECT
   
@@ -32,7 +32,7 @@ public:
     virtual void updateSettingsFromConfig();
 
 private slots:
-    void slotStopButtonClicked(KDevPlugin*);
+    void slotStopButtonClicked(TDevPlugin*);
     
 protected:
     virtual void queueCommand(const TQString &dir, const TQString &command);
@@ -40,7 +40,7 @@ protected:
 
 private:
     TQGuardedPtr<MakeWidget> m_widget;
-    KDevMakeFrontendIface *m_dcop;
+    TDevMakeFrontendIface *m_dcop;
     friend class MakeWidget;
 };
 
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 029efdc6..0e2e6aef 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -10,10 +10,10 @@
  ***************************************************************************/
 
 #include "makewidget.h"
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
-#include "kdevproject.h"
-#include "kdevpartcontroller.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
+#include "tdevproject.h"
+#include "tdevpartcontroller.h"
 #include "processlinemaker.h"
 #include "makeviewpart.h"
 #include "makeitem.h"
diff --git a/parts/outputviews/outputviewsfactory.cpp b/parts/outputviews/outputviewsfactory.cpp
index 55e5bf55..d63621d6 100644
--- a/parts/outputviews/outputviewsfactory.cpp
+++ b/parts/outputviews/outputviewsfactory.cpp
@@ -11,11 +11,11 @@
 
 #include "outputviewsfactory.h"
 
-static const KDevPluginInfo data("kdevoutputviews", I18N_NOOP("Messages Output"), "1.0");
+static const TDevPluginInfo data("tdevoutputviews", I18N_NOOP("Messages Output"), "1.0");
 
-K_EXPORT_COMPONENT_FACTORY( libkdevoutputviews, OutputViewsFactory( &data ) )
+K_EXPORT_COMPONENT_FACTORY( libtdevoutputviews, OutputViewsFactory( &data ) )
 
-const KDevPluginInfo *outputViewsInfo()
+const TDevPluginInfo *outputViewsInfo()
 {
     return data;
 }
diff --git a/parts/outputviews/outputviewsfactory.h b/parts/outputviews/outputviewsfactory.h
index 4bcba666..e79e60a2 100644
--- a/parts/outputviews/outputviewsfactory.h
+++ b/parts/outputviews/outputviewsfactory.h
@@ -12,16 +12,16 @@
 #ifndef _OUTPUTVIEWSFACTORY_H_
 #define _OUTPUTVIEWSFACTORY_H_
 
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 
 #include "appoutputviewpart.h"
 #include "makeviewpart.h"
 
-class KDevPluginInfo;
+class TDevPluginInfo;
 
 typedef K_TYPELIST_2( AppOutputViewPart, MakeViewPart ) OutputViews;
-typedef KDevGenericFactory< OutputViews > OutputViewsFactory;
+typedef TDevGenericFactory< OutputViews > OutputViewsFactory;
 
-const KDevPluginInfo *outputViewsInfo();
+const TDevPluginInfo *outputViewsInfo();
 
 #endif
diff --git a/parts/outputviews/kdevappoutputview.desktop b/parts/outputviews/tdevappoutputview.desktop
index bca43d54..7791162d 100644
--- a/parts/outputviews/kdevappoutputview.desktop
+++ b/parts/outputviews/tdevappoutputview.desktop
@@ -34,15 +34,15 @@ Comment[tg]=Тирезаи хориҷ кардани гузориш
 Comment[tr]=Uygulama Çıktı Görünümü
 Comment[zh_CN]=应用程序输出查看器
 Comment[zh_TW]=應用程式輸出檢視
-Name=KDevAppOutputView
+Name=TDevAppOutputView
 Name[da]=TDevelop Program-uddata fremvisning
 Name[de]=Anwendungsausgabe (TDevelop)
 Name[hi]=के-डेव-एप्प-आउटपुट-व्यू
 Name[nds]=Programmutgaav-Kieker (TDevelop)
-Name[pl]=KDevAppWidokWyjścia
+Name[pl]=TDevAppWidokWyjścia
 Name[sk]=KDev pohľad na výstup aplikácie
 Name[sv]=TDevelop programutmatningsvy
-Name[ta]=KDevApp வெளியீட்டுக் காட்சி
+Name[ta]=TDevApp வெளியீட்டுக் காட்சி
 Name[zh_TW]=TDevelop 應用程式輸出檢視
 GenericName=Application Output View
 GenericName[ca]=Visor de l'eixida de les aplicacions
@@ -78,7 +78,7 @@ GenericName[zh_CN]=应用程序输出查看器
 GenericName[zh_TW]=應用程式輸出檢視
 Icon=exec
 ServiceTypes=TDevelop/AppFrontend
-X-TDE-Library=libkdevappview
+X-TDE-Library=libtdevappview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
 X-TDevelop-Properties=OutputTool
diff --git a/parts/outputviews/kdevmakeview.desktop b/parts/outputviews/tdevmakeview.desktop
index bfea5cec..5651f031 100644
--- a/parts/outputviews/kdevmakeview.desktop
+++ b/parts/outputviews/tdevmakeview.desktop
@@ -35,7 +35,7 @@ Comment[tg]=Интерфейс ба талфифгар
 Comment[tr]=Derleyici Önucu
 Comment[zh_CN]=编译器前端
 Comment[zh_TW]=編譯器前端介面
-Name=KDevMakeView
+Name=TDevMakeView
 Name[da]=TDevelop Make-visning
 Name[de]=Make-Ausgabe (TDevelop)
 Name[hi]=के-डेव-मेक-व्यू
@@ -81,7 +81,7 @@ GenericName[zh_CN]=编译器前端
 GenericName[zh_TW]=編譯器前端介面
 Icon=konsole
 ServiceTypes=TDevelop/MakeFrontend
-X-TDE-Library=libkdevmakeview
+X-TDE-Library=libtdevmakeview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
 X-TDevelop-Properties=OutputTool
diff --git a/parts/outputviews/kdevmakeview.rc b/parts/outputviews/tdevmakeview.rc
index fc8c82f6..869191cb 100644
--- a/parts/outputviews/kdevmakeview.rc
+++ b/parts/outputviews/tdevmakeview.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KDevMakeView" version="1">
+<kpartgui name="TDevMakeView" version="1">
 <MenuBar>
  <Menu name="view">
    <Action name="view_next_error" group="error_operations"/>
diff --git a/parts/partexplorer/CMakeLists.txt b/parts/partexplorer/CMakeLists.txt
index 7fe5080f..8b9b130f 100644
--- a/parts/partexplorer/CMakeLists.txt
+++ b/parts/partexplorer/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevpartexplorer.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpartexplorer.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpartexplorer )
+install( FILES tdevpartexplorer.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpartexplorer.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpartexplorer )
 
 
-##### libkdevpartexplorer (module) ##############
+##### libtdevpartexplorer (module) ##############
 
-tde_add_kpart( libkdevpartexplorer AUTOMOC
+tde_add_kpart( libtdevpartexplorer AUTOMOC
   SOURCES
     partexplorerformbase.ui partexplorerform.cpp
     partexplorer_plugin.cpp
diff --git a/parts/partexplorer/Makefile.am b/parts/partexplorer/Makefile.am
index fcb6caff..b0d8dd8a 100644
--- a/parts/partexplorer/Makefile.am
+++ b/parts/partexplorer/Makefile.am
@@ -2,16 +2,16 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevpartexplorer.la
-libkdevpartexplorer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevpartexplorer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevpartexplorer.la
+libtdevpartexplorer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevpartexplorer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevpartexplorer_la_SOURCES = partexplorerformbase.ui partexplorerform.cpp partexplorer_plugin.cpp
+libtdevpartexplorer_la_SOURCES = partexplorerformbase.ui partexplorerform.cpp partexplorer_plugin.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevpartexplorer.desktop
+service_DATA = tdevpartexplorer.desktop
 
-rcdir = $(kde_datadir)/kdevpartexplorer
-rc_DATA = kdevpartexplorer.rc
+rcdir = $(kde_datadir)/tdevpartexplorer
+rc_DATA = tdevpartexplorer.rc
diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp
index d5240edb..43ab5717 100644
--- a/parts/partexplorer/partexplorer_plugin.cpp
+++ b/parts/partexplorer/partexplorer_plugin.cpp
@@ -13,28 +13,28 @@
 
 #include <kinstance.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdemainwindow.h>
 
-#include <kdevplugininfo.h>
-#include <kdevmainwindow.h>
+#include <tdevplugininfo.h>
+#include <tdevmainwindow.h>
 
 #include "partexplorerform.h"
 
-static const KDevPluginInfo data("kdevpartexplorer");
+static const TDevPluginInfo data("tdevpartexplorer");
 
-typedef KDevGenericFactory<PartExplorerPlugin> PartExplorerPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) )
+typedef TDevGenericFactory<PartExplorerPlugin> PartExplorerPluginFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevpartexplorer, PartExplorerPluginFactory( data ) )
 
 PartExplorerPlugin::PartExplorerPlugin(  TQObject *parent, const char *name, const TQStringList & )
-    : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" )
+    : TDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" )
 {
     // we need an instance
     setInstance( PartExplorerPluginFactory::instance() );
 
-    setXMLFile( "kdevpartexplorer.rc" );
+    setXMLFile( "tdevpartexplorer.rc" );
 
     // this should be your custom internal widget
     m_widget = new PartExplorerForm( mainWindow()->main() );
diff --git a/parts/partexplorer/partexplorer_plugin.h b/parts/partexplorer/partexplorer_plugin.h
index eea44750..622ff002 100644
--- a/parts/partexplorer/partexplorer_plugin.h
+++ b/parts/partexplorer/partexplorer_plugin.h
@@ -14,14 +14,14 @@
 
 #include <tqguardedptr.h>
 
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 
 class TQWidget;
 class TQPainter;
 class KURL;
 class PartExplorerForm;
 
-class PartExplorerPlugin : public KDevPlugin
+class PartExplorerPlugin : public TDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/partexplorer/kdevpartexplorer.desktop b/parts/partexplorer/tdevpartexplorer.desktop
index ff432eeb..0e1242c4 100644
--- a/parts/partexplorer/kdevpartexplorer.desktop
+++ b/parts/partexplorer/tdevpartexplorer.desktop
@@ -32,7 +32,7 @@ Comment[tg]=Воситаи графикӣ барои иҷро намудани �
 Comment[tr]=Kayıtlı servisler için TDETrader-benzeri sorgular yapmayı sağlayan bir grafiksel araç
 Comment[zh_CN]=调用TDETrader的图形工具－就像查询已经注册的服务。
 Comment[zh_TW]=執行類似 TDETrader 查詢註冊服務的圖形化工具
-Name=KDevPartExplorer
+Name=TDevPartExplorer
 Name[da]=TDevelop Part-søger
 Name[nds]=TDevelop-Komponentkieker
 Name[sk]=KDev Part prieskumník
@@ -70,7 +70,7 @@ GenericName[tr]=Bileşen Gezinti Aracı
 GenericName[zh_CN]=模块浏览器工具
 GenericName[zh_TW]=元件探索工具
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevpartexplorer
+X-TDE-Library=libtdevpartexplorer
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=KDEDevelopment
diff --git a/parts/partexplorer/kdevpartexplorer.rc b/parts/partexplorer/tdevpartexplorer.rc
index 9632115b..1dff4ed6 100644
--- a/parts/partexplorer/kdevpartexplorer.rc
+++ b/parts/partexplorer/tdevpartexplorer.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KDevPartExplorer" version="4">
+<kpartgui name="TDevPartExplorer" version="4">
 <MenuBar>
   <Menu name="tools" >
     <Action name="show_partexplorerform"/>
diff --git a/parts/quickopen/CMakeLists.txt b/parts/quickopen/CMakeLists.txt
index cb82433f..ad6fa926 100644
--- a/parts/quickopen/CMakeLists.txt
+++ b/parts/quickopen/CMakeLists.txt
@@ -28,13 +28,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevquickopen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpart_quickopen.rc DESTINATION ${DATA_INSTALL_DIR}/kdevquickopen )
+install( FILES tdevquickopen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpart_quickopen.rc DESTINATION ${DATA_INSTALL_DIR}/tdevquickopen )
 
 
-##### libkdevquickopen (module) #################
+##### libtdevquickopen (module) #################
 
-tde_add_kpart( libkdevquickopen AUTOMOC
+tde_add_kpart( libtdevquickopen AUTOMOC
   SOURCES
     quickopen_part.cpp quickopendialog.cpp
     quickopenclassdialog.cpp quickopenbase.ui
diff --git a/parts/quickopen/Makefile.am b/parts/quickopen/Makefile.am
index ca7ed3dd..cce44ae3 100644
--- a/parts/quickopen/Makefile.am
+++ b/parts/quickopen/Makefile.am
@@ -1,17 +1,17 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions \
 	-I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevquickopen.la
-libkdevquickopen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevquickopen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML)
+kde_module_LTLIBRARIES = libtdevquickopen.la
+libtdevquickopen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevquickopen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML)
 
-libkdevquickopen_la_SOURCES = quickopen_part.cpp quickopendialog.cpp quickopenclassdialog.cpp quickopenbase.ui quickopenfiledialog.cpp quickopenfunctiondialog.cpp quickopenfunctionchooseformbase.ui quickopenfunctionchooseform.cpp
+libtdevquickopen_la_SOURCES = quickopen_part.cpp quickopendialog.cpp quickopenclassdialog.cpp quickopenbase.ui quickopenfiledialog.cpp quickopenfunctiondialog.cpp quickopenfunctionchooseformbase.ui quickopenfunctionchooseform.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevquickopen.desktop
+service_DATA = tdevquickopen.desktop
 
-rcdir = $(kde_datadir)/kdevquickopen
-rc_DATA = kdevpart_quickopen.rc
+rcdir = $(kde_datadir)/tdevquickopen
+rc_DATA = tdevpart_quickopen.rc
 noinst_HEADERS = quickopendialog.h quickopenclassdialog.h quickopenfiledialog.h quickopenfunctiondialog.h quickopenfunctionchooseform.h
diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp
index 4d316e68..3a8a10c4 100644
--- a/parts/quickopen/quickopen_part.cpp
+++ b/parts/quickopen/quickopen_part.cpp
@@ -27,25 +27,25 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <klineedit.h>
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 
 #include <tdemainwindow.h>
 
 #include <tdeparts/part.h>
 #include <tdetexteditor/document.h>
 
-#include <kdevmainwindow.h>
-#include <kdevcore.h>
-#include <kdevpartcontroller.h>
-#include <kdevproject.h>
+#include <tdevmainwindow.h>
+#include <tdevcore.h>
+#include <tdevpartcontroller.h>
+#include <tdevproject.h>
 #include <codebrowserfrontend.h>
 
-#include "kdeveditorutil.h"
+#include "tdeveditorutil.h"
 
-typedef KDevGenericFactory<QuickOpenPart> QuickOpenFactory;
-static const KDevPluginInfo data("kdevquickopen");
-K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) )
+typedef TDevGenericFactory<QuickOpenPart> QuickOpenFactory;
+static const TDevPluginInfo data("tdevquickopen");
+K_EXPORT_COMPONENT_FACTORY( libtdevquickopen, QuickOpenFactory( data ) )
 
 using namespace KTextEditor;
 
@@ -53,7 +53,7 @@ QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringL
     : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" )
 {
     setInstance(QuickOpenFactory::instance());
-    setXMLFile("kdevpart_quickopen.rc");
+    setXMLFile("tdevpart_quickopen.rc");
 
     m_actionQuickOpen = new TDEAction( i18n("Quick Open File..."), CTRL + ALT + Key_O,
 				       this, TQT_SLOT(slotQuickFileOpen()),
@@ -100,14 +100,14 @@ void QuickOpenPart::slotQuickFileOpen( )
 void QuickOpenPart::slotQuickOpenClass( )
 {
     QuickOpenClassDialog dlg( this, mainWindow()->main() );    
-    dlg.nameEdit->setText( KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) );
+    dlg.nameEdit->setText( TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) );
     dlg.exec();
 }
 
 void QuickOpenPart::slotQuickOpenFunction()
 {
     QuickOpenFunctionDialog dlg( this, mainWindow()->main() );
-    dlg.nameEdit->setText( KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) );
+    dlg.nameEdit->setText( TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) );
     dlg.exec();
 }
 
@@ -119,7 +119,7 @@ void QuickOpenPart::slotSwitchTo()
 
 void QuickOpenPart::selectItem( ItemDom item )
 {
-    Extensions::KDevCodeBrowserFrontend* f = extension< Extensions::KDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" );
+    Extensions::TDevCodeBrowserFrontend* f = extension< Extensions::TDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" );
     
     if(f != 0) {
         ItemDom itemDom( &(*item) );
diff --git a/parts/quickopen/quickopen_part.h b/parts/quickopen/quickopen_part.h
index fa1d85e3..aff0d4f6 100644
--- a/parts/quickopen/quickopen_part.h
+++ b/parts/quickopen/quickopen_part.h
@@ -18,11 +18,11 @@
  *
  */
 
-#ifndef __KDEVPART_QUICKOPEN_H__
-#define __KDEVPART_QUICKOPEN_H__
+#ifndef __TDEVPART_QUICKOPEN_H__
+#define __TDEVPART_QUICKOPEN_H__
 
 #include <tqguardedptr.h>
-#include <kdevquickopen.h>
+#include <tdevquickopen.h>
 #include <codemodel.h>
 
 class TDEAction;
diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp
index 37987166..7dcfd48b 100644
--- a/parts/quickopen/quickopenclassdialog.cpp
+++ b/parts/quickopen/quickopenclassdialog.cpp
@@ -18,9 +18,9 @@
  *
  */
 
-#include <kdevproject.h>
-#include <kdevpartcontroller.h>
-#include <kdevlanguagesupport.h>
+#include <tdevproject.h>
+#include <tdevpartcontroller.h>
+#include <tdevlanguagesupport.h>
 
 #include <tdelistbox.h>
 #include <tdelocale.h>
diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp
index 18f15974..fc8da49a 100644
--- a/parts/quickopen/quickopenfiledialog.cpp
+++ b/parts/quickopen/quickopenfiledialog.cpp
@@ -18,8 +18,8 @@
  *
  */
 
-#include <kdevproject.h>
-#include <kdevpartcontroller.h>
+#include <tdevproject.h>
+#include <tdevpartcontroller.h>
 
 
 #include <tdelistbox.h>
diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp
index bbcab7e4..14f7a984 100644
--- a/parts/quickopen/quickopenfunctiondialog.cpp
+++ b/parts/quickopen/quickopenfunctiondialog.cpp
@@ -28,11 +28,11 @@
 #include <tdemessagebox.h>
 #include <klineedit.h>
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include <codemodel_utils.h>
-#include <kdevpartcontroller.h>
-#include <kdevproject.h>
-#include <kdevlanguagesupport.h>
+#include <tdevpartcontroller.h>
+#include <tdevproject.h>
+#include <tdevlanguagesupport.h>
 #include <tqregexp.h>
 
 
diff --git a/parts/quickopen/kdevpart_quickopen.rc b/parts/quickopen/tdevpart_quickopen.rc
index 6a50fc22..6a50fc22 100644
--- a/parts/quickopen/kdevpart_quickopen.rc
+++ b/parts/quickopen/tdevpart_quickopen.rc
diff --git a/parts/quickopen/kdevquickopen.desktop b/parts/quickopen/tdevquickopen.desktop
index 42a8e8ff..ed500ad4 100644
--- a/parts/quickopen/kdevquickopen.desktop
+++ b/parts/quickopen/tdevquickopen.desktop
@@ -75,6 +75,6 @@ GenericName[zh_TW]=快速開啟
 Icon=tdevelop
 ServiceTypes=TDevelop/QuickOpen
 X-TDevelop-Scope=Project
-X-TDE-Library=libkdevquickopen
+X-TDE-Library=libtdevquickopen
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeNavigation
diff --git a/parts/regexptest/CMakeLists.txt b/parts/regexptest/CMakeLists.txt
index 608f053c..3bc96414 100644
--- a/parts/regexptest/CMakeLists.txt
+++ b/parts/regexptest/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevregexptest.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevregexptest.rc DESTINATION ${DATA_INSTALL_DIR}/kdevregexptest )
+install( FILES tdevregexptest.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevregexptest.rc DESTINATION ${DATA_INSTALL_DIR}/tdevregexptest )
 
 
-##### libkdevregexptest (module) ################
+##### libtdevregexptest (module) ################
 
-tde_add_kpart( libkdevregexptest AUTOMOC
+tde_add_kpart( libtdevregexptest AUTOMOC
   SOURCES
     regexptestpart.cpp regexptestdlg.cpp regexptestdlgbase.ui
   LINK tdevelop-shared
diff --git a/parts/regexptest/Makefile.am b/parts/regexptest/Makefile.am
index df99989f..8e87ac79 100644
--- a/parts/regexptest/Makefile.am
+++ b/parts/regexptest/Makefile.am
@@ -2,16 +2,16 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevregexptest.la
-libkdevregexptest_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevregexptest_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevregexptest.la
+libtdevregexptest_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevregexptest_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevregexptest_la_SOURCES = regexptestpart.cpp regexptestdlg.cpp regexptestdlgbase.ui
+libtdevregexptest_la_SOURCES = regexptestpart.cpp regexptestdlg.cpp regexptestdlgbase.ui
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevregexptest.desktop
+service_DATA = tdevregexptest.desktop
 
-rcdir = $(kde_datadir)/kdevregexptest
-rc_DATA = kdevregexptest.rc
+rcdir = $(kde_datadir)/tdevregexptest
+rc_DATA = tdevregexptest.rc
diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp
index bd426411..200bee12 100644
--- a/parts/regexptest/regexptestdlg.cpp
+++ b/parts/regexptest/regexptestdlg.cpp
@@ -32,11 +32,11 @@
 #include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 
-#include "kdevplugin.h"
-#include "kdevpartcontroller.h"
+#include "tdevplugin.h"
+#include "tdevpartcontroller.h"
 
 
-RegexpTestDialog::RegexpTestDialog(KDevPlugin *part)
+RegexpTestDialog::RegexpTestDialog(TDevPlugin *part)
     : RegexpTestDialogBase(0, "regexp test dialog", false), _regexp_dialog(0)
 {
     pattern_edit->setFocus();
diff --git a/parts/regexptest/regexptestdlg.h b/parts/regexptest/regexptestdlg.h
index 4c7094a6..09e656d2 100644
--- a/parts/regexptest/regexptestdlg.h
+++ b/parts/regexptest/regexptestdlg.h
@@ -14,7 +14,7 @@
 
 #include "regexptestdlgbase.h"
 
-class KDevPlugin;
+class TDevPlugin;
 
 
 class RegexpTestDialog : public RegexpTestDialogBase
@@ -23,7 +23,7 @@ class RegexpTestDialog : public RegexpTestDialogBase
   
     
 public:
-    RegexpTestDialog( KDevPlugin *part );
+    RegexpTestDialog( TDevPlugin *part );
     ~RegexpTestDialog();
 
 protected:
@@ -39,7 +39,7 @@ private:
     virtual void checkKRegExp();
     virtual void insertQuoted();
 
-    KDevPlugin *m_part;
+    TDevPlugin *m_part;
 
     TQDialog * _regexp_dialog;
 };
diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp
index 6c45a492..0ca0b083 100644
--- a/parts/regexptest/regexptestpart.cpp
+++ b/parts/regexptest/regexptestpart.cpp
@@ -12,23 +12,23 @@
 #include "regexptestpart.h"
 
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 #include <tdeaction.h>
 
-#include "kdevcore.h"
+#include "tdevcore.h"
 #include "regexptestdlg.h"
 
-static const KDevPluginInfo data("kdevregexptest");
+static const TDevPluginInfo data("tdevregexptest");
 
-typedef KDevGenericFactory<RegexpTestPart> RegexpTestFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) )
+typedef TDevGenericFactory<RegexpTestPart> RegexpTestFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevregexptest, RegexpTestFactory( data ) )
 
 RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "RegexpTestPart")
+    : TDevPlugin(&data, parent, name ? name : "RegexpTestPart")
 {
     setInstance(RegexpTestFactory::instance());
-    setXMLFile("kdevregexptest.rc");
+    setXMLFile("tdevregexptest.rc");
 
     TDEAction *action;
 
diff --git a/parts/regexptest/regexptestpart.h b/parts/regexptest/regexptestpart.h
index ec153d90..3488e910 100644
--- a/parts/regexptest/regexptestpart.h
+++ b/parts/regexptest/regexptestpart.h
@@ -14,12 +14,12 @@
 
 #include <tqguardedptr.h>
 #include <kdialogbase.h>
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 
 class RegexpTestDialog;
 
 
-class RegexpTestPart : public KDevPlugin
+class RegexpTestPart : public TDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/regexptest/kdevregexptest.desktop b/parts/regexptest/tdevregexptest.desktop
index 57f93f73..e0978750 100644
--- a/parts/regexptest/kdevregexptest.desktop
+++ b/parts/regexptest/tdevregexptest.desktop
@@ -76,7 +76,7 @@ GenericName[tr]=Düzenli İfade Test Edicisi
 GenericName[zh_CN]=正则表达式测试
 GenericName[zh_TW]=正規表示式測試器
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevregexptest
+X-TDE-Library=libtdevregexptest
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=ScriptDevelopment,CDevelopment,CPPDevelopment
diff --git a/parts/regexptest/kdevregexptest.rc b/parts/regexptest/tdevregexptest.rc
index 99893d7f..99893d7f 100644
--- a/parts/regexptest/kdevregexptest.rc
+++ b/parts/regexptest/tdevregexptest.rc
diff --git a/parts/replace/CMakeLists.txt b/parts/replace/CMakeLists.txt
index 4779e553..b32da714 100644
--- a/parts/replace/CMakeLists.txt
+++ b/parts/replace/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevreplace.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpart_replace.rc DESTINATION ${DATA_INSTALL_DIR}/kdevreplace )
+install( FILES tdevreplace.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpart_replace.rc DESTINATION ${DATA_INSTALL_DIR}/tdevreplace )
 
 
-##### libkdevreplace (module) ###################
+##### libtdevreplace (module) ###################
 
-tde_add_kpart( libkdevreplace AUTOMOC
+tde_add_kpart( libtdevreplace AUTOMOC
   SOURCES
     replace_part.cpp replace_widget.cpp replacedlg.ui
     replaceitem.cpp replaceview.cpp replacedlgimpl.cpp
diff --git a/parts/replace/Makefile.am b/parts/replace/Makefile.am
index 8d75f0e8..36d8e64f 100644
--- a/parts/replace/Makefile.am
+++ b/parts/replace/Makefile.am
@@ -2,15 +2,15 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevreplace.la
-libkdevreplace_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevreplace_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
-libkdevreplace_la_SOURCES = replace_part.cpp replace_widget.cpp replacedlg.ui replaceitem.cpp replaceview.cpp replacedlgimpl.cpp
+kde_module_LTLIBRARIES = libtdevreplace.la
+libtdevreplace_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevreplace_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+libtdevreplace_la_SOURCES = replace_part.cpp replace_widget.cpp replacedlg.ui replaceitem.cpp replaceview.cpp replacedlgimpl.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevreplace.desktop
+service_DATA = tdevreplace.desktop
 
-rcdir = $(kde_datadir)/kdevreplace
-rc_DATA = kdevpart_replace.rc
+rcdir = $(kde_datadir)/tdevreplace
+rc_DATA = tdevpart_replace.rc
diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp
index 447548ef..40bfb1ea 100644
--- a/parts/replace/replace_part.cpp
+++ b/parts/replace/replace_part.cpp
@@ -15,25 +15,25 @@
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 #include <kdebug.h>
 #include <kstringhandler.h>
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
 
 #include "replace_widget.h"
 
-static const KDevPluginInfo data("kdevreplace");
+static const TDevPluginInfo data("tdevreplace");
 
-typedef KDevGenericFactory<ReplacePart> ReplaceFactory;
-K_EXPORT_COMPONENT_FACTORY(libkdevreplace, ReplaceFactory(data))
+typedef TDevGenericFactory<ReplacePart> ReplaceFactory;
+K_EXPORT_COMPONENT_FACTORY(libtdevreplace, ReplaceFactory(data))
 
 ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& )
-        : KDevPlugin( &data, parent, name ? name : "ReplacePart" )
+        : TDevPlugin( &data, parent, name ? name : "ReplacePart" )
 {
     setInstance(ReplaceFactory::instance());
-    setXMLFile("kdevpart_replace.rc");
+    setXMLFile("tdevpart_replace.rc");
 
     m_widget = new ReplaceWidget(this);
     m_widget->setIcon( SmallIcon("filefind") );
diff --git a/parts/replace/replace_part.h b/parts/replace/replace_part.h
index fbd0f2f7..f0316eb0 100644
--- a/parts/replace/replace_part.h
+++ b/parts/replace/replace_part.h
@@ -9,12 +9,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __KDEVPART_REPLACE_H__
-#define __KDEVPART_REPLACE_H__
+#ifndef __TDEVPART_REPLACE_H__
+#define __TDEVPART_REPLACE_H__
 
 
 #include <tqguardedptr.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include <tqpopupmenu.h>
 
 
@@ -22,7 +22,7 @@ class ReplaceWidget;
 class TDEAction;
 class Context;
 
-class ReplacePart : public KDevPlugin
+class ReplacePart : public TDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp
index 6b1bcbda..34dd3afd 100644
--- a/parts/replace/replace_widget.cpp
+++ b/parts/replace/replace_widget.cpp
@@ -26,11 +26,11 @@
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/selectioninterface.h>
-#include <kdevpartcontroller.h>
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
-#include <kdevproject.h>
-#include <kdevpartcontroller.h>
+#include <tdevpartcontroller.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
+#include <tdevproject.h>
+#include <tdevpartcontroller.h>
 #include <kcombobox.h>
 #include <tdelocale.h>
 #include <kstdguiitem.h>
@@ -87,7 +87,7 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part)
     connect( _cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( clear() ) );
     connect( _listview, TQT_SIGNAL( editDocument( const TQString &, int ) ), TQT_SLOT( editDocument( const TQString &, int ) ) );
 
-    connect( m_part->core(), TQT_SIGNAL( stopButtonClicked( KDevPlugin * ) ), TQT_SLOT( stopButtonClicked( KDevPlugin * ) ) );
+    connect( m_part->core(), TQT_SIGNAL( stopButtonClicked( TDevPlugin * ) ), TQT_SLOT( stopButtonClicked( TDevPlugin * ) ) );
 }
 
 //BEGIN Slots
@@ -184,7 +184,7 @@ void ReplaceWidget::editDocument( TQString const & file, int line )
     m_part->partController()->editDocument( KURL( file ), line );
 }
 
-void ReplaceWidget::stopButtonClicked( KDevPlugin * which )
+void ReplaceWidget::stopButtonClicked( TDevPlugin * which )
 {
     if ( which != 0 && which != m_part )
         return;
diff --git a/parts/replace/replace_widget.h b/parts/replace/replace_widget.h
index c9063928..64ca50e2 100644
--- a/parts/replace/replace_widget.h
+++ b/parts/replace/replace_widget.h
@@ -36,7 +36,7 @@ public:
 
 public slots:
     void showDialog();
-    void stopButtonClicked( KDevPlugin * );
+    void stopButtonClicked( TDevPlugin * );
 
 protected:
     virtual void focusInEvent(TQFocusEvent *e);
diff --git a/parts/replace/kdevpart_replace.rc b/parts/replace/tdevpart_replace.rc
index e3818308..e3818308 100644
--- a/parts/replace/kdevpart_replace.rc
+++ b/parts/replace/tdevpart_replace.rc
diff --git a/parts/replace/kdevreplace.desktop b/parts/replace/tdevreplace.desktop
index d2490c05..cd05c65c 100644
--- a/parts/replace/kdevreplace.desktop
+++ b/parts/replace/tdevreplace.desktop
@@ -75,6 +75,6 @@ GenericName[zh_TW]=取代元件
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
-X-TDE-Library=libkdevreplace
+X-TDE-Library=libtdevreplace
 X-TDevelop-Version=5
 X-TDevelop-Properties=FileReplace
diff --git a/parts/scripting/CMakeLists.txt b/parts/scripting/CMakeLists.txt
index f906bd02..371cf8f6 100644
--- a/parts/scripting/CMakeLists.txt
+++ b/parts/scripting/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevscripting.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevscripting.rc DESTINATION ${DATA_INSTALL_DIR}/kdevscripting )
+install( FILES tdevscripting.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevscripting.rc DESTINATION ${DATA_INSTALL_DIR}/tdevscripting )
 
 
-##### libkdevscripting (module) #################
+##### libtdevscripting (module) #################
 
-tde_add_kpart( libkdevscripting AUTOMOC
+tde_add_kpart( libtdevscripting AUTOMOC
   SOURCES
     scriptingpart.cpp scriptingglobalconfigbase.ui
     scriptingglobalconfig.cpp
diff --git a/parts/scripting/Makefile.am b/parts/scripting/Makefile.am
index 7262dac9..9de6d889 100644
--- a/parts/scripting/Makefile.am
+++ b/parts/scripting/Makefile.am
@@ -1,20 +1,20 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevscripting.la
-libkdevscripting_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevscripting_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevscripting.la
+libtdevscripting_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevscripting_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevscripting_la_SOURCES = scriptingpart.cpp scriptingglobalconfigbase.ui \
+libtdevscripting_la_SOURCES = scriptingpart.cpp scriptingglobalconfigbase.ui \
 	scriptingglobalconfig.cpp
 
 METASOURCES = AUTO
 
-appsharedir = $(kde_datadir)/kdevscripting
+appsharedir = $(kde_datadir)/tdevscripting
 appshare_DATA = 
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevscripting.desktop
+service_DATA = tdevscripting.desktop
 
-rcdir = $(kde_datadir)/kdevscripting
-rc_DATA = kdevscripting.rc
+rcdir = $(kde_datadir)/tdevscripting
+rc_DATA = tdevscripting.rc
 noinst_HEADERS = scriptingglobalconfig.h  scriptingpart.h
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index 80a33c9e..4ebee2b0 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -29,29 +29,29 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <tdemessagebox.h>
-#include <kdevplugininfo.h>
-#include <kdevgenericfactory.h>
+#include <tdevplugininfo.h>
+#include <tdevgenericfactory.h>
 
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
 #include <configwidgetproxy.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include "scriptingglobalconfig.h"
 #include "tdescriptactionmanager.h"
 
-typedef KDevGenericFactory<scriptingPart> scriptingFactory;
-KDevPluginInfo data("kdevscripting");
-K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) )
+typedef TDevGenericFactory<scriptingPart> scriptingFactory;
+TDevPluginInfo data("tdevscripting");
+K_EXPORT_COMPONENT_FACTORY( libtdevscripting, scriptingFactory( data ) )
 
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
 scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-    : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L)
+    : TDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L)
 {
     setInstance(scriptingFactory::instance());
-    setXMLFile("kdevscripting.rc");
+    setXMLFile("tdevscripting.rc");
 
     m_configProxy = new ConfigWidgetProxy(core());
     m_configProxy->createGlobalConfigPage(i18n("Scripting"), GLOBALDOC_OPTIONS, info()->icon());
diff --git a/parts/scripting/scriptingpart.h b/parts/scripting/scriptingpart.h
index 832318b9..ca6bafd9 100644
--- a/parts/scripting/scriptingpart.h
+++ b/parts/scripting/scriptingpart.h
@@ -18,10 +18,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef KDEVSCRIPTING_H
-#define KDEVSCRIPTING_H
+#ifndef TDEVSCRIPTING_H
+#define TDEVSCRIPTING_H
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 #include <tqguardedptr.h>
 
@@ -34,7 +34,7 @@ class KScriptActionManager;
 /**
 Please read the README.dox file for more info about this part
 */
-class scriptingPart: public KDevPlugin
+class scriptingPart: public TDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/scripting/kdevscripting.desktop b/parts/scripting/tdevscripting.desktop
index 22ef15e8..afa0cc10 100644
--- a/parts/scripting/kdevscripting.desktop
+++ b/parts/scripting/tdevscripting.desktop
@@ -72,6 +72,6 @@ X-TDevelop-Plugin-Copyright=(C) by ian reinhart geiser
 X-TDevelop-Args=
 
 X-TDevelop-Scope=Global
-X-TDE-Library=libkdevscripting
+X-TDE-Library=libtdevscripting
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeEditing
diff --git a/parts/scripting/kdevscripting.rc b/parts/scripting/tdevscripting.rc
index 217bece1..217bece1 100644
--- a/parts/scripting/kdevscripting.rc
+++ b/parts/scripting/tdevscripting.rc
diff --git a/parts/snippet/CMakeLists.txt b/parts/snippet/CMakeLists.txt
index 704ec3e9..43776bf0 100644
--- a/parts/snippet/CMakeLists.txt
+++ b/parts/snippet/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevsnippet.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpart_snippet.rc DESTINATION ${DATA_INSTALL_DIR}/kdevsnippet )
+install( FILES tdevsnippet.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpart_snippet.rc DESTINATION ${DATA_INSTALL_DIR}/tdevsnippet )
 
 
-##### libkdevsnippet (module) ###################
+##### libtdevsnippet (module) ###################
 
-tde_add_kpart( libkdevsnippet AUTOMOC
+tde_add_kpart( libtdevsnippet AUTOMOC
   SOURCES
     snippet_part.cpp snippet_widget.cpp snippetdlg.ui
     snippetitem.cpp snippetsettingsbase.ui snippetsettings.cpp
diff --git a/parts/snippet/Makefile.am b/parts/snippet/Makefile.am
index e2c207a4..d2429963 100644
--- a/parts/snippet/Makefile.am
+++ b/parts/snippet/Makefile.am
@@ -1,17 +1,17 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevsnippet.la
-libkdevsnippet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevsnippet_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevsnippet.la
+libtdevsnippet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevsnippet_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevsnippet_la_SOURCES = snippet_part.cpp snippet_widget.cpp snippetdlg.ui snippetitem.cpp snippetsettingsbase.ui snippetsettings.cpp snippetconfig.cpp
+libtdevsnippet_la_SOURCES = snippet_part.cpp snippet_widget.cpp snippetdlg.ui snippetitem.cpp snippetsettingsbase.ui snippetsettings.cpp snippetconfig.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevsnippet.desktop
+service_DATA = tdevsnippet.desktop
 
-rc_DATA = kdevpart_snippet.rc
-rcdir = $(kde_datadir)/kdevsnippet
+rc_DATA = tdevpart_snippet.rc
+rcdir = $(kde_datadir)/tdevsnippet
 
 noinst_HEADERS = snippetdlg.h snippetitem.h snippetsettingsbase.h snippetsettings.h snippetconfig.h
diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index 82969151..e31ebe7a 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -20,11 +20,11 @@
 #include <tqbuttongroup.h>
 #include <ktrader.h>
 
-#include "kdevcore.h"
-#include <kdevproject.h>
-#include "kdevmainwindow.h"
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include "tdevcore.h"
+#include <tdevproject.h>
+#include "tdevmainwindow.h"
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 
 #include <kdebug.h>
 
@@ -33,15 +33,15 @@
 #include "snippetsettings.h"
 #include "snippetconfig.h"
 
-static const KDevPluginInfo data("kdevsnippet");
-typedef KDevGenericFactory<SnippetPart> snippetFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) )
+static const TDevPluginInfo data("tdevsnippet");
+typedef TDevGenericFactory<SnippetPart> snippetFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevsnippet, snippetFactory( data ) )
 
 SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& )
-  : KDevPlugin(&data, parent, name ? name : "SnippetPart" )
+  : TDevPlugin(&data, parent, name ? name : "SnippetPart" )
 {
   setInstance(snippetFactory::instance());
-  setXMLFile("kdevpart_snippet.rc");
+  setXMLFile("tdevpart_snippet.rc");
 
   m_widget = new SnippetWidget(this);
   m_widget->setCaption(i18n("Code Snippets"));
diff --git a/parts/snippet/snippet_part.h b/parts/snippet/snippet_part.h
index 8ffd8fce..98a809cf 100644
--- a/parts/snippet/snippet_part.h
+++ b/parts/snippet/snippet_part.h
@@ -7,12 +7,12 @@
  */
 
 
-#ifndef __KDEVPART_SNIPPET_H__
-#define __KDEVPART_SNIPPET_H__
+#ifndef __TDEVPART_SNIPPET_H__
+#define __TDEVPART_SNIPPET_H__
 
 
 #include <tqguardedptr.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 
 class SnippetWidget;
@@ -20,11 +20,11 @@ class TDEAboutData;
 class KDialogBase;
 
 /*
-This is the KDevPlugin for the CodeSnippet feature
+This is the TDevPlugin for the CodeSnippet feature
 For more info read the README.dox file
 @author Robert Gruber
 */
-class SnippetPart : public KDevPlugin
+class SnippetPart : public TDevPlugin
 {
   Q_OBJECT
   
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index 9cd4ae4b..6b59f16f 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -36,9 +36,9 @@
 #include <kcombobox.h>
 #include <tdeversion.h>
 
-#include <kdevcore.h>
-#include <kdevproject.h>
-#include <kdevpartcontroller.h>
+#include <tdevcore.h>
+#include <tdevproject.h>
+#include <tdevpartcontroller.h>
 
 #include "snippetdlg.h"
 #include "snippetitem.h"
@@ -418,7 +418,7 @@ void SnippetWidget::initConfigOldVersion(TDEConfig *cfg)
 void SnippetWidget::initConfig()
 {
   if (_cfg == NULL)
-    _cfg = new TDEConfig("kdevsnippetrc", false, false);
+    _cfg = new TDEConfig("tdevsnippetrc", false, false);
 
   _cfg->setGroup("SnippetPart");
 
diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h
index 8b6c17a1..4d534802 100644
--- a/parts/snippet/snippet_widget.h
+++ b/parts/snippet/snippet_widget.h
@@ -19,7 +19,7 @@
 #include <tdetexteditor/view.h>
 #include "snippetconfig.h"
 
-class KDevProject;
+class TDevProject;
 class SnippetPart;
 class TQPushButton;
 class TDEListView;
diff --git a/parts/snippet/kdevpart_snippet.rc b/parts/snippet/tdevpart_snippet.rc
index 4f34ec50..f4b9d2db 100644
--- a/parts/snippet/kdevpart_snippet.rc
+++ b/parts/snippet/tdevpart_snippet.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="snippet" library="libkdevsnippet" version="3">
+<kpartplugin name="snippet" library="libtdevsnippet" version="3">
 	<MenuBar>
 	</MenuBar>
 	<Menu name="hidden">
diff --git a/parts/snippet/kdevsnippet.desktop b/parts/snippet/tdevsnippet.desktop
index f9ba9652..b257280c 100644
--- a/parts/snippet/kdevsnippet.desktop
+++ b/parts/snippet/tdevsnippet.desktop
@@ -97,6 +97,6 @@ GenericName[zh_TW]=程式碼片段
 Icon=editcut
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
-X-TDE-Library=libkdevsnippet
+X-TDE-Library=libtdevsnippet
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeEditing
diff --git a/parts/texttools/CMakeLists.txt b/parts/texttools/CMakeLists.txt
index 2ed4221c..4a893dd4 100644
--- a/parts/texttools/CMakeLists.txt
+++ b/parts/texttools/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevtexttools.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevtexttools.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevtexttools (module) #################
+##### libtdevtexttools (module) #################
 
-tde_add_kpart( libkdevtexttools AUTOMOC
+tde_add_kpart( libtdevtexttools AUTOMOC
   SOURCES texttoolspart.cpp texttoolswidget.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/texttools/Makefile.am b/parts/texttools/Makefile.am
index 725133be..105eec32 100644
--- a/parts/texttools/Makefile.am
+++ b/parts/texttools/Makefile.am
@@ -2,17 +2,17 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces 	   -I$(top_srcdir)/lib/sourceinfo 	   -I$(top_srcdir)/lib/util 	   $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevtexttools.la
-libkdevtexttools_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevtexttools_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevtexttools.la
+libtdevtexttools_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevtexttools_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevtexttools_la_SOURCES = texttoolspart.cpp texttoolswidget.cpp
+libtdevtexttools_la_SOURCES = texttoolspart.cpp texttoolswidget.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevtexttools.desktop
+service_DATA = tdevtexttools.desktop
 
 # not used currently
-#rcdir = $(kde_datadir)/kdevtexttools
-#rc_DATA = kdevtexttools.rc
+#rcdir = $(kde_datadir)/tdevtexttools
+#rc_DATA = tdevtexttools.rc
diff --git a/parts/texttools/kdevtexttools.desktop b/parts/texttools/tdevtexttools.desktop
index fd5fc736..c9caf618 100644
--- a/parts/texttools/kdevtexttools.desktop
+++ b/parts/texttools/tdevtexttools.desktop
@@ -78,7 +78,7 @@ GenericName[tr]=Metin Yapısı
 GenericName[zh_CN]=文件结构
 GenericName[zh_TW]=文字結構
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevtexttools
+X-TDE-Library=libtdevtexttools
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=CodeNavigation
diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp
index 4453030a..857e2bec 100644
--- a/parts/texttools/texttoolspart.cpp
+++ b/parts/texttools/texttoolspart.cpp
@@ -14,25 +14,25 @@
 #include <tqwhatsthis.h>
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 #include <tdetexteditor/editinterface.h>
 
-#include "kdevpartcontroller.h"
-#include "kdevmainwindow.h"
+#include "tdevpartcontroller.h"
+#include "tdevmainwindow.h"
 
 #include "texttoolswidget.h"
 
 
-typedef KDevGenericFactory<TextToolsPart> TextToolsFactory;
-static const KDevPluginInfo data("kdevtexttools");
-K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) )
+typedef TDevGenericFactory<TextToolsPart> TextToolsFactory;
+static const TDevPluginInfo data("tdevtexttools");
+K_EXPORT_COMPONENT_FACTORY( libtdevtexttools, TextToolsFactory( data ) )
 
 TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "TextToolsPart")
+    : TDevPlugin(&data, parent, name ? name : "TextToolsPart")
 {
     setInstance(TextToolsFactory::instance());
-    //    setXMLFile("kdevfileview.rc");
+    //    setXMLFile("tdevfileview.rc");
 
     m_widget = 0;
     
diff --git a/parts/texttools/texttoolspart.h b/parts/texttools/texttoolspart.h
index 0d822a65..fa911d98 100644
--- a/parts/texttools/texttoolspart.h
+++ b/parts/texttools/texttoolspart.h
@@ -14,12 +14,12 @@
 
 #include <tqguardedptr.h>
 #include <tdeparts/part.h>
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 
 class TextToolsWidget;
 
 
-class TextToolsPart : public KDevPlugin
+class TextToolsPart : public TDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp
index db2f0acc..ebf0c56b 100644
--- a/parts/texttools/texttoolswidget.cpp
+++ b/parts/texttools/texttoolswidget.cpp
@@ -22,8 +22,8 @@
 #include <tdetexteditor/selectioninterface.h>
 #include <tdetexteditor/editinterface.h>
 
-#include "kdevmainwindow.h"
-#include "kdevpartcontroller.h"
+#include "tdevmainwindow.h"
+#include "tdevpartcontroller.h"
 #include "texttoolspart.h"
 
 
diff --git a/parts/tipofday/CMakeLists.txt b/parts/tipofday/CMakeLists.txt
index 753f65e1..c3990be1 100644
--- a/parts/tipofday/CMakeLists.txt
+++ b/parts/tipofday/CMakeLists.txt
@@ -27,14 +27,14 @@ link_directories(
 ##### other data ################################
 
 tde_install_icons( )
-install( FILES kdevtipofday.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tips DESTINATION ${DATA_INSTALL_DIR}/kdevtipofday )
-install( FILES kdevpart_tipofday.rc DESTINATION ${DATA_INSTALL_DIR}/kdevtipofday )
+install( FILES tdevtipofday.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tips DESTINATION ${DATA_INSTALL_DIR}/tdevtipofday )
+install( FILES tdevpart_tipofday.rc DESTINATION ${DATA_INSTALL_DIR}/tdevtipofday )
 
 
-##### libkdevtipofday (module) ##################
+##### libtdevtipofday (module) ##################
 
-tde_add_kpart( libkdevtipofday AUTOMOC
+tde_add_kpart( libtdevtipofday AUTOMOC
   SOURCES tipofday_part.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/tipofday/Makefile.am b/parts/tipofday/Makefile.am
index 4ec54292..22560851 100644
--- a/parts/tipofday/Makefile.am
+++ b/parts/tipofday/Makefile.am
@@ -1,24 +1,24 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevtipofday.la
-libkdevtipofday_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevtipofday_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevtipofday.la
+libtdevtipofday_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevtipofday_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevtipofday_la_SOURCES = tipofday_part.cpp
+libtdevtipofday_la_SOURCES = tipofday_part.cpp
 
 METASOURCES = AUTO
 KDE_ICON = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevtipofday.desktop
+service_DATA = tdevtipofday.desktop
 
 tip_DATA = tips
-tipdir = $(kde_datadir)/kdevtipofday
+tipdir = $(kde_datadir)/tdevtipofday
 
-rc_DATA = kdevpart_tipofday.rc
-rcdir = $(kde_datadir)/kdevtipofday
+rc_DATA = tdevpart_tipofday.rc
+rcdir = $(kde_datadir)/tdevtipofday
 
 messages: rc.cpp
 	$(PREPARETIPS) > tips.cc
-	$(XGETTEXT) *.cpp *.h tips.cc -o $(podir)/kdevtipofday.pot
+	$(XGETTEXT) *.cpp *.h tips.cc -o $(podir)/tdevtipofday.pot
 	rm -f tips.cc
diff --git a/parts/tipofday/kdevpart_tipofday.rc b/parts/tipofday/tdevpart_tipofday.rc
index 43f7d1dc..43f7d1dc 100644
--- a/parts/tipofday/kdevpart_tipofday.rc
+++ b/parts/tipofday/tdevpart_tipofday.rc
diff --git a/parts/tipofday/kdevtipofday.desktop b/parts/tipofday/tdevtipofday.desktop
index 7efdbd9f..53d6d9c9 100644
--- a/parts/tipofday/kdevtipofday.desktop
+++ b/parts/tipofday/tdevtipofday.desktop
@@ -88,7 +88,7 @@ GenericName[zh_CN]=日积月累
 GenericName[zh_TW]=本日小提示
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevtipofday
+X-TDE-Library=libtdevtipofday
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
 X-TDevelop-Properties=Documentation
diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp
index 6cd63deb..f86ebf1f 100644
--- a/parts/tipofday/tipofday_part.cpp
+++ b/parts/tipofday/tipofday_part.cpp
@@ -8,28 +8,28 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
 #include <ktip.h>
 
-#include "kdevapi.h"
-#include "kdevcore.h"
+#include "tdevapi.h"
+#include "tdevcore.h"
 
-static const KDevPluginInfo data("kdevtipofday");
+static const TDevPluginInfo data("tdevtipofday");
 
-typedef KDevGenericFactory<TipOfDayPart> TipOfDayFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) )
+typedef TDevGenericFactory<TipOfDayPart> TipOfDayFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevtipofday, TipOfDayFactory( data ) )
 
 TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name ? name : "TipOfDayPart")
+  : TDevPlugin(&data, parent, name ? name : "TipOfDayPart")
 {
   setInstance(TipOfDayFactory::instance());
 
-  setXMLFile("kdevpart_tipofday.rc");
+  setXMLFile("tdevpart_tipofday.rc");
 
   TDEAction *action;
 
diff --git a/parts/tipofday/tipofday_part.h b/parts/tipofday/tipofday_part.h
index 4b982800..b5aafe50 100644
--- a/parts/tipofday/tipofday_part.h
+++ b/parts/tipofday/tipofday_part.h
@@ -3,14 +3,14 @@
  */
  
 
-#ifndef __KDEVPART_TIPOFDAY_H__
-#define __KDEVPART_TIPOFDAY_H__
+#ifndef __TDEVPART_TIPOFDAY_H__
+#define __TDEVPART_TIPOFDAY_H__
 
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 
-class TipOfDayPart : public KDevPlugin
+class TipOfDayPart : public TDevPlugin
 {
   Q_OBJECT
   
diff --git a/parts/tools/CMakeLists.txt b/parts/tools/CMakeLists.txt
index 7bd64c81..aaa0d462 100644
--- a/parts/tools/CMakeLists.txt
+++ b/parts/tools/CMakeLists.txt
@@ -28,13 +28,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevtools.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpart_tools.rc DESTINATION ${DATA_INSTALL_DIR}/kdevtools )
+install( FILES tdevtools.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpart_tools.rc DESTINATION ${DATA_INSTALL_DIR}/tdevtools )
 
 
-##### libkdevtools (module) #####################
+##### libtdevtools (module) #####################
 
-tde_add_kpart( libkdevtools AUTOMOC
+tde_add_kpart( libtdevtools AUTOMOC
   SOURCES
     tools_part.cpp toolsconfig.cpp toolsconfigwidgetbase.ui
     toolsconfigwidget.cpp kapplicationtree.cpp addtooldlg.ui
diff --git a/parts/tools/Makefile.am b/parts/tools/Makefile.am
index a61da964..da4d9d0b 100644
--- a/parts/tools/Makefile.am
+++ b/parts/tools/Makefile.am
@@ -1,16 +1,16 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevtools.la
-libkdevtools_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevtools_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevtools.la
+libtdevtools_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevtools_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevtools_la_SOURCES = tools_part.cpp toolsconfig.cpp toolsconfigwidgetbase.ui toolsconfigwidget.cpp kapplicationtree.cpp addtooldlg.ui
+libtdevtools_la_SOURCES = tools_part.cpp toolsconfig.cpp toolsconfigwidgetbase.ui toolsconfigwidget.cpp kapplicationtree.cpp addtooldlg.ui
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevtools.desktop
+service_DATA = tdevtools.desktop
 
-rc_DATA = kdevpart_tools.rc
-rcdir = $(kde_datadir)/kdevtools
+rc_DATA = tdevpart_tools.rc
+rcdir = $(kde_datadir)/tdevtools
diff --git a/parts/tools/addtooldlg.ui b/parts/tools/addtooldlg.ui
index a1a6157e..09fd5424 100644
--- a/parts/tools/addtooldlg.ui
+++ b/parts/tools/addtooldlg.ui
@@ -159,7 +159,7 @@ executed.&lt;/p&gt;</string>
                 <string>The path and name of the application to execute</string>
             </property>
         </widget>
-        <widget class="KDevApplicationTree" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TDevApplicationTree" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>tree</cstring>
             </property>
@@ -179,7 +179,7 @@ executed.&lt;/p&gt;</string>
 </widget>
 <customwidgets>
     <customwidget>
-        <class>KDevApplicationTree</class>
+        <class>TDevApplicationTree</class>
         <header location="local">kapplicationtree.h</header>
         <sizehint>
             <width>-1</width>
diff --git a/parts/tools/addtooldlg.ui.h b/parts/tools/addtooldlg.ui.h
index fea69766..cabb91e7 100644
--- a/parts/tools/addtooldlg.ui.h
+++ b/parts/tools/addtooldlg.ui.h
@@ -23,7 +23,7 @@ TQString AddToolDialog::getApp()
 
 void AddToolDialog::treeSelectionChanged( TQListViewItem * lvi )
 {
-    KDevAppTreeListItem* item = dynamic_cast<KDevAppTreeListItem*> ( lvi );
+    TDevAppTreeListItem* item = dynamic_cast<TDevAppTreeListItem*> ( lvi );
     if ( !item || item->isDirectory() )
 	return;
     execEdit->setURL( item->executable() );
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index 8c13a4ea..18e31265 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -1,5 +1,5 @@
 /*  This file is part of the KDE libraries
-    Nicked from KDElibs since KDevApplicationTree is not a public class..
+    Nicked from KDElibs since TDevApplicationTree is not a public class..
 
     Copyright (C) 1997 Torben Weis <weis@stud.uni-frankfurt.de>
     Copyright (C) 1999 Dirk A. Mueller <dmuell@gmx.net>
@@ -65,7 +65,7 @@ template class TQPtrList<TQString>;
 
 // ----------------------------------------------------------------------
 
-KDevAppTreeListItem::KDevAppTreeListItem( TDEListView* parent, const TQString & name,
+TDevAppTreeListItem::TDevAppTreeListItem( TDEListView* parent, const TQString & name,
                                     const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE )
     : TQListViewItem( parent, name )
 {
@@ -75,7 +75,7 @@ KDevAppTreeListItem::KDevAppTreeListItem( TDEListView* parent, const TQString &
 
 // ----------------------------------------------------------------------
 
-KDevAppTreeListItem::KDevAppTreeListItem( TQListViewItem* parent, const TQString & name,
+TDevAppTreeListItem::TDevAppTreeListItem( TQListViewItem* parent, const TQString & name,
                                     const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE )
     : TQListViewItem( parent, name )
 {
@@ -85,7 +85,7 @@ KDevAppTreeListItem::KDevAppTreeListItem( TQListViewItem* parent, const TQString
 
 // ----------------------------------------------------------------------
 
-void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry)
+void TDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry)
 {
     setPixmap(0, pixmap);
     parsed = parse;
@@ -101,7 +101,7 @@ void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, con
 // ----------------------------------------------------------------------
 // Ensure that dirs are sorted in front of files and case is ignored
 
-TQString KDevAppTreeListItem::key(int column, bool /*ascending*/) const
+TQString TDevAppTreeListItem::key(int column, bool /*ascending*/) const
 {
     if (directory)
         return TQString::fromLatin1(" ") + text(column).upper();
@@ -109,29 +109,29 @@ TQString KDevAppTreeListItem::key(int column, bool /*ascending*/) const
         return text(column).upper();
 }
 
-void KDevAppTreeListItem::activate()
+void TDevAppTreeListItem::activate()
 {
     if ( directory )
         setOpen(!isOpen());
 }
 
-void KDevAppTreeListItem::setOpen( bool o )
+void TDevAppTreeListItem::setOpen( bool o )
 {
     if( o && !parsed ) { // fill the children before opening
-        ((KDevApplicationTree *) parent())->addDesktopGroup( path, this );
+        ((TDevApplicationTree *) parent())->addDesktopGroup( path, this );
         parsed = true;
     }
     TQListViewItem::setOpen( o );
 }
 
-bool KDevAppTreeListItem::isDirectory()
+bool TDevAppTreeListItem::isDirectory()
 {
     return directory;
 }
 
 // ----------------------------------------------------------------------
 
-KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name )
+TDevApplicationTree::TDevApplicationTree( TQWidget *parent, const char* name )
     : TDEListView( parent, name ), currentitem(0)
 {
     addColumn( i18n("Known Applications") );
@@ -145,7 +145,7 @@ KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name )
 
 // ----------------------------------------------------------------------
 
-bool KDevApplicationTree::isDirSel()
+bool TDevApplicationTree::isDirSel()
 {
     if (!currentitem) return false; // if currentitem isn't set
     return currentitem->isDirectory();
@@ -153,12 +153,12 @@ bool KDevApplicationTree::isDirSel()
 
 // ----------------------------------------------------------------------
 
-void KDevApplicationTree::addDesktopGroup( TQString relPath, KDevAppTreeListItem *item)
+void TDevApplicationTree::addDesktopGroup( TQString relPath, TDevAppTreeListItem *item)
 {
    KServiceGroup::Ptr root = KServiceGroup::group(relPath);
    KServiceGroup::List list = root->entries();
 
-   KDevAppTreeListItem * newItem;
+   TDevAppTreeListItem * newItem;
    for( KServiceGroup::List::ConstIterator it = list.begin();
        it != list.end(); it++)
    {
@@ -200,10 +200,10 @@ void KDevApplicationTree::addDesktopGroup( TQString relPath, KDevAppTreeListItem
       TQPixmap pixmap = SmallIcon( icon );
 
       if (item)
-         newItem = new KDevAppTreeListItem( item, text, pixmap, false, isDir,
+         newItem = new TDevAppTreeListItem( item, text, pixmap, false, isDir,
                                          relPath, exec, dEntry );
       else
-         newItem = new KDevAppTreeListItem( this, text, pixmap, false, isDir,
+         newItem = new TDevAppTreeListItem( this, text, pixmap, false, isDir,
                                          relPath, exec, dEntry );
       if (isDir)
          newItem->setExpandable( true );
@@ -213,13 +213,13 @@ void KDevApplicationTree::addDesktopGroup( TQString relPath, KDevAppTreeListItem
 
 // ----------------------------------------------------------------------
 
-void KDevApplicationTree::slotItemHighlighted(TQListViewItem* i)
+void TDevApplicationTree::slotItemHighlighted(TQListViewItem* i)
 {
     // i may be 0 (see documentation)
     if(!i)
         return;
 
-    KDevAppTreeListItem *item = (KDevAppTreeListItem *) i;
+    TDevAppTreeListItem *item = (TDevAppTreeListItem *) i;
 
     currentitem = item;
 
@@ -230,13 +230,13 @@ void KDevApplicationTree::slotItemHighlighted(TQListViewItem* i)
 
 // ----------------------------------------------------------------------
 
-void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i)
+void TDevApplicationTree::slotSelectionChanged(TQListViewItem* i)
 {
     // i may be 0 (see documentation)
     if(!i)
         return;
 
-    KDevAppTreeListItem *item = (KDevAppTreeListItem *) i;
+    TDevAppTreeListItem *item = (TDevAppTreeListItem *) i;
 
     currentitem = item;
 
@@ -246,7 +246,7 @@ void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i)
 
 // ----------------------------------------------------------------------
 
-void KDevApplicationTree::resizeEvent( TQResizeEvent * e)
+void TDevApplicationTree::resizeEvent( TQResizeEvent * e)
 {
     setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent));
     TDEListView::resizeEvent(e);
diff --git a/parts/tools/kapplicationtree.h b/parts/tools/kapplicationtree.h
index 0ba2cc9f..b45bbeac 100644
--- a/parts/tools/kapplicationtree.h
+++ b/parts/tools/kapplicationtree.h
@@ -16,8 +16,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef __KDevApplicationTree_h__
-#define __KDevApplicationTree_h__
+#ifndef __TDevApplicationTree_h__
+#define __TDevApplicationTree_h__
 
 #include <kurl.h>
 #include <tdelistview.h>
@@ -36,7 +36,7 @@ class TQStringList;
 /**
  * @internal
  */
-class KDevAppTreeListItem : public TQListViewItem
+class TDevAppTreeListItem : public TQListViewItem
 {
     bool parsed;
     bool directory;
@@ -50,9 +50,9 @@ protected:
     void init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry);
 
 public:
-    KDevAppTreeListItem( TDEListView* parent, const TQString & name, const TQPixmap& pixmap,
+    TDevAppTreeListItem( TDEListView* parent, const TQString & name, const TQPixmap& pixmap,
                       bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE );
-    KDevAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap,
+    TDevAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap,
                       bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE );
     bool isDirectory();
 
@@ -63,7 +63,7 @@ protected:
     virtual void activate();
     virtual void setOpen( bool o );
 
-    friend class KDevApplicationTree;
+    friend class TDevApplicationTree;
 };
 
 /* ------------------------------------------------------------------------- */
@@ -71,23 +71,23 @@ protected:
 /**
  * @internal
  */
-class KDevApplicationTree : public TDEListView
+class TDevApplicationTree : public TDEListView
 {
     Q_OBJECT
   
 public:
-    KDevApplicationTree( TQWidget *parent, const char* name = 0 );
+    TDevApplicationTree( TQWidget *parent, const char* name = 0 );
 
     /**
      * Add a group of .desktop/.kdelnk entries
      */
-    void addDesktopGroup( TQString relPath, KDevAppTreeListItem *item = 0 );
+    void addDesktopGroup( TQString relPath, TDevAppTreeListItem *item = 0 );
 
     bool isDirSel();
 
 protected:
     void resizeEvent( TQResizeEvent *_ev );
-    KDevAppTreeListItem* currentitem;
+    TDevAppTreeListItem* currentitem;
 
 public slots:
     void slotItemHighlighted(TQListViewItem* i);
diff --git a/parts/tools/kdevpart_tools.rc b/parts/tools/tdevpart_tools.rc
index ab8a6a98..ab8a6a98 100644
--- a/parts/tools/kdevpart_tools.rc
+++ b/parts/tools/tdevpart_tools.rc
diff --git a/parts/tools/kdevtools.desktop b/parts/tools/tdevtools.desktop
index 225b4b5f..3b7e8272 100644
--- a/parts/tools/kdevtools.desktop
+++ b/parts/tools/tdevtools.desktop
@@ -76,7 +76,7 @@ GenericName[zh_CN]=工具菜单附加
 GenericName[zh_TW]=新增工具選單
 Icon=configure
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevtools
+X-TDE-Library=libtdevtools
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=AdditionalTools
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index 8734eadc..c6e4a242 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -19,14 +19,14 @@
 #include <kprocess.h>
 #include <tdetexteditor/document.h>
 
-#include "kdevcore.h"
-#include "kdevproject.h"
-#include "kdevpartcontroller.h"
-#include "kdevappfrontend.h"
-#include "kdevplugininfo.h"
+#include "tdevcore.h"
+#include "tdevproject.h"
+#include "tdevpartcontroller.h"
+#include "tdevappfrontend.h"
+#include "tdevplugininfo.h"
 #include "urlutil.h"
 #include "configwidgetproxy.h"
-#include "kdeveditorutil.h"
+#include "tdeveditorutil.h"
 
 #include "toolsconfig.h"
 #include "toolsconfigwidget.h"
@@ -34,17 +34,17 @@
 #define TOOLSSETTINGS 1
 #define EXTRATOOLSSETTINGS 2
 
-static const KDevPluginInfo data("kdevtools");
-K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) )
+static const TDevPluginInfo data("tdevtools");
+K_EXPORT_COMPONENT_FACTORY( libtdevtools, ToolsFactory( data ) )
 
 TQMap<int, TQString> externalToolMenuEntries;
 
 ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &)
-	: KDevPlugin( &data, parent, name ? name : "ToolsPart")
+	: TDevPlugin( &data, parent, name ? name : "ToolsPart")
 {
   setInstance(ToolsFactory::instance());
 
-  setXMLFile("kdevpart_tools.rc");
+  setXMLFile("tdevpart_tools.rc");
 
 	m_configProxy = new ConfigWidgetProxy( core() );
 	m_configProxy->createGlobalConfigPage( i18n("Tools Menu"), TOOLSSETTINGS, info()->icon() );
@@ -128,11 +128,11 @@ void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName)
     if (project())
         projectDirectory = project()->projectDirectory();
     
-    TQString selection = KDevEditorUtil::currentSelection( doc );
+    TQString selection = TDevEditorUtil::currentSelection( doc );
     if ( !selection.isEmpty() )
         selection = KShellProcess::quote( selection );
 
-    TQString word = KDevEditorUtil::currentWord( doc );
+    TQString word = TDevEditorUtil::currentWord( doc );
     
     // This should really be checked before inserting into the popup
     if (cmdline.contains("%D") && projectDirectory.isNull())
@@ -153,7 +153,7 @@ void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName)
 
     if (captured)
     {
-       if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
+       if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
             appFrontend->startAppCommand(TQString(), cmdline, false);
     }
     else 
diff --git a/parts/tools/tools_part.h b/parts/tools/tools_part.h
index 20af2ea8..4eeaf0e1 100644
--- a/parts/tools/tools_part.h
+++ b/parts/tools/tools_part.h
@@ -3,13 +3,13 @@
  */
 
 
-#ifndef __KDEVPART_TOOLS_H__
-#define __KDEVPART_TOOLS_H__
+#ifndef __TDEVPART_TOOLS_H__
+#define __TDEVPART_TOOLS_H__
 
 
 #include <tqguardedptr.h>
-#include <kdevplugin.h>
-#include <kdevgenericfactory.h>
+#include <tdevplugin.h>
+#include <tdevgenericfactory.h>
 
 
 class TQPopupMenu;
@@ -20,7 +20,7 @@ class ConfigWidgetProxy;
 class ToolsWidget;
 
 
-class ToolsPart : public KDevPlugin
+class ToolsPart : public TDevPlugin
   {
     Q_OBJECT
   
@@ -51,6 +51,6 @@ private:
 	ConfigWidgetProxy * m_configProxy;
   };
 
-typedef KDevGenericFactory<ToolsPart> ToolsFactory;
+typedef TDevGenericFactory<ToolsPart> ToolsFactory;
 
 #endif
diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp
index f21713e9..8d689f40 100644
--- a/parts/tools/toolsconfig.cpp
+++ b/parts/tools/toolsconfig.cpp
@@ -35,7 +35,7 @@ void ToolsConfig::showEvent(TQShowEvent *e)
       TQHBoxLayout *hbox = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
       TQVBoxLayout *vbox = new TQVBoxLayout(hbox);
-      _tree = new KDevApplicationTree(this);
+      _tree = new TDevApplicationTree(this);
       _tree->header()->hide();
       TQLabel *l = new TQLabel(_tree, i18n("&Applications:"), this);
       l->show();
@@ -121,7 +121,7 @@ void ToolsConfig::add(const TQString &desktopFile)
 
 void ToolsConfig::toList()
 {
-  KDevAppTreeListItem *item = dynamic_cast<KDevAppTreeListItem*>(_tree->selectedItem());
+  TDevAppTreeListItem *item = dynamic_cast<TDevAppTreeListItem*>(_tree->selectedItem());
   if (item && !item->desktopEntryPath().isEmpty())
     add(item->desktopEntryPath());
   checkButtons();
diff --git a/parts/tools/toolsconfig.h b/parts/tools/toolsconfig.h
index 074d5900..23081676 100644
--- a/parts/tools/toolsconfig.h
+++ b/parts/tools/toolsconfig.h
@@ -9,7 +9,7 @@
 
 class TQListBox;
 class TQPushButton;
-class KDevApplicationTree;
+class TDevApplicationTree;
 
 class Entry 
 {
@@ -60,7 +60,7 @@ private slots:
 
 private:
 
-    KDevApplicationTree *_tree;
+    TDevApplicationTree *_tree;
     TQListBox *_list;
     TQPushButton *_toList, *_toTree;
 
diff --git a/parts/uimode/CMakeLists.txt b/parts/uimode/CMakeLists.txt
index 478a4103..0eaa5ff6 100644
--- a/parts/uimode/CMakeLists.txt
+++ b/parts/uimode/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevuichooser.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevuichooser.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevuichooser (module) #################
+##### libtdevuichooser (module) #################
 
-tde_add_kpart( libkdevuichooser AUTOMOC
+tde_add_kpart( libtdevuichooser AUTOMOC
   SOURCES
     uichooser_part.cpp uichooser.ui uichooser_widget.cpp
   LINK tdevelop-shared
diff --git a/parts/uimode/Makefile.am b/parts/uimode/Makefile.am
index 00792790..df7ddba9 100644
--- a/parts/uimode/Makefile.am
+++ b/parts/uimode/Makefile.am
@@ -1,13 +1,13 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevuichooser.la
-libkdevuichooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevuichooser_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevuichooser.la
+libtdevuichooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevuichooser_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevuichooser_la_SOURCES = uichooser_part.cpp uichooser.ui uichooser_widget.cpp
+libtdevuichooser_la_SOURCES = uichooser_part.cpp uichooser.ui uichooser_widget.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevuichooser.desktop
+service_DATA = tdevuichooser.desktop
 
diff --git a/parts/uimode/kdevuichooser.desktop b/parts/uimode/tdevuichooser.desktop
index afb21a50..65faa5be 100644
--- a/parts/uimode/kdevuichooser.desktop
+++ b/parts/uimode/tdevuichooser.desktop
@@ -80,7 +80,7 @@ GenericName[zh_CN]=用户界面选择
 GenericName[zh_TW]=使用者介面選擇器
 Icon=view_choose
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevuichooser
+X-TDE-Library=libtdevuichooser
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
 X-TDevelop-Mode=AssistantMode
diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp
index fdc9fa6a..5795d829 100644
--- a/parts/uimode/uichooser_part.cpp
+++ b/parts/uimode/uichooser_part.cpp
@@ -3,23 +3,23 @@
 #include <tqvbox.h>
 
 #include <kdialogbase.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevcore.h>
+#include <tdevcore.h>
 #include <configwidgetproxy.h>
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
 #include "uichooser_widget.h"
 
 #define UICHOOSERSETTINGSPAGE 1
 
-typedef KDevGenericFactory<UIChooserPart> UIChooserFactory;
-static const KDevPluginInfo data("kdevuichooser");
-K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) )
+typedef TDevGenericFactory<UIChooserPart> UIChooserFactory;
+static const TDevPluginInfo data("tdevuichooser");
+K_EXPORT_COMPONENT_FACTORY( libtdevuichooser, UIChooserFactory( data ) )
 
 UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin( &data, parent, name ? name : "UIChooserPart")
+  : TDevPlugin( &data, parent, name ? name : "UIChooserPart")
 {
 	setInstance(UIChooserFactory::instance());
 
diff --git a/parts/uimode/uichooser_part.h b/parts/uimode/uichooser_part.h
index ff822e1d..e86f9211 100644
--- a/parts/uimode/uichooser_part.h
+++ b/parts/uimode/uichooser_part.h
@@ -3,16 +3,16 @@
  */
  
 
-#ifndef __KDEVPART_UICHOOSER_H__
-#define __KDEVPART_UICHOOSER_H__
+#ifndef __TDEVPART_UICHOOSER_H__
+#define __TDEVPART_UICHOOSER_H__
 
 
 class KDialogBase;
 class ConfigWidgetProxy;
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
-class UIChooserPart : public KDevPlugin
+class UIChooserPart : public TDevPlugin
 {
   Q_OBJECT
   
diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp
index cb75ec02..d70d648d 100644
--- a/parts/uimode/uichooser_widget.cpp
+++ b/parts/uimode/uichooser_widget.cpp
@@ -24,7 +24,7 @@
 #include <tdeversion.h>
 
 #include "uichooser_part.h"
-#include "kdevmainwindow.h"
+#include "tdevmainwindow.h"
 #include "uichooser_widget.h"
 
 UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const char *name)
diff --git a/parts/valgrind/CMakeLists.txt b/parts/valgrind/CMakeLists.txt
index 9c32760f..611aa4ec 100644
--- a/parts/valgrind/CMakeLists.txt
+++ b/parts/valgrind/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevvalgrind.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevpart_valgrind.rc DESTINATION ${DATA_INSTALL_DIR}/kdevvalgrind )
+install( FILES tdevvalgrind.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevpart_valgrind.rc DESTINATION ${DATA_INSTALL_DIR}/tdevvalgrind )
 
 
-##### libkdevvalgrind (module) ##################
+##### libtdevvalgrind (module) ##################
 
-tde_add_kpart( libkdevvalgrind AUTOMOC
+tde_add_kpart( libtdevvalgrind AUTOMOC
   SOURCES
     dialog_widget.ui valgrind_part.cpp valgrind_widget.cpp
     valgrind_dialog.cpp valgrinditem.cpp
diff --git a/parts/valgrind/Makefile.am b/parts/valgrind/Makefile.am
index e0cd6536..6e9e89c0 100644
--- a/parts/valgrind/Makefile.am
+++ b/parts/valgrind/Makefile.am
@@ -1,15 +1,15 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevvalgrind.la
-libkdevvalgrind_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevvalgrind_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevvalgrind.la
+libtdevvalgrind_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevvalgrind_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevvalgrind_la_SOURCES = dialog_widget.ui valgrind_part.cpp valgrind_widget.cpp valgrind_dialog.cpp valgrinditem.cpp
+libtdevvalgrind_la_SOURCES = dialog_widget.ui valgrind_part.cpp valgrind_widget.cpp valgrind_dialog.cpp valgrinditem.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevvalgrind.desktop
+service_DATA = tdevvalgrind.desktop
 
-rcdir = $(kde_datadir)/kdevvalgrind
-rc_DATA = kdevpart_valgrind.rc
+rcdir = $(kde_datadir)/tdevvalgrind
+rc_DATA = tdevpart_valgrind.rc
diff --git a/parts/valgrind/kdevpart_valgrind.rc b/parts/valgrind/tdevpart_valgrind.rc
index 440b62c2..440b62c2 100644
--- a/parts/valgrind/kdevpart_valgrind.rc
+++ b/parts/valgrind/tdevpart_valgrind.rc
diff --git a/parts/valgrind/kdevvalgrind.desktop b/parts/valgrind/tdevvalgrind.desktop
index e2142182..0c4fa769 100644
--- a/parts/valgrind/kdevvalgrind.desktop
+++ b/parts/valgrind/tdevvalgrind.desktop
@@ -69,6 +69,6 @@ GenericName[zh_TW]=Valgrind 前端介面
 Icon=tdevelop
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
-X-TDE-Library=libkdevvalgrind
+X-TDE-Library=libtdevvalgrind
 X-TDevelop-Version=5
 X-TDevelop-Properties=CompiledDevelopment
diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
index 1b262175..88d9427c 100644
--- a/parts/valgrind/valgrind_part.cpp
+++ b/parts/valgrind/valgrind_part.cpp
@@ -6,31 +6,31 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <tdeaction.h>
 #include <kprocess.h>
 #include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
-#include "kdevproject.h"
-#include "kdevplugininfo.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
+#include "tdevproject.h"
+#include "tdevplugininfo.h"
 
 #include "valgrind_widget.h"
 #include "valgrind_dialog.h"
 #include "valgrinditem.h"
 
-typedef KDevGenericFactory<ValgrindPart> ValgrindFactory;
-static const KDevPluginInfo data("kdevvalgrind");
-K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) )
+typedef TDevGenericFactory<ValgrindPart> ValgrindFactory;
+static const TDevPluginInfo data("tdevvalgrind");
+K_EXPORT_COMPONENT_FACTORY( libtdevvalgrind, ValgrindFactory( data ) )
 
 ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& )
-  : KDevPlugin( &data, parent, name ? name : "ValgrindPart" )
+  : TDevPlugin( &data, parent, name ? name : "ValgrindPart" )
 {
   setInstance( ValgrindFactory::instance() );
-  setXMLFile( "kdevpart_valgrind.rc" );
+  setXMLFile( "tdevpart_valgrind.rc" );
 
   proc = new KShellProcess();
   connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )),
@@ -39,8 +39,8 @@ ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringLi
            this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) );
   connect( proc, TQT_SIGNAL(processExited( TDEProcess* )),
            this, TQT_SLOT(processExited( TDEProcess* )) );
-  connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
-           this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
+  connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
+           this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) );
   connect( core(), TQT_SIGNAL(projectOpened()),
            this, TQT_SLOT(projectOpened()) );
 
@@ -196,7 +196,7 @@ void ValgrindPart::slotKillValgrind()
     proc->kill();
 }
 
-void ValgrindPart::slotStopButtonClicked( KDevPlugin* which )
+void ValgrindPart::slotStopButtonClicked( TDevPlugin* which )
 {
   if ( which != 0 && which != this )
     return;
diff --git a/parts/valgrind/valgrind_part.h b/parts/valgrind/valgrind_part.h
index 6a05737b..1982ea33 100644
--- a/parts/valgrind/valgrind_part.h
+++ b/parts/valgrind/valgrind_part.h
@@ -2,18 +2,18 @@
  *  Copyright (C) 2002 Harald Fernengel <harry@kdevelop.org>   
  */
 
-#ifndef __KDEVPART_VALGRIND_H__
-#define __KDEVPART_VALGRIND_H__
+#ifndef __TDEVPART_VALGRIND_H__
+#define __TDEVPART_VALGRIND_H__
 
 #include <tqguardedptr.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 class ValgrindWidget;
 class TDEProcess;
 
-class ValgrindPart : public KDevPlugin
+class ValgrindPart : public TDevPlugin
 {
   Q_OBJECT
   
@@ -31,7 +31,7 @@ private slots:
   void slotExecValgrind();
   void slotExecCalltree();
   void slotKillValgrind();
-  void slotStopButtonClicked( KDevPlugin* which );
+  void slotStopButtonClicked( TDevPlugin* which );
   void receivedStdout( TDEProcess*, char*, int );
   void receivedStderr( TDEProcess*, char*, int );
   void processExited( TDEProcess* );
diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp
index 70484704..f32ab9b7 100644
--- a/parts/valgrind/valgrind_widget.cpp
+++ b/parts/valgrind/valgrind_widget.cpp
@@ -10,10 +10,10 @@
 #include <tdelocale.h>
 #include <kstatusbar.h>
 
-#include <kdevcore.h>
-#include <kdevpartcontroller.h>
-#include <kdevmainwindow.h>
-#include <kdevproject.h>
+#include <tdevcore.h>
+#include <tdevpartcontroller.h>
+#include <tdevmainwindow.h>
+#include <tdevproject.h>
 
 #include "valgrind_part.h"
 #include "valgrind_widget.h"
diff --git a/parts/vcsmanager/CMakeLists.txt b/parts/vcsmanager/CMakeLists.txt
index de236f81..a672b4ac 100644
--- a/parts/vcsmanager/CMakeLists.txt
+++ b/parts/vcsmanager/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevvcsmanager.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevvcsmanager.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevvcsmanager (module) ################
+##### libtdevvcsmanager (module) ################
 
-tde_add_kpart( libkdevvcsmanager AUTOMOC
+tde_add_kpart( libtdevvcsmanager AUTOMOC
   SOURCES
     vcsmanagerpart.cpp vcsmanagerprojectconfigbase.ui
     vcsmanagerprojectconfig.cpp
diff --git a/parts/vcsmanager/Makefile.am b/parts/vcsmanager/Makefile.am
index 5f7534ee..66897658 100644
--- a/parts/vcsmanager/Makefile.am
+++ b/parts/vcsmanager/Makefile.am
@@ -1,19 +1,19 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevvcsmanager.la
-libkdevvcsmanager_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevvcsmanager_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevvcsmanager.la
+libtdevvcsmanager_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevvcsmanager_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevvcsmanager_la_SOURCES = vcsmanagerpart.cpp \
+libtdevvcsmanager_la_SOURCES = vcsmanagerpart.cpp \
 	vcsmanagerprojectconfigbase.ui vcsmanagerprojectconfig.cpp
 
 METASOURCES = AUTO
 
-appsharedir = $(kde_datadir)/kdevvcsmanager
+appsharedir = $(kde_datadir)/tdevvcsmanager
 appshare_DATA = 
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevvcsmanager.desktop
+service_DATA = tdevvcsmanager.desktop
 
-rcdir = $(kde_datadir)/kdevvcsmanager
+rcdir = $(kde_datadir)/tdevvcsmanager
 
diff --git a/parts/vcsmanager/kdevvcsmanager.desktop b/parts/vcsmanager/tdevvcsmanager.desktop
index 35cdf2aa..91fe7c98 100644
--- a/parts/vcsmanager/kdevvcsmanager.desktop
+++ b/parts/vcsmanager/tdevvcsmanager.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Service
 Exec=blubb
-Name=KDevVCSManager
+Name=TDevVCSManager
 Name[da]=TDevelop VCS-håndtering
 Name[nds]=TDevelop-VKS-Pleger
 Name[sk]=KDev VCS manažér
 Name[sv]=TDevelop VCS-hantering
-Name[tg]=РоҳбариKDevVCS
+Name[tg]=РоҳбариTDevVCS
 Name[zh_TW]=TDevelop VCS 管理器
 GenericName=VCSManager
 GenericName[da]=VCS-håndtering
@@ -60,6 +60,6 @@ X-TDevelop-Plugin-Copyright=(C) by Jens Dagerbo
 X-TDevelop-Args=
 
 X-TDevelop-Scope=Core
-X-TDE-Library=libkdevvcsmanager
+X-TDE-Library=libtdevvcsmanager
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS
diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp
index ec176c47..5f5ad639 100644
--- a/parts/vcsmanager/vcsmanagerpart.cpp
+++ b/parts/vcsmanager/vcsmanagerpart.cpp
@@ -29,32 +29,32 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <tdemessagebox.h>
-#include <kdevplugininfo.h>
-#include <kdevgenericfactory.h>
+#include <tdevplugininfo.h>
+#include <tdevgenericfactory.h>
 #include <kdebug.h>
 
-#include <kdevcore.h>
-#include <kdevmainwindow.h>
+#include <tdevcore.h>
+#include <tdevmainwindow.h>
 #include <configwidgetproxy.h>
-#include <kdevplugincontroller.h>
+#include <tdevplugincontroller.h>
 #include "domutil.h"
 
 #include "vcsmanagerprojectconfig.h"
 
-typedef KDevGenericFactory<VCSManagerPart> VCSManagerFactory;
-KDevPluginInfo data("kdevvcsmanager");
-K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) )
+typedef TDevGenericFactory<VCSManagerPart> VCSManagerFactory;
+TDevPluginInfo data("tdevvcsmanager");
+K_EXPORT_COMPONENT_FACTORY( libtdevvcsmanager, VCSManagerFactory( data ) )
 
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
 VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-	: KDevPlugin(&data, parent, name ? name : "VCSManagerPart")
+	: TDevPlugin(&data, parent, name ? name : "VCSManagerPart")
 {
 	kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl;
 
 	setInstance(VCSManagerFactory::instance());
-//	setXMLFile("kdevvcsmanager.rc");
+//	setXMLFile("tdevvcsmanager.rc");
 
 	m_configProxy = new ConfigWidgetProxy(core());
 	m_configProxy->createProjectConfigPage(i18n("Version Control"), PROJECTDOC_OPTIONS, info()->icon());
diff --git a/parts/vcsmanager/vcsmanagerpart.h b/parts/vcsmanager/vcsmanagerpart.h
index 1fbccbff..aa52de94 100644
--- a/parts/vcsmanager/vcsmanagerpart.h
+++ b/parts/vcsmanager/vcsmanagerpart.h
@@ -18,10 +18,10 @@
 *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
 ***************************************************************************/
 
-#ifndef KDEVVCSMANAGER_H
-#define KDEVVCSMANAGER_H
+#ifndef TDEVVCSMANAGER_H
+#define TDEVVCSMANAGER_H
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 #include <tqguardedptr.h>
 
@@ -35,7 +35,7 @@ class VCSManagerWidget;
 /**
 Please read the README.dox file for more info about this part
 */
-class VCSManagerPart: public KDevPlugin
+class VCSManagerPart: public TDevPlugin
 {
 	Q_OBJECT
   
diff --git a/pics/hi16-app-kdevassistant.png b/pics/hi16-app-tdevassistant.png
index 52080a46..52080a46 100644
--- a/pics/hi16-app-kdevassistant.png
+++ b/pics/hi16-app-tdevassistant.png
diff --git a/pics/hi16-app-kdevdesigner.png b/pics/hi16-app-tdevdesigner.png
index 8286c826..8286c826 100644
--- a/pics/hi16-app-kdevdesigner.png
+++ b/pics/hi16-app-tdevdesigner.png
diff --git a/pics/hi32-app-kdevassistant.png b/pics/hi32-app-tdevassistant.png
index ea042cf3..ea042cf3 100644
--- a/pics/hi32-app-kdevassistant.png
+++ b/pics/hi32-app-tdevassistant.png
diff --git a/pics/hi32-app-kdevdesigner.png b/pics/hi32-app-tdevdesigner.png
index 2de4d679..2de4d679 100644
--- a/pics/hi32-app-kdevdesigner.png
+++ b/pics/hi32-app-tdevdesigner.png
diff --git a/pics/hi48-app-kdevassistant.png b/pics/hi48-app-tdevassistant.png
index 29d27dd7..29d27dd7 100644
--- a/pics/hi48-app-kdevassistant.png
+++ b/pics/hi48-app-tdevassistant.png
diff --git a/pics/hi48-app-kdevdesigner.png b/pics/hi48-app-tdevdesigner.png
index df634b85..df634b85 100644
--- a/pics/hi48-app-kdevdesigner.png
+++ b/pics/hi48-app-tdevdesigner.png
diff --git a/pics/mini/CMakeLists.txt b/pics/mini/CMakeLists.txt
index 143ea8d3..704cbedf 100644
--- a/pics/mini/CMakeLists.txt
+++ b/pics/mini/CMakeLists.txt
@@ -19,4 +19,4 @@ install( FILES
     CVpublic_signal.png CVpublic_slot.png CVpublic_var.png
     CVstruct.png CVpackage_meth.png CVpackage_var.png
     CVtypedef.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevclassview/pics )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevclassview/pics )
diff --git a/pics/mini/Makefile.am b/pics/mini/Makefile.am
index 94e74ffb..5b921601 100644
--- a/pics/mini/Makefile.am
+++ b/pics/mini/Makefile.am
@@ -1,4 +1,4 @@
-minipicsdir = $(kde_datadir)/kdevclassview/pics
+minipicsdir = $(kde_datadir)/tdevclassview/pics
 minipics_DATA = CTchildren.png CTclients.png CTparents.png CTsuppliers.png \
 	CTvirtuals.png 		CVclass.png CVglobal_meth.png CVglobal_var.png CVnamespace.png \
 			CVprivate_meth.png CVprivate_signal.png CVprivate_slot.png CVprivate_var.png \
diff --git a/pics/misc/CMakeLists.txt b/pics/misc/CMakeLists.txt
index 86b1d049..6d156aeb 100644
--- a/pics/misc/CMakeLists.txt
+++ b/pics/misc/CMakeLists.txt
@@ -10,6 +10,6 @@
 #################################################
 
 install( FILES
-    tdevelop-splash.png kdevassistant-splash.png
-    kdevdesigner-splash.png
+    tdevelop-splash.png tdevassistant-splash.png
+    tdevdesigner-splash.png
   DESTINATION ${DATA_INSTALL_DIR}/tdevelop/pics )
diff --git a/pics/misc/Makefile.am b/pics/misc/Makefile.am
index d748146d..5f2435c3 100644
--- a/pics/misc/Makefile.am
+++ b/pics/misc/Makefile.am
@@ -1,3 +1,3 @@
 picsdir = $(kde_datadir)/tdevelop/pics
-pics_DATA = tdevelop-splash.png kdevassistant-splash.png \
-	kdevdesigner-splash.png
+pics_DATA = tdevelop-splash.png tdevassistant-splash.png \
+	tdevdesigner-splash.png
diff --git a/pics/misc/kdevassistant-splash.png b/pics/misc/tdevassistant-splash.png
index eb13d766..eb13d766 100644
--- a/pics/misc/kdevassistant-splash.png
+++ b/pics/misc/tdevassistant-splash.png
diff --git a/pics/misc/kdevdesigner-splash.png b/pics/misc/tdevdesigner-splash.png
index ace51a84..ace51a84 100644
--- a/pics/misc/kdevdesigner-splash.png
+++ b/pics/misc/tdevdesigner-splash.png
diff --git a/pics/toolbar/CMakeLists.txt b/pics/toolbar/CMakeLists.txt
index 89891ee4..8b3bfbb8 100644
--- a/pics/toolbar/CMakeLists.txt
+++ b/pics/toolbar/CMakeLists.txt
@@ -15,17 +15,17 @@ tde_install_icons(
     dbgnext dbgwatchvar dbgrun dbgstepout dbgmemview dbgparam
     dbgrunto dbgstep dbgnextinst dbgrestart dbgstepinst dbgvar
     debugger dbgjumpto
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdebugger/icons )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdebugger/icons )
 
 tde_install_icons(
     classnew classwiz
-  DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport/icons )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport/icons )
 
 tde_install_icons(
     dbgnext dbgrun dbgstepout dbgrunto dbgstep dbgrestart
     debugger
-  DESTINATION ${DATA_INSTALL_DIR}/kdevrbdebugger/icons )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevrbdebugger/icons )
 
 tde_install_icons(
     grep
-  DESTINATION ${DATA_INSTALL_DIR}/kdevgrepview/icons )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevgrepview/icons )
diff --git a/pics/toolbar/Makefile.am b/pics/toolbar/Makefile.am
index d60121e7..0713d5b3 100644
--- a/pics/toolbar/Makefile.am
+++ b/pics/toolbar/Makefile.am
@@ -1,14 +1,14 @@
 tdevelopdir = $(kde_datadir)/tdevelop/icons
 tdevelop_ICON = AUTO
 
-kdevdebuggerdir = $(kde_datadir)/kdevdebugger/icons
-kdevdebugger_ICON = dbgnext dbgwatchvar dbgrun dbgstepout dbgmemview dbgparam dbgrunto dbgstep dbgnextinst dbgrestart dbgstepinst dbgvar debugger dbgjumpto
+tdevdebuggerdir = $(kde_datadir)/tdevdebugger/icons
+tdevdebugger_ICON = dbgnext dbgwatchvar dbgrun dbgstepout dbgmemview dbgparam dbgrunto dbgstep dbgnextinst dbgrestart dbgstepinst dbgvar debugger dbgjumpto
 
-cppsupportdir = $(kde_datadir)/kdevcppsupport/icons
+cppsupportdir = $(kde_datadir)/tdevcppsupport/icons
 cppsupport_ICON = classnew classwiz
 
-kdevrbdebuggerdir = $(kde_datadir)/kdevrbdebugger/icons
-kdevrbdebugger_ICON = dbgnext dbgrun dbgstepout dbgrunto dbgstep dbgrestart debugger
+tdevrbdebuggerdir = $(kde_datadir)/tdevrbdebugger/icons
+tdevrbdebugger_ICON = dbgnext dbgrun dbgstepout dbgrunto dbgstep dbgrestart debugger
 
-grepdir = $(kde_datadir)/kdevgrepview/icons
+grepdir = $(kde_datadir)/tdevgrepview/icons
 grep_ICON = grep
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 558caeb4..b58b6df5 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 kdevassistantrc DESTINATION ${CONFIG_INSTALL_DIR} )
-install( FILES kdevassistantui.rc DESTINATION ${DATA_INSTALL_DIR}/kdevassistant )
+install( FILES tdeveloprc tdevassistantrc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( FILES tdevassistantui.rc DESTINATION ${DATA_INSTALL_DIR}/tdevassistant )
 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 kdevideextension.cpp settingswidget.ui
-  LINK kdevshell-shared
+    main.cpp tdevideextension.cpp settingswidget.ui
+  LINK tdevshell-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-##### kdevassistant (executable) ################
+##### tdevassistant (executable) ################
 
-tde_add_executable( kdevassistant
+tde_add_executable( tdevassistant
   SOURCES
-    main_assistant.cpp kdevassistantextension.cpp
-  LINK kdevshell-shared
+    main_assistant.cpp tdevassistantextension.cpp
+  LINK tdevshell-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-##### kdevshell (shared) ########################
+##### tdevshell (shared) ########################
 
-tde_add_library( kdevshell SHARED AUTOMOC
+tde_add_library( tdevshell SHARED AUTOMOC
   SOURCES
     api.cpp core.cpp documentationpart.cpp editorproxy.cpp
     generalinfowidget.cpp generalinfowidgetbase.ui
@@ -92,7 +92,7 @@ tde_add_library( kdevshell SHARED AUTOMOC
     toplevel.cpp
   VERSION 0.0.0
   LINK
-    kdevutil-static d-shared kinterfacedesigner-shared
-    profileengine-shared tdevelop-shared kdevwidgets-shared
+    tdevutil-static d-shared kinterfacedesigner-shared
+    profileengine-shared tdevelop-shared tdevwidgets-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/src/Mainpage.dox b/src/Mainpage.dox
index 2f055d1b..7f2255d2 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>: -lkdevshell
+<b>Link with</b>: -ltdevshell
 
 <b>Include path</b>: -I\$(kde_includes)/tdevelop/shell
 
@@ -109,7 +109,7 @@ Example:
         }
             
     protected:
-        KDevAssistantExtension();
+        TDevAssistantExtension();
     
     };
     @endcode
diff --git a/src/Makefile.am b/src/Makefile.am
index 047e89a4..b0b8a04c 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 = libkdevshell.la
-libkdevshell_la_LDFLAGS = $(all_libraries) -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
-libkdevshell_la_LIBADD = \
+lib_LTLIBRARIES = libtdevshell.la
+libtdevshell_la_LDFLAGS = $(all_libraries) -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
+libtdevshell_la_LIBADD = \
 	$(top_builddir)/src/profileengine/lib/libprofileengine.la $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la \
+	$(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la \
 	$(top_builddir)/src/newui/libd.la $(LIB_TDEHTML) -ltdetexteditor -L../lib/interfaces/external/.libs -lkinterfacedesigner
-libkdevshell_la_SOURCES = api.cpp core.cpp documentationpart.cpp \
+libtdevshell_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 kdevassistant
+bin_PROGRAMS = tdevelop tdevassistant
 
-tdevelop_SOURCES = main.cpp kdevideextension.cpp settingswidget.ui
+tdevelop_SOURCES = main.cpp tdevideextension.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 = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner
+tdevelop_LDADD = libtdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner
 
 rcdir = $(kde_datadir)/tdevelop
 rc_DATA = tdevelopui.rc eventsrc
 
-# default KDevelop configuration
+# default TDevelop configuration
 tdevelopdatadir = $(kde_confdir)
-tdevelopdata_DATA = tdeveloprc kdevassistantrc
+tdevelopdata_DATA = tdeveloprc tdevassistantrc
 
 SUBDIRS = profiles profileengine newui tdeconf_update
-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
+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
 
-rc_assistantdir = $(kde_datadir)/kdevassistant
-rc_assistant_DATA =  kdevassistantui.rc
+rc_assistantdir = $(kde_datadir)/tdevassistant
+rc_assistant_DATA =  tdevassistantui.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 kdevutil kdevinterfaces kdevextensions
-DOXYGEN_PROJECTNAME = KDevelop Generic Shell
-DOXYGEN_DOCDIRPREFIX = kdevshell
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces tdevextensions
+DOXYGEN_PROJECTNAME = TDevelop Generic Shell
+DOXYGEN_DOCDIRPREFIX = tdevshell
 include ../Doxyfile.am
 profilesdatadir = $(kde_datadir)/tdevelop/profiles
 profilesdata_DATA = projectprofiles
diff --git a/src/api.cpp b/src/api.cpp
index 8e56da3d..4053f871 100644
--- a/src/api.cpp
+++ b/src/api.cpp
@@ -9,18 +9,18 @@
 API *API::s_instance = 0;
 
 
-KDevMainWindow *API::mainWindow() const
+TDevMainWindow *API::mainWindow() const
 {
   return TopLevel::getInstance();
 }
 
-KDevPartController *API::partController() const
+TDevPartController *API::partController() const
 {
   return PartController::getInstance();
 }
 
 
-KDevCore *API::core() const
+TDevCore *API::core() const
 {
   return Core::getInstance();
 }
@@ -41,7 +41,7 @@ API *API::getInstance()
 
 
 API::API()
-  : KDevApi()
+  : TDevApi()
 {
   m_classStore = new CodeModel();
 }
@@ -53,7 +53,7 @@ API::~API()
   m_classStore = 0;
 }
 
-KDevPluginController * API::pluginController() const
+TDevPluginController * API::pluginController() const
 {
     return PluginController::getInstance();
 }
diff --git a/src/api.h b/src/api.h
index fb20447a..2957b42a 100644
--- a/src/api.h
+++ b/src/api.h
@@ -2,7 +2,7 @@
 #define _API_H_
 
 
-#include "kdevapi.h"
+#include "tdevapi.h"
 
 
 class CodeModel;
@@ -10,14 +10,14 @@ class CodeModel;
 /**
 API implementation.
 */
-class API : public KDevApi
+class API : public TDevApi
 {
 public:
 
-  virtual KDevMainWindow *mainWindow() const;
-  virtual KDevPartController *partController() const;
-  virtual KDevPluginController *pluginController() const;
-  virtual KDevCore *core() const;
+  virtual TDevMainWindow *mainWindow() const;
+  virtual TDevPartController *partController() const;
+  virtual TDevPluginController *pluginController() const;
+  virtual TDevCore *core() const;
   virtual CodeModel *codeModel() const;
 
   static API *getInstance();
diff --git a/src/core.cpp b/src/core.cpp
index ccdd0ace..64c3d0b9 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -59,7 +59,7 @@ void Core::setupShourtcutTips(KXMLGUIClient * client)
 }
 
 Core::Core()
-  : KDevCore()
+  : TDevCore()
 {
 }
 
@@ -88,7 +88,7 @@ bool Core::queryClose()
 }
 
 
-void Core::running(KDevPlugin * which, bool runs)
+void Core::running(TDevPlugin * which, bool runs)
 {
   emit activeProcessChanged( which, runs );
 }
diff --git a/src/core.h b/src/core.h
index c041eac0..9973c7e0 100644
--- a/src/core.h
+++ b/src/core.h
@@ -7,7 +7,7 @@
 #include <tdeparts/partmanager.h>
 
 
-#include "kdevcore.h"
+#include "tdevcore.h"
 
 namespace MainWindowUtils{
 
@@ -17,7 +17,7 @@ TQString beautifyToolTip(const TQString& text);
 /**
 Core implementation.
 */
-class Core : public KDevCore
+class Core : public TDevCore
 {
   Q_OBJECT
   
@@ -41,7 +41,7 @@ public:
 
   ~Core();
 
-  virtual void running(KDevPlugin *which, bool runs);
+  virtual void running(TDevPlugin *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(KDevPlugin* which = 0) { emit stopButtonClicked( which ); }
+  void doEmitStopButtonPressed(TDevPlugin* which = 0) { emit stopButtonClicked( which ); }
 
   bool queryClose();
 
 signals:
 
-  void activeProcessChanged(KDevPlugin* which, bool runs);
+  void activeProcessChanged(TDevPlugin* which, bool runs);
 
 protected:
 
diff --git a/src/documentationpart.cpp b/src/documentationpart.cpp
index b9ad78d0..43c9db67 100644
--- a/src/documentationpart.cpp
+++ b/src/documentationpart.cpp
@@ -3,7 +3,7 @@
 #include "documentationpart.h"
 
 HTMLDocumentationPart::HTMLDocumentationPart()
-  : KDevHTMLPart()
+  : TDevHTMLPart()
 {
     setOptions(CanDuplicate | CanOpenInNewWindow);
 }
diff --git a/src/documentationpart.h b/src/documentationpart.h
index dd86ce8a..84f17023 100644
--- a/src/documentationpart.h
+++ b/src/documentationpart.h
@@ -1,14 +1,14 @@
 #ifndef __DOCUMENTATIONPART_H__
 #define __DOCUMENTATIONPART_H__
 
-#include <kdevhtmlpart.h>
+#include <tdevhtmlpart.h>
 
 /**
 HTML documentation part.
 
-Implements shell-dependent "duplicate" and "open in new window" actions of KDevHTMLPart.
+Implements shell-dependent "duplicate" and "open in new window" actions of TDevHTMLPart.
 */
-class HTMLDocumentationPart : public KDevHTMLPart
+class HTMLDocumentationPart : public TDevHTMLPart
 {
   Q_OBJECT
   
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index 73ff852b..fca4bfdf 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -27,7 +27,7 @@
 #include "partcontroller.h"
 #include "core.h"
 #include "multibuffer.h"
-#include "kdeveditorutil.h"
+#include "tdeveditorutil.h"
 
 #include "editorproxy.h"
 
@@ -178,20 +178,20 @@ void EditorProxy::popupAboutToShow()
 
 	unsigned int line;
 	unsigned int col;
-	if ( !KDevEditorUtil::currentPositionReal( &line, &col, doc ) ) return;
+	if ( !TDevEditorUtil::currentPositionReal( &line, &col, doc ) ) return;
 
 	TQString wordstr;
-	TQString selection = KDevEditorUtil::currentSelection( doc );
+	TQString selection = TDevEditorUtil::currentSelection( doc );
 	if ( !selection.isEmpty() && selection.contains('\n') != 0 )
 	{
 		wordstr = selection;
 	}
 	else
 	{
-		wordstr = KDevEditorUtil::currentWord( doc );
+		wordstr = TDevEditorUtil::currentWord( doc );
 	}
 
-	TQString linestr = KDevEditorUtil::currentLine( doc );
+	TQString linestr = TDevEditorUtil::currentLine( doc );
 	
 	EditorContext context( doc->url(), line, col, linestr, wordstr );
 	Core::getInstance()->fillContextMenu( popup, &context );
diff --git a/src/eventsrc b/src/eventsrc
index baa16c20..4032da95 100644
--- a/src/eventsrc
+++ b/src/eventsrc
@@ -1,6 +1,6 @@
 [!Global!]
 IconName=tdevelop
-Comment=KDevelop
+Comment=TDevelop
 Comment[hi]=के-डेवलप
 
 [ProcessSuccess]
diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp
index 7a8695ff..67723b65 100644
--- a/src/languageselectwidget.cpp
+++ b/src/languageselectwidget.cpp
@@ -26,7 +26,7 @@
 #include <kservice.h>
 #include <ktrader.h>
 #include <tdeapplication.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include "domutil.h"
 
 #include "languageselectwidget.h"
diff --git a/src/main.cpp b/src/main.cpp
index 6f27e415..2df35f7e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,7 @@
 #include "core.h"
 #include "projectmanager.h"
 
-#include "kdevideextension.h"
+#include "tdevideextension.h"
 
 static TDECmdLineOptions options[] =
 {
@@ -86,15 +86,15 @@ int main(int argc, char *argv[])
 
   TDEApplication app;
 
-  KDevIDEExtension::init();
+  TDevIDEExtension::init();
 
-  KDevSplashScreen *splash = 0;
+  TDevSplashScreen *splash = 0;
   TQString splashFile = locate("appdata", "pics/tdevelop-splash.png");
   if (!splashFile.isEmpty())
   {
     TQPixmap pm;
     pm.load(splashFile);
-    splash = new KDevSplashScreen( pm );
+    splash = new TDevSplashScreen( pm );
   }
 
   app.processEvents();
diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp
index ba2c1886..7cd9a98d 100644
--- a/src/main_assistant.cpp
+++ b/src/main_assistant.cpp
@@ -18,7 +18,7 @@
 #include "core.h"
 #include "projectmanager.h"
 
-#include "kdevassistantextension.h"
+#include "tdevassistantextension.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("kdevassistant", I18N_NOOP("TDevelop Assistant"),
+  TDEAboutData aboutData("tdevassistant", 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;
 
-  KDevAssistantExtension::init();
+  TDevAssistantExtension::init();
 
-  KDevSplashScreen *splash = 0;
-  TQString splashFile = locate("data", "tdevelop/pics/kdevassistant-splash.png");
+  TDevSplashScreen *splash = 0;
+  TQString splashFile = locate("data", "tdevelop/pics/tdevassistant-splash.png");
   if (!splashFile.isEmpty())
   {
     TQPixmap pm;
     pm.load(splashFile);
-    splash = new KDevSplashScreen( pm );
+    splash = new TDevSplashScreen( pm );
   }
   if (splash) splash->show();
 
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
 
   if (splash) delete splash;
 
-  kapp->dcopClient()->registerAs("kdevassistant");
+  kapp->dcopClient()->registerAs("tdevassistant");
 
   return app.exec();
 }
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index a06dba14..8e44d7b7 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -55,11 +55,11 @@
 #include "projectmanager.h"
 #include "core.h"
 #include "api.h"
-#include "kdevmakefrontend.h"
+#include "tdevmakefrontend.h"
 #include "toplevel.h"
 #include "plugincontroller.h"
 
-#include "kdevplugininfo.h"
+#include "tdevplugininfo.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(KDevPlugin*, bool)),
-           this, TQT_SLOT(slotActiveProcessChanged(KDevPlugin*, bool)) );
+  connect( Core::getInstance(), TQT_SIGNAL(activeProcessChanged(TDevPlugin*, bool)),
+           this, TQT_SLOT(slotActiveProcessChanged(TDevPlugin*, 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 );
 
-  KDevPartController * partController = API::getInstance()->partController();
+  TDevPartController * 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( KDevPlugin* plugin, bool active )
+void MainWindowShare::slotActiveProcessChanged( TDevPlugin* plugin, bool active )
 {
   if ( !plugin )
     return;
@@ -251,7 +251,7 @@ void MainWindowShare::slotActiveProcessChanged( KDevPlugin* plugin, bool active
 
 void MainWindowShare::slotStopPopupActivated( int id )
 {
-  KDevPlugin* plugin = activeProcesses.at( id );
+  TDevPlugin* 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 ( KDevPlugin* plugin = activeProcesses.first(); plugin; plugin = activeProcesses.next() ) {
+  for ( TDevPlugin* 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;
 
-    KDevPartController * partController = API::getInstance()->partController();
+    TDevPartController * 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 a9ec620a..7ac08bdb 100644
--- a/src/mainwindowshare.h
+++ b/src/mainwindowshare.h
@@ -54,7 +54,7 @@ private slots:
   void slotConfigureNotifications();
   void slotConfigureEditors();
   void slotSettings();
-  void slotActiveProcessChanged( KDevPlugin*, bool );
+  void slotActiveProcessChanged( TDevPlugin*, 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<KDevPlugin>  activeProcesses;
+  TQPtrList<TDevPlugin>  activeProcesses;
 };
 
 #endif // __MAINWINDOWSHARE_H__
diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp
index 05a4d26f..757eeab7 100644
--- a/src/multibuffer.cpp
+++ b/src/multibuffer.cpp
@@ -32,7 +32,7 @@
 #include "toplevel.h"
 #include "editorproxy.h"
 #include "partcontroller.h"
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 
 #include <kdebug.h>
 #include <kmimetype.h>
@@ -53,7 +53,7 @@ MultiBuffer::MultiBuffer( TQWidget *parent )
         m_activeBuffer( 0 )
 {
     EditorProxy::getInstance() ->registerEditor( this );
-    if ( KDevLanguageSupport *lang =
+    if ( TDevLanguageSupport *lang =
          API::getInstance() ->languageSupport() )
     {
         setOrientation( lang->splitOrientation() );
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index 21b78a8c..16bffcca 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -54,14 +54,14 @@
 #include "documentationpart.h"
 #include "ksavealldialog.h"
 
-#include "kdevproject.h"
+#include "tdevproject.h"
 #include "urlutil.h"
 #include "mimewarningdialog.h"
 #include "domutil.h"
-#include "kdevjobtimer.h"
+#include "tdevjobtimer.h"
 
 #include "designer.h"
-#include "kdevlanguagesupport.h"
+#include "tdevlanguagesupport.h"
 
 #include "multibuffer.h"
 #include "partcontroller.h"
@@ -90,7 +90,7 @@ struct ModificationData
 
 
 PartController::PartController(TQWidget *parent)
-  : KDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false)
+  : TDevPartController(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 ( KDevLanguageSupport *lang =
+        if ( TDevLanguageSupport *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 == "ExternalKDevDesigner" )
+		if ( DesignerSetting == "ExternalTDevDesigner" )
 		{
-			designerExec = "kdevdesigner";
+			designerExec = "tdevdesigner";
 		}
-		else if ( DesignerSetting == "EmbeddedKDevDesigner" )
+		else if ( DesignerSetting == "EmbeddedTDevDesigner" )
 		{
 			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 * KDevDesignerFactory = static_cast<KParts::Factory*>( KLibLoader::self()->factory( TQFile::encodeName( "libkdevdesignerpart" ) ) ) )
+			else if ( KParts::Factory * TDevDesignerFactory = static_cast<KParts::Factory*>( KLibLoader::self()->factory( TQFile::encodeName( "libtdevdesignerpart" ) ) ) )
 			{
-				KParts::ReadWritePart * kdevpart = static_cast<KParts::ReadWritePart*>( KDevDesignerFactory->createPart( TopLevel::getInstance()->main(), 0, 0, 0, "KParts::ReadWritePart"  ) );
-				kdevpart->openURL( url );
+				KParts::ReadWritePart * tdevpart = static_cast<KParts::ReadWritePart*>( TDevDesignerFactory->createPart( TopLevel::getInstance()->main(), 0, 0, 0, "KParts::ReadWritePart"  ) );
+				tdevpart->openURL( url );
 				addHistoryEntry();
-				integratePart( kdevpart, url );
+				integratePart( tdevpart, 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;
-		KDevJobTimer::singleShot( 0, this, TQT_SLOT(slotDocumentDirtyStepTwo(void*)), p );
+		TDevJobTimer::singleShot( 0, this, TQT_SLOT(slotDocumentDirtyStepTwo(void*)), p );
 	}
 }
 
diff --git a/src/partcontroller.h b/src/partcontroller.h
index 2e621c38..064c6ef6 100644
--- a/src/partcontroller.h
+++ b/src/partcontroller.h
@@ -1,7 +1,7 @@
 #ifndef __PARTCONTROLLER_H__
 #define __PARTCONTROLLER_H__
 
-#include "kdevpartcontroller.h"
+#include "tdevpartcontroller.h"
 
 #include <tqwidget.h>
 #include <tqdatetime.h>
@@ -40,7 +40,7 @@ class KDirWatch;
 /**
 Part controler implementation.
 */
-class PartController : public KDevPartController
+class PartController : public TDevPartController
 {
   Q_OBJECT
   
@@ -51,7 +51,7 @@ public:
   static void createInstance(TQWidget *parent);
   static PartController *getInstance();
 
-  ///// KDevPartController interface
+  ///// TDevPartController 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 30aa9171..7b6410b7 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -19,14 +19,14 @@
 #include <kstatusbar.h>
 #include <kiconloader.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 <tdevapi.h>
+#include <tdevplugin.h>
+#include <tdevmakefrontend.h>
+#include <tdevappfrontend.h>
+#include <tdevdifffrontend.h>
+#include <tdevsourceformatter.h>
+#include <tdevcreatefile.h>
+#include <tdevplugininfo.h>
 #include <tdeaction.h>
 
 #include <profileengine.h>
@@ -77,7 +77,7 @@ PluginController *PluginController::getInstance()
 
 
 PluginController::PluginController()
-  : KDevPluginController()
+  : TDevPluginController()
 {
 /*  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()));
 
-    KDevPlugin *plugin = loadPlugin( *it );
+    TDevPlugin *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<KDevPlugin> it( m_parts ); !it.isEmpty(); )
+  for( TQDictIterator<TDevPlugin> it( m_parts ); !it.isEmpty(); )
   {
-    KDevPlugin* part = it.current();
+    TDevPlugin* part = it.current();
     removePart( part );
     m_parts.remove( it.currentKey() );
     delete part;
@@ -180,7 +180,7 @@ void PluginController::unloadProjectPlugins( )
 	{
 		TQString name = (*it)->desktopEntryName();
 
-		if ( KDevPlugin * plugin = m_parts[ name ] )
+		if ( TDevPlugin * 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() )
 	{
-		KDevPlugin* part = m_parts[ *it ];
+		TDevPlugin* part = m_parts[ *it ];
 		if( part )
 		{
 			kdDebug(9000) << " *** Removing: " << *it << endl;
@@ -206,11 +206,11 @@ void PluginController::unloadPlugins( TQStringList const & unloadParts )
 	}
 }
 
-KDevPlugin *PluginController::loadPlugin( const KService::Ptr &service )
+TDevPlugin *PluginController::loadPlugin( const KService::Ptr &service )
 {
     int err = 0;
-    KDevPlugin * pl = KParts::ComponentFactory
-        ::createInstanceFromService<KDevPlugin>( service, API::getInstance(), 0,
+    TDevPlugin * pl = KParts::ComponentFactory
+        ::createInstanceFromService<TDevPlugin>( 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, KDevPlugin *part)
+void PluginController::integrateAndRememberPart(const TQString &name, TDevPlugin *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, KDevPlugin *part)
+void PluginController::removeAndForgetPart(const TQString &name, TDevPlugin *part)
 {
     kdDebug() << "removing: " << name << endl;
     m_parts.remove(name);
     removePart(part);
 }
 
-const TQValueList<KDevPlugin*> PluginController::loadedPlugins()
+const TQValueList<TDevPlugin*> PluginController::loadedPlugins()
 {
-	TQValueList<KDevPlugin*> plugins;
-	TQDictIterator<KDevPlugin> itt(m_parts);
+	TQValueList<TDevPlugin*> plugins;
+	TQDictIterator<TDevPlugin> itt(m_parts);
 	while( itt.current() )
 	{
 		plugins.append( itt.current() );
@@ -279,26 +279,26 @@ const TQValueList<KDevPlugin*> PluginController::loadedPlugins()
 	return plugins;
 }
 
-KDevPlugin * PluginController::extension( const TQString & serviceType, const TQString & constraint )
+TDevPlugin * PluginController::extension( const TQString & serviceType, const TQString & constraint )
 {
-    TDETrader::OfferList offers = KDevPluginController::query(serviceType, constraint);
+    TDETrader::OfferList offers = TDevPluginController::query(serviceType, constraint);
     for (TDETrader::OfferList::const_iterator it = offers.constBegin(); it != offers.end(); ++it)
     {
-        KDevPlugin *ext = m_parts[(*it)->desktopEntryName()];
+        TDevPlugin *ext = m_parts[(*it)->desktopEntryName()];
         if (ext) return ext;
     }
     return 0;
 }
 
-KDevPlugin * PluginController::loadPlugin( const TQString & serviceType, const TQString & constraint )
+TDevPlugin * PluginController::loadPlugin( const TQString & serviceType, const TQString & constraint )
 {
-	TDETrader::OfferList offers = KDevPluginController::query( serviceType, constraint );
+	TDETrader::OfferList offers = TDevPluginController::query( serviceType, constraint );
 	if ( !offers.size() == 1 ) return 0;
 
 	TDETrader::OfferList::const_iterator it = offers.constBegin();
 	TQString name = (*it)->desktopEntryName();
 
-	KDevPlugin * plugin = 0;
+	TDevPlugin * plugin = 0;
 	if ( plugin = m_parts[ name ] )
 	{
 		return plugin;
@@ -372,12 +372,12 @@ void PluginController::selectPlugins( )
 }
 
 /*
-KDevPlugin * PluginController::getPlugin( const KService::Ptr & service )
+TDevPlugin * PluginController::getPlugin( const KService::Ptr & service )
 {
-	KDevPlugin * plugin = m_parts[ (*it)->name() ];
+	TDevPlugin * plugin = m_parts[ (*it)->name() ];
 	if ( !plugin )
 	{
-		KDevPlugin * plugin = loadPlugin( *it );
+		TDevPlugin * plugin = loadPlugin( *it );
 		if ( plugin )
 		{
 			integratePart( plugin );
diff --git a/src/plugincontroller.h b/src/plugincontroller.h
index d5c3f423..eb635bb6 100644
--- a/src/plugincontroller.h
+++ b/src/plugincontroller.h
@@ -6,13 +6,13 @@
 
 #include <kservice.h>
 
-#include <kdevplugincontroller.h>
+#include <tdevplugincontroller.h>
 
 #include <profileengine.h>
 
 class KXMLGUIClient;
 class KService;
-class KDevPlugin;
+class TDevPlugin;
 class KDialogBase;
 class ProjectInfo;
 
@@ -20,7 +20,7 @@ class ProjectInfo;
 Plugin controller implementation.
 Loads and unloads plugins.
 */
-class PluginController : public KDevPluginController
+class PluginController : public TDevPluginController
 {
   Q_OBJECT
   
@@ -33,7 +33,7 @@ public:
   static TQStringList argumentsFromService( const KService::Ptr &service );
 
 
-  virtual KDevPlugin * loadPlugin( const TQString & serviceType, const TQString & constraint );
+  virtual TDevPlugin * 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() );
 
-  //  KDevPlugin * getPlugin( const KService::Ptr &service );
+  //  TDevPlugin * getPlugin( const KService::Ptr &service );
 
-  virtual KDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "");
+  virtual TDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "");
 
   void unloadPlugins( TQStringList const & );
 
   void integratePart(KXMLGUIClient *part);
-  void integrateAndRememberPart(const TQString &name, KDevPlugin *part);
+  void integrateAndRememberPart(const TQString &name, TDevPlugin *part);
   void removePart(KXMLGUIClient* part);
-  void removeAndForgetPart(const TQString &name, KDevPlugin* part);
+  void removeAndForgetPart(const TQString &name, TDevPlugin* part);
 
-  const TQValueList<KDevPlugin*> loadedPlugins();
+  const TQValueList<TDevPlugin*> loadedPlugins();
 
   ProfileEngine &engine() { return m_engine; }
 
@@ -82,10 +82,10 @@ private slots:
   void unloadPlugins();
 
 private:
-	static KDevPlugin *loadPlugin( const KService::Ptr &service );
+	static TDevPlugin *loadPlugin( const KService::Ptr &service );
 
 
-  TQDict<KDevPlugin> m_parts;
+  TQDict<TDevPlugin> m_parts;
   TQString m_profile;
 
   static PluginController *s_instance;
diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp
index 2f896b51..4f32a37d 100644
--- a/src/pluginselectdialog.cpp
+++ b/src/pluginselectdialog.cpp
@@ -18,7 +18,7 @@
 #include <tdeapplication.h>
 #include <kurllabel.h>
 
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 #include "projectmanager.h"
 #include "plugincontroller.h"
 #include "pluginselectdialog.h"
@@ -109,9 +109,9 @@ void PluginSelectDialog::itemSelected( TQListViewItem * item )
 
 void PluginSelectDialog::init( )
 {
-	const TQValueList<KDevPlugin*> loadedPlugins = PluginController::getInstance()->loadedPlugins();
+	const TQValueList<TDevPlugin*> loadedPlugins = PluginController::getInstance()->loadedPlugins();
 	TQStringList loadedPluginDesktopNames;
-	TQValueList<KDevPlugin*>::ConstIterator it = loadedPlugins.begin();
+	TQValueList<TDevPlugin*>::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 cfd7c59c..443da696 100644
--- a/src/profileengine/editor/CMakeLists.txt
+++ b/src/profileengine/editor/CMakeLists.txt
@@ -21,9 +21,9 @@ link_directories(
 )
 
 
-##### kdevprofileeditor (executable) ############
+##### tdevprofileeditor (executable) ############
 
-tde_add_executable( kdevprofileeditor
+tde_add_executable( tdevprofileeditor
   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 26f69be6..fae89b48 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 = kdevprofileeditor
-kdevprofileeditor_LDFLAGS = $(all_libraries)
-kdevprofileeditor_LDADD = \
+bin_PROGRAMS = tdevprofileeditor
+tdevprofileeditor_LDFLAGS = $(all_libraries)
+tdevprofileeditor_LDADD = \
 	$(top_builddir)/src/profileengine/lib/libprofileengine.la libprofileeditor.la \
 	$(LIB_TDEUI) $(LIB_TDEIO)
-kdevprofileeditor_SOURCES = main.cpp
+tdevprofileeditor_SOURCES = main.cpp
 
 
diff --git a/src/profileengine/editor/main.cpp b/src/profileengine/editor/main.cpp
index 46d128f3..68e942d7 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("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "",
+    TDEAboutData about("tdevprofileeditor", 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 08b6e7ad..66b1f159 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 kdevutil kdevinterfaces
-DOXYGEN_PROJECTNAME = KDevelop Shell Profiles Library
-DOXYGEN_DOCDIRPREFIX = kdevprofiles
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces
+DOXYGEN_PROJECTNAME = TDevelop Shell Profiles Library
+DOXYGEN_DOCDIRPREFIX = tdevprofiles
 include ../../../Doxyfile.am
diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp
index fd4d06fa..8678732e 100644
--- a/src/profileengine/lib/profileengine.cpp
+++ b/src/profileengine/lib/profileengine.cpp
@@ -25,7 +25,7 @@
 #include <tdeglobal.h>
 #include <kstandarddirs.h>
 
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 
 ProfileEngine::ProfileEngine()
 {
diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h
index 36d85697..d630f576 100644
--- a/src/profileengine/lib/profileengine.h
+++ b/src/profileengine/lib/profileengine.h
@@ -61,27 +61,27 @@ public:
 /**
 Profile engine.
 
-- Uses KDevelop profiles to form lists of plugin offers;
+- Uses TDevelop profiles to form lists of plugin offers;
 - Provides means of managing profiles;
 - Provides means to access the resources provided by a profile.
 
-KDevelop profiles form a tree with a root profile named "KDevelop".
+TDevelop profiles form a tree with a root profile named "TDevelop".
 For example, such profiles tree can look as:
 @code
-KDevelop
+TDevelop
 - IDE
   - CompiledLanguageIDE
     - AdaIDE
     - CandCppIDE
       - CIDE
       - CppIDE
-        - KDECppIDE
+        - TDECppIDE
     - FortranIDE
     ...
   - DatabaseIDE
   - ScriptingLanguageIDE
   ..
-- KDevAssistant
+- TDevAssistant
 @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 KDevPlugin class documentation for more information of plugin types.*/
+    @sa TDevPlugin 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 "KDevelop" and it
-    defines an empty list of plugins. Applications built on KDevelop platform
+    /**@return The root profile. Root profile is always named "TDevelop" and it
+    defines an empty list of plugins. Applications built on TDevelop 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 5d886c88..396262a3 100644
--- a/src/profiles/CMakeLists.txt
+++ b/src/profiles/CMakeLists.txt
@@ -10,6 +10,6 @@
 #################################################
 
 add_subdirectory( IDE )
-add_subdirectory( KDevAssistant )
+add_subdirectory( TDevAssistant )
 
 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 20e256e4..5023cfd9 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( KDECppIDE )
+add_subdirectory( TDECppIDE )
 
 install( FILES
     profile.config
diff --git a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/Makefile.am b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/Makefile.am
index 79978385..fc781b15 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 = KDECppIDE
+SUBDIRS = TDECppIDE
diff --git a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/CMakeLists.txt b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE/CMakeLists.txt
index c87e4747..a364b7a9 100644
--- a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/CMakeLists.txt
+++ b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     profile.config
-  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE )
diff --git a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/Makefile.am b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE/Makefile.am
index 5e5e943e..9368caac 100644
--- a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/Makefile.am
+++ b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE/Makefile.am
@@ -1,3 +1,3 @@
-profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE
+profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE
 profiles_DATA = profile.config
 
diff --git a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/profile.config b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE/profile.config
index b5b45c4c..b5b45c4c 100644
--- a/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/KDECppIDE/profile.config
+++ b/src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE/profile.config
diff --git a/src/profiles/IDE/ScriptingLanguageIDE/RubyIDE/profile.config b/src/profiles/IDE/ScriptingLanguageIDE/RubyIDE/profile.config
index 5e58c161..99a52802 100644
--- a/src/profiles/IDE/ScriptingLanguageIDE/RubyIDE/profile.config
+++ b/src/profiles/IDE/ScriptingLanguageIDE/RubyIDE/profile.config
@@ -1,5 +1,5 @@
 [Disable]
-List=kdevfilelist,kdevsnippet,kdevvalgrind,kdevastyle,kdevctags2,kdevsecurity,kdevregexptest
+List=tdevfilelist,kdevsnippet,kdevvalgrind,kdevastyle,kdevctags2,kdevsecurity,kdevregexptest
 
 [Enable]
 List=
diff --git a/src/profiles/KDevAssistant/Makefile.am b/src/profiles/KDevAssistant/Makefile.am
deleted file mode 100644
index dda1dd47..00000000
--- a/src/profiles/KDevAssistant/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-profilesdir = $(kde_datadir)/tdevelop/profiles/KDevAssistant
-profiles_DATA = profile.config
-
diff --git a/src/profiles/Makefile.am b/src/profiles/Makefile.am
index 3e0a706a..34789723 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 KDevAssistant
+SUBDIRS = IDE TDevAssistant
diff --git a/src/profiles/KDevAssistant/CMakeLists.txt b/src/profiles/TDevAssistant/CMakeLists.txt
index 1f22e2e7..c6f5900f 100644
--- a/src/profiles/KDevAssistant/CMakeLists.txt
+++ b/src/profiles/TDevAssistant/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 install( FILES
     profile.config
-  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/KDevAssistant )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/TDevAssistant )
diff --git a/src/profiles/TDevAssistant/Makefile.am b/src/profiles/TDevAssistant/Makefile.am
new file mode 100644
index 00000000..39590a36
--- /dev/null
+++ b/src/profiles/TDevAssistant/Makefile.am
@@ -0,0 +1,3 @@
+profilesdir = $(kde_datadir)/tdevelop/profiles/TDevAssistant
+profiles_DATA = profile.config
+
diff --git a/src/profiles/KDevAssistant/profile.config b/src/profiles/TDevAssistant/profile.config
index 46edc970..46edc970 100644
--- a/src/profiles/KDevAssistant/profile.config
+++ b/src/profiles/TDevAssistant/profile.config
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index c0380ffb..3ced0d63 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -30,11 +30,11 @@ class TQDomDocument;
 #include <kstatusbar.h>
 #include <kiconloader.h>
 
-#include "kdevproject.h"
-#include "kdevlanguagesupport.h"
-#include "kdevplugin.h"
-#include "kdevcreatefile.h"
-#include "kdevversioncontrol.h"
+#include "tdevproject.h"
+#include "tdevlanguagesupport.h"
+#include "tdevplugin.h"
+#include "tdevcreatefile.h"
+#include "tdevversioncontrol.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 KDevelop2 project."));
+  action->setWhatsThis(i18n("<b>Open project</b><p>Opens a KDevelop3 or TDevelop2 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("kdevprj"))
-      loadKDevelop2Project( url );
+  if (url.path().endsWith("tdevprj"))
+      loadTDevelop2Project( url );
   else
       loadProject( url );
 }
@@ -490,8 +490,8 @@ bool ProjectManager::loadProjectPart()
     return false;
   }
 
-  KDevProject *projectPart = KParts::ComponentFactory
-    ::createInstanceFromService< KDevProject >( projectService, API::getInstance(), 0,
+  TDevProject *projectPart = KParts::ComponentFactory
+    ::createInstanceFromService< TDevProject >( projectService, API::getInstance(), 0,
                                                   PluginController::argumentsFromService( projectService ) );
   if ( !projectPart ) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
@@ -517,7 +517,7 @@ bool ProjectManager::loadProjectPart()
 
 void ProjectManager::unloadProjectPart()
 {
-  KDevProject *projectPart = API::getInstance()->project();
+  TDevProject *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();
-  KDevLanguageSupport *langSupport = KParts::ComponentFactory
-      ::createInstanceFromService<KDevLanguageSupport>( languageSupportService,
+  TDevLanguageSupport *langSupport = KParts::ComponentFactory
+      ::createInstanceFromService<TDevLanguageSupport>( languageSupportService,
                                                         API::getInstance(),
                                                         0,
                                                         PluginController::argumentsFromService(  languageSupportService ) );
@@ -569,7 +569,7 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang)
 
 void ProjectManager::unloadLanguageSupport()
 {
-  KDevLanguageSupport *langSupport = API::getInstance()->languageSupport();
+  TDevLanguageSupport *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::loadKDevelop2Project( const KURL & url )
+bool ProjectManager::loadTDevelop2Project( const KURL & url )
 {
     if( !url.isValid() || !url.isLocalFile() ){
         KMessageBox::sorry(0, i18n("Invalid URL."));
         return false;
     }
 
-    TQString cmd = TDEGlobal::dirs()->findExe( "kdevprj2tdevelop" );
+    TQString cmd = TDEGlobal::dirs()->findExe( "tdevprj2tdevelop" );
     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 3a92409e..3c1b3599 100644
--- a/src/projectmanager.h
+++ b/src/projectmanager.h
@@ -17,7 +17,7 @@ class KService;
 class ProjectInfo;
 class ProjectSession;
 class TDERecentFilesAction;
-class KDevPlugin;
+class TDevPlugin;
 
 
 class ProjectInfo
@@ -65,7 +65,7 @@ public:
 
 public slots:
   bool loadProject( const KURL& url);
-  bool loadKDevelop2Project( const KURL& url);
+  bool loadTDevelop2Project( const KURL& url);
   bool closeProject( bool exiting = false );
 
 private slots:
@@ -102,7 +102,7 @@ private:
 
   ProjectSession* m_pProjectSession;
 
-  KDevPlugin *m_vcsPlugin;
+  TDevPlugin *m_vcsPlugin;
   TQString m_vcsName;
 
   TQString m_oldProfileName;
diff --git a/src/projectprofiles b/src/projectprofiles
index d2224272..b86f9b25 100644
--- a/src/projectprofiles
+++ b/src/projectprofiles
@@ -8,8 +8,8 @@ Profiles=ShellIDE
 Profiles=CIDE
 
 [C++]
-Keywords=Empty,KDE
-Profiles=CppIDE,KDECppIDE
+Keywords=Empty,TDE
+Profiles=CppIDE,TDECppIDE
 
 [Fortran77]
 Profiles=FortranIDE
diff --git a/src/projectsession.cpp b/src/projectsession.cpp
index afdaf0b5..1b8173fc 100644
--- a/src/projectsession.cpp
+++ b/src/projectsession.cpp
@@ -34,7 +34,7 @@
 #include "domutil.h"
 #include "documentationpart.h"
 #include "toplevel.h"
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 
 #include "projectsession.h"
 #include "projectsession.moc"
@@ -68,7 +68,7 @@ void ProjectSession::initXMLTree()
 }
 
 //---------------------------------------------------------------------------
-bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQValueList< KDevPlugin * > plugins )
+bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQValueList< TDevPlugin * > 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<KDevPlugin*>::ConstIterator it = plugins.begin();
+	TQValueList<TDevPlugin*>::ConstIterator it = plugins.begin();
 	while( it != plugins.end() )
 	{
-		KDevPlugin* pPlugin = (*it);
+		TDevPlugin* 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< KDevPlugin * > plugins )
+bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValueList< TDevPlugin * > plugins )
 {
   TQString section, keyword;
   TQDomElement session = domdoc.documentElement();
@@ -390,10 +390,10 @@ bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValue
     }
   }
 
-	TQValueList<KDevPlugin*>::ConstIterator itt = plugins.begin();
+	TQValueList<TDevPlugin*>::ConstIterator itt = plugins.begin();
 	while( itt != plugins.end() )
 	{
-		KDevPlugin* pPlugin = (*itt);
+		TDevPlugin* pPlugin = (*itt);
 		TQString pluginName = pPlugin->instance()->instanceName();
 		TQDomElement pluginEl = domdoc.createElement(pluginName);
 
diff --git a/src/projectsession.h b/src/projectsession.h
index e386bdbc..64101496 100644
--- a/src/projectsession.h
+++ b/src/projectsession.h
@@ -24,7 +24,7 @@
 
 class TQWidget;
 class KURL;
-class KDevPlugin;
+class TDevPlugin;
 
 /**
  * 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<KDevPlugin*> plugins );
+  bool saveToFile(const TQString& fileName, const TQValueList<TDevPlugin*> plugins );
 
   /** Opens the .kdevses file and loads the project session from it. */
-  bool restoreFromFile(const TQString& fileName, const TQValueList<KDevPlugin*> plugins );
+  bool restoreFromFile(const TQString& fileName, const TQValueList<TDevPlugin*> plugins );
 
 signals:
   void sig_restoreMainWindowProperties(const TQDomElement* el);
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index 3c9db000..f82f4882 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -41,7 +41,7 @@
 #include <profile.h>
 #include <profileengine.h>
 #include <designer.h>
-#include <kdevproject.h>
+#include <tdevproject.h>
 #include <urlutil.h>
 
 #include "api.h"
@@ -81,7 +81,7 @@ void SimpleMainWindow::init()
 
     createFramework();
     createActions();
-    new KDevStatusBar(this);
+    new TDevStatusBar(this);
 
     setAcceptDrops(true);
 
@@ -466,7 +466,7 @@ void SimpleMainWindow::createActions()
 void SimpleMainWindow::raiseEditor()
 {
     kdDebug() << "SimpleMainWindow::raiseEditor" << endl;
-    KDevPartController *partcontroller = API::getInstance()->partController();
+    TDevPartController *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 );
     }
 
-    KDevProject *project = API::getInstance()->project();
+    TDevProject *project = API::getInstance()->project();
     if (project)
     {
         TQString projectname = project->projectName();
diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h
index 7dbf5695..1f80119f 100644
--- a/src/simplemainwindow.h
+++ b/src/simplemainwindow.h
@@ -21,9 +21,9 @@
 #define SIMPLEMAINWINDOW_H
 
 #include <dmainwindow.h>
-#include <kdevplugin.h>
-#include <kdevmainwindow.h>
-#include <kdevpartcontroller.h>
+#include <tdevplugin.h>
+#include <tdevmainwindow.h>
+#include <tdevpartcontroller.h>
 
 class TDEAction;
 class TQPopupMenu;
@@ -34,7 +34,7 @@ namespace KParts {
     class ReadOnlyPart;
 }
 
-class SimpleMainWindow: public DMainWindow, public KDevMainWindow {
+class SimpleMainWindow: public DMainWindow, public TDevMainWindow {
     Q_OBJECT
   
 public:
diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp
index 205656bd..446705b8 100644
--- a/src/splashscreen.cpp
+++ b/src/splashscreen.cpp
@@ -10,7 +10,7 @@
 #include <tdelocale.h>
 #include <tdeglobalsettings.h>
 
-KDevSplashScreen::KDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashScreen(pixmap, f)
+TDevSplashScreen::TDevSplashScreen(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 @@ KDevSplashScreen::KDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashS
 }
 
 
-KDevSplashScreen::~KDevSplashScreen()
+TDevSplashScreen::~TDevSplashScreen()
 {
 }
 
 
-void KDevSplashScreen::animate()
+void TDevSplashScreen::animate()
 {
 	state = ((state + 1) % (2*progress_bar_size-1));
 	repaint();
 }
 
 
-void KDevSplashScreen::message( const TQString &str, int flags, const TQColor &color)
+void TDevSplashScreen::message( const TQString &str, int flags, const TQColor &color)
 {
 	TQSplashScreen::message(str,flags,color);
 	animate();
@@ -41,7 +41,7 @@ void KDevSplashScreen::message( const TQString &str, int flags, const TQColor &c
 }
 
 
-void KDevSplashScreen::drawContents (TQPainter* painter)
+void TDevSplashScreen::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 b8d5563c..11a329bc 100644
--- a/src/splashscreen.h
+++ b/src/splashscreen.h
@@ -11,14 +11,14 @@ class TQPixmap;
 /**
 Splash screen.
 */
-class KDevSplashScreen : public TQSplashScreen
+class TDevSplashScreen : public TQSplashScreen
 {
 Q_OBJECT
   
 
 public:
-	KDevSplashScreen(const TQPixmap& pixmap, WFlags f = 0);
-	virtual ~KDevSplashScreen();
+	TDevSplashScreen(const TQPixmap& pixmap, WFlags f = 0);
+	virtual ~TDevSplashScreen();
 
 protected:
 	void drawContents (TQPainter * painter);
diff --git a/src/statusbar.cpp b/src/statusbar.cpp
index b4e11769..e1f8f3b5 100644
--- a/src/statusbar.cpp
+++ b/src/statusbar.cpp
@@ -27,7 +27,7 @@
 #include "statusbar.h"
 #include "partcontroller.h"
 
-KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name)
+TDevStatusBar::TDevStatusBar(TQWidget *parent, const char *name)
     : KStatusBar(parent, name), _cursorIface(0), _activePart(0)
 {
 	TQWidget * w = new TQWidget( this );
@@ -44,10 +44,10 @@ KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name)
 }
 
 
-KDevStatusBar::~KDevStatusBar()
+TDevStatusBar::~TDevStatusBar()
 {}
 
-void KDevStatusBar::activePartChanged(KParts::Part *part)
+void TDevStatusBar::activePartChanged(KParts::Part *part)
 {
 	if ( _activePart && _activePart->widget() )
 		disconnect( _activePart->widget(), 0, this, 0 );
@@ -80,7 +80,7 @@ void KDevStatusBar::activePartChanged(KParts::Part *part)
 	}
 }
 
-void KDevStatusBar::cursorPositionChanged()
+void TDevStatusBar::cursorPositionChanged()
 {
   if (_cursorIface)
   {
@@ -90,18 +90,18 @@ void KDevStatusBar::cursorPositionChanged()
   }
 }
 
-void KDevStatusBar::setStatus(const TQString &str)
+void TDevStatusBar::setStatus(const TQString &str)
 {
 	_status->setText(str);
 }
 
 
-void KDevStatusBar::setCursorPosition(int line, int col)
+void TDevStatusBar::setCursorPosition(int line, int col)
 {
 	_status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col));
 }
 
-void KDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)
+void TDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)
 {
 	KStatusBar::addWidget(widget,stretch,permanent);
 
diff --git a/src/statusbar.h b/src/statusbar.h
index 2f5370ef..09f1af97 100644
--- a/src/statusbar.h
+++ b/src/statusbar.h
@@ -24,14 +24,14 @@ namespace KParts { class Part; }
 /**
 Status bar.
 */
-class KDevStatusBar : public KStatusBar
+class TDevStatusBar : public KStatusBar
 {
     Q_OBJECT
   
 
 public:
-    KDevStatusBar( TQWidget *parent=0, const char *name=0 );
-    ~KDevStatusBar();
+    TDevStatusBar( TQWidget *parent=0, const char *name=0 );
+    ~TDevStatusBar();
     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 4b605615..8eb5c732 100644
--- a/src/tdeconf_update/CMakeLists.txt
+++ b/src/tdeconf_update/CMakeLists.txt
@@ -20,13 +20,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdev-gen-settings.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+install( FILES tdev-gen-settings.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 
-##### kdev-gen-settings-tdeconf_update (executable)
+##### tdev-gen-settings-tdeconf_update (executable)
 
-tde_add_executable( kdev-gen-settings-tdeconf_update
-  SOURCES kdev-gen-settings-tdeconf_update.cpp
+tde_add_executable( tdev-gen-settings-tdeconf_update
+  SOURCES tdev-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 f806baa2..4cf2dab5 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 = kdev-gen-settings.upd 
+update_DATA = tdev-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 = kdev-gen-settings-tdeconf_update
+tdeconf_PROGRAMS = tdev-gen-settings-tdeconf_update
 tdeconfdir = $(libdir)/tdeconf_update_bin
 
-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)
+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)
 
 # vim: set noet:
 
diff --git a/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp b/src/tdeconf_update/tdev-gen-settings-tdeconf_update.cpp
index 63e4a834..ae20ae57 100644
--- a/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp
+++ b/src/tdeconf_update/tdev-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 KDevDesigner")
+    if ( group == "General Options" && key == "Embed TDevDesigner")
     {
         newKeyValue = "Designer App";
         if ( value.lower() == "true" )
diff --git a/src/tdeconf_update/kdev-gen-settings.upd b/src/tdeconf_update/tdev-gen-settings.upd
index 1fd3803f..1fd3803f 100644
--- a/src/tdeconf_update/kdev-gen-settings.upd
+++ b/src/tdeconf_update/tdev-gen-settings.upd
diff --git a/src/kdevassistantextension.cpp b/src/tdevassistantextension.cpp
index ddbfb6bf..f53d2bc3 100644
--- a/src/kdevassistantextension.cpp
+++ b/src/tdevassistantextension.cpp
@@ -17,24 +17,24 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include "kdevassistantextension.h"
+#include "tdevassistantextension.h"
 
-KDevAssistantExtension::KDevAssistantExtension()
+TDevAssistantExtension::TDevAssistantExtension()
  : ShellExtension()
 {
 }
 
-void KDevAssistantExtension::init()
+void TDevAssistantExtension::init()
 {
-    s_instance = new KDevAssistantExtension();
+    s_instance = new TDevAssistantExtension();
 }
 
-TQString KDevAssistantExtension::xmlFile()
+TQString TDevAssistantExtension::xmlFile()
 {
-    return "kdevassistantui.rc";
+    return "tdevassistantui.rc";
 }
 
-TQString KDevAssistantExtension::defaultProfile()
+TQString TDevAssistantExtension::defaultProfile()
 {
-    return "KDevAssistant";
+    return "TDevAssistant";
 }
diff --git a/src/kdevassistantextension.h b/src/tdevassistantextension.h
index 874cafbd..a53d9dbd 100644
--- a/src/kdevassistantextension.h
+++ b/src/tdevassistantextension.h
@@ -17,12 +17,12 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef KDEVASSISTANTEXTENSION_H
-#define KDEVASSISTANTEXTENSION_H
+#ifndef TDEVASSISTANTEXTENSION_H
+#define TDEVASSISTANTEXTENSION_H
 
 #include "shellextension.h"
 
-class KDevAssistantExtension : public ShellExtension {
+class TDevAssistantExtension : public ShellExtension {
 public:
     static void init();
 
@@ -34,7 +34,7 @@ public:
     virtual TQString defaultProfile();
         
 protected:
-    KDevAssistantExtension();
+    TDevAssistantExtension();
 
 };
 
diff --git a/src/kdevassistantrc b/src/tdevassistantrc
index eaab6fc6..eaab6fc6 100644
--- a/src/kdevassistantrc
+++ b/src/tdevassistantrc
diff --git a/src/kdevassistantui.rc b/src/tdevassistantui.rc
index a5b202ce..39171359 100644
--- a/src/kdevassistantui.rc
+++ b/src/tdevassistantui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui version="9" name="kdevassistant" >
+<kpartgui version="9" name="tdevassistant" >
 <MenuBar>
   <Menu name="file" noMerge="1"><text>&amp;File</text>
     <DefineGroup name="new_merge"/>
diff --git a/src/kdevideextension.cpp b/src/tdevideextension.cpp
index 7bfbf29f..a6b62e12 100644
--- a/src/kdevideextension.cpp
+++ b/src/tdevideextension.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include "kdevideextension.h"
+#include "tdevideextension.h"
 
 #include <tqvbox.h>
 #include <tqcheckbox.h>
@@ -34,24 +34,24 @@
 #include <tdeapplication.h>
 #include <tdefontrequester.h>
 
-#include <kdevplugin.h>
-#include <kdevmakefrontend.h>
-#include <kdevplugincontroller.h>
+#include <tdevplugin.h>
+#include <tdevmakefrontend.h>
+#include <tdevplugincontroller.h>
 
 #include "api.h"
 #include "settingswidget.h"
 
-KDevIDEExtension::KDevIDEExtension()
+TDevIDEExtension::TDevIDEExtension()
  : ShellExtension()
 {
 }
 
-void KDevIDEExtension::init()
+void TDevIDEExtension::init()
 {
-    s_instance = new KDevIDEExtension();
+    s_instance = new TDevIDEExtension();
 }
 
-void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
+void TDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
 {
     TDEConfig* config = kapp->config();
     TQVBox *vbox = dlg->addVBoxPage(i18n("General"), i18n("General"), BarIcon("tdevelop", TDEIcon::SizeMedium) );
@@ -75,8 +75,8 @@ void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
 
     TQString DesignerSetting = config->readEntry( "DesignerSetting", "ExternalDesigner" );
     gsw->qtDesignerRadioButton->setChecked( DesignerSetting == "ExternalDesigner" );
-    gsw->seperateAppRadioButton->setChecked( DesignerSetting == "ExternalKDevDesigner" );
-    gsw->embeddedDesignerRadioButton->setChecked( DesignerSetting == "EmbeddedKDevDesigner" );
+    gsw->seperateAppRadioButton->setChecked( DesignerSetting == "ExternalTDevDesigner" );
+    gsw->embeddedDesignerRadioButton->setChecked( DesignerSetting == "EmbeddedTDevDesigner" );
 
     config->setGroup("TerminalEmulator");
     gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::fromLatin1("konsole") ) );
@@ -85,7 +85,7 @@ void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
     gsw->useOtherTerminal->setChecked( !useKDESetting );
 }
 
-void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
+void TDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
 {
     TDEConfig* config = kapp->config();
 
@@ -97,8 +97,8 @@ void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
 
     TQString DesignerSetting;
     if ( gsw->qtDesignerRadioButton->isChecked() ) DesignerSetting = "ExternalDesigner";
-    if ( gsw->seperateAppRadioButton->isChecked() ) DesignerSetting = "ExternalKDevDesigner";
-    if ( gsw->embeddedDesignerRadioButton->isChecked() ) DesignerSetting = "EmbeddedKDevDesigner";
+    if ( gsw->seperateAppRadioButton->isChecked() ) DesignerSetting = "ExternalTDevDesigner";
+    if ( gsw->embeddedDesignerRadioButton->isChecked() ) DesignerSetting = "EmbeddedTDevDesigner";
     config->writeEntry( "DesignerSetting", DesignerSetting );
 
     config->setGroup("MakeOutputView");
@@ -108,9 +108,9 @@ void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
     //current item id must be in sync with the enum!
     config->writeEntry("CompilerOutputLevel",gsw->compileOutputCombo->currentItem());
     config->sync();
-    if( KDevPlugin *makeExt = API::getInstance()->pluginController()->extension("TDevelop/MakeFrontend"))
+    if( TDevPlugin *makeExt = API::getInstance()->pluginController()->extension("TDevelop/MakeFrontend"))
     {
-        static_cast<KDevMakeFrontend*>(makeExt)->updateSettingsFromConfig();
+        static_cast<TDevMakeFrontend*>(makeExt)->updateSettingsFromConfig();
     }
 
     config->setGroup("TerminalEmulator");
@@ -118,12 +118,12 @@ void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
     config->writeEntry("TerminalApplication", gsw->terminalEdit->text().stripWhiteSpace() );
 }
 
-TQString KDevIDEExtension::xmlFile()
+TQString TDevIDEExtension::xmlFile()
 {
     return "tdevelopui.rc";
 }
 
-TQString KDevIDEExtension::defaultProfile()
+TQString TDevIDEExtension::defaultProfile()
 {
     return "IDE";
 }
diff --git a/src/kdevideextension.h b/src/tdevideextension.h
index 1e25da7e..64c1a8ca 100644
--- a/src/kdevideextension.h
+++ b/src/tdevideextension.h
@@ -17,14 +17,14 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef KDEVIDEEXTENSION_H
-#define KDEVIDEEXTENSION_H
+#ifndef TDEVIDEEXTENSION_H
+#define TDEVIDEEXTENSION_H
 
 #include <shellextension.h>
 
 class SettingsWidget;
 
-class KDevIDEExtension : public ShellExtension {
+class TDevIDEExtension : public ShellExtension {
 public:
     static void init();
 
@@ -36,7 +36,7 @@ public:
     virtual TQString defaultProfile();
     
 protected:
-    KDevIDEExtension();
+    TDevIDEExtension();
     
 private:
     SettingsWidget *gsw;
diff --git a/src/kdevpluginprofilerc b/src/tdevpluginprofilerc
index 1c2abb92..b93ba2c1 100644
--- a/src/kdevpluginprofilerc
+++ b/src/tdevpluginprofilerc
@@ -12,7 +12,7 @@ C++=Profile_CPP
 C++/Embedded=Profile_CPP
 C++/KDE=Profile_CPP
 C++/wxWidgets=
-C++/KDevelop
+C++/TDevelop
 C++/Generic
 C++/GTK+
 C++/QMake=
@@ -30,7 +30,7 @@ Haskell=
 Pascal/Free Pascal=
 
 [Profile_BASE]
-plugins=KDevFileView,KDevClassView,KDevBookmarks,KDevQuickOpen
+plugins=TDevFileView,KDevClassView,KDevBookmarks,KDevQuickOpen
 
 [Profile_COMPILED]
 inherits=Profile_BASE
@@ -38,7 +38,7 @@ plugins=
 
 [Profile_CPP]
 inherits=Profile_COMPILED
-plugins=KDevDebugger
+plugins=TDevDebugger
 
 [Profile_SCRIPT]
 inherits=Profile_BASE
diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index 129d869c..63416175 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -8,14 +8,14 @@
 
 #include "simplemainwindow.h"
 
-KDevMainWindow *TopLevel::s_instance = 0;
+TDevMainWindow *TopLevel::s_instance = 0;
 
 bool TopLevel::mainWindowValid()
 {
   return s_instance != 0;
 }
 
-KDevMainWindow *TopLevel::getInstance()
+TDevMainWindow *TopLevel::getInstance()
 {
   if (!s_instance)
   {
@@ -28,7 +28,7 @@ KDevMainWindow *TopLevel::getInstance()
   return s_instance;
 }
 
-void TopLevel::invalidateInstance(KDevMainWindow *instance)
+void TopLevel::invalidateInstance(TDevMainWindow *instance)
 {
   if ( s_instance == instance )
     s_instance = 0;
diff --git a/src/toplevel.h b/src/toplevel.h
index 8eb0243a..081ddcae 100644
--- a/src/toplevel.h
+++ b/src/toplevel.h
@@ -2,10 +2,10 @@
 #define __TOPLEVEL_H__
 
 
-#include "kdevmainwindow.h"
+#include "tdevmainwindow.h"
 
 
-/**\brief This class handles the single object of type KDevMainWindow.
+/**\brief This class handles the single object of type TDevMainWindow.
 
 It is completely static (all methods and attributes).
 */
@@ -14,13 +14,13 @@ class TopLevel
 {
 public:
 
-  static KDevMainWindow *getInstance();                                 //!< Get a pointer to the single KDevTopLevel object
+  static TDevMainWindow *getInstance();                                 //!< Get a pointer to the single KDevTopLevel object
   static bool mainWindowValid();
-  static void invalidateInstance(KDevMainWindow *instance);             //!< Signal that the object has been (or is about to be) destroyed
+  static void invalidateInstance(TDevMainWindow *instance);             //!< Signal that the object has been (or is about to be) destroyed
 
 private:
 
-  static KDevMainWindow *s_instance;                                    //!< Pointer to the single KDevTopLevel object or 0L
+  static TDevMainWindow *s_instance;                                    //!< Pointer to the single KDevTopLevel object or 0L
   
 };
 
diff --git a/tde_app_devel.desktop b/tde_app_devel.desktop
new file mode 100644
index 00000000..ee7ddfc5
--- /dev/null
+++ b/tde_app_devel.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Icon=tdevelop
+DocPath=tde_app_devel/index.html
+Categories=Qt;TDE;Development;IDE;X-TDE-TDevelopIDE
+NoDisplay=true
+Name=TDevelop Programming
diff --git a/kdevassistant.desktop b/tdevassistant.desktop
index 0e8192cf..d4640788 100644
--- a/kdevassistant.desktop
+++ b/tdevassistant.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=kdevassistant %u
+Exec=tdevassistant %u
 Icon=tdevelop
 DocPath=tdevelop/index.html
 Terminal=false
diff --git a/kdevdesigner/AUTHORS b/tdevdesigner/AUTHORS
index 40d295ec..5ecf318c 100644
--- a/kdevdesigner/AUTHORS
+++ b/tdevdesigner/AUTHORS
@@ -1,4 +1,4 @@
-KDevDesigner: Alexander Dymo <adymo@mksat.net>
+TDevDesigner: Alexander Dymo <adymo@mksat.net>
 Qt Designer Copyright: (C) 2000-2003 Trolltech AS All Rights Reserved
 
 
diff --git a/kdevdesigner/CMakeLists.txt b/tdevdesigner/CMakeLists.txt
index 9584f4c7..9584f4c7 100644
--- a/kdevdesigner/CMakeLists.txt
+++ b/tdevdesigner/CMakeLists.txt
diff --git a/kdevdesigner/LICENSE.GPL b/tdevdesigner/LICENSE.GPL
index c13faf0d..c13faf0d 100644
--- a/kdevdesigner/LICENSE.GPL
+++ b/tdevdesigner/LICENSE.GPL
diff --git a/kdevdesigner/Makefile.am b/tdevdesigner/Makefile.am
index 4cc5b44c..4cc5b44c 100644
--- a/kdevdesigner/Makefile.am
+++ b/tdevdesigner/Makefile.am
diff --git a/kdevdesigner/NEWS b/tdevdesigner/NEWS
index 0519ecba..0519ecba 100644
--- a/kdevdesigner/NEWS
+++ b/tdevdesigner/NEWS
diff --git a/kdevdesigner/README b/tdevdesigner/README
index 99b55648..23675fdb 100644
--- a/kdevdesigner/README
+++ b/tdevdesigner/README
@@ -1,25 +1,25 @@
-KDevDesigner is a port of Qt Designer (code taken from Qt 3.3 distribution) to KDE technologies:
+TDevDesigner is a port of Qt Designer (code taken from Qt 3.3 distribution) to KDE technologies:
 1) XML GUI
 2) KParts
 3) KFileDialog
 4) TDEIconLoader
 
-KDevDesigner consists of a part and a shell. 
+TDevDesigner consists of a part and a shell. 
 Part can be used in Konqueror and KDevelop to edit and view ui files and projects.
 Shell loads a part with "in shell" argument so that the part can create projects and ui files.
 
 Other important notes:
-KDevDesignerPart is Read/Write part which ignores readonly mode.
+TDevDesignerPart is Read/Write part which ignores readonly mode.
 Designer Editor plugins are not loaded.
 Available in system designer plugins are loaded if possible (tested with Qt 3.3 version).
 
-KDevDesignerPart integration:
-KDevDesignerPart implements KInterfaceDesigner interface (defined in tdevelop/lib/external_interfaces).
+TDevDesignerPart integration:
+TDevDesignerPart implements KInterfaceDesigner interface (defined in tdevelop/lib/external_interfaces).
 
 WARNING:
 If you want to modify this code, try to introduce as few modifications to original Qt Designer code as possible.
 Write your own classes and wrappers instead. The goal is to ease syncronization between the port and original Qt Designer.
-Feel free to modify kdevdesigner_part.h(cpp) though.
+Feel free to modify tdevdesigner_part.h(cpp) though.
 
 FUTURE:
 Trolltech promises that Qt 4 will have easilly embeddable designer. If that happens, this port will be dropped for KDevelop 4.
diff --git a/kdevdesigner/TODO b/tdevdesigner/TODO
index 0519ecba..0519ecba 100644
--- a/kdevdesigner/TODO
+++ b/tdevdesigner/TODO
diff --git a/kdevdesigner/designer/CMakeLists.txt b/tdevdesigner/designer/CMakeLists.txt
index 4cdcea2b..c74d2977 100644
--- a/kdevdesigner/designer/CMakeLists.txt
+++ b/tdevdesigner/designer/CMakeLists.txt
@@ -14,7 +14,7 @@ add_definitions( -DDESIGNER -UQT_NO_ASCII_CAST )
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/kdevdesigner/shared
+  ${CMAKE_SOURCE_DIR}/tdevdesigner/shared
   ${CMAKE_SOURCE_DIR}/lib/interfaces/external
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
@@ -28,17 +28,17 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    kdevdesigner_part.desktop
+    tdevdesigner_part.desktop
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 install( FILES
-    kdevdesigner_part.rc kdevdesigner_part_sh.rc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdesignerpart )
+    tdevdesigner_part.rc tdevdesigner_part_sh.rc
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdesignerpart )
 
 add_subdirectory( pics )
 
 
-##### libkdevdesignerpart (module) ##############
+##### libtdevdesignerpart (module) ##############
 
 set( SRCS
   about.ui dbconnection.ui gotolinedialog.ui
@@ -53,7 +53,7 @@ set( SRCS
   editfunctionsimpl.cpp filechooser.cpp formfile.cpp
   formsettingsimpl.cpp formwindow.cpp hierarchyview.cpp
   iconvieweditorimpl.cpp layout.cpp listboxdnd.cpp
-  kdevdesigner_part.cpp actiondnd.cpp actioneditorimpl.cpp
+  tdevdesigner_part.cpp actiondnd.cpp actioneditorimpl.cpp
   listboxeditorimpl.cpp listboxrename.cpp listdnd.cpp
   listeditor.ui pixmapcollectioneditor.ui listviewdnd.cpp
   listvieweditorimpl.cpp mainwindow.cpp listvieweditor.ui
@@ -98,10 +98,10 @@ tde_moc( SRCS
  )
 
 
-tde_add_kpart( libkdevdesignerpart AUTOMOC
+tde_add_kpart( libtdevdesignerpart AUTOMOC
   SOURCES ${SRCS}
   LINK
-    kdevqui-static shared-static kinterfacedesigner-shared
+    tdevqui-static shared-static kinterfacedesigner-shared
     tdeio-shared tdeparts-shared tqassistantclient
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kdevdesigner/designer/Makefile.am b/tdevdesigner/designer/Makefile.am
index 1857de19..b486e711 100644
--- a/kdevdesigner/designer/Makefile.am
+++ b/tdevdesigner/designer/Makefile.am
@@ -2,20 +2,20 @@ SUBDIRS = pics
 
 AM_CXXFLAGS=-DDESIGNER
 KDE_CXXFLAGS=-UQT_NO_ASCII_CAST
-INCLUDES = -I$(top_srcdir)/kdevdesigner/shared \
+INCLUDES = -I$(top_srcdir)/tdevdesigner/shared \
 	-I$(top_srcdir)/lib/interfaces/external $(all_includes)
 METASOURCES = AUTO
-kde_module_LTLIBRARIES =  libkdevdesignerpart.la
-libkdevdesignerpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libkdevdesignerpart_la_LIBADD = \
-	$(top_builddir)/kdevdesigner/uilib/libkdevqui.la $(top_builddir)/kdevdesigner/shared/libshared.la \
+kde_module_LTLIBRARIES =  libtdevdesignerpart.la
+libtdevdesignerpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
+libtdevdesignerpart_la_LIBADD = \
+	$(top_builddir)/tdevdesigner/uilib/libtdevqui.la $(top_builddir)/tdevdesigner/shared/libshared.la \
 	$(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltqassistantclient $(LIB_TDEFILE) $(LIB_TDEPARTS)
-libkdevdesignerpart_la_SOURCES = kdevdesigner_part.cpp actiondnd.cpp actioneditorimpl.cpp actionlistview.cpp asciivalidator.cpp command.cpp connectionitems.cpp connectiontable.cpp customwidgeteditorimpl.cpp database.cpp dbconnectionimpl.cpp dbconnectionsimpl.cpp defs.cpp designerapp.cpp designerappiface.cpp editfunctionsimpl.cpp filechooser.cpp formfile.cpp formsettingsimpl.cpp formwindow.cpp hierarchyview.cpp iconvieweditorimpl.cpp layout.cpp listboxdnd.cpp listboxeditorimpl.cpp listboxrename.cpp listdnd.cpp listviewdnd.cpp listvieweditorimpl.cpp mainwindow.cpp mainwindowactions.cpp menubareditor.cpp metadatabase.cpp multilineeditorimpl.cpp newformimpl.cpp orderindicator.cpp outputwindow.cpp paletteeditoradvancedimpl.cpp paletteeditorimpl.cpp pixmapchooser.cpp pixmapcollection.cpp popupmenueditor.cpp previewframe.cpp previewwidgetimpl.cpp project.cpp projectsettingsimpl.cpp propertyeditor.cpp propertyobject.cpp qcompletionedit.cpp resource.cpp sizehandle.cpp sourceeditor.cpp sourcefile.cpp startdialogimpl.cpp styledbutton.cpp syntaxhighlighter_html.cpp tableeditorimpl.cpp timestamp.cpp variabledialogimpl.cpp widgetaction.cpp widgetfactory.cpp wizardeditorimpl.cpp workspace.cpp about.ui dbconnection.ui gotolinedialog.ui newform.ui previewwidget.ui variabledialog.ui actioneditor.ui dbconnectioneditor.ui iconvieweditor.ui paletteeditor.ui projectsettings.ui wizardeditor.ui configtoolboxdialog.ui dbconnections.ui listboxeditor.ui paletteeditoradvanced.ui replacedialog.ui connectiondialog.ui editfunctions.ui listeditor.ui pixmapcollectioneditor.ui richtextfontdialog.ui createtemplate.ui finddialog.ui listvieweditor.ui pixmapfunction.ui startdialog.ui customwidgeteditor.ui formsettings.ui multilineeditor.ui preferences.ui tableeditor.ui designeraction.cpp myiconloader.cpp
-partrcdir = $(kde_datadir)/kdevdesignerpart
+libtdevdesignerpart_la_SOURCES = tdevdesigner_part.cpp actiondnd.cpp actioneditorimpl.cpp actionlistview.cpp asciivalidator.cpp command.cpp connectionitems.cpp connectiontable.cpp customwidgeteditorimpl.cpp database.cpp dbconnectionimpl.cpp dbconnectionsimpl.cpp defs.cpp designerapp.cpp designerappiface.cpp editfunctionsimpl.cpp filechooser.cpp formfile.cpp formsettingsimpl.cpp formwindow.cpp hierarchyview.cpp iconvieweditorimpl.cpp layout.cpp listboxdnd.cpp listboxeditorimpl.cpp listboxrename.cpp listdnd.cpp listviewdnd.cpp listvieweditorimpl.cpp mainwindow.cpp mainwindowactions.cpp menubareditor.cpp metadatabase.cpp multilineeditorimpl.cpp newformimpl.cpp orderindicator.cpp outputwindow.cpp paletteeditoradvancedimpl.cpp paletteeditorimpl.cpp pixmapchooser.cpp pixmapcollection.cpp popupmenueditor.cpp previewframe.cpp previewwidgetimpl.cpp project.cpp projectsettingsimpl.cpp propertyeditor.cpp propertyobject.cpp qcompletionedit.cpp resource.cpp sizehandle.cpp sourceeditor.cpp sourcefile.cpp startdialogimpl.cpp styledbutton.cpp syntaxhighlighter_html.cpp tableeditorimpl.cpp timestamp.cpp variabledialogimpl.cpp widgetaction.cpp widgetfactory.cpp wizardeditorimpl.cpp workspace.cpp about.ui dbconnection.ui gotolinedialog.ui newform.ui previewwidget.ui variabledialog.ui actioneditor.ui dbconnectioneditor.ui iconvieweditor.ui paletteeditor.ui projectsettings.ui wizardeditor.ui configtoolboxdialog.ui dbconnections.ui listboxeditor.ui paletteeditoradvanced.ui replacedialog.ui connectiondialog.ui editfunctions.ui listeditor.ui pixmapcollectioneditor.ui richtextfontdialog.ui createtemplate.ui finddialog.ui listvieweditor.ui pixmapfunction.ui startdialog.ui customwidgeteditor.ui formsettings.ui multilineeditor.ui preferences.ui tableeditor.ui designeraction.cpp myiconloader.cpp
+partrcdir = $(kde_datadir)/tdevdesignerpart
 partdesktopdir = $(kde_servicesdir)
-partdesktop_DATA =  kdevdesigner_part.desktop
-partrc_DATA = kdevdesigner_part.rc kdevdesigner_part_sh.rc
-noinst_HEADERS = kdevdesigner_part.h designeraction.h myiconloader.h
-picsdirdir = $(kde_datadir)/kdevdesignerpart/pics
+partdesktop_DATA =  tdevdesigner_part.desktop
+partrc_DATA = tdevdesigner_part.rc tdevdesigner_part_sh.rc
+noinst_HEADERS = tdevdesigner_part.h designeraction.h myiconloader.h
+picsdirdir = $(kde_datadir)/tdevdesignerpart/pics
 
 KDE_OPTIONS=nofinal
diff --git a/kdevdesigner/designer/about.ui b/tdevdesigner/designer/about.ui
index 48d53486..48d53486 100644
--- a/kdevdesigner/designer/about.ui
+++ b/tdevdesigner/designer/about.ui
diff --git a/kdevdesigner/designer/actiondnd.cpp b/tdevdesigner/designer/actiondnd.cpp
index 33f0c4bf..33f0c4bf 100644
--- a/kdevdesigner/designer/actiondnd.cpp
+++ b/tdevdesigner/designer/actiondnd.cpp
diff --git a/kdevdesigner/designer/actiondnd.h b/tdevdesigner/designer/actiondnd.h
index 1e9f68b0..1e9f68b0 100644
--- a/kdevdesigner/designer/actiondnd.h
+++ b/tdevdesigner/designer/actiondnd.h
diff --git a/kdevdesigner/designer/actioneditor.ui b/tdevdesigner/designer/actioneditor.ui
index 13a56a04..13a56a04 100644
--- a/kdevdesigner/designer/actioneditor.ui
+++ b/tdevdesigner/designer/actioneditor.ui
diff --git a/kdevdesigner/designer/actioneditorimpl.cpp b/tdevdesigner/designer/actioneditorimpl.cpp
index 294507a9..294507a9 100644
--- a/kdevdesigner/designer/actioneditorimpl.cpp
+++ b/tdevdesigner/designer/actioneditorimpl.cpp
diff --git a/kdevdesigner/designer/actioneditorimpl.h b/tdevdesigner/designer/actioneditorimpl.h
index 9e67ed9a..9e67ed9a 100644
--- a/kdevdesigner/designer/actioneditorimpl.h
+++ b/tdevdesigner/designer/actioneditorimpl.h
diff --git a/kdevdesigner/designer/actionlistview.cpp b/tdevdesigner/designer/actionlistview.cpp
index 3e8c95c2..3e8c95c2 100644
--- a/kdevdesigner/designer/actionlistview.cpp
+++ b/tdevdesigner/designer/actionlistview.cpp
diff --git a/kdevdesigner/designer/actionlistview.h b/tdevdesigner/designer/actionlistview.h
index 047b21bd..047b21bd 100644
--- a/kdevdesigner/designer/actionlistview.h
+++ b/tdevdesigner/designer/actionlistview.h
diff --git a/kdevdesigner/designer/asciivalidator.cpp b/tdevdesigner/designer/asciivalidator.cpp
index 667b0a61..667b0a61 100644
--- a/kdevdesigner/designer/asciivalidator.cpp
+++ b/tdevdesigner/designer/asciivalidator.cpp
diff --git a/kdevdesigner/designer/asciivalidator.h b/tdevdesigner/designer/asciivalidator.h
index a284f6ab..a284f6ab 100644
--- a/kdevdesigner/designer/asciivalidator.h
+++ b/tdevdesigner/designer/asciivalidator.h
diff --git a/kdevdesigner/designer/command.cpp b/tdevdesigner/designer/command.cpp
index b9b97827..cce10a34 100644
--- a/kdevdesigner/designer/command.cpp
+++ b/tdevdesigner/designer/command.cpp
@@ -56,7 +56,7 @@
 #endif
 #include <tqaction.h>
 
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 #include <tdelocale.h>
 
diff --git a/kdevdesigner/designer/command.h b/tdevdesigner/designer/command.h
index b1c7a2a5..b1c7a2a5 100644
--- a/kdevdesigner/designer/command.h
+++ b/tdevdesigner/designer/command.h
diff --git a/kdevdesigner/designer/configtoolboxdialog.ui b/tdevdesigner/designer/configtoolboxdialog.ui
index 226cdd35..226cdd35 100644
--- a/kdevdesigner/designer/configtoolboxdialog.ui
+++ b/tdevdesigner/designer/configtoolboxdialog.ui
diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/tdevdesigner/designer/configtoolboxdialog.ui.h
index 7dcd6530..7dcd6530 100644
--- a/kdevdesigner/designer/configtoolboxdialog.ui.h
+++ b/tdevdesigner/designer/configtoolboxdialog.ui.h
diff --git a/kdevdesigner/designer/connectiondialog.ui b/tdevdesigner/designer/connectiondialog.ui
index 51995633..51995633 100644
--- a/kdevdesigner/designer/connectiondialog.ui
+++ b/tdevdesigner/designer/connectiondialog.ui
diff --git a/kdevdesigner/designer/connectiondialog.ui.h b/tdevdesigner/designer/connectiondialog.ui.h
index 25a5d5f2..25a5d5f2 100644
--- a/kdevdesigner/designer/connectiondialog.ui.h
+++ b/tdevdesigner/designer/connectiondialog.ui.h
diff --git a/kdevdesigner/designer/connectionitems.cpp b/tdevdesigner/designer/connectionitems.cpp
index 12b03a1d..12b03a1d 100644
--- a/kdevdesigner/designer/connectionitems.cpp
+++ b/tdevdesigner/designer/connectionitems.cpp
diff --git a/kdevdesigner/designer/connectionitems.h b/tdevdesigner/designer/connectionitems.h
index fe5e276d..fe5e276d 100644
--- a/kdevdesigner/designer/connectionitems.h
+++ b/tdevdesigner/designer/connectionitems.h
diff --git a/kdevdesigner/designer/connectiontable.cpp b/tdevdesigner/designer/connectiontable.cpp
index 834fdc96..834fdc96 100644
--- a/kdevdesigner/designer/connectiontable.cpp
+++ b/tdevdesigner/designer/connectiontable.cpp
diff --git a/kdevdesigner/designer/connectiontable.h b/tdevdesigner/designer/connectiontable.h
index 60b84426..60b84426 100644
--- a/kdevdesigner/designer/connectiontable.h
+++ b/tdevdesigner/designer/connectiontable.h
diff --git a/kdevdesigner/designer/createtemplate.ui b/tdevdesigner/designer/createtemplate.ui
index e03340b1..e03340b1 100644
--- a/kdevdesigner/designer/createtemplate.ui
+++ b/tdevdesigner/designer/createtemplate.ui
diff --git a/kdevdesigner/designer/customwidgeteditor.ui b/tdevdesigner/designer/customwidgeteditor.ui
index db6860f0..db6860f0 100644
--- a/kdevdesigner/designer/customwidgeteditor.ui
+++ b/tdevdesigner/designer/customwidgeteditor.ui
diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/tdevdesigner/designer/customwidgeteditorimpl.cpp
index f417f6f2..f417f6f2 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.cpp
+++ b/tdevdesigner/designer/customwidgeteditorimpl.cpp
diff --git a/kdevdesigner/designer/customwidgeteditorimpl.h b/tdevdesigner/designer/customwidgeteditorimpl.h
index 9e53b2ce..9e53b2ce 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.h
+++ b/tdevdesigner/designer/customwidgeteditorimpl.h
diff --git a/kdevdesigner/designer/database.cpp b/tdevdesigner/designer/database.cpp
index b5baea28..b5baea28 100644
--- a/kdevdesigner/designer/database.cpp
+++ b/tdevdesigner/designer/database.cpp
diff --git a/kdevdesigner/designer/database.h b/tdevdesigner/designer/database.h
index cbde491f..cbde491f 100644
--- a/kdevdesigner/designer/database.h
+++ b/tdevdesigner/designer/database.h
diff --git a/kdevdesigner/designer/dbconnection.ui b/tdevdesigner/designer/dbconnection.ui
index 75b7d5cb..75b7d5cb 100644
--- a/kdevdesigner/designer/dbconnection.ui
+++ b/tdevdesigner/designer/dbconnection.ui
diff --git a/kdevdesigner/designer/dbconnectioneditor.ui b/tdevdesigner/designer/dbconnectioneditor.ui
index 40ef0a9b..40ef0a9b 100644
--- a/kdevdesigner/designer/dbconnectioneditor.ui
+++ b/tdevdesigner/designer/dbconnectioneditor.ui
diff --git a/kdevdesigner/designer/dbconnectionimpl.cpp b/tdevdesigner/designer/dbconnectionimpl.cpp
index 3cfd1fdc..3cfd1fdc 100644
--- a/kdevdesigner/designer/dbconnectionimpl.cpp
+++ b/tdevdesigner/designer/dbconnectionimpl.cpp
diff --git a/kdevdesigner/designer/dbconnectionimpl.h b/tdevdesigner/designer/dbconnectionimpl.h
index e2db2286..e2db2286 100644
--- a/kdevdesigner/designer/dbconnectionimpl.h
+++ b/tdevdesigner/designer/dbconnectionimpl.h
diff --git a/kdevdesigner/designer/dbconnections.ui b/tdevdesigner/designer/dbconnections.ui
index 27d7d127..27d7d127 100644
--- a/kdevdesigner/designer/dbconnections.ui
+++ b/tdevdesigner/designer/dbconnections.ui
diff --git a/kdevdesigner/designer/dbconnectionsimpl.cpp b/tdevdesigner/designer/dbconnectionsimpl.cpp
index e589679b..e589679b 100644
--- a/kdevdesigner/designer/dbconnectionsimpl.cpp
+++ b/tdevdesigner/designer/dbconnectionsimpl.cpp
diff --git a/kdevdesigner/designer/dbconnectionsimpl.h b/tdevdesigner/designer/dbconnectionsimpl.h
index e06cc06a..e06cc06a 100644
--- a/kdevdesigner/designer/dbconnectionsimpl.h
+++ b/tdevdesigner/designer/dbconnectionsimpl.h
diff --git a/kdevdesigner/designer/defs.cpp b/tdevdesigner/designer/defs.cpp
index c1aa36de..c1aa36de 100644
--- a/kdevdesigner/designer/defs.cpp
+++ b/tdevdesigner/designer/defs.cpp
diff --git a/kdevdesigner/designer/defs.h b/tdevdesigner/designer/defs.h
index 45143b81..45143b81 100644
--- a/kdevdesigner/designer/defs.h
+++ b/tdevdesigner/designer/defs.h
diff --git a/kdevdesigner/designer/designer_pch.h b/tdevdesigner/designer/designer_pch.h
index fa840181..fa840181 100644
--- a/kdevdesigner/designer/designer_pch.h
+++ b/tdevdesigner/designer/designer_pch.h
diff --git a/kdevdesigner/designer/designeraction.cpp b/tdevdesigner/designer/designeraction.cpp
index 66ecb438..66ecb438 100644
--- a/kdevdesigner/designer/designeraction.cpp
+++ b/tdevdesigner/designer/designeraction.cpp
diff --git a/kdevdesigner/designer/designeraction.h b/tdevdesigner/designer/designeraction.h
index 85efef6b..85efef6b 100644
--- a/kdevdesigner/designer/designeraction.h
+++ b/tdevdesigner/designer/designeraction.h
diff --git a/kdevdesigner/designer/designerapp.cpp b/tdevdesigner/designer/designerapp.cpp
index 22d1e531..22d1e531 100644
--- a/kdevdesigner/designer/designerapp.cpp
+++ b/tdevdesigner/designer/designerapp.cpp
diff --git a/kdevdesigner/designer/designerapp.h b/tdevdesigner/designer/designerapp.h
index b3c62a11..b3c62a11 100644
--- a/kdevdesigner/designer/designerapp.h
+++ b/tdevdesigner/designer/designerapp.h
diff --git a/kdevdesigner/designer/designerappiface.cpp b/tdevdesigner/designer/designerappiface.cpp
index 57ee992e..57ee992e 100644
--- a/kdevdesigner/designer/designerappiface.cpp
+++ b/tdevdesigner/designer/designerappiface.cpp
diff --git a/kdevdesigner/designer/designerappiface.h b/tdevdesigner/designer/designerappiface.h
index 2ddcd47c..2ddcd47c 100644
--- a/kdevdesigner/designer/designerappiface.h
+++ b/tdevdesigner/designer/designerappiface.h
diff --git a/kdevdesigner/designer/editfunctions.ui b/tdevdesigner/designer/editfunctions.ui
index ea59e46a..ea59e46a 100644
--- a/kdevdesigner/designer/editfunctions.ui
+++ b/tdevdesigner/designer/editfunctions.ui
diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/tdevdesigner/designer/editfunctionsimpl.cpp
index 5681f00b..78730c99 100644
--- a/kdevdesigner/designer/editfunctionsimpl.cpp
+++ b/tdevdesigner/designer/editfunctionsimpl.cpp
@@ -34,7 +34,7 @@
 
 #include <kiconloader.h>
 #include <klineedit.h>
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 #include <tqlistview.h>
 #include <tqpushbutton.h>
@@ -61,7 +61,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
     for ( TQValueList<MetaDataBase::Function>::Iterator it = functionList.begin(); it != functionList.end(); ++it ) {
 	TQListViewItem *i = new TQListViewItem( functionListView );
 
-	i->setPixmap( 0, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()) );
+	i->setPixmap( 0, SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()) );
 	i->setText( 0, (*it).function );
 	i->setText( 1, (*it).returnType );
 	i->setText( 2, (*it).specifier );
@@ -269,7 +269,7 @@ void EditFunctions::okClicked()
 void EditFunctions::functionAdd( const TQString &access, const TQString &type )
 {
     TQListViewItem *i = new TQListViewItem( functionListView );
-    i->setPixmap( 0, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()) );
+    i->setPixmap( 0, SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()) );
     i->setRenameEnabled( 0, TRUE );
     i->setText( 1, "void" );
     i->setText( 2, "virtual" );
@@ -507,7 +507,7 @@ void EditFunctions::displaySlots( bool justSlots )
 	    continue;
 	TQListViewItem *i = new TQListViewItem( functionListView );
 	functionIds.insert( i, (*it).id );
-	i->setPixmap( 0, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()) );
+	i->setPixmap( 0, SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()) );
 	i->setText( 0, (*it).newName );
 	i->setText( 1, (*it).retTyp );
 	i->setText( 2, (*it).spec );
diff --git a/kdevdesigner/designer/editfunctionsimpl.h b/tdevdesigner/designer/editfunctionsimpl.h
index 0d4259dc..0d4259dc 100644
--- a/kdevdesigner/designer/editfunctionsimpl.h
+++ b/tdevdesigner/designer/editfunctionsimpl.h
diff --git a/kdevdesigner/designer/filechooser.cpp b/tdevdesigner/designer/filechooser.cpp
index 0f4c426e..0f4c426e 100644
--- a/kdevdesigner/designer/filechooser.cpp
+++ b/tdevdesigner/designer/filechooser.cpp
diff --git a/kdevdesigner/designer/filechooser.h b/tdevdesigner/designer/filechooser.h
index 42430334..42430334 100644
--- a/kdevdesigner/designer/filechooser.h
+++ b/tdevdesigner/designer/filechooser.h
diff --git a/kdevdesigner/designer/finddialog.ui b/tdevdesigner/designer/finddialog.ui
index 9b16cd8c..9b16cd8c 100644
--- a/kdevdesigner/designer/finddialog.ui
+++ b/tdevdesigner/designer/finddialog.ui
diff --git a/kdevdesigner/designer/finddialog.ui.h b/tdevdesigner/designer/finddialog.ui.h
index 126c0a5f..126c0a5f 100644
--- a/kdevdesigner/designer/finddialog.ui.h
+++ b/tdevdesigner/designer/finddialog.ui.h
diff --git a/kdevdesigner/designer/formfile.cpp b/tdevdesigner/designer/formfile.cpp
index 4ba5b7c7..ce04010e 100644
--- a/kdevdesigner/designer/formfile.cpp
+++ b/tdevdesigner/designer/formfile.cpp
@@ -45,7 +45,7 @@
 
 #include <tdefiledialog.h>
 #include <tdelocale.h>
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 static TQString make_func_pretty( const TQString &s )
 {
diff --git a/kdevdesigner/designer/formfile.h b/tdevdesigner/designer/formfile.h
index 79f92d16..79f92d16 100644
--- a/kdevdesigner/designer/formfile.h
+++ b/tdevdesigner/designer/formfile.h
diff --git a/kdevdesigner/designer/formsettings.ui b/tdevdesigner/designer/formsettings.ui
index 6337e8cf..6337e8cf 100644
--- a/kdevdesigner/designer/formsettings.ui
+++ b/tdevdesigner/designer/formsettings.ui
diff --git a/kdevdesigner/designer/formsettingsimpl.cpp b/tdevdesigner/designer/formsettingsimpl.cpp
index e29ea157..e29ea157 100644
--- a/kdevdesigner/designer/formsettingsimpl.cpp
+++ b/tdevdesigner/designer/formsettingsimpl.cpp
diff --git a/kdevdesigner/designer/formsettingsimpl.h b/tdevdesigner/designer/formsettingsimpl.h
index 3dcb6dd7..3dcb6dd7 100644
--- a/kdevdesigner/designer/formsettingsimpl.h
+++ b/tdevdesigner/designer/formsettingsimpl.h
diff --git a/kdevdesigner/designer/formwindow.cpp b/tdevdesigner/designer/formwindow.cpp
index 4e5bc09d..8852eaa2 100644
--- a/kdevdesigner/designer/formwindow.cpp
+++ b/tdevdesigner/designer/formwindow.cpp
@@ -46,7 +46,7 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 #include <tqevent.h>
 #include <tqpainter.h>
@@ -192,7 +192,7 @@ void FormWindow::init()
 	     this, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ) );
     propShowBlocked = FALSE;
 
-    setIcon( SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()) );
+    setIcon( SmallIcon( "designer_form.png" , TDevDesignerPartFactory::instance()) );
 
     connect( &commands, TQT_SIGNAL( modificationChanged( bool ) ),
 	     this, TQT_SLOT( modificationChanged( bool ) ) );
@@ -372,7 +372,7 @@ void FormWindow::insertWidget()
     if ( !savePixmapInline() && currTool == WidgetDatabase::idFromClassName( "PixmapLabel" ) ) { // ### what to do for pixmaps in project
 	TQPixmap pix;
 	// we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that
-	pix.convertFromImage( SmallIcon( "designer_image.png" , KDevDesignerPartFactory::instance()).convertToImage() );
+	pix.convertFromImage( SmallIcon( "designer_image.png" , TDevDesignerPartFactory::instance()).convertToImage() );
 	( (TQLabel*)w )->setPixmap( pix );
     }
     int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) );
diff --git a/kdevdesigner/designer/formwindow.h b/tdevdesigner/designer/formwindow.h
index d4295e7e..d4295e7e 100644
--- a/kdevdesigner/designer/formwindow.h
+++ b/tdevdesigner/designer/formwindow.h
diff --git a/kdevdesigner/designer/gotolinedialog.ui b/tdevdesigner/designer/gotolinedialog.ui
index 99df35d2..99df35d2 100644
--- a/kdevdesigner/designer/gotolinedialog.ui
+++ b/tdevdesigner/designer/gotolinedialog.ui
diff --git a/kdevdesigner/designer/gotolinedialog.ui.h b/tdevdesigner/designer/gotolinedialog.ui.h
index 4ddf4114..4ddf4114 100644
--- a/kdevdesigner/designer/gotolinedialog.ui.h
+++ b/tdevdesigner/designer/gotolinedialog.ui.h
diff --git a/kdevdesigner/designer/hierarchyview.cpp b/tdevdesigner/designer/hierarchyview.cpp
index c6433cd0..860897ff 100644
--- a/kdevdesigner/designer/hierarchyview.cpp
+++ b/tdevdesigner/designer/hierarchyview.cpp
@@ -43,7 +43,7 @@
 #include "menubareditor.h"
 
 #include <kiconloader.h>
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 #include <tdelocale.h>
 
 #include <tqpalette.h>
@@ -175,10 +175,10 @@ void HierarchyItem::cancelRename( int col )
 HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects )
     : TQListView( parent ), formWindow( fw )
 {
-    DesignerFormPix = SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance());
-    DesignerLayoutPix = SmallIcon( "designer_layout.png" , KDevDesignerPartFactory::instance());
-    DesignerFolderPix = SmallIcon( "designer_folder.png" , KDevDesignerPartFactory::instance());
-    DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance());
+    DesignerFormPix = SmallIcon( "designer_form.png" , TDevDesignerPartFactory::instance());
+    DesignerLayoutPix = SmallIcon( "designer_layout.png" , TDevDesignerPartFactory::instance());
+    DesignerFolderPix = SmallIcon( "designer_folder.png" , TDevDesignerPartFactory::instance());
+    DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance());
 
     init_colors();
 
@@ -1047,16 +1047,16 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
 
     if ( i->rtti() == HierarchyItem::FunctParent || i->rtti() == HierarchyItem::SlotParent ||
 	 i->rtti() == HierarchyItem::VarParent ) {
-	menu.insertItem( SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), i18n( "Edit..." ), EDIT );
+	menu.insertItem( SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()), i18n( "Edit..." ), EDIT );
     } else
-	menu.insertItem( SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()), i18n( "New..." ), NEW );
+	menu.insertItem( SmallIcon( "designer_filenew.png" , TDevDesignerPartFactory::instance()), i18n( "New..." ), NEW );
     if ( i->rtti() == HierarchyItem::DefinitionParent || i->rtti() == HierarchyItem::Variable ||
 	 i->rtti() == HierarchyItem::Definition ) {
-	menu.insertItem( SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), i18n( "Edit..." ), EDIT );
+	menu.insertItem( SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()), i18n( "Edit..." ), EDIT );
     }
     if ( i->rtti() == HierarchyItem::Function || i->rtti() == HierarchyItem::Slot ) {
 	if ( formWindow->project()->isCpp() )
-	    menu.insertItem( SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), i18n( "Properties" ), PROPS );
+	    menu.insertItem( SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()), i18n( "Properties" ), PROPS );
 	if ( MetaDataBase::hasEditor( formWindow->project()->language() ) )
 	    menu.insertItem( i18n( "Goto Implementation" ), GOIMPL );
 	insertDelete = TRUE;
@@ -1065,7 +1065,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
 	 i->rtti() == HierarchyItem::Function || i->rtti() == HierarchyItem::Slot ||
 	 i->rtti() == HierarchyItem::Definition ) {
 	menu.insertSeparator();
-	menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()), i18n( "Delete" ), DEL );
+	menu.insertItem( SmallIcon( "designer_editcut.png" , TDevDesignerPartFactory::instance()), i18n( "Delete" ), DEL );
     }
     popupOpen = TRUE;
     int res = menu.exec( pos );
diff --git a/kdevdesigner/designer/hierarchyview.h b/tdevdesigner/designer/hierarchyview.h
index cb21ed50..cb21ed50 100644
--- a/kdevdesigner/designer/hierarchyview.h
+++ b/tdevdesigner/designer/hierarchyview.h
diff --git a/kdevdesigner/designer/iconvieweditor.ui b/tdevdesigner/designer/iconvieweditor.ui
index 8711bd6b..8711bd6b 100644
--- a/kdevdesigner/designer/iconvieweditor.ui
+++ b/tdevdesigner/designer/iconvieweditor.ui
diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/tdevdesigner/designer/iconvieweditorimpl.cpp
index 32a81412..32a81412 100644
--- a/kdevdesigner/designer/iconvieweditorimpl.cpp
+++ b/tdevdesigner/designer/iconvieweditorimpl.cpp
diff --git a/kdevdesigner/designer/iconvieweditorimpl.h b/tdevdesigner/designer/iconvieweditorimpl.h
index 969c9cf4..969c9cf4 100644
--- a/kdevdesigner/designer/iconvieweditorimpl.h
+++ b/tdevdesigner/designer/iconvieweditorimpl.h
diff --git a/kdevdesigner/designer/layout.cpp b/tdevdesigner/designer/layout.cpp
index b8fb737c..b8fb737c 100644
--- a/kdevdesigner/designer/layout.cpp
+++ b/tdevdesigner/designer/layout.cpp
diff --git a/kdevdesigner/designer/layout.h b/tdevdesigner/designer/layout.h
index d1ea776e..d1ea776e 100644
--- a/kdevdesigner/designer/layout.h
+++ b/tdevdesigner/designer/layout.h
diff --git a/kdevdesigner/designer/listboxdnd.cpp b/tdevdesigner/designer/listboxdnd.cpp
index 54498478..54498478 100644
--- a/kdevdesigner/designer/listboxdnd.cpp
+++ b/tdevdesigner/designer/listboxdnd.cpp
diff --git a/kdevdesigner/designer/listboxdnd.h b/tdevdesigner/designer/listboxdnd.h
index 5abf792f..5abf792f 100644
--- a/kdevdesigner/designer/listboxdnd.h
+++ b/tdevdesigner/designer/listboxdnd.h
diff --git a/kdevdesigner/designer/listboxeditor.ui b/tdevdesigner/designer/listboxeditor.ui
index df584ddf..df584ddf 100644
--- a/kdevdesigner/designer/listboxeditor.ui
+++ b/tdevdesigner/designer/listboxeditor.ui
diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/tdevdesigner/designer/listboxeditorimpl.cpp
index 01dfa64e..01dfa64e 100644
--- a/kdevdesigner/designer/listboxeditorimpl.cpp
+++ b/tdevdesigner/designer/listboxeditorimpl.cpp
diff --git a/kdevdesigner/designer/listboxeditorimpl.h b/tdevdesigner/designer/listboxeditorimpl.h
index 28ca0254..28ca0254 100644
--- a/kdevdesigner/designer/listboxeditorimpl.h
+++ b/tdevdesigner/designer/listboxeditorimpl.h
diff --git a/kdevdesigner/designer/listboxrename.cpp b/tdevdesigner/designer/listboxrename.cpp
index 0a32d292..0a32d292 100644
--- a/kdevdesigner/designer/listboxrename.cpp
+++ b/tdevdesigner/designer/listboxrename.cpp
diff --git a/kdevdesigner/designer/listboxrename.h b/tdevdesigner/designer/listboxrename.h
index ec666f70..ec666f70 100644
--- a/kdevdesigner/designer/listboxrename.h
+++ b/tdevdesigner/designer/listboxrename.h
diff --git a/kdevdesigner/designer/listdnd.cpp b/tdevdesigner/designer/listdnd.cpp
index 8431fd18..8431fd18 100644
--- a/kdevdesigner/designer/listdnd.cpp
+++ b/tdevdesigner/designer/listdnd.cpp
diff --git a/kdevdesigner/designer/listdnd.h b/tdevdesigner/designer/listdnd.h
index 39e1af11..39e1af11 100644
--- a/kdevdesigner/designer/listdnd.h
+++ b/tdevdesigner/designer/listdnd.h
diff --git a/kdevdesigner/designer/listeditor.ui b/tdevdesigner/designer/listeditor.ui
index c477ff1a..c477ff1a 100644
--- a/kdevdesigner/designer/listeditor.ui
+++ b/tdevdesigner/designer/listeditor.ui
diff --git a/kdevdesigner/designer/listeditor.ui.h b/tdevdesigner/designer/listeditor.ui.h
index 7f179cef..7f179cef 100644
--- a/kdevdesigner/designer/listeditor.ui.h
+++ b/tdevdesigner/designer/listeditor.ui.h
diff --git a/kdevdesigner/designer/listviewdnd.cpp b/tdevdesigner/designer/listviewdnd.cpp
index 32dcc6d5..32dcc6d5 100644
--- a/kdevdesigner/designer/listviewdnd.cpp
+++ b/tdevdesigner/designer/listviewdnd.cpp
diff --git a/kdevdesigner/designer/listviewdnd.h b/tdevdesigner/designer/listviewdnd.h
index 5a59f4ad..5a59f4ad 100644
--- a/kdevdesigner/designer/listviewdnd.h
+++ b/tdevdesigner/designer/listviewdnd.h
diff --git a/kdevdesigner/designer/listvieweditor.ui b/tdevdesigner/designer/listvieweditor.ui
index 8a0abe14..8a0abe14 100644
--- a/kdevdesigner/designer/listvieweditor.ui
+++ b/tdevdesigner/designer/listvieweditor.ui
diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/tdevdesigner/designer/listvieweditorimpl.cpp
index c5ec7498..c5ec7498 100644
--- a/kdevdesigner/designer/listvieweditorimpl.cpp
+++ b/tdevdesigner/designer/listvieweditorimpl.cpp
diff --git a/kdevdesigner/designer/listvieweditorimpl.h b/tdevdesigner/designer/listvieweditorimpl.h
index 64048c9d..64048c9d 100644
--- a/kdevdesigner/designer/listvieweditorimpl.h
+++ b/tdevdesigner/designer/listvieweditorimpl.h
diff --git a/kdevdesigner/designer/mainwindow.cpp b/tdevdesigner/designer/mainwindow.cpp
index 3d900532..3f53e004 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/tdevdesigner/designer/mainwindow.cpp
@@ -117,7 +117,7 @@
 #include <tqassistantclient.h>
 #include <stdlib.h>
 
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 static bool mblockNewForms = FALSE;
 extern TQMap<TQWidget*, TQString> *qwf_forms;
@@ -149,7 +149,7 @@ static TQString textNoAccel( const TQString& text)
 }
 
 
-MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, const TQString &plgDir )
+MainWindow::MainWindow( TDevDesignerPart *part, bool asClient, bool single, const TQString &plgDir )
     : TQMainWindow( 0, "designer_mainwindow"/*, WType_TopLevel | (single ? 0 : WDestructiveClose) | WGroupLeader*/ ),
       grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ),
       fileFilter( i18n( "TQt User-Interface Files (*.ui)" ) ), client( asClient ),
@@ -187,7 +187,7 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
 	tqApp->setMainWidget( this );*/
     TQWidgetFactory::addWidgetFactory( new CustomWidgetFactory );
 #ifndef TQ_WS_MACX
-    setIcon( BarIcon( "designer_appicon.png", KDevDesignerPartFactory::instance() ) );
+    setIcon( BarIcon( "designer_appicon.png", TDevDesignerPartFactory::instance() ) );
 #endif
 
     actionGroupTools = 0;
@@ -336,7 +336,7 @@ void MainWindow::setupMDI()
     vbox->setMargin( 1 );
     vbox->setLineWidth( 1 );
     qworkspace = new TQWorkspace( vbox );
-    qworkspace->setPaletteBackgroundPixmap( UserIcon( "designer_background.png", KDevDesignerPartFactory::instance() ) );
+    qworkspace->setPaletteBackgroundPixmap( UserIcon( "designer_background.png", TDevDesignerPartFactory::instance() ) );
     qworkspace->setScrollBarsEnabled( TRUE );
     connect( qworkspace, TQT_SIGNAL( windowActivated( TQWidget * ) ),
 	     this, TQT_SLOT( activeWindowChanged( TQWidget * ) ) );
@@ -2392,7 +2392,7 @@ void MainWindow::readConfig()
 	if ( l.count() > c ) {
 	    w->isContainer = (bool)l[ c++ ].toInt();
 	}
-	w->pixmap = new TQPixmap( BarIcon( TQDir::home().absPath() + "/.designer/" + w->className , KDevDesignerPartFactory::instance()) );
+	w->pixmap = new TQPixmap( BarIcon( TQDir::home().absPath() + "/.designer/" + w->className , TDevDesignerPartFactory::instance()) );
 	MetaDataBase::addCustomWidget( w );
     }
     if ( num > 0 )
@@ -3115,7 +3115,7 @@ TemplateWizardInterface * MainWindow::templateWizardInterface( const TQString& c
 
 void MainWindow::setupPluginManagers()
 {
-    editorPluginManager = new TQPluginManager<EditorInterface>( IID_Editor, TQApplication::libraryPaths(), "/kdevdesigner" );
+    editorPluginManager = new TQPluginManager<EditorInterface>( IID_Editor, TQApplication::libraryPaths(), "/tdevdesigner" );
     MetaDataBase::setEditor( editorPluginManager->featureList() );
 
     templateWizardPluginManager =
diff --git a/kdevdesigner/designer/mainwindow.h b/tdevdesigner/designer/mainwindow.h
index 1b68c14d..f22d371f 100644
--- a/kdevdesigner/designer/mainwindow.h
+++ b/tdevdesigner/designer/mainwindow.h
@@ -75,7 +75,7 @@ class TQToolBar;
 #endif
 class Preferences;
 
-class KDevDesignerPart;
+class TDevDesignerPart;
 
 class MainWindow : public TQMainWindow
 {
@@ -85,7 +85,7 @@ class MainWindow : public TQMainWindow
 public:
     enum LineMode { Error, Step, StackFrame };
 
-    MainWindow( KDevDesignerPart *part, bool asClient, bool single = FALSE, const TQString &plgDir = "/designer" );
+    MainWindow( TDevDesignerPart *part, bool asClient, bool single = FALSE, const TQString &plgDir = "/designer" );
     ~MainWindow();
 
     HierarchyView *objectHierarchy() const;
@@ -194,7 +194,7 @@ public:
     void statusMessage(const TQString &msg);
     
     //integration
-    KDevDesignerPart *part() const { return m_part; }
+    TDevDesignerPart *part() const { return m_part; }
     
 public slots:
     void showProperties( TQObject *w );
@@ -478,14 +478,14 @@ private:
     TQString pluginDir;
     bool sSignalHandlers;
     
-    KDevDesignerPart *m_part;
+    TDevDesignerPart *m_part;
 
 public:
     TQString lastSaveFilter;
     TQPtrList<TQAction> toolActions;
     TQPtrList<TQAction> commonWidgetsPage;
 
-friend class KDevDesignerPart;
+friend class TDevDesignerPart;
 };
 
 class SenderObject : public TQObject
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/tdevdesigner/designer/mainwindowactions.cpp
index 7fa1d1f7..b9d0b1b6 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/tdevdesigner/designer/mainwindowactions.cpp
@@ -83,7 +83,7 @@
 #include "configtoolboxdialog.h"
 #include "designeraction.h"
 
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 static const char * whatsthis_image[] = {
     "16 16 3 1",
@@ -114,10 +114,10 @@ const TQString toolbarHelp = "<p>Toolbars contain a number of buttons to "
 
 static TQIconSet createIconSet( const TQString &name )
 {
-    TQIconSet ic( BarIcon( "" + name, KDevDesignerPartFactory::instance() ) );
+    TQIconSet ic( BarIcon( "" + name, TDevDesignerPartFactory::instance() ) );
     TQString prefix = "designer_";
     int right = name.length() - prefix.length();
-    ic.setPixmap( BarIcon( prefix + "d_" + name.right( right ), KDevDesignerPartFactory::instance() ),
+    ic.setPixmap( BarIcon( prefix + "d_" + name.right( right ), TDevDesignerPartFactory::instance() ),
 		  TQIconSet::Small, TQIconSet::Disabled );
     return ic;
 }
diff --git a/kdevdesigner/designer/menubareditor.cpp b/tdevdesigner/designer/menubareditor.cpp
index f62e15e0..f62e15e0 100644
--- a/kdevdesigner/designer/menubareditor.cpp
+++ b/tdevdesigner/designer/menubareditor.cpp
diff --git a/kdevdesigner/designer/menubareditor.h b/tdevdesigner/designer/menubareditor.h
index f6279f2b..f6279f2b 100644
--- a/kdevdesigner/designer/menubareditor.h
+++ b/tdevdesigner/designer/menubareditor.h
diff --git a/kdevdesigner/designer/metadatabase.cpp b/tdevdesigner/designer/metadatabase.cpp
index 7aa004d7..aa85fc80 100644
--- a/kdevdesigner/designer/metadatabase.cpp
+++ b/tdevdesigner/designer/metadatabase.cpp
@@ -34,7 +34,7 @@
 #include "project.h"
 #include "mainwindow.h"
 
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 #include <kiconloader.h>
 #include <tdeapplication.h>
@@ -1277,7 +1277,7 @@ MetaDataBase::CustomWidget::CustomWidget()
     includeFile = "mywidget.h";
     includePolicy = Local;
     sizeHint = TQSize( -1, -1 );
-    pixmap = new TQPixmap( BarIcon( "designer_customwidget.png", KDevDesignerPartFactory::instance() ) );
+    pixmap = new TQPixmap( BarIcon( "designer_customwidget.png", TDevDesignerPartFactory::instance() ) );
     id = -1;
     sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
     isContainer = FALSE;
diff --git a/kdevdesigner/designer/metadatabase.h b/tdevdesigner/designer/metadatabase.h
index 352e10d7..352e10d7 100644
--- a/kdevdesigner/designer/metadatabase.h
+++ b/tdevdesigner/designer/metadatabase.h
diff --git a/kdevdesigner/designer/multilineeditor.ui b/tdevdesigner/designer/multilineeditor.ui
index f0ff2129..f0ff2129 100644
--- a/kdevdesigner/designer/multilineeditor.ui
+++ b/tdevdesigner/designer/multilineeditor.ui
diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/tdevdesigner/designer/multilineeditorimpl.cpp
index ef06f77b..a3f6093e 100644
--- a/kdevdesigner/designer/multilineeditorimpl.cpp
+++ b/tdevdesigner/designer/multilineeditorimpl.cpp
@@ -33,7 +33,7 @@
 #include "widgetfactory.h"
 
 #include <kiconloader.h>
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 #include <tqtextedit.h>
 #include <tqrichtext_p.h>
@@ -101,25 +101,25 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
 	basicToolBar = new TQToolBar( i18n( "Basics" ), this, DockTop );
 
 	ToolBarItem *it = new ToolBarItem( this, basicToolBar, i18n( "Italic" ),
-					   "i", BarIcon( "designer_textitalic.png", KDevDesignerPartFactory::instance() ), CTRL+Key_I );
+					   "i", BarIcon( "designer_textitalic.png", TDevDesignerPartFactory::instance() ), CTRL+Key_I );
 	it->addTo( stylesMenu );
 	connect( it, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *b = new ToolBarItem( this, basicToolBar, i18n( "Bold" ),
-					  "b", BarIcon( "designer_textbold.png", KDevDesignerPartFactory::instance() ), CTRL+Key_B );
+					  "b", BarIcon( "designer_textbold.png", TDevDesignerPartFactory::instance() ), CTRL+Key_B );
 	b->addTo( stylesMenu );
 	connect( b, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *ul = new ToolBarItem( this, basicToolBar, i18n( "Underline" ),
-					   "u", BarIcon( "designer_textunderline.png" , KDevDesignerPartFactory::instance()), CTRL+Key_U );
+					   "u", BarIcon( "designer_textunderline.png" , TDevDesignerPartFactory::instance()), CTRL+Key_U );
 	ul->addTo( stylesMenu );
 	connect( ul, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *tt = new ToolBarItem( this, basicToolBar, i18n( "Typewriter" ),
-					   "tt", BarIcon( "designer_textteletext.png", KDevDesignerPartFactory::instance() ) );
+					   "tt", BarIcon( "designer_textteletext.png", TDevDesignerPartFactory::instance() ) );
 	tt->addTo( stylesMenu );
 	connect( tt, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
@@ -130,14 +130,14 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
 	menuBar->insertItem( i18n( "&Layout" ), layoutMenu );
 
 	TQAction *brAction = new TQAction( this );
-	brAction->setIconSet( BarIcon( "designer_textlinebreak.png", KDevDesignerPartFactory::instance() ) );
+	brAction->setIconSet( BarIcon( "designer_textlinebreak.png", TDevDesignerPartFactory::instance() ) );
 	brAction->setText( i18n("Break" ) );
 	brAction->addTo( basicToolBar );
 	brAction->addTo( layoutMenu );
 	connect( brAction, TQT_SIGNAL( activated() ) , this, TQT_SLOT( insertBR() ) );
 
 	ToolBarItem *p = new ToolBarItem( this, basicToolBar, i18n( "Paragraph" ),
-					  "p", BarIcon( "designer_textparagraph.png", KDevDesignerPartFactory::instance() ) );
+					  "p", BarIcon( "designer_textparagraph.png", TDevDesignerPartFactory::instance() ) );
 	p->addTo( layoutMenu );
 	connect( p, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
@@ -145,25 +145,25 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
 	basicToolBar->addSeparator();
 
 	ToolBarItem *al = new ToolBarItem( this, basicToolBar, i18n( "Align left" ),
-					   "p align=\"left\"", BarIcon( "designer_textleft.png", KDevDesignerPartFactory::instance() ) );
+					   "p align=\"left\"", BarIcon( "designer_textleft.png", TDevDesignerPartFactory::instance() ) );
 	al->addTo( layoutMenu );
 	connect( al, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *ac = new ToolBarItem( this, basicToolBar, i18n( "Align center" ),
-					   "p align=\"center\"", BarIcon( "designer_textcenter.png", KDevDesignerPartFactory::instance() ) );
+					   "p align=\"center\"", BarIcon( "designer_textcenter.png", TDevDesignerPartFactory::instance() ) );
 	ac->addTo( layoutMenu );
 	connect( ac, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *ar = new ToolBarItem( this, basicToolBar, i18n( "Align right" ),
-					   "p align=\"right\"", BarIcon( "designer_textright.png", KDevDesignerPartFactory::instance() ) );
+					   "p align=\"right\"", BarIcon( "designer_textright.png", TDevDesignerPartFactory::instance() ) );
 	ar->addTo( layoutMenu );
 	connect( ar, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *block = new ToolBarItem( this, basicToolBar, i18n( "Blockquote" ),
-					      "blockquote", BarIcon( "designer_textjustify.png", KDevDesignerPartFactory::instance() ) );
+					      "blockquote", BarIcon( "designer_textjustify.png", TDevDesignerPartFactory::instance() ) );
 	block->addTo( layoutMenu );
 	connect( block, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
@@ -175,7 +175,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
 	fontToolBar = new TQToolBar( "Fonts", this, DockTop );
 
 	TQAction *fontAction = new TQAction( this );
-	fontAction->setIconSet( BarIcon( "designer_textfont.png", KDevDesignerPartFactory::instance() ) );
+	fontAction->setIconSet( BarIcon( "designer_textfont.png", TDevDesignerPartFactory::instance() ) );
 	fontAction->setText( i18n("Font" ) );
 	fontAction->addTo( fontToolBar );
 	fontAction->addTo( fontMenu );
@@ -183,27 +183,27 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
 
 
 	ToolBarItem *fp1 = new ToolBarItem( this, fontToolBar, i18n( "Fontsize +1" ),
-					    "font size=\"+1\"", BarIcon( "designer_textlarger.png", KDevDesignerPartFactory::instance() ) );
+					    "font size=\"+1\"", BarIcon( "designer_textlarger.png", TDevDesignerPartFactory::instance() ) );
 	connect( fp1, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *fm1 = new ToolBarItem( this, fontToolBar, i18n( "Fontsize -1" ),
-					    "font size=\"-1\"", BarIcon( "designer_textsmaller.png", KDevDesignerPartFactory::instance() ) );
+					    "font size=\"-1\"", BarIcon( "designer_textsmaller.png", TDevDesignerPartFactory::instance() ) );
 	connect( fm1, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *h1 = new ToolBarItem( this, fontToolBar, i18n( "Headline 1" ),
-					   "h1", BarIcon( "designer_texth1.png", KDevDesignerPartFactory::instance() ) );
+					   "h1", BarIcon( "designer_texth1.png", TDevDesignerPartFactory::instance() ) );
 	connect( h1, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *h2 = new ToolBarItem( this, fontToolBar, i18n( "Headline 2" ),
-					   "h2", BarIcon( "designer_texth2.png", KDevDesignerPartFactory::instance()  ) );
+					   "h2", BarIcon( "designer_texth2.png", TDevDesignerPartFactory::instance()  ) );
 	connect( h2, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *h3 = new ToolBarItem( this, fontToolBar, i18n( "Headline 3" ),
-					   "h3", BarIcon( "designer_texth3.png", KDevDesignerPartFactory::instance() ) );
+					   "h3", BarIcon( "designer_texth3.png", TDevDesignerPartFactory::instance() ) );
 	connect( h3, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
@@ -213,7 +213,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
 	optionsToolBar = new TQToolBar( "Options", this, DockTop );
 	wrapAction = new TQAction( this );
 	wrapAction->setToggleAction( TRUE );
-	wrapAction->setIconSet( BarIcon( "designer_wordwrap.png", KDevDesignerPartFactory::instance() ) );
+	wrapAction->setIconSet( BarIcon( "designer_wordwrap.png", TDevDesignerPartFactory::instance() ) );
 	wrapAction->setText( i18n( "Word Wrapping" ) );
 	wrapAction->addTo( optionsToolBar );
 	wrapAction->addTo( optionsMenu );
diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/tdevdesigner/designer/multilineeditorimpl.h
index 34d47b3e..34d47b3e 100644
--- a/kdevdesigner/designer/multilineeditorimpl.h
+++ b/tdevdesigner/designer/multilineeditorimpl.h
diff --git a/kdevdesigner/designer/myiconloader.cpp b/tdevdesigner/designer/myiconloader.cpp
index 80bbc5ba..72a1bdfb 100644
--- a/kdevdesigner/designer/myiconloader.cpp
+++ b/tdevdesigner/designer/myiconloader.cpp
@@ -18,15 +18,15 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 #include "myiconloader.h"
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 #include <kiconloader.h>
 
 TQPixmap BarIcon2( const TQString & name )
 {
-    return BarIcon(name, KDevDesignerPartFactory::instance());
+    return BarIcon(name, TDevDesignerPartFactory::instance());
 }
 
 TQPixmap SmallIcon2( const TQString & name)
 {
-    return SmallIcon(name, KDevDesignerPartFactory::instance());
+    return SmallIcon(name, TDevDesignerPartFactory::instance());
 }
diff --git a/kdevdesigner/designer/myiconloader.h b/tdevdesigner/designer/myiconloader.h
index 63a47eee..63a47eee 100644
--- a/kdevdesigner/designer/myiconloader.h
+++ b/tdevdesigner/designer/myiconloader.h
diff --git a/kdevdesigner/designer/newform.ui b/tdevdesigner/designer/newform.ui
index 81cb4fa5..81cb4fa5 100644
--- a/kdevdesigner/designer/newform.ui
+++ b/tdevdesigner/designer/newform.ui
diff --git a/kdevdesigner/designer/newformimpl.cpp b/tdevdesigner/designer/newformimpl.cpp
index 0cdc738b..b5cc7c58 100644
--- a/kdevdesigner/designer/newformimpl.cpp
+++ b/tdevdesigner/designer/newformimpl.cpp
@@ -38,7 +38,7 @@
 #include "sourcefile.h"
 
 #include <kiconloader.h>
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 #include <tdelocale.h>
 
 #include <tqiconview.h>
@@ -252,7 +252,7 @@ void NewForm::insertTemplates( TQIconView *tView,
 	    ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).arg( *it ) );
 	    allItems.append( pi );
 	    pi->setLanguage( *it );
-	    pi->setPixmap( BarIcon( "designer_project.png" , KDevDesignerPartFactory::instance()) );
+	    pi->setPixmap( BarIcon( "designer_project.png" , TDevDesignerPartFactory::instance()) );
 	    pi->setDragEnabled( FALSE );
 	}
     }
@@ -260,24 +260,24 @@ void NewForm::insertTemplates( TQIconView *tView,
     FormItem *fi = new FormItem( tView,i18n( "Dialog" ) );
     allItems.append( fi );
     fi->setFormType( FormItem::Dialog );
-    fi->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) );
+    fi->setPixmap( BarIcon( "designer_newform.png" , TDevDesignerPartFactory::instance()) );
     fi->setDragEnabled( FALSE );
     cur = fi;
     if ( !MainWindow::self->singleProjectMode() ) {
 	fi = new FormItem( tView,i18n( "Wizard" ) );
 	allItems.append( fi );
 	fi->setFormType( FormItem::Wizard );
-	fi->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) );
+	fi->setPixmap( BarIcon( "designer_newform.png" , TDevDesignerPartFactory::instance()) );
 	fi->setDragEnabled( FALSE );
 	fi = new FormItem( tView, i18n( "Widget" ) );
 	allItems.append( fi );
 	fi->setFormType( FormItem::Widget );
-	fi->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) );
+	fi->setPixmap( BarIcon( "designer_newform.png" , TDevDesignerPartFactory::instance()) );
 	fi->setDragEnabled( FALSE );
 	fi = new FormItem( tView, i18n( "Main Window" ) );
 	allItems.append( fi );
 	fi->setFormType( FormItem::MainWindow );
-	fi->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) );
+	fi->setPixmap( BarIcon( "designer_newform.png" , TDevDesignerPartFactory::instance()) );
 	fi->setDragEnabled( FALSE );
 
 	TQString templPath = templatePath;
@@ -310,7 +310,7 @@ void NewForm::insertTemplates( TQIconView *tView,
 		    CustomFormItem *ci = new CustomFormItem( tView, name );
 		    allItems.append( ci );
 		    ci->setDragEnabled( FALSE );
-		    ci->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) );
+		    ci->setPixmap( BarIcon( "designer_newform.png" , TDevDesignerPartFactory::instance()) );
 		    ci->setTemplateFile( fi->absFilePath() );
 		}
 	    }
@@ -328,7 +328,7 @@ void NewForm::insertTemplates( TQIconView *tView,
 		allItems.append( si );
 		si->setExtension( eit.key() );
 		si->setLanguage( *it );
-		si->setPixmap( BarIcon( "designer_filenew.png", KDevDesignerPartFactory::instance() ) );
+		si->setPixmap( BarIcon( "designer_filenew.png", TDevDesignerPartFactory::instance() ) );
 		si->setDragEnabled( FALSE );
 	    }
 	    iface->release();
@@ -345,7 +345,7 @@ void NewForm::insertTemplates( TQIconView *tView,
 	    allItems.append( si );
 	    si->setTemplate( *sit );
 	    si->setLanguage( siface->language( *sit ) );
-	    si->setPixmap( BarIcon( "designer_filenew.png", KDevDesignerPartFactory::instance() ) );
+	    si->setPixmap( BarIcon( "designer_filenew.png", TDevDesignerPartFactory::instance() ) );
 	    si->setDragEnabled( FALSE );
 	    siface->release();
 	}
diff --git a/kdevdesigner/designer/newformimpl.h b/tdevdesigner/designer/newformimpl.h
index 863f5b9d..863f5b9d 100644
--- a/kdevdesigner/designer/newformimpl.h
+++ b/tdevdesigner/designer/newformimpl.h
diff --git a/kdevdesigner/designer/orderindicator.cpp b/tdevdesigner/designer/orderindicator.cpp
index 2904cfbf..2904cfbf 100644
--- a/kdevdesigner/designer/orderindicator.cpp
+++ b/tdevdesigner/designer/orderindicator.cpp
diff --git a/kdevdesigner/designer/orderindicator.h b/tdevdesigner/designer/orderindicator.h
index 33e486d4..33e486d4 100644
--- a/kdevdesigner/designer/orderindicator.h
+++ b/tdevdesigner/designer/orderindicator.h
diff --git a/kdevdesigner/designer/outputwindow.cpp b/tdevdesigner/designer/outputwindow.cpp
index a23c14a7..a23c14a7 100644
--- a/kdevdesigner/designer/outputwindow.cpp
+++ b/tdevdesigner/designer/outputwindow.cpp
diff --git a/kdevdesigner/designer/outputwindow.h b/tdevdesigner/designer/outputwindow.h
index 79b3e79a..79b3e79a 100644
--- a/kdevdesigner/designer/outputwindow.h
+++ b/tdevdesigner/designer/outputwindow.h
diff --git a/kdevdesigner/designer/paletteeditor.ui b/tdevdesigner/designer/paletteeditor.ui
index 32b14b54..32b14b54 100644
--- a/kdevdesigner/designer/paletteeditor.ui
+++ b/tdevdesigner/designer/paletteeditor.ui
diff --git a/kdevdesigner/designer/paletteeditoradvanced.ui b/tdevdesigner/designer/paletteeditoradvanced.ui
index 579f0e68..579f0e68 100644
--- a/kdevdesigner/designer/paletteeditoradvanced.ui
+++ b/tdevdesigner/designer/paletteeditoradvanced.ui
diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp b/tdevdesigner/designer/paletteeditoradvancedimpl.cpp
index 903c1a4f..903c1a4f 100644
--- a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
+++ b/tdevdesigner/designer/paletteeditoradvancedimpl.cpp
diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.h b/tdevdesigner/designer/paletteeditoradvancedimpl.h
index 1fb59912..1fb59912 100644
--- a/kdevdesigner/designer/paletteeditoradvancedimpl.h
+++ b/tdevdesigner/designer/paletteeditoradvancedimpl.h
diff --git a/kdevdesigner/designer/paletteeditorimpl.cpp b/tdevdesigner/designer/paletteeditorimpl.cpp
index ae0cf7fd..ae0cf7fd 100644
--- a/kdevdesigner/designer/paletteeditorimpl.cpp
+++ b/tdevdesigner/designer/paletteeditorimpl.cpp
diff --git a/kdevdesigner/designer/paletteeditorimpl.h b/tdevdesigner/designer/paletteeditorimpl.h
index c1943a61..c1943a61 100644
--- a/kdevdesigner/designer/paletteeditorimpl.h
+++ b/tdevdesigner/designer/paletteeditorimpl.h
diff --git a/kdevdesigner/designer/pics/CMakeLists.txt b/tdevdesigner/designer/pics/CMakeLists.txt
index 3b6367c0..940ecd0d 100644
--- a/kdevdesigner/designer/pics/CMakeLists.txt
+++ b/tdevdesigner/designer/pics/CMakeLists.txt
@@ -81,5 +81,5 @@ install(
     designer_undo.png designer_up.png designer_uparrow.png designer_vsplit.png
     designer_wait.png designer_widgetstack.png designer_wizarddata.png
     designer_wizarddialog.png designer_wordwrap.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdesignerpart/pics
+  DESTINATION ${DATA_INSTALL_DIR}/tdevdesignerpart/pics
 )
diff --git a/kdevdesigner/designer/pics/Makefile.am b/tdevdesigner/designer/pics/Makefile.am
index 8749186b..be65c4d5 100644
--- a/kdevdesigner/designer/pics/Makefile.am
+++ b/tdevdesigner/designer/pics/Makefile.am
@@ -1,2 +1,2 @@
-picsdirdir = $(kde_datadir)/kdevdesignerpart/pics
+picsdirdir = $(kde_datadir)/tdevdesignerpart/pics
 picsdir_DATA =  designer_adjustsize.png designer_appicon.png designer_arrow.png designer_background.png designer_book.png designer_buttongroup.png designer_checkbox.png designer_combobox.png designer_connecttool.png designer_cross.png designer_customwidget.png designer_d_adjustsize.png designer_d_book.png designer_d_buttongroup.png designer_d_checkbox.png designer_d_combobox.png designer_d_connecttool.png designer_d_customwidget.png designer_d_databrowser.png designer_d_datatable.png designer_d_dataview.png designer_d_dateedit.png designer_d_datetimeedit.png designer_d_dial.png designer_d_down.png designer_d_editbreaklayout.png designer_d_editcopy.png designer_d_editcut.png designer_d_editdelete.png designer_d_editgrid.png designer_d_edithlayout.png designer_d_edithlayoutsplit.png designer_d_editlower.png designer_d_editpaste.png designer_d_editraise.png designer_d_editslots.png designer_d_editvlayout.png designer_d_editvlayoutsplit.png designer_d_filenew.png designer_d_fileopen.png designer_d_filesave.png designer_d_folder.png designer_d_form.png designer_d_frame.png designer_d_groupbox.png designer_d_help.png designer_d_home.png designer_d_iconview.png designer_d_image.png designer_d_label.png designer_d_layout.png designer_d_lcdnumber.png designer_d_left.png designer_d_line.png designer_d_lineedit.png designer_d_listbox.png designer_d_listview.png designer_d_multilineedit.png designer_d_newform.png designer_d_ordertool.png designer_d_pixlabel.png designer_d_pointer.png designer_d_print.png designer_d_progress.png designer_d_project.png designer_d_pushbutton.png designer_d_radiobutton.png designer_d_redo.png designer_d_richtextedit.png designer_d_right.png designer_d_scrollbar.png designer_d_searchfind.png designer_d_setbuddy.png designer_d_slider.png designer_d_spacer.png designer_d_spinbox.png designer_d_table.png designer_d_tabwidget.png designer_d_textbold.png designer_d_textbrowser.png designer_d_textcenter.png designer_d_textedit.png designer_d_textfont.png designer_d_texth1.png designer_d_texth2.png designer_d_texth3.png designer_d_textitalic.png designer_d_textjustify.png designer_d_textlarger.png designer_d_textleft.png designer_d_textlinebreak.png designer_d_textparagraph.png designer_d_textright.png designer_d_textsmaller.png designer_d_textteletext.png designer_d_textunderline.png designer_d_textview.png designer_d_timeedit.png designer_d_toolbox.png designer_d_toolbutton.png designer_d_undo.png designer_d_up.png designer_d_widgetstack.png designer_d_wizarddata.png designer_d_wizarddialog.png designer_d_wordwrap.png designer_databrowser.png designer_datatable.png designer_dataview.png designer_dateedit.png designer_datetimeedit.png designer_dial.png designer_down.png designer_editbreaklayout.png designer_editcopy.png designer_editcut.png designer_editdelete.png designer_editgrid.png designer_edithlayout.png designer_edithlayoutsplit.png designer_editlower.png designer_editpaste.png designer_editraise.png designer_editslots.png designer_editvlayout.png designer_editvlayoutsplit.png designer_filenew.png designer_fileopen.png designer_filesave.png designer_folder.png designer_form.png designer_frame.png designer_groupbox.png designer_hand.png designer_help.png designer_home.png designer_hsplit.png designer_ibeam.png designer_iconview.png designer_image.png designer_label.png designer_layout.png designer_lcdnumber.png designer_left.png designer_line.png designer_lineedit.png designer_listbox.png designer_listview.png designer_multilineedit.png designer_newform.png designer_no.png designer_object.png designer_ordertool.png designer_pixlabel.png designer_pointer.png designer_print.png designer_progress.png designer_project.png designer_pushbutton.png designer_qtlogo.png designer_radiobutton.png designer_redo.png designer_resetproperty.png designer_richtextedit.png designer_right.png designer_s_down.png designer_s_editcut.png designer_s_left.png designer_s_right.png designer_s_up.png designer_scrollbar.png designer_searchfind.png designer_setbuddy.png designer_sizeall.png designer_sizeb.png designer_sizef.png designer_sizeh.png designer_sizev.png designer_slider.png designer_spacer.png designer_spinbox.png designer_splash.png designer_table.png designer_tabwidget.png designer_textbold.png designer_textbrowser.png designer_textcenter.png designer_textedit.png designer_textfont.png designer_texth1.png designer_texth2.png designer_texth3.png designer_textitalic.png designer_textjustify.png designer_textlarger.png designer_textleft.png designer_textlinebreak.png designer_textparagraph.png designer_textright.png designer_textsmaller.png designer_textteletext.png designer_textunderline.png designer_textview.png designer_timeedit.png designer_toolbox.png designer_toolbutton.png designer_undo.png designer_up.png designer_uparrow.png designer_vsplit.png designer_wait.png designer_widgetstack.png designer_wizarddata.png designer_wizarddialog.png designer_wordwrap.png
diff --git a/kdevdesigner/designer/pics/designer_adjustsize.png b/tdevdesigner/designer/pics/designer_adjustsize.png
index 6ade1e22..6ade1e22 100644
--- a/kdevdesigner/designer/pics/designer_adjustsize.png
+++ b/tdevdesigner/designer/pics/designer_adjustsize.png
diff --git a/kdevdesigner/designer/pics/designer_appicon.png b/tdevdesigner/designer/pics/designer_appicon.png
index 7aadcbad..7aadcbad 100644
--- a/kdevdesigner/designer/pics/designer_appicon.png
+++ b/tdevdesigner/designer/pics/designer_appicon.png
diff --git a/kdevdesigner/designer/pics/designer_arrow.png b/tdevdesigner/designer/pics/designer_arrow.png
index 53921d83..53921d83 100644
--- a/kdevdesigner/designer/pics/designer_arrow.png
+++ b/tdevdesigner/designer/pics/designer_arrow.png
diff --git a/kdevdesigner/designer/pics/designer_background.png b/tdevdesigner/designer/pics/designer_background.png
index 27d2e997..27d2e997 100644
--- a/kdevdesigner/designer/pics/designer_background.png
+++ b/tdevdesigner/designer/pics/designer_background.png
diff --git a/kdevdesigner/designer/pics/designer_book.png b/tdevdesigner/designer/pics/designer_book.png
index dd850abb..dd850abb 100644
--- a/kdevdesigner/designer/pics/designer_book.png
+++ b/tdevdesigner/designer/pics/designer_book.png
diff --git a/kdevdesigner/designer/pics/designer_buttongroup.png b/tdevdesigner/designer/pics/designer_buttongroup.png
index d89e28fd..d89e28fd 100644
--- a/kdevdesigner/designer/pics/designer_buttongroup.png
+++ b/tdevdesigner/designer/pics/designer_buttongroup.png
diff --git a/kdevdesigner/designer/pics/designer_checkbox.png b/tdevdesigner/designer/pics/designer_checkbox.png
index ab6f53e0..ab6f53e0 100644
--- a/kdevdesigner/designer/pics/designer_checkbox.png
+++ b/tdevdesigner/designer/pics/designer_checkbox.png
diff --git a/kdevdesigner/designer/pics/designer_combobox.png b/tdevdesigner/designer/pics/designer_combobox.png
index 7d4890a7..7d4890a7 100644
--- a/kdevdesigner/designer/pics/designer_combobox.png
+++ b/tdevdesigner/designer/pics/designer_combobox.png
diff --git a/kdevdesigner/designer/pics/designer_connecttool.png b/tdevdesigner/designer/pics/designer_connecttool.png
index fca6748f..fca6748f 100644
--- a/kdevdesigner/designer/pics/designer_connecttool.png
+++ b/tdevdesigner/designer/pics/designer_connecttool.png
diff --git a/kdevdesigner/designer/pics/designer_cross.png b/tdevdesigner/designer/pics/designer_cross.png
index d5e9f0c7..d5e9f0c7 100644
--- a/kdevdesigner/designer/pics/designer_cross.png
+++ b/tdevdesigner/designer/pics/designer_cross.png
diff --git a/kdevdesigner/designer/pics/designer_customwidget.png b/tdevdesigner/designer/pics/designer_customwidget.png
index ab790e1f..ab790e1f 100644
--- a/kdevdesigner/designer/pics/designer_customwidget.png
+++ b/tdevdesigner/designer/pics/designer_customwidget.png
diff --git a/kdevdesigner/designer/pics/designer_d_adjustsize.png b/tdevdesigner/designer/pics/designer_d_adjustsize.png
index d61ca7af..d61ca7af 100644
--- a/kdevdesigner/designer/pics/designer_d_adjustsize.png
+++ b/tdevdesigner/designer/pics/designer_d_adjustsize.png
diff --git a/kdevdesigner/designer/pics/designer_d_book.png b/tdevdesigner/designer/pics/designer_d_book.png
index 5517f0c4..5517f0c4 100644
--- a/kdevdesigner/designer/pics/designer_d_book.png
+++ b/tdevdesigner/designer/pics/designer_d_book.png
diff --git a/kdevdesigner/designer/pics/designer_d_buttongroup.png b/tdevdesigner/designer/pics/designer_d_buttongroup.png
index 1e451a88..1e451a88 100644
--- a/kdevdesigner/designer/pics/designer_d_buttongroup.png
+++ b/tdevdesigner/designer/pics/designer_d_buttongroup.png
diff --git a/kdevdesigner/designer/pics/designer_d_checkbox.png b/tdevdesigner/designer/pics/designer_d_checkbox.png
index 1415eabb..1415eabb 100644
--- a/kdevdesigner/designer/pics/designer_d_checkbox.png
+++ b/tdevdesigner/designer/pics/designer_d_checkbox.png
diff --git a/kdevdesigner/designer/pics/designer_d_combobox.png b/tdevdesigner/designer/pics/designer_d_combobox.png
index 5fb44eff..5fb44eff 100644
--- a/kdevdesigner/designer/pics/designer_d_combobox.png
+++ b/tdevdesigner/designer/pics/designer_d_combobox.png
diff --git a/kdevdesigner/designer/pics/designer_d_connecttool.png b/tdevdesigner/designer/pics/designer_d_connecttool.png
index 76a3b5f5..76a3b5f5 100644
--- a/kdevdesigner/designer/pics/designer_d_connecttool.png
+++ b/tdevdesigner/designer/pics/designer_d_connecttool.png
diff --git a/kdevdesigner/designer/pics/designer_d_customwidget.png b/tdevdesigner/designer/pics/designer_d_customwidget.png
index 5ea648fb..5ea648fb 100644
--- a/kdevdesigner/designer/pics/designer_d_customwidget.png
+++ b/tdevdesigner/designer/pics/designer_d_customwidget.png
diff --git a/kdevdesigner/designer/pics/designer_d_databrowser.png b/tdevdesigner/designer/pics/designer_d_databrowser.png
index c1155c8c..c1155c8c 100644
--- a/kdevdesigner/designer/pics/designer_d_databrowser.png
+++ b/tdevdesigner/designer/pics/designer_d_databrowser.png
diff --git a/kdevdesigner/designer/pics/designer_d_datatable.png b/tdevdesigner/designer/pics/designer_d_datatable.png
index 7060dc3a..7060dc3a 100644
--- a/kdevdesigner/designer/pics/designer_d_datatable.png
+++ b/tdevdesigner/designer/pics/designer_d_datatable.png
diff --git a/kdevdesigner/designer/pics/designer_d_dataview.png b/tdevdesigner/designer/pics/designer_d_dataview.png
index c507d416..c507d416 100644
--- a/kdevdesigner/designer/pics/designer_d_dataview.png
+++ b/tdevdesigner/designer/pics/designer_d_dataview.png
diff --git a/kdevdesigner/designer/pics/designer_d_dateedit.png b/tdevdesigner/designer/pics/designer_d_dateedit.png
index 162e63a8..162e63a8 100644
--- a/kdevdesigner/designer/pics/designer_d_dateedit.png
+++ b/tdevdesigner/designer/pics/designer_d_dateedit.png
diff --git a/kdevdesigner/designer/pics/designer_d_datetimeedit.png b/tdevdesigner/designer/pics/designer_d_datetimeedit.png
index 83dc2fc3..83dc2fc3 100644
--- a/kdevdesigner/designer/pics/designer_d_datetimeedit.png
+++ b/tdevdesigner/designer/pics/designer_d_datetimeedit.png
diff --git a/kdevdesigner/designer/pics/designer_d_dial.png b/tdevdesigner/designer/pics/designer_d_dial.png
index a84869e4..a84869e4 100644
--- a/kdevdesigner/designer/pics/designer_d_dial.png
+++ b/tdevdesigner/designer/pics/designer_d_dial.png
diff --git a/kdevdesigner/designer/pics/designer_d_down.png b/tdevdesigner/designer/pics/designer_d_down.png
index 57b407e4..57b407e4 100644
--- a/kdevdesigner/designer/pics/designer_d_down.png
+++ b/tdevdesigner/designer/pics/designer_d_down.png
diff --git a/kdevdesigner/designer/pics/designer_d_editbreaklayout.png b/tdevdesigner/designer/pics/designer_d_editbreaklayout.png
index 2a36d67d..2a36d67d 100644
--- a/kdevdesigner/designer/pics/designer_d_editbreaklayout.png
+++ b/tdevdesigner/designer/pics/designer_d_editbreaklayout.png
diff --git a/kdevdesigner/designer/pics/designer_d_editcopy.png b/tdevdesigner/designer/pics/designer_d_editcopy.png
index 500758d4..500758d4 100644
--- a/kdevdesigner/designer/pics/designer_d_editcopy.png
+++ b/tdevdesigner/designer/pics/designer_d_editcopy.png
diff --git a/kdevdesigner/designer/pics/designer_d_editcut.png b/tdevdesigner/designer/pics/designer_d_editcut.png
index 8d50ae0a..8d50ae0a 100644
--- a/kdevdesigner/designer/pics/designer_d_editcut.png
+++ b/tdevdesigner/designer/pics/designer_d_editcut.png
diff --git a/kdevdesigner/designer/pics/designer_d_editdelete.png b/tdevdesigner/designer/pics/designer_d_editdelete.png
index f4d0f7a1..f4d0f7a1 100644
--- a/kdevdesigner/designer/pics/designer_d_editdelete.png
+++ b/tdevdesigner/designer/pics/designer_d_editdelete.png
diff --git a/kdevdesigner/designer/pics/designer_d_editgrid.png b/tdevdesigner/designer/pics/designer_d_editgrid.png
index ad2b87b9..ad2b87b9 100644
--- a/kdevdesigner/designer/pics/designer_d_editgrid.png
+++ b/tdevdesigner/designer/pics/designer_d_editgrid.png
diff --git a/kdevdesigner/designer/pics/designer_d_edithlayout.png b/tdevdesigner/designer/pics/designer_d_edithlayout.png
index dacaf82e..dacaf82e 100644
--- a/kdevdesigner/designer/pics/designer_d_edithlayout.png
+++ b/tdevdesigner/designer/pics/designer_d_edithlayout.png
diff --git a/kdevdesigner/designer/pics/designer_d_edithlayoutsplit.png b/tdevdesigner/designer/pics/designer_d_edithlayoutsplit.png
index 00a96055..00a96055 100644
--- a/kdevdesigner/designer/pics/designer_d_edithlayoutsplit.png
+++ b/tdevdesigner/designer/pics/designer_d_edithlayoutsplit.png
diff --git a/kdevdesigner/designer/pics/designer_d_editlower.png b/tdevdesigner/designer/pics/designer_d_editlower.png
index a0a16b40..a0a16b40 100644
--- a/kdevdesigner/designer/pics/designer_d_editlower.png
+++ b/tdevdesigner/designer/pics/designer_d_editlower.png
diff --git a/kdevdesigner/designer/pics/designer_d_editpaste.png b/tdevdesigner/designer/pics/designer_d_editpaste.png
index d31071e9..d31071e9 100644
--- a/kdevdesigner/designer/pics/designer_d_editpaste.png
+++ b/tdevdesigner/designer/pics/designer_d_editpaste.png
diff --git a/kdevdesigner/designer/pics/designer_d_editraise.png b/tdevdesigner/designer/pics/designer_d_editraise.png
index 5f7f04b9..5f7f04b9 100644
--- a/kdevdesigner/designer/pics/designer_d_editraise.png
+++ b/tdevdesigner/designer/pics/designer_d_editraise.png
diff --git a/kdevdesigner/designer/pics/designer_d_editslots.png b/tdevdesigner/designer/pics/designer_d_editslots.png
index cd791b43..cd791b43 100644
--- a/kdevdesigner/designer/pics/designer_d_editslots.png
+++ b/tdevdesigner/designer/pics/designer_d_editslots.png
diff --git a/kdevdesigner/designer/pics/designer_d_editvlayout.png b/tdevdesigner/designer/pics/designer_d_editvlayout.png
index ed202af7..ed202af7 100644
--- a/kdevdesigner/designer/pics/designer_d_editvlayout.png
+++ b/tdevdesigner/designer/pics/designer_d_editvlayout.png
diff --git a/kdevdesigner/designer/pics/designer_d_editvlayoutsplit.png b/tdevdesigner/designer/pics/designer_d_editvlayoutsplit.png
index 54ee44c0..54ee44c0 100644
--- a/kdevdesigner/designer/pics/designer_d_editvlayoutsplit.png
+++ b/tdevdesigner/designer/pics/designer_d_editvlayoutsplit.png
diff --git a/kdevdesigner/designer/pics/designer_d_filenew.png b/tdevdesigner/designer/pics/designer_d_filenew.png
index d5e7061b..d5e7061b 100644
--- a/kdevdesigner/designer/pics/designer_d_filenew.png
+++ b/tdevdesigner/designer/pics/designer_d_filenew.png
diff --git a/kdevdesigner/designer/pics/designer_d_fileopen.png b/tdevdesigner/designer/pics/designer_d_fileopen.png
index 343f0039..343f0039 100644
--- a/kdevdesigner/designer/pics/designer_d_fileopen.png
+++ b/tdevdesigner/designer/pics/designer_d_fileopen.png
diff --git a/kdevdesigner/designer/pics/designer_d_filesave.png b/tdevdesigner/designer/pics/designer_d_filesave.png
index 5d1476d2..5d1476d2 100644
--- a/kdevdesigner/designer/pics/designer_d_filesave.png
+++ b/tdevdesigner/designer/pics/designer_d_filesave.png
diff --git a/kdevdesigner/designer/pics/designer_d_folder.png b/tdevdesigner/designer/pics/designer_d_folder.png
index 4bed3caf..4bed3caf 100644
--- a/kdevdesigner/designer/pics/designer_d_folder.png
+++ b/tdevdesigner/designer/pics/designer_d_folder.png
diff --git a/kdevdesigner/designer/pics/designer_d_form.png b/tdevdesigner/designer/pics/designer_d_form.png
index 9f89d654..9f89d654 100644
--- a/kdevdesigner/designer/pics/designer_d_form.png
+++ b/tdevdesigner/designer/pics/designer_d_form.png
diff --git a/kdevdesigner/designer/pics/designer_d_frame.png b/tdevdesigner/designer/pics/designer_d_frame.png
index 09b21b21..09b21b21 100644
--- a/kdevdesigner/designer/pics/designer_d_frame.png
+++ b/tdevdesigner/designer/pics/designer_d_frame.png
diff --git a/kdevdesigner/designer/pics/designer_d_groupbox.png b/tdevdesigner/designer/pics/designer_d_groupbox.png
index e7e01083..e7e01083 100644
--- a/kdevdesigner/designer/pics/designer_d_groupbox.png
+++ b/tdevdesigner/designer/pics/designer_d_groupbox.png
diff --git a/kdevdesigner/designer/pics/designer_d_help.png b/tdevdesigner/designer/pics/designer_d_help.png
index 8f9d1826..8f9d1826 100644
--- a/kdevdesigner/designer/pics/designer_d_help.png
+++ b/tdevdesigner/designer/pics/designer_d_help.png
diff --git a/kdevdesigner/designer/pics/designer_d_home.png b/tdevdesigner/designer/pics/designer_d_home.png
index b3906a4f..b3906a4f 100644
--- a/kdevdesigner/designer/pics/designer_d_home.png
+++ b/tdevdesigner/designer/pics/designer_d_home.png
diff --git a/kdevdesigner/designer/pics/designer_d_iconview.png b/tdevdesigner/designer/pics/designer_d_iconview.png
index a07b2b75..a07b2b75 100644
--- a/kdevdesigner/designer/pics/designer_d_iconview.png
+++ b/tdevdesigner/designer/pics/designer_d_iconview.png
diff --git a/kdevdesigner/designer/pics/designer_d_image.png b/tdevdesigner/designer/pics/designer_d_image.png
index f7cb29c3..f7cb29c3 100644
--- a/kdevdesigner/designer/pics/designer_d_image.png
+++ b/tdevdesigner/designer/pics/designer_d_image.png
diff --git a/kdevdesigner/designer/pics/designer_d_label.png b/tdevdesigner/designer/pics/designer_d_label.png
index bfbd5b88..bfbd5b88 100644
--- a/kdevdesigner/designer/pics/designer_d_label.png
+++ b/tdevdesigner/designer/pics/designer_d_label.png
diff --git a/kdevdesigner/designer/pics/designer_d_layout.png b/tdevdesigner/designer/pics/designer_d_layout.png
index 090b4bb2..090b4bb2 100644
--- a/kdevdesigner/designer/pics/designer_d_layout.png
+++ b/tdevdesigner/designer/pics/designer_d_layout.png
diff --git a/kdevdesigner/designer/pics/designer_d_lcdnumber.png b/tdevdesigner/designer/pics/designer_d_lcdnumber.png
index 786747e6..786747e6 100644
--- a/kdevdesigner/designer/pics/designer_d_lcdnumber.png
+++ b/tdevdesigner/designer/pics/designer_d_lcdnumber.png
diff --git a/kdevdesigner/designer/pics/designer_d_left.png b/tdevdesigner/designer/pics/designer_d_left.png
index 50d03bbe..50d03bbe 100644
--- a/kdevdesigner/designer/pics/designer_d_left.png
+++ b/tdevdesigner/designer/pics/designer_d_left.png
diff --git a/kdevdesigner/designer/pics/designer_d_line.png b/tdevdesigner/designer/pics/designer_d_line.png
index 25b0daeb..25b0daeb 100644
--- a/kdevdesigner/designer/pics/designer_d_line.png
+++ b/tdevdesigner/designer/pics/designer_d_line.png
diff --git a/kdevdesigner/designer/pics/designer_d_lineedit.png b/tdevdesigner/designer/pics/designer_d_lineedit.png
index 9d34ce97..9d34ce97 100644
--- a/kdevdesigner/designer/pics/designer_d_lineedit.png
+++ b/tdevdesigner/designer/pics/designer_d_lineedit.png
diff --git a/kdevdesigner/designer/pics/designer_d_listbox.png b/tdevdesigner/designer/pics/designer_d_listbox.png
index d80c7900..d80c7900 100644
--- a/kdevdesigner/designer/pics/designer_d_listbox.png
+++ b/tdevdesigner/designer/pics/designer_d_listbox.png
diff --git a/kdevdesigner/designer/pics/designer_d_listview.png b/tdevdesigner/designer/pics/designer_d_listview.png
index c5d9be3e..c5d9be3e 100644
--- a/kdevdesigner/designer/pics/designer_d_listview.png
+++ b/tdevdesigner/designer/pics/designer_d_listview.png
diff --git a/kdevdesigner/designer/pics/designer_d_multilineedit.png b/tdevdesigner/designer/pics/designer_d_multilineedit.png
index a62e6622..a62e6622 100644
--- a/kdevdesigner/designer/pics/designer_d_multilineedit.png
+++ b/tdevdesigner/designer/pics/designer_d_multilineedit.png
diff --git a/kdevdesigner/designer/pics/designer_d_newform.png b/tdevdesigner/designer/pics/designer_d_newform.png
index ace61302..ace61302 100644
--- a/kdevdesigner/designer/pics/designer_d_newform.png
+++ b/tdevdesigner/designer/pics/designer_d_newform.png
diff --git a/kdevdesigner/designer/pics/designer_d_ordertool.png b/tdevdesigner/designer/pics/designer_d_ordertool.png
index 61bdc7ef..61bdc7ef 100644
--- a/kdevdesigner/designer/pics/designer_d_ordertool.png
+++ b/tdevdesigner/designer/pics/designer_d_ordertool.png
diff --git a/kdevdesigner/designer/pics/designer_d_pixlabel.png b/tdevdesigner/designer/pics/designer_d_pixlabel.png
index 21e1f492..21e1f492 100644
--- a/kdevdesigner/designer/pics/designer_d_pixlabel.png
+++ b/tdevdesigner/designer/pics/designer_d_pixlabel.png
diff --git a/kdevdesigner/designer/pics/designer_d_pointer.png b/tdevdesigner/designer/pics/designer_d_pointer.png
index e6903eb6..e6903eb6 100644
--- a/kdevdesigner/designer/pics/designer_d_pointer.png
+++ b/tdevdesigner/designer/pics/designer_d_pointer.png
diff --git a/kdevdesigner/designer/pics/designer_d_print.png b/tdevdesigner/designer/pics/designer_d_print.png
index 6a72a764..6a72a764 100644
--- a/kdevdesigner/designer/pics/designer_d_print.png
+++ b/tdevdesigner/designer/pics/designer_d_print.png
diff --git a/kdevdesigner/designer/pics/designer_d_progress.png b/tdevdesigner/designer/pics/designer_d_progress.png
index 25d857a6..25d857a6 100644
--- a/kdevdesigner/designer/pics/designer_d_progress.png
+++ b/tdevdesigner/designer/pics/designer_d_progress.png
diff --git a/kdevdesigner/designer/pics/designer_d_project.png b/tdevdesigner/designer/pics/designer_d_project.png
index b265eae0..b265eae0 100644
--- a/kdevdesigner/designer/pics/designer_d_project.png
+++ b/tdevdesigner/designer/pics/designer_d_project.png
diff --git a/kdevdesigner/designer/pics/designer_d_pushbutton.png b/tdevdesigner/designer/pics/designer_d_pushbutton.png
index 635f35cb..635f35cb 100644
--- a/kdevdesigner/designer/pics/designer_d_pushbutton.png
+++ b/tdevdesigner/designer/pics/designer_d_pushbutton.png
diff --git a/kdevdesigner/designer/pics/designer_d_radiobutton.png b/tdevdesigner/designer/pics/designer_d_radiobutton.png
index e86eb8c1..e86eb8c1 100644
--- a/kdevdesigner/designer/pics/designer_d_radiobutton.png
+++ b/tdevdesigner/designer/pics/designer_d_radiobutton.png
diff --git a/kdevdesigner/designer/pics/designer_d_redo.png b/tdevdesigner/designer/pics/designer_d_redo.png
index 6e993cc6..6e993cc6 100644
--- a/kdevdesigner/designer/pics/designer_d_redo.png
+++ b/tdevdesigner/designer/pics/designer_d_redo.png
diff --git a/kdevdesigner/designer/pics/designer_d_richtextedit.png b/tdevdesigner/designer/pics/designer_d_richtextedit.png
index ba7ada19..ba7ada19 100644
--- a/kdevdesigner/designer/pics/designer_d_richtextedit.png
+++ b/tdevdesigner/designer/pics/designer_d_richtextedit.png
diff --git a/kdevdesigner/designer/pics/designer_d_right.png b/tdevdesigner/designer/pics/designer_d_right.png
index 9dbf2dd6..9dbf2dd6 100644
--- a/kdevdesigner/designer/pics/designer_d_right.png
+++ b/tdevdesigner/designer/pics/designer_d_right.png
diff --git a/kdevdesigner/designer/pics/designer_d_scrollbar.png b/tdevdesigner/designer/pics/designer_d_scrollbar.png
index 9a818970..9a818970 100644
--- a/kdevdesigner/designer/pics/designer_d_scrollbar.png
+++ b/tdevdesigner/designer/pics/designer_d_scrollbar.png
diff --git a/kdevdesigner/designer/pics/designer_d_searchfind.png b/tdevdesigner/designer/pics/designer_d_searchfind.png
index e85e33fe..e85e33fe 100644
--- a/kdevdesigner/designer/pics/designer_d_searchfind.png
+++ b/tdevdesigner/designer/pics/designer_d_searchfind.png
diff --git a/kdevdesigner/designer/pics/designer_d_setbuddy.png b/tdevdesigner/designer/pics/designer_d_setbuddy.png
index fe816aa2..fe816aa2 100644
--- a/kdevdesigner/designer/pics/designer_d_setbuddy.png
+++ b/tdevdesigner/designer/pics/designer_d_setbuddy.png
diff --git a/kdevdesigner/designer/pics/designer_d_slider.png b/tdevdesigner/designer/pics/designer_d_slider.png
index a1ad5d5b..a1ad5d5b 100644
--- a/kdevdesigner/designer/pics/designer_d_slider.png
+++ b/tdevdesigner/designer/pics/designer_d_slider.png
diff --git a/kdevdesigner/designer/pics/designer_d_spacer.png b/tdevdesigner/designer/pics/designer_d_spacer.png
index 15319d99..15319d99 100644
--- a/kdevdesigner/designer/pics/designer_d_spacer.png
+++ b/tdevdesigner/designer/pics/designer_d_spacer.png
diff --git a/kdevdesigner/designer/pics/designer_d_spinbox.png b/tdevdesigner/designer/pics/designer_d_spinbox.png
index cafbe012..cafbe012 100644
--- a/kdevdesigner/designer/pics/designer_d_spinbox.png
+++ b/tdevdesigner/designer/pics/designer_d_spinbox.png
diff --git a/kdevdesigner/designer/pics/designer_d_table.png b/tdevdesigner/designer/pics/designer_d_table.png
index a95bde12..a95bde12 100644
--- a/kdevdesigner/designer/pics/designer_d_table.png
+++ b/tdevdesigner/designer/pics/designer_d_table.png
diff --git a/kdevdesigner/designer/pics/designer_d_tabwidget.png b/tdevdesigner/designer/pics/designer_d_tabwidget.png
index 0f0bad0d..0f0bad0d 100644
--- a/kdevdesigner/designer/pics/designer_d_tabwidget.png
+++ b/tdevdesigner/designer/pics/designer_d_tabwidget.png
diff --git a/kdevdesigner/designer/pics/designer_d_textbold.png b/tdevdesigner/designer/pics/designer_d_textbold.png
index 6e8a5cf5..6e8a5cf5 100644
--- a/kdevdesigner/designer/pics/designer_d_textbold.png
+++ b/tdevdesigner/designer/pics/designer_d_textbold.png
diff --git a/kdevdesigner/designer/pics/designer_d_textbrowser.png b/tdevdesigner/designer/pics/designer_d_textbrowser.png
index b4315f90..b4315f90 100644
--- a/kdevdesigner/designer/pics/designer_d_textbrowser.png
+++ b/tdevdesigner/designer/pics/designer_d_textbrowser.png
diff --git a/kdevdesigner/designer/pics/designer_d_textcenter.png b/tdevdesigner/designer/pics/designer_d_textcenter.png
index 7a66036d..7a66036d 100644
--- a/kdevdesigner/designer/pics/designer_d_textcenter.png
+++ b/tdevdesigner/designer/pics/designer_d_textcenter.png
diff --git a/kdevdesigner/designer/pics/designer_d_textedit.png b/tdevdesigner/designer/pics/designer_d_textedit.png
index 69314141..69314141 100644
--- a/kdevdesigner/designer/pics/designer_d_textedit.png
+++ b/tdevdesigner/designer/pics/designer_d_textedit.png
diff --git a/kdevdesigner/designer/pics/designer_d_textfont.png b/tdevdesigner/designer/pics/designer_d_textfont.png
index beb2112b..beb2112b 100644
--- a/kdevdesigner/designer/pics/designer_d_textfont.png
+++ b/tdevdesigner/designer/pics/designer_d_textfont.png
diff --git a/kdevdesigner/designer/pics/designer_d_texth1.png b/tdevdesigner/designer/pics/designer_d_texth1.png
index 87d7e157..87d7e157 100644
--- a/kdevdesigner/designer/pics/designer_d_texth1.png
+++ b/tdevdesigner/designer/pics/designer_d_texth1.png
diff --git a/kdevdesigner/designer/pics/designer_d_texth2.png b/tdevdesigner/designer/pics/designer_d_texth2.png
index e90437b2..e90437b2 100644
--- a/kdevdesigner/designer/pics/designer_d_texth2.png
+++ b/tdevdesigner/designer/pics/designer_d_texth2.png
diff --git a/kdevdesigner/designer/pics/designer_d_texth3.png b/tdevdesigner/designer/pics/designer_d_texth3.png
index 1c7eefe5..1c7eefe5 100644
--- a/kdevdesigner/designer/pics/designer_d_texth3.png
+++ b/tdevdesigner/designer/pics/designer_d_texth3.png
diff --git a/kdevdesigner/designer/pics/designer_d_textitalic.png b/tdevdesigner/designer/pics/designer_d_textitalic.png
index d2c07fad..d2c07fad 100644
--- a/kdevdesigner/designer/pics/designer_d_textitalic.png
+++ b/tdevdesigner/designer/pics/designer_d_textitalic.png
diff --git a/kdevdesigner/designer/pics/designer_d_textjustify.png b/tdevdesigner/designer/pics/designer_d_textjustify.png
index 3fb3cc34..3fb3cc34 100644
--- a/kdevdesigner/designer/pics/designer_d_textjustify.png
+++ b/tdevdesigner/designer/pics/designer_d_textjustify.png
diff --git a/kdevdesigner/designer/pics/designer_d_textlarger.png b/tdevdesigner/designer/pics/designer_d_textlarger.png
index ecc35f54..ecc35f54 100644
--- a/kdevdesigner/designer/pics/designer_d_textlarger.png
+++ b/tdevdesigner/designer/pics/designer_d_textlarger.png
diff --git a/kdevdesigner/designer/pics/designer_d_textleft.png b/tdevdesigner/designer/pics/designer_d_textleft.png
index 90dc0248..90dc0248 100644
--- a/kdevdesigner/designer/pics/designer_d_textleft.png
+++ b/tdevdesigner/designer/pics/designer_d_textleft.png
diff --git a/kdevdesigner/designer/pics/designer_d_textlinebreak.png b/tdevdesigner/designer/pics/designer_d_textlinebreak.png
index 4566f59e..4566f59e 100644
--- a/kdevdesigner/designer/pics/designer_d_textlinebreak.png
+++ b/tdevdesigner/designer/pics/designer_d_textlinebreak.png
diff --git a/kdevdesigner/designer/pics/designer_d_textparagraph.png b/tdevdesigner/designer/pics/designer_d_textparagraph.png
index a7ef75c7..a7ef75c7 100644
--- a/kdevdesigner/designer/pics/designer_d_textparagraph.png
+++ b/tdevdesigner/designer/pics/designer_d_textparagraph.png
diff --git a/kdevdesigner/designer/pics/designer_d_textright.png b/tdevdesigner/designer/pics/designer_d_textright.png
index ee89b93b..ee89b93b 100644
--- a/kdevdesigner/designer/pics/designer_d_textright.png
+++ b/tdevdesigner/designer/pics/designer_d_textright.png
diff --git a/kdevdesigner/designer/pics/designer_d_textsmaller.png b/tdevdesigner/designer/pics/designer_d_textsmaller.png
index d4251de0..d4251de0 100644
--- a/kdevdesigner/designer/pics/designer_d_textsmaller.png
+++ b/tdevdesigner/designer/pics/designer_d_textsmaller.png
diff --git a/kdevdesigner/designer/pics/designer_d_textteletext.png b/tdevdesigner/designer/pics/designer_d_textteletext.png
index d80af143..d80af143 100644
--- a/kdevdesigner/designer/pics/designer_d_textteletext.png
+++ b/tdevdesigner/designer/pics/designer_d_textteletext.png
diff --git a/kdevdesigner/designer/pics/designer_d_textunderline.png b/tdevdesigner/designer/pics/designer_d_textunderline.png
index cab0b788..cab0b788 100644
--- a/kdevdesigner/designer/pics/designer_d_textunderline.png
+++ b/tdevdesigner/designer/pics/designer_d_textunderline.png
diff --git a/kdevdesigner/designer/pics/designer_d_textview.png b/tdevdesigner/designer/pics/designer_d_textview.png
index 05ce9c69..05ce9c69 100644
--- a/kdevdesigner/designer/pics/designer_d_textview.png
+++ b/tdevdesigner/designer/pics/designer_d_textview.png
diff --git a/kdevdesigner/designer/pics/designer_d_timeedit.png b/tdevdesigner/designer/pics/designer_d_timeedit.png
index 955144ec..955144ec 100644
--- a/kdevdesigner/designer/pics/designer_d_timeedit.png
+++ b/tdevdesigner/designer/pics/designer_d_timeedit.png
diff --git a/kdevdesigner/designer/pics/designer_d_toolbox.png b/tdevdesigner/designer/pics/designer_d_toolbox.png
index e1f84471..e1f84471 100644
--- a/kdevdesigner/designer/pics/designer_d_toolbox.png
+++ b/tdevdesigner/designer/pics/designer_d_toolbox.png
diff --git a/kdevdesigner/designer/pics/designer_d_toolbutton.png b/tdevdesigner/designer/pics/designer_d_toolbutton.png
index 08e309a7..08e309a7 100644
--- a/kdevdesigner/designer/pics/designer_d_toolbutton.png
+++ b/tdevdesigner/designer/pics/designer_d_toolbutton.png
diff --git a/kdevdesigner/designer/pics/designer_d_undo.png b/tdevdesigner/designer/pics/designer_d_undo.png
index 22ac97f2..22ac97f2 100644
--- a/kdevdesigner/designer/pics/designer_d_undo.png
+++ b/tdevdesigner/designer/pics/designer_d_undo.png
diff --git a/kdevdesigner/designer/pics/designer_d_up.png b/tdevdesigner/designer/pics/designer_d_up.png
index 4c3ab7c9..4c3ab7c9 100644
--- a/kdevdesigner/designer/pics/designer_d_up.png
+++ b/tdevdesigner/designer/pics/designer_d_up.png
diff --git a/kdevdesigner/designer/pics/designer_d_widgetstack.png b/tdevdesigner/designer/pics/designer_d_widgetstack.png
index c62f8e15..c62f8e15 100644
--- a/kdevdesigner/designer/pics/designer_d_widgetstack.png
+++ b/tdevdesigner/designer/pics/designer_d_widgetstack.png
diff --git a/kdevdesigner/designer/pics/designer_d_wizarddata.png b/tdevdesigner/designer/pics/designer_d_wizarddata.png
index fb540b87..fb540b87 100644
--- a/kdevdesigner/designer/pics/designer_d_wizarddata.png
+++ b/tdevdesigner/designer/pics/designer_d_wizarddata.png
diff --git a/kdevdesigner/designer/pics/designer_d_wizarddialog.png b/tdevdesigner/designer/pics/designer_d_wizarddialog.png
index b83ca7e6..b83ca7e6 100644
--- a/kdevdesigner/designer/pics/designer_d_wizarddialog.png
+++ b/tdevdesigner/designer/pics/designer_d_wizarddialog.png
diff --git a/kdevdesigner/designer/pics/designer_d_wordwrap.png b/tdevdesigner/designer/pics/designer_d_wordwrap.png
index 8a299033..8a299033 100644
--- a/kdevdesigner/designer/pics/designer_d_wordwrap.png
+++ b/tdevdesigner/designer/pics/designer_d_wordwrap.png
diff --git a/kdevdesigner/designer/pics/designer_databrowser.png b/tdevdesigner/designer/pics/designer_databrowser.png
index 1dd95782..1dd95782 100644
--- a/kdevdesigner/designer/pics/designer_databrowser.png
+++ b/tdevdesigner/designer/pics/designer_databrowser.png
diff --git a/kdevdesigner/designer/pics/designer_datatable.png b/tdevdesigner/designer/pics/designer_datatable.png
index 5b3bfc76..5b3bfc76 100644
--- a/kdevdesigner/designer/pics/designer_datatable.png
+++ b/tdevdesigner/designer/pics/designer_datatable.png
diff --git a/kdevdesigner/designer/pics/designer_dataview.png b/tdevdesigner/designer/pics/designer_dataview.png
index 5f6aad33..5f6aad33 100644
--- a/kdevdesigner/designer/pics/designer_dataview.png
+++ b/tdevdesigner/designer/pics/designer_dataview.png
diff --git a/kdevdesigner/designer/pics/designer_dateedit.png b/tdevdesigner/designer/pics/designer_dateedit.png
index 48286bec..48286bec 100644
--- a/kdevdesigner/designer/pics/designer_dateedit.png
+++ b/tdevdesigner/designer/pics/designer_dateedit.png
diff --git a/kdevdesigner/designer/pics/designer_datetimeedit.png b/tdevdesigner/designer/pics/designer_datetimeedit.png
index 68a56737..68a56737 100644
--- a/kdevdesigner/designer/pics/designer_datetimeedit.png
+++ b/tdevdesigner/designer/pics/designer_datetimeedit.png
diff --git a/kdevdesigner/designer/pics/designer_dial.png b/tdevdesigner/designer/pics/designer_dial.png
index 260033c2..260033c2 100644
--- a/kdevdesigner/designer/pics/designer_dial.png
+++ b/tdevdesigner/designer/pics/designer_dial.png
diff --git a/kdevdesigner/designer/pics/designer_down.png b/tdevdesigner/designer/pics/designer_down.png
index 3269deca..3269deca 100644
--- a/kdevdesigner/designer/pics/designer_down.png
+++ b/tdevdesigner/designer/pics/designer_down.png
diff --git a/kdevdesigner/designer/pics/designer_editbreaklayout.png b/tdevdesigner/designer/pics/designer_editbreaklayout.png
index badbb8e7..badbb8e7 100644
--- a/kdevdesigner/designer/pics/designer_editbreaklayout.png
+++ b/tdevdesigner/designer/pics/designer_editbreaklayout.png
diff --git a/kdevdesigner/designer/pics/designer_editcopy.png b/tdevdesigner/designer/pics/designer_editcopy.png
index 2f931cb2..2f931cb2 100644
--- a/kdevdesigner/designer/pics/designer_editcopy.png
+++ b/tdevdesigner/designer/pics/designer_editcopy.png
diff --git a/kdevdesigner/designer/pics/designer_editcut.png b/tdevdesigner/designer/pics/designer_editcut.png
index a911482d..a911482d 100644
--- a/kdevdesigner/designer/pics/designer_editcut.png
+++ b/tdevdesigner/designer/pics/designer_editcut.png
diff --git a/kdevdesigner/designer/pics/designer_editdelete.png b/tdevdesigner/designer/pics/designer_editdelete.png
index 9f0491dd..9f0491dd 100644
--- a/kdevdesigner/designer/pics/designer_editdelete.png
+++ b/tdevdesigner/designer/pics/designer_editdelete.png
diff --git a/kdevdesigner/designer/pics/designer_editgrid.png b/tdevdesigner/designer/pics/designer_editgrid.png
index f2b18e8a..f2b18e8a 100644
--- a/kdevdesigner/designer/pics/designer_editgrid.png
+++ b/tdevdesigner/designer/pics/designer_editgrid.png
diff --git a/kdevdesigner/designer/pics/designer_edithlayout.png b/tdevdesigner/designer/pics/designer_edithlayout.png
index 1a2b1504..1a2b1504 100644
--- a/kdevdesigner/designer/pics/designer_edithlayout.png
+++ b/tdevdesigner/designer/pics/designer_edithlayout.png
diff --git a/kdevdesigner/designer/pics/designer_edithlayoutsplit.png b/tdevdesigner/designer/pics/designer_edithlayoutsplit.png
index cba102bc..cba102bc 100644
--- a/kdevdesigner/designer/pics/designer_edithlayoutsplit.png
+++ b/tdevdesigner/designer/pics/designer_edithlayoutsplit.png
diff --git a/kdevdesigner/designer/pics/designer_editlower.png b/tdevdesigner/designer/pics/designer_editlower.png
index 50605f27..50605f27 100644
--- a/kdevdesigner/designer/pics/designer_editlower.png
+++ b/tdevdesigner/designer/pics/designer_editlower.png
diff --git a/kdevdesigner/designer/pics/designer_editpaste.png b/tdevdesigner/designer/pics/designer_editpaste.png
index b1b7f853..b1b7f853 100644
--- a/kdevdesigner/designer/pics/designer_editpaste.png
+++ b/tdevdesigner/designer/pics/designer_editpaste.png
diff --git a/kdevdesigner/designer/pics/designer_editraise.png b/tdevdesigner/designer/pics/designer_editraise.png
index f1572517..f1572517 100644
--- a/kdevdesigner/designer/pics/designer_editraise.png
+++ b/tdevdesigner/designer/pics/designer_editraise.png
diff --git a/kdevdesigner/designer/pics/designer_editslots.png b/tdevdesigner/designer/pics/designer_editslots.png
index b86bddb6..b86bddb6 100644
--- a/kdevdesigner/designer/pics/designer_editslots.png
+++ b/tdevdesigner/designer/pics/designer_editslots.png
diff --git a/kdevdesigner/designer/pics/designer_editvlayout.png b/tdevdesigner/designer/pics/designer_editvlayout.png
index f4cd3f9c..f4cd3f9c 100644
--- a/kdevdesigner/designer/pics/designer_editvlayout.png
+++ b/tdevdesigner/designer/pics/designer_editvlayout.png
diff --git a/kdevdesigner/designer/pics/designer_editvlayoutsplit.png b/tdevdesigner/designer/pics/designer_editvlayoutsplit.png
index 0180cf5a..0180cf5a 100644
--- a/kdevdesigner/designer/pics/designer_editvlayoutsplit.png
+++ b/tdevdesigner/designer/pics/designer_editvlayoutsplit.png
diff --git a/kdevdesigner/designer/pics/designer_filenew.png b/tdevdesigner/designer/pics/designer_filenew.png
index 9520080e..9520080e 100644
--- a/kdevdesigner/designer/pics/designer_filenew.png
+++ b/tdevdesigner/designer/pics/designer_filenew.png
diff --git a/kdevdesigner/designer/pics/designer_fileopen.png b/tdevdesigner/designer/pics/designer_fileopen.png
index 30052901..30052901 100644
--- a/kdevdesigner/designer/pics/designer_fileopen.png
+++ b/tdevdesigner/designer/pics/designer_fileopen.png
diff --git a/kdevdesigner/designer/pics/designer_filesave.png b/tdevdesigner/designer/pics/designer_filesave.png
index c137165b..c137165b 100644
--- a/kdevdesigner/designer/pics/designer_filesave.png
+++ b/tdevdesigner/designer/pics/designer_filesave.png
diff --git a/kdevdesigner/designer/pics/designer_folder.png b/tdevdesigner/designer/pics/designer_folder.png
index bab6df0f..bab6df0f 100644
--- a/kdevdesigner/designer/pics/designer_folder.png
+++ b/tdevdesigner/designer/pics/designer_folder.png
diff --git a/kdevdesigner/designer/pics/designer_form.png b/tdevdesigner/designer/pics/designer_form.png
index 08268bf7..08268bf7 100644
--- a/kdevdesigner/designer/pics/designer_form.png
+++ b/tdevdesigner/designer/pics/designer_form.png
diff --git a/kdevdesigner/designer/pics/designer_frame.png b/tdevdesigner/designer/pics/designer_frame.png
index c070b9c4..c070b9c4 100644
--- a/kdevdesigner/designer/pics/designer_frame.png
+++ b/tdevdesigner/designer/pics/designer_frame.png
diff --git a/kdevdesigner/designer/pics/designer_groupbox.png b/tdevdesigner/designer/pics/designer_groupbox.png
index 4025b4dc..4025b4dc 100644
--- a/kdevdesigner/designer/pics/designer_groupbox.png
+++ b/tdevdesigner/designer/pics/designer_groupbox.png
diff --git a/kdevdesigner/designer/pics/designer_hand.png b/tdevdesigner/designer/pics/designer_hand.png
index ac01ee60..ac01ee60 100644
--- a/kdevdesigner/designer/pics/designer_hand.png
+++ b/tdevdesigner/designer/pics/designer_hand.png
diff --git a/kdevdesigner/designer/pics/designer_help.png b/tdevdesigner/designer/pics/designer_help.png
index 2ab2c25d..2ab2c25d 100644
--- a/kdevdesigner/designer/pics/designer_help.png
+++ b/tdevdesigner/designer/pics/designer_help.png
diff --git a/kdevdesigner/designer/pics/designer_home.png b/tdevdesigner/designer/pics/designer_home.png
index 806d11d2..806d11d2 100644
--- a/kdevdesigner/designer/pics/designer_home.png
+++ b/tdevdesigner/designer/pics/designer_home.png
diff --git a/kdevdesigner/designer/pics/designer_hsplit.png b/tdevdesigner/designer/pics/designer_hsplit.png
index 232faf14..232faf14 100644
--- a/kdevdesigner/designer/pics/designer_hsplit.png
+++ b/tdevdesigner/designer/pics/designer_hsplit.png
diff --git a/kdevdesigner/designer/pics/designer_ibeam.png b/tdevdesigner/designer/pics/designer_ibeam.png
index 6074c89f..6074c89f 100644
--- a/kdevdesigner/designer/pics/designer_ibeam.png
+++ b/tdevdesigner/designer/pics/designer_ibeam.png
diff --git a/kdevdesigner/designer/pics/designer_iconview.png b/tdevdesigner/designer/pics/designer_iconview.png
index 13b8f153..13b8f153 100644
--- a/kdevdesigner/designer/pics/designer_iconview.png
+++ b/tdevdesigner/designer/pics/designer_iconview.png
diff --git a/kdevdesigner/designer/pics/designer_image.png b/tdevdesigner/designer/pics/designer_image.png
index 29854df6..29854df6 100644
--- a/kdevdesigner/designer/pics/designer_image.png
+++ b/tdevdesigner/designer/pics/designer_image.png
diff --git a/kdevdesigner/designer/pics/designer_label.png b/tdevdesigner/designer/pics/designer_label.png
index 5d7d7b4c..5d7d7b4c 100644
--- a/kdevdesigner/designer/pics/designer_label.png
+++ b/tdevdesigner/designer/pics/designer_label.png
diff --git a/kdevdesigner/designer/pics/designer_layout.png b/tdevdesigner/designer/pics/designer_layout.png
index 168eb1f8..168eb1f8 100644
--- a/kdevdesigner/designer/pics/designer_layout.png
+++ b/tdevdesigner/designer/pics/designer_layout.png
diff --git a/kdevdesigner/designer/pics/designer_lcdnumber.png b/tdevdesigner/designer/pics/designer_lcdnumber.png
index 64eda5e4..64eda5e4 100644
--- a/kdevdesigner/designer/pics/designer_lcdnumber.png
+++ b/tdevdesigner/designer/pics/designer_lcdnumber.png
diff --git a/kdevdesigner/designer/pics/designer_left.png b/tdevdesigner/designer/pics/designer_left.png
index e58177f4..e58177f4 100644
--- a/kdevdesigner/designer/pics/designer_left.png
+++ b/tdevdesigner/designer/pics/designer_left.png
diff --git a/kdevdesigner/designer/pics/designer_line.png b/tdevdesigner/designer/pics/designer_line.png
index 5c64dfb5..5c64dfb5 100644
--- a/kdevdesigner/designer/pics/designer_line.png
+++ b/tdevdesigner/designer/pics/designer_line.png
diff --git a/kdevdesigner/designer/pics/designer_lineedit.png b/tdevdesigner/designer/pics/designer_lineedit.png
index 75fc890f..75fc890f 100644
--- a/kdevdesigner/designer/pics/designer_lineedit.png
+++ b/tdevdesigner/designer/pics/designer_lineedit.png
diff --git a/kdevdesigner/designer/pics/designer_listbox.png b/tdevdesigner/designer/pics/designer_listbox.png
index d467fc9f..d467fc9f 100644
--- a/kdevdesigner/designer/pics/designer_listbox.png
+++ b/tdevdesigner/designer/pics/designer_listbox.png
diff --git a/kdevdesigner/designer/pics/designer_listview.png b/tdevdesigner/designer/pics/designer_listview.png
index d71cc1c9..d71cc1c9 100644
--- a/kdevdesigner/designer/pics/designer_listview.png
+++ b/tdevdesigner/designer/pics/designer_listview.png
diff --git a/kdevdesigner/designer/pics/designer_multilineedit.png b/tdevdesigner/designer/pics/designer_multilineedit.png
index e2f08995..e2f08995 100644
--- a/kdevdesigner/designer/pics/designer_multilineedit.png
+++ b/tdevdesigner/designer/pics/designer_multilineedit.png
diff --git a/kdevdesigner/designer/pics/designer_newform.png b/tdevdesigner/designer/pics/designer_newform.png
index 37779c13..37779c13 100644
--- a/kdevdesigner/designer/pics/designer_newform.png
+++ b/tdevdesigner/designer/pics/designer_newform.png
diff --git a/kdevdesigner/designer/pics/designer_no.png b/tdevdesigner/designer/pics/designer_no.png
index 8bacc044..8bacc044 100644
--- a/kdevdesigner/designer/pics/designer_no.png
+++ b/tdevdesigner/designer/pics/designer_no.png
diff --git a/kdevdesigner/designer/pics/designer_object.png b/tdevdesigner/designer/pics/designer_object.png
index cc4192ed..cc4192ed 100644
--- a/kdevdesigner/designer/pics/designer_object.png
+++ b/tdevdesigner/designer/pics/designer_object.png
diff --git a/kdevdesigner/designer/pics/designer_ordertool.png b/tdevdesigner/designer/pics/designer_ordertool.png
index ad122839..ad122839 100644
--- a/kdevdesigner/designer/pics/designer_ordertool.png
+++ b/tdevdesigner/designer/pics/designer_ordertool.png
diff --git a/kdevdesigner/designer/pics/designer_pixlabel.png b/tdevdesigner/designer/pics/designer_pixlabel.png
index 32b90d82..32b90d82 100644
--- a/kdevdesigner/designer/pics/designer_pixlabel.png
+++ b/tdevdesigner/designer/pics/designer_pixlabel.png
diff --git a/kdevdesigner/designer/pics/designer_pointer.png b/tdevdesigner/designer/pics/designer_pointer.png
index 67e38a36..67e38a36 100644
--- a/kdevdesigner/designer/pics/designer_pointer.png
+++ b/tdevdesigner/designer/pics/designer_pointer.png
diff --git a/kdevdesigner/designer/pics/designer_print.png b/tdevdesigner/designer/pics/designer_print.png
index 57e3e532..57e3e532 100644
--- a/kdevdesigner/designer/pics/designer_print.png
+++ b/tdevdesigner/designer/pics/designer_print.png
diff --git a/kdevdesigner/designer/pics/designer_progress.png b/tdevdesigner/designer/pics/designer_progress.png
index 44ae094e..44ae094e 100644
--- a/kdevdesigner/designer/pics/designer_progress.png
+++ b/tdevdesigner/designer/pics/designer_progress.png
diff --git a/kdevdesigner/designer/pics/designer_project.png b/tdevdesigner/designer/pics/designer_project.png
index 6a0fb96f..6a0fb96f 100644
--- a/kdevdesigner/designer/pics/designer_project.png
+++ b/tdevdesigner/designer/pics/designer_project.png
diff --git a/kdevdesigner/designer/pics/designer_pushbutton.png b/tdevdesigner/designer/pics/designer_pushbutton.png
index 61f779ce..61f779ce 100644
--- a/kdevdesigner/designer/pics/designer_pushbutton.png
+++ b/tdevdesigner/designer/pics/designer_pushbutton.png
diff --git a/kdevdesigner/designer/pics/designer_qtlogo.png b/tdevdesigner/designer/pics/designer_qtlogo.png
index 4e1a1472..4e1a1472 100644
--- a/kdevdesigner/designer/pics/designer_qtlogo.png
+++ b/tdevdesigner/designer/pics/designer_qtlogo.png
diff --git a/kdevdesigner/designer/pics/designer_radiobutton.png b/tdevdesigner/designer/pics/designer_radiobutton.png
index 10c1d8c3..10c1d8c3 100644
--- a/kdevdesigner/designer/pics/designer_radiobutton.png
+++ b/tdevdesigner/designer/pics/designer_radiobutton.png
diff --git a/kdevdesigner/designer/pics/designer_redo.png b/tdevdesigner/designer/pics/designer_redo.png
index abdad26c..abdad26c 100644
--- a/kdevdesigner/designer/pics/designer_redo.png
+++ b/tdevdesigner/designer/pics/designer_redo.png
diff --git a/kdevdesigner/designer/pics/designer_resetproperty.png b/tdevdesigner/designer/pics/designer_resetproperty.png
index cc0d6a26..cc0d6a26 100644
--- a/kdevdesigner/designer/pics/designer_resetproperty.png
+++ b/tdevdesigner/designer/pics/designer_resetproperty.png
diff --git a/kdevdesigner/designer/pics/designer_richtextedit.png b/tdevdesigner/designer/pics/designer_richtextedit.png
index 73573a8a..73573a8a 100644
--- a/kdevdesigner/designer/pics/designer_richtextedit.png
+++ b/tdevdesigner/designer/pics/designer_richtextedit.png
diff --git a/kdevdesigner/designer/pics/designer_right.png b/tdevdesigner/designer/pics/designer_right.png
index 5f2f7036..5f2f7036 100644
--- a/kdevdesigner/designer/pics/designer_right.png
+++ b/tdevdesigner/designer/pics/designer_right.png
diff --git a/kdevdesigner/designer/pics/designer_s_down.png b/tdevdesigner/designer/pics/designer_s_down.png
index 908e55e1..908e55e1 100644
--- a/kdevdesigner/designer/pics/designer_s_down.png
+++ b/tdevdesigner/designer/pics/designer_s_down.png
diff --git a/kdevdesigner/designer/pics/designer_s_editcut.png b/tdevdesigner/designer/pics/designer_s_editcut.png
index 7cf5a9eb..7cf5a9eb 100644
--- a/kdevdesigner/designer/pics/designer_s_editcut.png
+++ b/tdevdesigner/designer/pics/designer_s_editcut.png
diff --git a/kdevdesigner/designer/pics/designer_s_left.png b/tdevdesigner/designer/pics/designer_s_left.png
index e6e19f8f..e6e19f8f 100644
--- a/kdevdesigner/designer/pics/designer_s_left.png
+++ b/tdevdesigner/designer/pics/designer_s_left.png
diff --git a/kdevdesigner/designer/pics/designer_s_right.png b/tdevdesigner/designer/pics/designer_s_right.png
index bfccda6b..bfccda6b 100644
--- a/kdevdesigner/designer/pics/designer_s_right.png
+++ b/tdevdesigner/designer/pics/designer_s_right.png
diff --git a/kdevdesigner/designer/pics/designer_s_up.png b/tdevdesigner/designer/pics/designer_s_up.png
index 97705d47..97705d47 100644
--- a/kdevdesigner/designer/pics/designer_s_up.png
+++ b/tdevdesigner/designer/pics/designer_s_up.png
diff --git a/kdevdesigner/designer/pics/designer_scrollbar.png b/tdevdesigner/designer/pics/designer_scrollbar.png
index 466c58de..466c58de 100644
--- a/kdevdesigner/designer/pics/designer_scrollbar.png
+++ b/tdevdesigner/designer/pics/designer_scrollbar.png
diff --git a/kdevdesigner/designer/pics/designer_searchfind.png b/tdevdesigner/designer/pics/designer_searchfind.png
index 3f369fdb..3f369fdb 100644
--- a/kdevdesigner/designer/pics/designer_searchfind.png
+++ b/tdevdesigner/designer/pics/designer_searchfind.png
diff --git a/kdevdesigner/designer/pics/designer_setbuddy.png b/tdevdesigner/designer/pics/designer_setbuddy.png
index c1edb89b..c1edb89b 100644
--- a/kdevdesigner/designer/pics/designer_setbuddy.png
+++ b/tdevdesigner/designer/pics/designer_setbuddy.png
diff --git a/kdevdesigner/designer/pics/designer_sizeall.png b/tdevdesigner/designer/pics/designer_sizeall.png
index fa2a266a..fa2a266a 100644
--- a/kdevdesigner/designer/pics/designer_sizeall.png
+++ b/tdevdesigner/designer/pics/designer_sizeall.png
diff --git a/kdevdesigner/designer/pics/designer_sizeb.png b/tdevdesigner/designer/pics/designer_sizeb.png
index ac5235b0..ac5235b0 100644
--- a/kdevdesigner/designer/pics/designer_sizeb.png
+++ b/tdevdesigner/designer/pics/designer_sizeb.png
diff --git a/kdevdesigner/designer/pics/designer_sizef.png b/tdevdesigner/designer/pics/designer_sizef.png
index 28a30c29..28a30c29 100644
--- a/kdevdesigner/designer/pics/designer_sizef.png
+++ b/tdevdesigner/designer/pics/designer_sizef.png
diff --git a/kdevdesigner/designer/pics/designer_sizeh.png b/tdevdesigner/designer/pics/designer_sizeh.png
index 7b8abd3a..7b8abd3a 100644
--- a/kdevdesigner/designer/pics/designer_sizeh.png
+++ b/tdevdesigner/designer/pics/designer_sizeh.png
diff --git a/kdevdesigner/designer/pics/designer_sizev.png b/tdevdesigner/designer/pics/designer_sizev.png
index 80b3d8b2..80b3d8b2 100644
--- a/kdevdesigner/designer/pics/designer_sizev.png
+++ b/tdevdesigner/designer/pics/designer_sizev.png
diff --git a/kdevdesigner/designer/pics/designer_slider.png b/tdevdesigner/designer/pics/designer_slider.png
index 525bd1ca..525bd1ca 100644
--- a/kdevdesigner/designer/pics/designer_slider.png
+++ b/tdevdesigner/designer/pics/designer_slider.png
diff --git a/kdevdesigner/designer/pics/designer_spacer.png b/tdevdesigner/designer/pics/designer_spacer.png
index 926e8afc..926e8afc 100644
--- a/kdevdesigner/designer/pics/designer_spacer.png
+++ b/tdevdesigner/designer/pics/designer_spacer.png
diff --git a/kdevdesigner/designer/pics/designer_spinbox.png b/tdevdesigner/designer/pics/designer_spinbox.png
index 7ae20630..7ae20630 100644
--- a/kdevdesigner/designer/pics/designer_spinbox.png
+++ b/tdevdesigner/designer/pics/designer_spinbox.png
diff --git a/kdevdesigner/designer/pics/designer_splash.png b/tdevdesigner/designer/pics/designer_splash.png
index d3b62a17..d3b62a17 100644
--- a/kdevdesigner/designer/pics/designer_splash.png
+++ b/tdevdesigner/designer/pics/designer_splash.png
diff --git a/kdevdesigner/designer/pics/designer_table.png b/tdevdesigner/designer/pics/designer_table.png
index 4bbd9c2d..4bbd9c2d 100644
--- a/kdevdesigner/designer/pics/designer_table.png
+++ b/tdevdesigner/designer/pics/designer_table.png
diff --git a/kdevdesigner/designer/pics/designer_tabwidget.png b/tdevdesigner/designer/pics/designer_tabwidget.png
index 1254bb63..1254bb63 100644
--- a/kdevdesigner/designer/pics/designer_tabwidget.png
+++ b/tdevdesigner/designer/pics/designer_tabwidget.png
diff --git a/kdevdesigner/designer/pics/designer_textbold.png b/tdevdesigner/designer/pics/designer_textbold.png
index 7f4f7344..7f4f7344 100644
--- a/kdevdesigner/designer/pics/designer_textbold.png
+++ b/tdevdesigner/designer/pics/designer_textbold.png
diff --git a/kdevdesigner/designer/pics/designer_textbrowser.png b/tdevdesigner/designer/pics/designer_textbrowser.png
index 090e2f84..090e2f84 100644
--- a/kdevdesigner/designer/pics/designer_textbrowser.png
+++ b/tdevdesigner/designer/pics/designer_textbrowser.png
diff --git a/kdevdesigner/designer/pics/designer_textcenter.png b/tdevdesigner/designer/pics/designer_textcenter.png
index 5c68b09c..5c68b09c 100644
--- a/kdevdesigner/designer/pics/designer_textcenter.png
+++ b/tdevdesigner/designer/pics/designer_textcenter.png
diff --git a/kdevdesigner/designer/pics/designer_textedit.png b/tdevdesigner/designer/pics/designer_textedit.png
index 823d0818..823d0818 100644
--- a/kdevdesigner/designer/pics/designer_textedit.png
+++ b/tdevdesigner/designer/pics/designer_textedit.png
diff --git a/kdevdesigner/designer/pics/designer_textfont.png b/tdevdesigner/designer/pics/designer_textfont.png
index a4de87a4..a4de87a4 100644
--- a/kdevdesigner/designer/pics/designer_textfont.png
+++ b/tdevdesigner/designer/pics/designer_textfont.png
diff --git a/kdevdesigner/designer/pics/designer_texth1.png b/tdevdesigner/designer/pics/designer_texth1.png
index 1c3aa2fd..1c3aa2fd 100644
--- a/kdevdesigner/designer/pics/designer_texth1.png
+++ b/tdevdesigner/designer/pics/designer_texth1.png
diff --git a/kdevdesigner/designer/pics/designer_texth2.png b/tdevdesigner/designer/pics/designer_texth2.png
index ba73121d..ba73121d 100644
--- a/kdevdesigner/designer/pics/designer_texth2.png
+++ b/tdevdesigner/designer/pics/designer_texth2.png
diff --git a/kdevdesigner/designer/pics/designer_texth3.png b/tdevdesigner/designer/pics/designer_texth3.png
index 1d9f8732..1d9f8732 100644
--- a/kdevdesigner/designer/pics/designer_texth3.png
+++ b/tdevdesigner/designer/pics/designer_texth3.png
diff --git a/kdevdesigner/designer/pics/designer_textitalic.png b/tdevdesigner/designer/pics/designer_textitalic.png
index 68e2b44c..68e2b44c 100644
--- a/kdevdesigner/designer/pics/designer_textitalic.png
+++ b/tdevdesigner/designer/pics/designer_textitalic.png
diff --git a/kdevdesigner/designer/pics/designer_textjustify.png b/tdevdesigner/designer/pics/designer_textjustify.png
index 6e746c80..6e746c80 100644
--- a/kdevdesigner/designer/pics/designer_textjustify.png
+++ b/tdevdesigner/designer/pics/designer_textjustify.png
diff --git a/kdevdesigner/designer/pics/designer_textlarger.png b/tdevdesigner/designer/pics/designer_textlarger.png
index 89960939..89960939 100644
--- a/kdevdesigner/designer/pics/designer_textlarger.png
+++ b/tdevdesigner/designer/pics/designer_textlarger.png
diff --git a/kdevdesigner/designer/pics/designer_textleft.png b/tdevdesigner/designer/pics/designer_textleft.png
index 72b27652..72b27652 100644
--- a/kdevdesigner/designer/pics/designer_textleft.png
+++ b/tdevdesigner/designer/pics/designer_textleft.png
diff --git a/kdevdesigner/designer/pics/designer_textlinebreak.png b/tdevdesigner/designer/pics/designer_textlinebreak.png
index 081a49e0..081a49e0 100644
--- a/kdevdesigner/designer/pics/designer_textlinebreak.png
+++ b/tdevdesigner/designer/pics/designer_textlinebreak.png
diff --git a/kdevdesigner/designer/pics/designer_textparagraph.png b/tdevdesigner/designer/pics/designer_textparagraph.png
index dcd0b3ea..dcd0b3ea 100644
--- a/kdevdesigner/designer/pics/designer_textparagraph.png
+++ b/tdevdesigner/designer/pics/designer_textparagraph.png
diff --git a/kdevdesigner/designer/pics/designer_textright.png b/tdevdesigner/designer/pics/designer_textright.png
index d7186722..d7186722 100644
--- a/kdevdesigner/designer/pics/designer_textright.png
+++ b/tdevdesigner/designer/pics/designer_textright.png
diff --git a/kdevdesigner/designer/pics/designer_textsmaller.png b/tdevdesigner/designer/pics/designer_textsmaller.png
index 10953d9a..10953d9a 100644
--- a/kdevdesigner/designer/pics/designer_textsmaller.png
+++ b/tdevdesigner/designer/pics/designer_textsmaller.png
diff --git a/kdevdesigner/designer/pics/designer_textteletext.png b/tdevdesigner/designer/pics/designer_textteletext.png
index c0204636..c0204636 100644
--- a/kdevdesigner/designer/pics/designer_textteletext.png
+++ b/tdevdesigner/designer/pics/designer_textteletext.png
diff --git a/kdevdesigner/designer/pics/designer_textunderline.png b/tdevdesigner/designer/pics/designer_textunderline.png
index 3477ccb3..3477ccb3 100644
--- a/kdevdesigner/designer/pics/designer_textunderline.png
+++ b/tdevdesigner/designer/pics/designer_textunderline.png
diff --git a/kdevdesigner/designer/pics/designer_textview.png b/tdevdesigner/designer/pics/designer_textview.png
index ec2270c3..ec2270c3 100644
--- a/kdevdesigner/designer/pics/designer_textview.png
+++ b/tdevdesigner/designer/pics/designer_textview.png
diff --git a/kdevdesigner/designer/pics/designer_timeedit.png b/tdevdesigner/designer/pics/designer_timeedit.png
index 01b37888..01b37888 100644
--- a/kdevdesigner/designer/pics/designer_timeedit.png
+++ b/tdevdesigner/designer/pics/designer_timeedit.png
diff --git a/kdevdesigner/designer/pics/designer_toolbox.png b/tdevdesigner/designer/pics/designer_toolbox.png
index 2ab71dc7..2ab71dc7 100644
--- a/kdevdesigner/designer/pics/designer_toolbox.png
+++ b/tdevdesigner/designer/pics/designer_toolbox.png
diff --git a/kdevdesigner/designer/pics/designer_toolbutton.png b/tdevdesigner/designer/pics/designer_toolbutton.png
index 25d240a1..25d240a1 100644
--- a/kdevdesigner/designer/pics/designer_toolbutton.png
+++ b/tdevdesigner/designer/pics/designer_toolbutton.png
diff --git a/kdevdesigner/designer/pics/designer_undo.png b/tdevdesigner/designer/pics/designer_undo.png
index 839a823f..839a823f 100644
--- a/kdevdesigner/designer/pics/designer_undo.png
+++ b/tdevdesigner/designer/pics/designer_undo.png
diff --git a/kdevdesigner/designer/pics/designer_up.png b/tdevdesigner/designer/pics/designer_up.png
index e4373122..e4373122 100644
--- a/kdevdesigner/designer/pics/designer_up.png
+++ b/tdevdesigner/designer/pics/designer_up.png
diff --git a/kdevdesigner/designer/pics/designer_uparrow.png b/tdevdesigner/designer/pics/designer_uparrow.png
index eefe4a00..eefe4a00 100644
--- a/kdevdesigner/designer/pics/designer_uparrow.png
+++ b/tdevdesigner/designer/pics/designer_uparrow.png
diff --git a/kdevdesigner/designer/pics/designer_vsplit.png b/tdevdesigner/designer/pics/designer_vsplit.png
index b820c19f..b820c19f 100644
--- a/kdevdesigner/designer/pics/designer_vsplit.png
+++ b/tdevdesigner/designer/pics/designer_vsplit.png
diff --git a/kdevdesigner/designer/pics/designer_wait.png b/tdevdesigner/designer/pics/designer_wait.png
index 5d8cfed2..5d8cfed2 100644
--- a/kdevdesigner/designer/pics/designer_wait.png
+++ b/tdevdesigner/designer/pics/designer_wait.png
diff --git a/kdevdesigner/designer/pics/designer_widgetstack.png b/tdevdesigner/designer/pics/designer_widgetstack.png
index c326de81..c326de81 100644
--- a/kdevdesigner/designer/pics/designer_widgetstack.png
+++ b/tdevdesigner/designer/pics/designer_widgetstack.png
diff --git a/kdevdesigner/designer/pics/designer_wizarddata.png b/tdevdesigner/designer/pics/designer_wizarddata.png
index 9493e3b1..9493e3b1 100644
--- a/kdevdesigner/designer/pics/designer_wizarddata.png
+++ b/tdevdesigner/designer/pics/designer_wizarddata.png
diff --git a/kdevdesigner/designer/pics/designer_wizarddialog.png b/tdevdesigner/designer/pics/designer_wizarddialog.png
index a22dc88a..a22dc88a 100644
--- a/kdevdesigner/designer/pics/designer_wizarddialog.png
+++ b/tdevdesigner/designer/pics/designer_wizarddialog.png
diff --git a/kdevdesigner/designer/pics/designer_wordwrap.png b/tdevdesigner/designer/pics/designer_wordwrap.png
index 29513c32..29513c32 100644
--- a/kdevdesigner/designer/pics/designer_wordwrap.png
+++ b/tdevdesigner/designer/pics/designer_wordwrap.png
diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/tdevdesigner/designer/pixmapchooser.cpp
index 92d68ac1..279997ba 100644
--- a/kdevdesigner/designer/pixmapchooser.cpp
+++ b/tdevdesigner/designer/pixmapchooser.cpp
@@ -32,7 +32,7 @@
 #include <kimagefilepreview.h>
 #include <klineedit.h>
 
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 #include "pixmapchooser.h"
 #include "formwindow.h"
@@ -196,7 +196,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T
 	if ( dia.exec() == TQDialog::Accepted ) {
 	    TQPixmap pix;
 	    // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that
-	    pix.convertFromImage( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ).convertToImage() );
+	    pix.convertFromImage( BarIcon( "designer_image.png", TDevDesignerPartFactory::instance() ).convertToImage() );
 
 	    MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), dia.editArguments->text() );
 	    return pix;
@@ -211,7 +211,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T
 }
 
 ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name )
-    : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) )
+    : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( BarIcon( "designer_image.png", TDevDesignerPartFactory::instance() ) )
 {
     fmts = TQImage::inputFormats();
 }
diff --git a/kdevdesigner/designer/pixmapchooser.h b/tdevdesigner/designer/pixmapchooser.h
index c6523488..c6523488 100644
--- a/kdevdesigner/designer/pixmapchooser.h
+++ b/tdevdesigner/designer/pixmapchooser.h
diff --git a/kdevdesigner/designer/pixmapcollection.cpp b/tdevdesigner/designer/pixmapcollection.cpp
index 880423a3..880423a3 100644
--- a/kdevdesigner/designer/pixmapcollection.cpp
+++ b/tdevdesigner/designer/pixmapcollection.cpp
diff --git a/kdevdesigner/designer/pixmapcollection.h b/tdevdesigner/designer/pixmapcollection.h
index 10d630fc..10d630fc 100644
--- a/kdevdesigner/designer/pixmapcollection.h
+++ b/tdevdesigner/designer/pixmapcollection.h
diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui b/tdevdesigner/designer/pixmapcollectioneditor.ui
index 30f74183..30f74183 100644
--- a/kdevdesigner/designer/pixmapcollectioneditor.ui
+++ b/tdevdesigner/designer/pixmapcollectioneditor.ui
diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui.h b/tdevdesigner/designer/pixmapcollectioneditor.ui.h
index 82bd7929..82bd7929 100644
--- a/kdevdesigner/designer/pixmapcollectioneditor.ui.h
+++ b/tdevdesigner/designer/pixmapcollectioneditor.ui.h
diff --git a/kdevdesigner/designer/pixmapfunction.ui b/tdevdesigner/designer/pixmapfunction.ui
index 760abe56..760abe56 100644
--- a/kdevdesigner/designer/pixmapfunction.ui
+++ b/tdevdesigner/designer/pixmapfunction.ui
diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/tdevdesigner/designer/popupmenueditor.cpp
index da6289dd..da6289dd 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/tdevdesigner/designer/popupmenueditor.cpp
diff --git a/kdevdesigner/designer/popupmenueditor.h b/tdevdesigner/designer/popupmenueditor.h
index 714ecf42..714ecf42 100644
--- a/kdevdesigner/designer/popupmenueditor.h
+++ b/tdevdesigner/designer/popupmenueditor.h
diff --git a/kdevdesigner/designer/preferences.ui b/tdevdesigner/designer/preferences.ui
index 363164ed..363164ed 100644
--- a/kdevdesigner/designer/preferences.ui
+++ b/tdevdesigner/designer/preferences.ui
diff --git a/kdevdesigner/designer/previewframe.cpp b/tdevdesigner/designer/previewframe.cpp
index c26d51fc..c26d51fc 100644
--- a/kdevdesigner/designer/previewframe.cpp
+++ b/tdevdesigner/designer/previewframe.cpp
diff --git a/kdevdesigner/designer/previewframe.h b/tdevdesigner/designer/previewframe.h
index 1883a062..1883a062 100644
--- a/kdevdesigner/designer/previewframe.h
+++ b/tdevdesigner/designer/previewframe.h
diff --git a/kdevdesigner/designer/previewwidget.ui b/tdevdesigner/designer/previewwidget.ui
index 3b792253..3b792253 100644
--- a/kdevdesigner/designer/previewwidget.ui
+++ b/tdevdesigner/designer/previewwidget.ui
diff --git a/kdevdesigner/designer/previewwidgetimpl.cpp b/tdevdesigner/designer/previewwidgetimpl.cpp
index d574f9ae..d574f9ae 100644
--- a/kdevdesigner/designer/previewwidgetimpl.cpp
+++ b/tdevdesigner/designer/previewwidgetimpl.cpp
diff --git a/kdevdesigner/designer/previewwidgetimpl.h b/tdevdesigner/designer/previewwidgetimpl.h
index d8887bee..d8887bee 100644
--- a/kdevdesigner/designer/previewwidgetimpl.h
+++ b/tdevdesigner/designer/previewwidgetimpl.h
diff --git a/kdevdesigner/designer/project.cpp b/tdevdesigner/designer/project.cpp
index 0ab26894..0ab26894 100644
--- a/kdevdesigner/designer/project.cpp
+++ b/tdevdesigner/designer/project.cpp
diff --git a/kdevdesigner/designer/project.h b/tdevdesigner/designer/project.h
index 3e80428f..3e80428f 100644
--- a/kdevdesigner/designer/project.h
+++ b/tdevdesigner/designer/project.h
diff --git a/kdevdesigner/designer/projectsettings.ui b/tdevdesigner/designer/projectsettings.ui
index d606a521..d606a521 100644
--- a/kdevdesigner/designer/projectsettings.ui
+++ b/tdevdesigner/designer/projectsettings.ui
diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/tdevdesigner/designer/projectsettingsimpl.cpp
index 99bb800d..99bb800d 100644
--- a/kdevdesigner/designer/projectsettingsimpl.cpp
+++ b/tdevdesigner/designer/projectsettingsimpl.cpp
diff --git a/kdevdesigner/designer/projectsettingsimpl.h b/tdevdesigner/designer/projectsettingsimpl.h
index c1b7fb0c..c1b7fb0c 100644
--- a/kdevdesigner/designer/projectsettingsimpl.h
+++ b/tdevdesigner/designer/projectsettingsimpl.h
diff --git a/kdevdesigner/designer/propertyeditor.cpp b/tdevdesigner/designer/propertyeditor.cpp
index e7a5d387..c22e9b22 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/tdevdesigner/designer/propertyeditor.cpp
@@ -47,7 +47,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 #include <tqpainter.h>
 #include <tqpalette.h>
@@ -405,7 +405,7 @@ void PropertyItem::createResetButton()
 	resetButton->parentWidget()->lower();
 	return;
     }
-    const TQPixmap DesignerResetPix = SmallIcon( "designer_resetproperty.png" , KDevDesignerPartFactory::instance());
+    const TQPixmap DesignerResetPix = SmallIcon( "designer_resetproperty.png" , TDevDesignerPartFactory::instance());
 
     TQHBox *hbox = new TQHBox( listview->viewport() );
     hbox->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
@@ -2362,20 +2362,20 @@ TQComboBox *PropertyCursorItem::combo()
     comb->hide();
     TQBitmap cur;
 
-    const TQPixmap ArrowPix = SmallIcon( "designer_arrow.png" , KDevDesignerPartFactory::instance());
-    const TQPixmap UpArrowPix = SmallIcon( "designer_uparrow.png" , KDevDesignerPartFactory::instance());
-    const TQPixmap CrossPix = SmallIcon( "designer_cross.png" , KDevDesignerPartFactory::instance());
-    const TQPixmap WaitPix = SmallIcon( "designer_wait.png" , KDevDesignerPartFactory::instance());
-    const TQPixmap IBeamPix = SmallIcon( "designer_ibeam.png" , KDevDesignerPartFactory::instance());
-    const TQPixmap SizeVPix = SmallIcon( "designer_sizev.png" , KDevDesignerPartFactory::instance());
-    const TQPixmap SizeHPix = SmallIcon( "designer_sizeh.png" , KDevDesignerPartFactory::instance());
-    const TQPixmap SizeFPix = SmallIcon( "designer_sizef.png" , KDevDesignerPartFactory::instance());
-    const TQPixmap SizeBPix = SmallIcon( "designer_sizeb.png" , KDevDesignerPartFactory::instance());
-    const TQPixmap SizeAllPix = SmallIcon( "designer_sizeall.png" , KDevDesignerPartFactory::instance());
-    const TQPixmap VSplitPix = SmallIcon( "designer_vsplit.png" , KDevDesignerPartFactory::instance());
-    const TQPixmap HSplitPix = SmallIcon( "designer_hsplit.png" , KDevDesignerPartFactory::instance());
-    const TQPixmap HandPix = SmallIcon( "designer_hand.png" , KDevDesignerPartFactory::instance());
-    const TQPixmap NoPix = SmallIcon( "designer_no.png" , KDevDesignerPartFactory::instance());
+    const TQPixmap ArrowPix = SmallIcon( "designer_arrow.png" , TDevDesignerPartFactory::instance());
+    const TQPixmap UpArrowPix = SmallIcon( "designer_uparrow.png" , TDevDesignerPartFactory::instance());
+    const TQPixmap CrossPix = SmallIcon( "designer_cross.png" , TDevDesignerPartFactory::instance());
+    const TQPixmap WaitPix = SmallIcon( "designer_wait.png" , TDevDesignerPartFactory::instance());
+    const TQPixmap IBeamPix = SmallIcon( "designer_ibeam.png" , TDevDesignerPartFactory::instance());
+    const TQPixmap SizeVPix = SmallIcon( "designer_sizev.png" , TDevDesignerPartFactory::instance());
+    const TQPixmap SizeHPix = SmallIcon( "designer_sizeh.png" , TDevDesignerPartFactory::instance());
+    const TQPixmap SizeFPix = SmallIcon( "designer_sizef.png" , TDevDesignerPartFactory::instance());
+    const TQPixmap SizeBPix = SmallIcon( "designer_sizeb.png" , TDevDesignerPartFactory::instance());
+    const TQPixmap SizeAllPix = SmallIcon( "designer_sizeall.png" , TDevDesignerPartFactory::instance());
+    const TQPixmap VSplitPix = SmallIcon( "designer_vsplit.png" , TDevDesignerPartFactory::instance());
+    const TQPixmap HSplitPix = SmallIcon( "designer_hsplit.png" , TDevDesignerPartFactory::instance());
+    const TQPixmap HandPix = SmallIcon( "designer_hand.png" , TDevDesignerPartFactory::instance());
+    const TQPixmap NoPix = SmallIcon( "designer_no.png" , TDevDesignerPartFactory::instance());
 
     comb->insertItem( ArrowPix, i18n("Arrow"), TQObject::ArrowCursor);
     comb->insertItem( UpArrowPix, i18n("Up-Arrow"), TQObject::UpArrowCursor );
@@ -3958,7 +3958,7 @@ void EventList::setup()
     if ( !formWindow )
 	return;
     LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() );
-    const TQPixmap DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance());
+    const TQPixmap DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance());
     TQStrList sigs;
     if ( iface )
     {
@@ -4004,7 +4004,7 @@ void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e )
 	s = TQString( editor->widget()->name() ) + "_" + i->text( 0 );
     }
 
-    const TQPixmap DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance());
+    const TQPixmap DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance());
     insertEntry( i, DesignerEditSlotsPix , s );
 }
 
@@ -4028,8 +4028,8 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
     TQPopupMenu menu;
     const int NEW_ITEM = 1;
     const int DEL_ITEM = 2;
-    menu.insertItem( SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()), i18n( "New Signal Handler" ), NEW_ITEM );
-    menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()), i18n( "Delete Signal Handler" ), DEL_ITEM );
+    menu.insertItem( SmallIcon( "designer_filenew.png" , TDevDesignerPartFactory::instance()), i18n( "New Signal Handler" ), NEW_ITEM );
+    menu.insertItem( SmallIcon( "designer_editcut.png" , TDevDesignerPartFactory::instance()), i18n( "Delete Signal Handler" ), DEL_ITEM );
     int res = menu.exec( pos );
     if ( res == NEW_ITEM ) {
 	TQString s;
@@ -4042,7 +4042,7 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
 	} else {
 	    s = TQString( editor->widget()->name() ) + "_" + ( i->parent() ? i->parent() : i )->text( 0 );
 	}
-	insertEntry( i->parent() ? i->parent() : i, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), s );
+	insertEntry( i->parent() ? i->parent() : i, SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()), s );
     } else if ( res == DEL_ITEM && i->parent() ) {
 	MetaDataBase::Connection conn;
 	conn.sender = editor->widget();
@@ -4100,7 +4100,7 @@ void EventList::renamed( TQListViewItem *i )
 	    funcname += "(" + sig + ")";
 	}
 
-         //normally add a function in kdevdesigner
+         //normally add a function in tdevdesigner
         AddFunctionCommand *cmd2 = new AddFunctionCommand( i18n( "Add Function" ),
                                                 formWindow, funcname.latin1(), "virtual",
                                                 "public",
diff --git a/kdevdesigner/designer/propertyeditor.h b/tdevdesigner/designer/propertyeditor.h
index 7b7eccd8..7b7eccd8 100644
--- a/kdevdesigner/designer/propertyeditor.h
+++ b/tdevdesigner/designer/propertyeditor.h
diff --git a/kdevdesigner/designer/propertyobject.cpp b/tdevdesigner/designer/propertyobject.cpp
index 1bd1883f..1bd1883f 100644
--- a/kdevdesigner/designer/propertyobject.cpp
+++ b/tdevdesigner/designer/propertyobject.cpp
diff --git a/kdevdesigner/designer/propertyobject.h b/tdevdesigner/designer/propertyobject.h
index 2590399a..2590399a 100644
--- a/kdevdesigner/designer/propertyobject.h
+++ b/tdevdesigner/designer/propertyobject.h
diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/tdevdesigner/designer/qcompletionedit.cpp
index ed0c986e..ed0c986e 100644
--- a/kdevdesigner/designer/qcompletionedit.cpp
+++ b/tdevdesigner/designer/qcompletionedit.cpp
diff --git a/kdevdesigner/designer/qcompletionedit.h b/tdevdesigner/designer/qcompletionedit.h
index 5c3f7fe1..5c3f7fe1 100644
--- a/kdevdesigner/designer/qcompletionedit.h
+++ b/tdevdesigner/designer/qcompletionedit.h
diff --git a/kdevdesigner/designer/replacedialog.ui b/tdevdesigner/designer/replacedialog.ui
index 27d01a58..27d01a58 100644
--- a/kdevdesigner/designer/replacedialog.ui
+++ b/tdevdesigner/designer/replacedialog.ui
diff --git a/kdevdesigner/designer/replacedialog.ui.h b/tdevdesigner/designer/replacedialog.ui.h
index 63946525..63946525 100644
--- a/kdevdesigner/designer/replacedialog.ui.h
+++ b/tdevdesigner/designer/replacedialog.ui.h
diff --git a/kdevdesigner/designer/resource.cpp b/tdevdesigner/designer/resource.cpp
index a6285db5..26b46a68 100644
--- a/kdevdesigner/designer/resource.cpp
+++ b/tdevdesigner/designer/resource.cpp
@@ -85,7 +85,7 @@
 #include <tdefiledialog.h>
 #include <tdelocale.h>
 
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 static TQString makeIndent( int indent )
 {
@@ -1299,7 +1299,7 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname*
 	if ( mainwindow && mainwindow->currProject() ) {
 	    pix = mainwindow->currProject()->pixmapCollection()->pixmap( arg );
 	} else {
-	    pix = BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() );
+	    pix = BarIcon( "designer_image.png", TDevDesignerPartFactory::instance() );
 	    // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that
 	    pix.convertFromImage( pix.convertToImage() );
 	}
@@ -1307,7 +1307,7 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname*
 	MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg );
 	return pix;
     }
-    TQPixmap pix = BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() );
+    TQPixmap pix = BarIcon( "designer_image.png", TDevDesignerPartFactory::instance() );
     // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that
     pix.convertFromImage( pix.convertToImage() );
     MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg );
diff --git a/kdevdesigner/designer/resource.h b/tdevdesigner/designer/resource.h
index 06598254..06598254 100644
--- a/kdevdesigner/designer/resource.h
+++ b/tdevdesigner/designer/resource.h
diff --git a/kdevdesigner/designer/richtextfontdialog.ui b/tdevdesigner/designer/richtextfontdialog.ui
index d7d6c5a7..d7d6c5a7 100644
--- a/kdevdesigner/designer/richtextfontdialog.ui
+++ b/tdevdesigner/designer/richtextfontdialog.ui
diff --git a/kdevdesigner/designer/richtextfontdialog.ui.h b/tdevdesigner/designer/richtextfontdialog.ui.h
index 27a11a21..27a11a21 100644
--- a/kdevdesigner/designer/richtextfontdialog.ui.h
+++ b/tdevdesigner/designer/richtextfontdialog.ui.h
diff --git a/kdevdesigner/designer/sizehandle.cpp b/tdevdesigner/designer/sizehandle.cpp
index d60f223b..d60f223b 100644
--- a/kdevdesigner/designer/sizehandle.cpp
+++ b/tdevdesigner/designer/sizehandle.cpp
diff --git a/kdevdesigner/designer/sizehandle.h b/tdevdesigner/designer/sizehandle.h
index 44917884..44917884 100644
--- a/kdevdesigner/designer/sizehandle.h
+++ b/tdevdesigner/designer/sizehandle.h
diff --git a/kdevdesigner/designer/sourceeditor.cpp b/tdevdesigner/designer/sourceeditor.cpp
index 2850e20e..43d18cba 100644
--- a/kdevdesigner/designer/sourceeditor.cpp
+++ b/tdevdesigner/designer/sourceeditor.cpp
@@ -38,7 +38,7 @@
 #include "hierarchyview.h"
 #include <tqmessagebox.h>
 #include <tqtextstream.h>
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface )
     : TQVBox( parent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 )
@@ -49,7 +49,7 @@ SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageIn
 			    this, MainWindow::self->designerInterface() );
     iFace->onBreakPointChange( TQT_TQOBJECT(MainWindow::self), TQT_SLOT( breakPointsChanged() ) );
     resize( 600, 400 );
-    setIcon( SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) );
+    setIcon( SmallIcon( "designer_filenew.png" , TDevDesignerPartFactory::instance()) );
 }
 
 SourceEditor::~SourceEditor()
diff --git a/kdevdesigner/designer/sourceeditor.h b/tdevdesigner/designer/sourceeditor.h
index 3dde636e..3dde636e 100644
--- a/kdevdesigner/designer/sourceeditor.h
+++ b/tdevdesigner/designer/sourceeditor.h
diff --git a/kdevdesigner/designer/sourcefile.cpp b/tdevdesigner/designer/sourcefile.cpp
index 3d848bbf..3d848bbf 100644
--- a/kdevdesigner/designer/sourcefile.cpp
+++ b/tdevdesigner/designer/sourcefile.cpp
diff --git a/kdevdesigner/designer/sourcefile.h b/tdevdesigner/designer/sourcefile.h
index ef4d31db..ef4d31db 100644
--- a/kdevdesigner/designer/sourcefile.h
+++ b/tdevdesigner/designer/sourcefile.h
diff --git a/kdevdesigner/designer/startdialog.ui b/tdevdesigner/designer/startdialog.ui
index 383fdfda..383fdfda 100644
--- a/kdevdesigner/designer/startdialog.ui
+++ b/tdevdesigner/designer/startdialog.ui
diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/tdevdesigner/designer/startdialogimpl.cpp
index adff44fd..e7099068 100644
--- a/kdevdesigner/designer/startdialogimpl.cpp
+++ b/tdevdesigner/designer/startdialogimpl.cpp
@@ -18,7 +18,7 @@
 #include <tqcheckbox.h>
 #include <tqurl.h>
 
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 #include "mainwindow.h"
 #include "startdialogimpl.h"
@@ -138,7 +138,7 @@ void StartDialog::insertRecentItems( TQStringList &files, bool isProject )
 	TQFileInfo fi( *it );
 	item = new TQIconViewItem( recentView, fi.fileName() );
 	recentFiles[recentView->index( item )] = *it;
-	item->setPixmap( BarIcon( iconName, KDevDesignerPartFactory::instance() ) );
+	item->setPixmap( BarIcon( iconName, TDevDesignerPartFactory::instance() ) );
 	item->setDragEnabled( FALSE );
     }
 }
diff --git a/kdevdesigner/designer/startdialogimpl.h b/tdevdesigner/designer/startdialogimpl.h
index 8fb574d0..8fb574d0 100644
--- a/kdevdesigner/designer/startdialogimpl.h
+++ b/tdevdesigner/designer/startdialogimpl.h
diff --git a/kdevdesigner/designer/styledbutton.cpp b/tdevdesigner/designer/styledbutton.cpp
index 82c9ddb8..82c9ddb8 100644
--- a/kdevdesigner/designer/styledbutton.cpp
+++ b/tdevdesigner/designer/styledbutton.cpp
diff --git a/kdevdesigner/designer/styledbutton.h b/tdevdesigner/designer/styledbutton.h
index 8065fe84..8065fe84 100644
--- a/kdevdesigner/designer/styledbutton.h
+++ b/tdevdesigner/designer/styledbutton.h
diff --git a/kdevdesigner/designer/syntaxhighlighter_html.cpp b/tdevdesigner/designer/syntaxhighlighter_html.cpp
index 5bb681f9..5bb681f9 100644
--- a/kdevdesigner/designer/syntaxhighlighter_html.cpp
+++ b/tdevdesigner/designer/syntaxhighlighter_html.cpp
diff --git a/kdevdesigner/designer/syntaxhighlighter_html.h b/tdevdesigner/designer/syntaxhighlighter_html.h
index efd1a616..efd1a616 100644
--- a/kdevdesigner/designer/syntaxhighlighter_html.h
+++ b/tdevdesigner/designer/syntaxhighlighter_html.h
diff --git a/kdevdesigner/designer/tableeditor.ui b/tdevdesigner/designer/tableeditor.ui
index deacf5d4..deacf5d4 100644
--- a/kdevdesigner/designer/tableeditor.ui
+++ b/tdevdesigner/designer/tableeditor.ui
diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/tdevdesigner/designer/tableeditorimpl.cpp
index 060611f6..060611f6 100644
--- a/kdevdesigner/designer/tableeditorimpl.cpp
+++ b/tdevdesigner/designer/tableeditorimpl.cpp
diff --git a/kdevdesigner/designer/tableeditorimpl.h b/tdevdesigner/designer/tableeditorimpl.h
index 7729f33e..7729f33e 100644
--- a/kdevdesigner/designer/tableeditorimpl.h
+++ b/tdevdesigner/designer/tableeditorimpl.h
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/tdevdesigner/designer/tdevdesigner_part.cpp
index ac966d00..def9aa7f 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/tdevdesigner/designer/tdevdesigner_part.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 #include <kinstance.h>
 #include <tdeaction.h>
@@ -40,12 +40,12 @@
 #include "designeraction.h"
 #include "formwindow.h"
 
-KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widgetName
+TDevDesignerPart::TDevDesignerPart( TQWidget *parentWidget, const char *// widgetName
                                     ,
                                   TQObject *parent, const char *name, const TQStringList &args )
     : KInterfaceDesigner::Designer(parent, name)
 {
-    setInstance( KDevDesignerPartFactory::instance() );
+    setInstance( TDevDesignerPartFactory::instance() );
 
     m_widget = new MainWindow( this, true );
     m_widget->reparent(parentWidget, TQPoint(0,0));
@@ -55,9 +55,9 @@ KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widge
 
     setupActions();
     if (args.contains("in shell"))
-        setXMLFile("kdevdesigner_part_sh.rc");
+        setXMLFile("tdevdesigner_part_sh.rc");
     else
-        setXMLFile("kdevdesigner_part.rc");
+        setXMLFile("tdevdesigner_part.rc");
 
     setReadWrite(true);
     setModified(false);
@@ -65,7 +65,7 @@ KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widge
     connect(m_widget, TQT_SIGNAL(formModified(bool )), this, TQT_SLOT(formModified(bool)));
 }
 
-void KDevDesignerPart::setupDesignerWindow()
+void TDevDesignerPart::setupDesignerWindow()
 {
     m_widget->menuBar()->hide();
     m_widget->layoutToolBar->hide();
@@ -76,15 +76,15 @@ void KDevDesignerPart::setupDesignerWindow()
 
 static TQIconSet createPartIconSet( const TQString &name )
 {
-    TQIconSet ic( BarIcon( "" + name, KDevDesignerPartFactory::instance() ) );
+    TQIconSet ic( BarIcon( "" + name, TDevDesignerPartFactory::instance() ) );
     TQString prefix = "designer_";
     int right = name.length() - prefix.length();
-    ic.setPixmap( BarIcon( prefix + "d_" + name.right( right ), KDevDesignerPartFactory::instance() ),
+    ic.setPixmap( BarIcon( prefix + "d_" + name.right( right ), TDevDesignerPartFactory::instance() ),
 		  TQIconSet::Small, TQIconSet::Disabled );
     return ic;
 }
 
-void KDevDesignerPart::setupActions( )
+void TDevDesignerPart::setupActions( )
 {
     TDEAction *action;
     action = KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
@@ -169,20 +169,20 @@ void KDevDesignerPart::setupActions( )
     stateSync(action, m_widget->actionWindowPrevious);
 
     action = KStdAction::preferences(this, TQT_SLOT(editPreferences()), actionCollection());
-    action->setText(i18n("Configure &KDevDesigner..."));
+    action->setText(i18n("Configure &TDevDesigner..."));
     stateSync(action, m_widget->actionEditPreferences);
 }
 
-KDevDesignerPart::~KDevDesignerPart()
+TDevDesignerPart::~TDevDesignerPart()
 {
 }
 
-void KDevDesignerPart::setReadWrite(bool rw)
+void TDevDesignerPart::setReadWrite(bool rw)
 {
     ReadWritePart::setReadWrite(rw);
 }
 
-void KDevDesignerPart::setModified(bool modified)
+void TDevDesignerPart::setModified(bool modified)
 {
 /*    TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
     if (!save)
@@ -195,13 +195,13 @@ void KDevDesignerPart::setModified(bool modified)
     ReadWritePart::setModified(modified);
 }
 
-bool KDevDesignerPart::openFile()
+bool TDevDesignerPart::openFile()
 {
     m_widget->fileOpen("", "", m_file);
     return true;
 }
 
-bool KDevDesignerPart::saveFile()
+bool TDevDesignerPart::saveFile()
 {
     if (isReadWrite() == false)
         return false;
@@ -209,7 +209,7 @@ bool KDevDesignerPart::saveFile()
     return true;
 }
 
-void KDevDesignerPart::stateSync( TDEAction * tdeaction, TQAction * qaction )
+void TDevDesignerPart::stateSync( TDEAction * tdeaction, TQAction * qaction )
 {
     if (!qaction)
         return;
@@ -220,7 +220,7 @@ void KDevDesignerPart::stateSync( TDEAction * tdeaction, TQAction * qaction )
     connect(ac, TQT_SIGNAL(actionEnabled(bool )), tdeaction, TQT_SLOT(setEnabled(bool )));
 }
 
-void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * action )
+void TDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * action )
 {
     if (!action)
         return;
@@ -240,15 +240,15 @@ void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * act
 #include <tdeaboutdata.h>
 #include <tdelocale.h>
 
-TDEInstance*  KDevDesignerPartFactory::s_instance = 0L;
-TDEAboutData* KDevDesignerPartFactory::s_about = 0L;
+TDEInstance*  TDevDesignerPartFactory::s_instance = 0L;
+TDEAboutData* TDevDesignerPartFactory::s_about = 0L;
 
-KDevDesignerPartFactory::KDevDesignerPartFactory()
+TDevDesignerPartFactory::TDevDesignerPartFactory()
     : KParts::Factory()
 {
 }
 
-KDevDesignerPartFactory::~KDevDesignerPartFactory()
+TDevDesignerPartFactory::~TDevDesignerPartFactory()
 {
     delete s_instance;
     delete s_about;
@@ -256,12 +256,12 @@ KDevDesignerPartFactory::~KDevDesignerPartFactory()
     s_instance = 0L;
 }
 
-KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
+KParts::Part* TDevDesignerPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
                                                         TQObject *parent, const char *name,
                                                         const char *classname, const TQStringList &args )
 {
     // Create an instance of our Part
-    KDevDesignerPart* obj = new KDevDesignerPart( parentWidget, widgetName, parent, name, args );
+    TDevDesignerPart* obj = new TDevDesignerPart( parentWidget, widgetName, parent, name, args );
 
     // See if we are to be read-write or not
     if (TQCString(classname) == "KParts::ReadOnlyPart")
@@ -270,11 +270,11 @@ KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *parentWidget,
     return obj;
 }
 
-TDEInstance* KDevDesignerPartFactory::instance()
+TDEInstance* TDevDesignerPartFactory::instance()
 {
     if( !s_instance )
     {
-        s_about = new TDEAboutData("kdevdesignerpart", I18N_NOOP("KDevDesignerPart"), "0.1");
+        s_about = new TDEAboutData("tdevdesignerpart", I18N_NOOP("TDevDesignerPart"), "0.1");
         s_about->addAuthor("Alexander Dymo", 0, "cloudtemple@mksat.net");
         s_about->addAuthor("Trolltech AS", 0, "info@trolltech.com");
         s_instance = new TDEInstance(s_about);
@@ -284,15 +284,15 @@ TDEInstance* KDevDesignerPartFactory::instance()
 
 extern "C"
 {
-    void* init_libkdevdesignerpart()
+    void* init_libtdevdesignerpart()
     {
-        return new KDevDesignerPartFactory;
+        return new TDevDesignerPartFactory;
     }
 }
 
 //actions
 
-void KDevDesignerPart::fileNew( )
+void TDevDesignerPart::fileNew( )
 {
     if (!m_widget->actionNewFile)
     {
@@ -302,167 +302,167 @@ void KDevDesignerPart::fileNew( )
     m_widget->actionNewFile->activate();
 }
 
-void KDevDesignerPart::fileOpen()
+void TDevDesignerPart::fileOpen()
 {
     m_widget->fileOpen();
 }
 
-void KDevDesignerPart::fileSaveAs()
+void TDevDesignerPart::fileSaveAs()
 {
     m_widget->actionFileSaveAs->activate();
 }
 
-void KDevDesignerPart::fileClose( )
+void TDevDesignerPart::fileClose( )
 {
     m_widget->actionFileClose->activate();
 }
 
-void KDevDesignerPart::fileCreateTemplate( )
+void TDevDesignerPart::fileCreateTemplate( )
 {
     m_widget->fileCreateTemplate();
 }
 
-void KDevDesignerPart::editUndo( )
+void TDevDesignerPart::editUndo( )
 {
     m_widget->actionEditUndo->activate();
 }
 
-void KDevDesignerPart::editRedo( )
+void TDevDesignerPart::editRedo( )
 {
     m_widget->actionEditRedo->activate();
 }
 
-void KDevDesignerPart::editCut( )
+void TDevDesignerPart::editCut( )
 {
     m_widget->actionEditCut->activate();
 }
 
-void KDevDesignerPart::editPaste( )
+void TDevDesignerPart::editPaste( )
 {
     m_widget->actionEditPaste->activate();
 }
 
-void KDevDesignerPart::editCopy( )
+void TDevDesignerPart::editCopy( )
 {
     m_widget->actionEditCopy->activate();
 }
 
-void KDevDesignerPart::editDelete( )
+void TDevDesignerPart::editDelete( )
 {
     m_widget->actionEditDelete->activate();
 }
 
-void KDevDesignerPart::editSelectAll( )
+void TDevDesignerPart::editSelectAll( )
 {
     m_widget->actionEditSelectAll->activate();
 }
 
-void KDevDesignerPart::editAccels( )
+void TDevDesignerPart::editAccels( )
 {
     m_widget->actionEditAccels->activate();
 }
 
-void KDevDesignerPart::editFunctions( )
+void TDevDesignerPart::editFunctions( )
 {
     m_widget->actionEditFunctions->activate();
 }
 
-void KDevDesignerPart::editConnections( )
+void TDevDesignerPart::editConnections( )
 {
     m_widget->actionEditConnections->activate();
 }
 
-void KDevDesignerPart::editFormSettings( )
+void TDevDesignerPart::editFormSettings( )
 {
     m_widget->actionEditFormSettings->activate();
 }
 
-void KDevDesignerPart::editPreferences( )
+void TDevDesignerPart::editPreferences( )
 {
     m_widget->actionEditPreferences->activate();
 }
 
-void KDevDesignerPart::projectAddFile( )
+void TDevDesignerPart::projectAddFile( )
 {
     m_widget->actionProjectAddFile->activate();
 }
 
-void KDevDesignerPart::projectImageCollection( )
+void TDevDesignerPart::projectImageCollection( )
 {
     m_widget->actionEditPixmapCollection->activate();
 }
 
-void KDevDesignerPart::projectDatabaseCollections( )
+void TDevDesignerPart::projectDatabaseCollections( )
 {
     m_widget->actionEditDatabaseConnections->activate();
 }
 
-void KDevDesignerPart::projectSettings( )
+void TDevDesignerPart::projectSettings( )
 {
     m_widget->actionEditProjectSettings->activate();
 }
 
-void KDevDesignerPart::toolsConfigureToolbox( )
+void TDevDesignerPart::toolsConfigureToolbox( )
 {
     m_widget->toolsConfigure();
 }
 
-void KDevDesignerPart::layoutAdjustSize( )
+void TDevDesignerPart::layoutAdjustSize( )
 {
     m_widget->actionEditAdjustSize->activate();
 }
 
-void KDevDesignerPart::layoutHLayout( )
+void TDevDesignerPart::layoutHLayout( )
 {
     m_widget->actionEditHLayout->activate();
 }
 
-void KDevDesignerPart::layoutVLayout( )
+void TDevDesignerPart::layoutVLayout( )
 {
     m_widget->actionEditVLayout->activate();
 }
 
-void KDevDesignerPart::layoutGridLayout( )
+void TDevDesignerPart::layoutGridLayout( )
 {
     m_widget->actionEditGridLayout->activate();
 }
 
-void KDevDesignerPart::layoutSplitHLayout( )
+void TDevDesignerPart::layoutSplitHLayout( )
 {
     m_widget->actionEditSplitHorizontal->activate();
 }
 
-void KDevDesignerPart::layoutSplitVLayout( )
+void TDevDesignerPart::layoutSplitVLayout( )
 {
     m_widget->actionEditSplitVertical->activate();
 }
 
-void KDevDesignerPart::layoutBreak( )
+void TDevDesignerPart::layoutBreak( )
 {
     m_widget->actionEditBreakLayout->activate();
 }
 
-void KDevDesignerPart::windowPreview( )
+void TDevDesignerPart::windowPreview( )
 {
     m_widget->actionPreview->activate();
 }
 
-void KDevDesignerPart::windowNext( )
+void TDevDesignerPart::windowNext( )
 {
     m_widget->actionWindowNext->activate();
 }
 
-void KDevDesignerPart::windowPrev( )
+void TDevDesignerPart::windowPrev( )
 {
     m_widget->actionWindowPrevious->activate();
 }
 
-void KDevDesignerPart::statusMessage( const TQString & msg )
+void TDevDesignerPart::statusMessage( const TQString & msg )
 {
     emit setStatusBarText(msg);
 }
 
-void KDevDesignerPart::setToggleActionChecked( bool b)
+void TDevDesignerPart::setToggleActionChecked( bool b)
 {
     if (!sender())
         return;
@@ -484,7 +484,7 @@ void KDevDesignerPart::setToggleActionChecked( bool b)
     tdeaction->blockSignals(false);
 }
 
-void KDevDesignerPart::setToggleActionOn( bool b )
+void TDevDesignerPart::setToggleActionOn( bool b )
 {
     if (!sender())
         return;
@@ -500,33 +500,33 @@ void KDevDesignerPart::setToggleActionOn( bool b )
     connect(qaction, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool )));
 }
 
-void KDevDesignerPart::openProject( const TQString & // projectFile
+void TDevDesignerPart::openProject( const TQString & // projectFile
                                     )
 {
     //TODO: implement
     return;
 }
 
-KInterfaceDesigner::DesignerType KDevDesignerPart::designerType( )
+KInterfaceDesigner::DesignerType TDevDesignerPart::designerType( )
 {
     return KInterfaceDesigner::TQtDesigner;
 }
 
-void KDevDesignerPart::emitAddedFunction( const TQString & form, KInterfaceDesigner::Function func )
+void TDevDesignerPart::emitAddedFunction( const TQString & form, KInterfaceDesigner::Function func )
 {
-    kdDebug() << "KDevDesignerPart::emitAddedFunction: form " << form << ", function: " << func.function << endl;
+    kdDebug() << "TDevDesignerPart::emitAddedFunction: form " << form << ", function: " << func.function << endl;
     emit addedFunction(designerType(), form, func);
 }
 
-void KDevDesignerPart::emitRemovedFunction( const TQString & form, KInterfaceDesigner::Function func )
+void TDevDesignerPart::emitRemovedFunction( const TQString & form, KInterfaceDesigner::Function func )
 {
-    kdDebug() << "KDevDesignerPart::emitRemovedFunction: form " << form << ", function: " << func.function << endl;
+    kdDebug() << "TDevDesignerPart::emitRemovedFunction: form " << form << ", function: " << func.function << endl;
     emit removedFunction(designerType(), form, func);
 }
 
-void KDevDesignerPart::emitEditedFunction( const TQString & form, KInterfaceDesigner::Function oldFunc, KInterfaceDesigner::Function func )
+void TDevDesignerPart::emitEditedFunction( const TQString & form, KInterfaceDesigner::Function oldFunc, KInterfaceDesigner::Function func )
 {
-    kdDebug() << "KDevDesignerPart::emitEditedFunction: form " << form
+    kdDebug() << "TDevDesignerPart::emitEditedFunction: form " << form
         << ", old function: " << oldFunc.function
         << ", function: " << func.function << endl;
 
@@ -534,32 +534,32 @@ void KDevDesignerPart::emitEditedFunction( const TQString & form, KInterfaceDesi
     emit editedFunction(designerType(), form, oldFunc, func);
 }
 
-void KDevDesignerPart::emitEditFunction(const TQString &formName, const TQString &functionName)
+void TDevDesignerPart::emitEditFunction(const TQString &formName, const TQString &functionName)
 {
-    kdDebug() << "KDevDesignerPart::emitEditedFunction: form " << formName
+    kdDebug() << "TDevDesignerPart::emitEditedFunction: form " << formName
         << ", function: " << functionName << endl;
     emit editFunction(designerType(), formName, functionName);
 }
 
-void KDevDesignerPart::formModified(bool b)
+void TDevDesignerPart::formModified(bool b)
 {
-    kdDebug() << "KDevDesignerPart::formModified " << b << endl;
+    kdDebug() << "TDevDesignerPart::formModified " << b << endl;
     setModified(b);
 }
 
-void KDevDesignerPart::emitEditSource(const TQString &formName)
+void TDevDesignerPart::emitEditSource(const TQString &formName)
 {
     emit editSource(designerType(), formName);
 }
 
-void KDevDesignerPart::emitNewStatus(const TQString &formName, int status)
+void TDevDesignerPart::emitNewStatus(const TQString &formName, int status)
 {
     emit newStatus(formName, status);
 }
 
-void KDevDesignerPart::toolsEditCustomWidgets( )
+void TDevDesignerPart::toolsEditCustomWidgets( )
 {
     m_widget->toolsCustomWidget();
 }
 
-#include "kdevdesigner_part.moc"
+#include "tdevdesigner_part.moc"
diff --git a/kdevdesigner/designer/kdevdesigner_part.desktop b/tdevdesigner/designer/tdevdesigner_part.desktop
index 2928a8ad..998d4f74 100644
--- a/kdevdesigner/designer/kdevdesigner_part.desktop
+++ b/tdevdesigner/designer/tdevdesigner_part.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=KDevDesignerPart
+Name=TDevDesignerPart
 Name[da]=TDevelop Designer-part
-Name[el]=ΤμήμαKDevDesigner
+Name[el]=ΤμήμαTDevDesigner
 Name[nds]=Kdevelop-Makerkomponent
 Name[ne]=केडीई विकास डिजाइनर भाग
 Name[sv]=TDevelop designerdel
@@ -10,7 +10,7 @@ Name[tg]=KDevҚисми дизайнгар
 Name[zh_TW]=TDevelop 設計元件
 MimeType=application/x-designer
 ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
-X-TDE-Library=libkdevdesignerpart
+X-TDE-Library=libtdevdesignerpart
 Type=Service
 InitialPreference=10
 
diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/tdevdesigner/designer/tdevdesigner_part.h
index 3006c600..3381da5a 100644
--- a/kdevdesigner/designer/kdevdesigner_part.h
+++ b/tdevdesigner/designer/tdevdesigner_part.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef _KDEVDESIGNERPART_H_
-#define _KDEVDESIGNERPART_H_
+#ifndef _TDEVDESIGNERPART_H_
+#define _TDEVDESIGNERPART_H_
 
 #include <tqmap.h>
 
@@ -36,14 +36,14 @@ class TDEAction;
 class TQAction;
 class TDERadioAction;
 
-class KDevDesignerPart : public KInterfaceDesigner::Designer
+class TDevDesignerPart : public KInterfaceDesigner::Designer
 {
     Q_OBJECT
   
 public:
-    KDevDesignerPart(TQWidget *parentWidget, const char *widgetName,
+    TDevDesignerPart(TQWidget *parentWidget, const char *widgetName,
                     TQObject *parent, const char *name, const TQStringList &args);
-    virtual ~KDevDesignerPart();
+    virtual ~TDevDesignerPart();
 
     virtual void setReadWrite(bool rw);
     virtual void setModified(bool modified);
@@ -128,13 +128,13 @@ private:
 class TDEInstance;
 class TDEAboutData;
 
-class KDevDesignerPartFactory : public KParts::Factory
+class TDevDesignerPartFactory : public KParts::Factory
 {
     Q_OBJECT
   
 public:
-    KDevDesignerPartFactory();
-    virtual ~KDevDesignerPartFactory();
+    TDevDesignerPartFactory();
+    virtual ~TDevDesignerPartFactory();
     virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
                                             TQObject *parent, const char *name,
                                             const char *classname, const TQStringList &args );
@@ -145,4 +145,4 @@ private:
     static TDEAboutData* s_about;
 };
 
-#endif // _KDEVDESIGNERPART_H_
+#endif // _TDEVDESIGNERPART_H_
diff --git a/kdevdesigner/designer/kdevdesigner_part.rc b/tdevdesigner/designer/tdevdesigner_part.rc
index 71adcdc9..318a0761 100644
--- a/kdevdesigner/designer/kdevdesigner_part.rc
+++ b/tdevdesigner/designer/tdevdesigner_part.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kdevdesigner_part" version="6">
+<kpartgui name="tdevdesigner_part" version="6">
 <MenuBar>
   <Menu name="file" noMerge="1"><text>&amp;File</text>
     <Action name="file_createtemplate" group="new_merge"/>
diff --git a/kdevdesigner/designer/kdevdesigner_part_sh.rc b/tdevdesigner/designer/tdevdesigner_part_sh.rc
index eb6b503b..c0ec9d8a 100644
--- a/kdevdesigner/designer/kdevdesigner_part_sh.rc
+++ b/tdevdesigner/designer/tdevdesigner_part_sh.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kdevdesigner_part" version="4">
+<kpartgui name="tdevdesigner_part" version="4">
 <MenuBar>
   <Menu name="file" noMerge="1"><text>&amp;File</text>
     <Action name="file_new" group="new_merge"/>
diff --git a/kdevdesigner/designer/timestamp.cpp b/tdevdesigner/designer/timestamp.cpp
index 553d9e3f..553d9e3f 100644
--- a/kdevdesigner/designer/timestamp.cpp
+++ b/tdevdesigner/designer/timestamp.cpp
diff --git a/kdevdesigner/designer/timestamp.h b/tdevdesigner/designer/timestamp.h
index 078a925d..078a925d 100644
--- a/kdevdesigner/designer/timestamp.h
+++ b/tdevdesigner/designer/timestamp.h
diff --git a/kdevdesigner/designer/variabledialog.ui b/tdevdesigner/designer/variabledialog.ui
index b5971ce9..b5971ce9 100644
--- a/kdevdesigner/designer/variabledialog.ui
+++ b/tdevdesigner/designer/variabledialog.ui
diff --git a/kdevdesigner/designer/variabledialogimpl.cpp b/tdevdesigner/designer/variabledialogimpl.cpp
index d2d7ef67..d2d7ef67 100644
--- a/kdevdesigner/designer/variabledialogimpl.cpp
+++ b/tdevdesigner/designer/variabledialogimpl.cpp
diff --git a/kdevdesigner/designer/variabledialogimpl.h b/tdevdesigner/designer/variabledialogimpl.h
index 65295073..65295073 100644
--- a/kdevdesigner/designer/variabledialogimpl.h
+++ b/tdevdesigner/designer/variabledialogimpl.h
diff --git a/kdevdesigner/designer/widgetaction.cpp b/tdevdesigner/designer/widgetaction.cpp
index c2ce0721..c2ce0721 100644
--- a/kdevdesigner/designer/widgetaction.cpp
+++ b/tdevdesigner/designer/widgetaction.cpp
diff --git a/kdevdesigner/designer/widgetaction.h b/tdevdesigner/designer/widgetaction.h
index 161bc8a0..161bc8a0 100644
--- a/kdevdesigner/designer/widgetaction.h
+++ b/tdevdesigner/designer/widgetaction.h
diff --git a/kdevdesigner/designer/widgetfactory.cpp b/tdevdesigner/designer/widgetfactory.cpp
index 9d04535a..1271e84e 100644
--- a/kdevdesigner/designer/widgetfactory.cpp
+++ b/tdevdesigner/designer/widgetfactory.cpp
@@ -45,7 +45,7 @@
 #include "menubareditor.h"
 #include "popupmenueditor.h"
 
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 #include <kiconloader.h>
 
@@ -797,7 +797,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
     } else if ( className == "PixmapLabel" ) {
 	QDesignerLabel *l = new QDesignerLabel( parent, name );
 	if ( init ) {
-	    l->setPixmap( BarIcon( "designer_qtlogo.png", KDevDesignerPartFactory::instance() ) );
+	    l->setPixmap( BarIcon( "designer_qtlogo.png", TDevDesignerPartFactory::instance() ) );
 	    l->setScaledContents( TRUE );
 	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "pixmap", TRUE );
diff --git a/kdevdesigner/designer/widgetfactory.h b/tdevdesigner/designer/widgetfactory.h
index feebe9c7..feebe9c7 100644
--- a/kdevdesigner/designer/widgetfactory.h
+++ b/tdevdesigner/designer/widgetfactory.h
diff --git a/kdevdesigner/designer/wizardeditor.ui b/tdevdesigner/designer/wizardeditor.ui
index 84302d09..84302d09 100644
--- a/kdevdesigner/designer/wizardeditor.ui
+++ b/tdevdesigner/designer/wizardeditor.ui
diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/tdevdesigner/designer/wizardeditorimpl.cpp
index c4c4f83d..c4c4f83d 100644
--- a/kdevdesigner/designer/wizardeditorimpl.cpp
+++ b/tdevdesigner/designer/wizardeditorimpl.cpp
diff --git a/kdevdesigner/designer/wizardeditorimpl.h b/tdevdesigner/designer/wizardeditorimpl.h
index f49a6b6c..f49a6b6c 100644
--- a/kdevdesigner/designer/wizardeditorimpl.h
+++ b/tdevdesigner/designer/wizardeditorimpl.h
diff --git a/kdevdesigner/designer/workspace.cpp b/tdevdesigner/designer/workspace.cpp
index b806cc6c..7eb7f86f 100644
--- a/kdevdesigner/designer/workspace.cpp
+++ b/tdevdesigner/designer/workspace.cpp
@@ -37,7 +37,7 @@
 #include "propertyeditor.h"
 
 #include <kiconloader.h>
-#include "kdevdesigner_part.h"
+#include "tdevdesigner_part.h"
 
 #include <tqheader.h>
 #include <tqdragobject.h>
@@ -59,7 +59,7 @@ WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p )
     init();
     project = p;
     t = ProjectType;
-    setPixmap( 0, SmallIcon( "designer_folder.png" , KDevDesignerPartFactory::instance()) );
+    setPixmap( 0, SmallIcon( "designer_folder.png" , TDevDesignerPartFactory::instance()) );
     setExpandable( FALSE );
 }
 
@@ -69,7 +69,7 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf )
     init();
     sourceFile = sf;
     t = SourceFileType;
-    setPixmap( 0, SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) );
+    setPixmap( 0, SmallIcon( "designer_filenew.png" , TDevDesignerPartFactory::instance()) );
 }
 
 WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p )
@@ -79,7 +79,7 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p )
     object = o;
     project = p;
     t = ObjectType;
-    setPixmap( 0, SmallIcon( "designer_object.png" , KDevDesignerPartFactory::instance()) );
+    setPixmap( 0, SmallIcon( "designer_object.png" , TDevDesignerPartFactory::instance()) );
     TQObject::connect( p->fakeFormFileFor( o ), TQT_SIGNAL( somethingChanged(FormFile*) ),
 		      listView(), TQT_SLOT( update() ) );
 }
@@ -91,13 +91,13 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type )
     formFile = ff;
     t = type;
     if ( type ==  FormFileType ) {
-	setPixmap( 0, SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()) );
+	setPixmap( 0, SmallIcon( "designer_form.png" , TDevDesignerPartFactory::instance()) );
 	TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) );
 	if ( formFile->supportsCodeFile() ) {
 	    (void) new WorkspaceItem( this, formFile, FormSourceType );
 	}
     } else if ( type == FormSourceType ) {
-	setPixmap( 0, SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) );
+	setPixmap( 0, SmallIcon( "designer_filenew.png" , TDevDesignerPartFactory::instance()) );
     }
 }
 
@@ -597,23 +597,23 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos )
     case WorkspaceItem::SourceFileType:
 	menu.insertItem( i18n( "&Open Source File" ), OPEN_SOURCE );
 	menu.insertSeparator();
-	menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()),
+	menu.insertItem( SmallIcon( "designer_editcut.png" , TDevDesignerPartFactory::instance()),
 			 i18n( "&Remove Source File From Project" ), REMOVE_SOURCE );
 	break;
     case WorkspaceItem::FormFileType:
 	menu.insertItem( i18n( "&Open Form" ), OPEN_FORM );
 	menu.insertSeparator();
-	menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()),
+	menu.insertItem( SmallIcon( "designer_editcut.png" , TDevDesignerPartFactory::instance()),
 			 i18n( "&Remove Form From Project" ), REMOVE_FORM );
 	break;
     case WorkspaceItem::FormSourceType:
 	menu.insertItem( i18n( "&Open Form Source" ), OPEN_FORM_SOURCE );
 	menu.insertSeparator();
 	if ( project->isCpp() )
-	    menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()),
+	    menu.insertItem( SmallIcon( "designer_editcut.png" , TDevDesignerPartFactory::instance()),
 			     i18n( "&Remove Source File From Form" ), REMOVE_FORM_SOURCE );
 	else
-	    menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()),
+	    menu.insertItem( SmallIcon( "designer_editcut.png" , TDevDesignerPartFactory::instance()),
 	                     i18n( "&Remove Form From Project" ), REMOVE_FORM );
 	break;
     case WorkspaceItem::ProjectType:
diff --git a/kdevdesigner/designer/workspace.h b/tdevdesigner/designer/workspace.h
index 052a1b87..052a1b87 100644
--- a/kdevdesigner/designer/workspace.h
+++ b/tdevdesigner/designer/workspace.h
diff --git a/kdevdesigner/interfaces/actioninterface.h b/tdevdesigner/interfaces/actioninterface.h
index cf217ee7..cf217ee7 100644
--- a/kdevdesigner/interfaces/actioninterface.h
+++ b/tdevdesigner/interfaces/actioninterface.h
diff --git a/kdevdesigner/interfaces/classbrowserinterface.h b/tdevdesigner/interfaces/classbrowserinterface.h
index 99dc4911..99dc4911 100644
--- a/kdevdesigner/interfaces/classbrowserinterface.h
+++ b/tdevdesigner/interfaces/classbrowserinterface.h
diff --git a/kdevdesigner/interfaces/designerinterface.h b/tdevdesigner/interfaces/designerinterface.h
index d5aeebf6..d5aeebf6 100644
--- a/kdevdesigner/interfaces/designerinterface.h
+++ b/tdevdesigner/interfaces/designerinterface.h
diff --git a/kdevdesigner/interfaces/editorinterface.h b/tdevdesigner/interfaces/editorinterface.h
index 29055324..29055324 100644
--- a/kdevdesigner/interfaces/editorinterface.h
+++ b/tdevdesigner/interfaces/editorinterface.h
diff --git a/kdevdesigner/interfaces/filterinterface.h b/tdevdesigner/interfaces/filterinterface.h
index 6af54bcb..6af54bcb 100644
--- a/kdevdesigner/interfaces/filterinterface.h
+++ b/tdevdesigner/interfaces/filterinterface.h
diff --git a/kdevdesigner/interfaces/interpreterinterface.h b/tdevdesigner/interfaces/interpreterinterface.h
index 45ba9e12..45ba9e12 100644
--- a/kdevdesigner/interfaces/interpreterinterface.h
+++ b/tdevdesigner/interfaces/interpreterinterface.h
diff --git a/kdevdesigner/interfaces/languageinterface.h b/tdevdesigner/interfaces/languageinterface.h
index 9d1f7e3d..9d1f7e3d 100644
--- a/kdevdesigner/interfaces/languageinterface.h
+++ b/tdevdesigner/interfaces/languageinterface.h
diff --git a/kdevdesigner/interfaces/preferenceinterface.h b/tdevdesigner/interfaces/preferenceinterface.h
index 5b356c4b..5b356c4b 100644
--- a/kdevdesigner/interfaces/preferenceinterface.h
+++ b/tdevdesigner/interfaces/preferenceinterface.h
diff --git a/kdevdesigner/interfaces/projectsettingsiface.h b/tdevdesigner/interfaces/projectsettingsiface.h
index e47f8ae7..e47f8ae7 100644
--- a/kdevdesigner/interfaces/projectsettingsiface.h
+++ b/tdevdesigner/interfaces/projectsettingsiface.h
diff --git a/kdevdesigner/interfaces/sourcetemplateiface.h b/tdevdesigner/interfaces/sourcetemplateiface.h
index 8d914625..8d914625 100644
--- a/kdevdesigner/interfaces/sourcetemplateiface.h
+++ b/tdevdesigner/interfaces/sourcetemplateiface.h
diff --git a/kdevdesigner/interfaces/templatewizardiface.h b/tdevdesigner/interfaces/templatewizardiface.h
index be1c57f1..be1c57f1 100644
--- a/kdevdesigner/interfaces/templatewizardiface.h
+++ b/tdevdesigner/interfaces/templatewizardiface.h
diff --git a/kdevdesigner/interfaces/widgetinterface.h b/tdevdesigner/interfaces/widgetinterface.h
index 5f0312f8..5f0312f8 100644
--- a/kdevdesigner/interfaces/widgetinterface.h
+++ b/tdevdesigner/interfaces/widgetinterface.h
diff --git a/tdevdesigner/plugins/Makefile.am b/tdevdesigner/plugins/Makefile.am
new file mode 100644
index 00000000..5d1b7d39
--- /dev/null
+++ b/tdevdesigner/plugins/Makefile.am
@@ -0,0 +1,8 @@
+INCLUDES = -I$(top_srcdir)/interfaces $(all_includes)
+METASOURCES = AUTO
+tdevdesignerdir = $(kde_moduledir)/plugins/tdevdesigner
+tdevdesigner_LTLIBRARIES =  libtdevdesigner_lang.la
+libtdevdesigner_lang_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+libtdevdesigner_lang_la_SOURCES = languageinterfaceimpl.cpp
+libtdevdesigner_lang_la_LIBADD = $(LIB_QT)
+
diff --git a/kdevdesigner/plugins/languageinterfaceimpl.cpp b/tdevdesigner/plugins/languageinterfaceimpl.cpp
index 2e4f9f20..2e4f9f20 100644
--- a/kdevdesigner/plugins/languageinterfaceimpl.cpp
+++ b/tdevdesigner/plugins/languageinterfaceimpl.cpp
diff --git a/kdevdesigner/plugins/languageinterfaceimpl.h b/tdevdesigner/plugins/languageinterfaceimpl.h
index b9db9997..b9db9997 100644
--- a/kdevdesigner/plugins/languageinterfaceimpl.h
+++ b/tdevdesigner/plugins/languageinterfaceimpl.h
diff --git a/kdevdesigner/shared/CMakeLists.txt b/tdevdesigner/shared/CMakeLists.txt
index 46c5e8f6..46c5e8f6 100644
--- a/kdevdesigner/shared/CMakeLists.txt
+++ b/tdevdesigner/shared/CMakeLists.txt
diff --git a/kdevdesigner/shared/Makefile.am b/tdevdesigner/shared/Makefile.am
index ea86ae94..ea86ae94 100644
--- a/kdevdesigner/shared/Makefile.am
+++ b/tdevdesigner/shared/Makefile.am
diff --git a/kdevdesigner/shared/domtool.cpp b/tdevdesigner/shared/domtool.cpp
index f8ed4ec5..f8ed4ec5 100644
--- a/kdevdesigner/shared/domtool.cpp
+++ b/tdevdesigner/shared/domtool.cpp
diff --git a/kdevdesigner/shared/domtool.h b/tdevdesigner/shared/domtool.h
index efa67f09..efa67f09 100644
--- a/kdevdesigner/shared/domtool.h
+++ b/tdevdesigner/shared/domtool.h
diff --git a/kdevdesigner/shared/globaldefs.h b/tdevdesigner/shared/globaldefs.h
index 655545c6..655545c6 100644
--- a/kdevdesigner/shared/globaldefs.h
+++ b/tdevdesigner/shared/globaldefs.h
diff --git a/kdevdesigner/shared/parser.cpp b/tdevdesigner/shared/parser.cpp
index 1fb2c5a7..1fb2c5a7 100644
--- a/kdevdesigner/shared/parser.cpp
+++ b/tdevdesigner/shared/parser.cpp
diff --git a/kdevdesigner/shared/parser.h b/tdevdesigner/shared/parser.h
index abec9963..abec9963 100644
--- a/kdevdesigner/shared/parser.h
+++ b/tdevdesigner/shared/parser.h
diff --git a/kdevdesigner/shared/ui2uib.cpp b/tdevdesigner/shared/ui2uib.cpp
index 5cff46e0..5cff46e0 100644
--- a/kdevdesigner/shared/ui2uib.cpp
+++ b/tdevdesigner/shared/ui2uib.cpp
diff --git a/kdevdesigner/shared/ui2uib.h b/tdevdesigner/shared/ui2uib.h
index 81041e6e..81041e6e 100644
--- a/kdevdesigner/shared/ui2uib.h
+++ b/tdevdesigner/shared/ui2uib.h
diff --git a/kdevdesigner/shared/uib.cpp b/tdevdesigner/shared/uib.cpp
index 7072626a..7072626a 100644
--- a/kdevdesigner/shared/uib.cpp
+++ b/tdevdesigner/shared/uib.cpp
diff --git a/kdevdesigner/shared/uib.h b/tdevdesigner/shared/uib.h
index e6a6b05f..e6a6b05f 100644
--- a/kdevdesigner/shared/uib.h
+++ b/tdevdesigner/shared/uib.h
diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/tdevdesigner/shared/widgetdatabase.cpp
index be4b6091..c2635a9d 100644
--- a/kdevdesigner/shared/widgetdatabase.cpp
+++ b/tdevdesigner/shared/widgetdatabase.cpp
@@ -27,7 +27,7 @@
 #include "widgetdatabase.h"
 #include "../interfaces/widgetinterface.h"
 
-#include "../designer/kdevdesigner_part.h"
+#include "../designer/tdevdesigner_part.h"
 
 #include <kiconloader.h>
 #include <kdebug.h>
@@ -646,7 +646,7 @@ TQIconSet WidgetDatabase::iconSet( int id )
     if ( !r->icon ) {
 	if ( r->iconSet.isEmpty() )
 	    return TQIconSet();
-	TQPixmap pix = BarIcon( r->iconSet, KDevDesignerPartFactory::instance() );
+	TQPixmap pix = BarIcon( r->iconSet, TDevDesignerPartFactory::instance() );
 	if ( pix.isNull() )
 	    pix = TQPixmap( r->iconSet );
 	r->icon = new TQIconSet( pix );
diff --git a/kdevdesigner/shared/widgetdatabase.h b/tdevdesigner/shared/widgetdatabase.h
index 5395f2ef..5395f2ef 100644
--- a/kdevdesigner/shared/widgetdatabase.h
+++ b/tdevdesigner/shared/widgetdatabase.h
diff --git a/kdevdesigner/src/CMakeLists.txt b/tdevdesigner/src/CMakeLists.txt
index c232cd2f..e7cf1615 100644
--- a/kdevdesigner/src/CMakeLists.txt
+++ b/tdevdesigner/src/CMakeLists.txt
@@ -23,14 +23,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevdesigner.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kdevdesigner_shell.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdesigner )
+install( FILES tdevdesigner.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES tdevdesigner_shell.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdesigner )
 
 
-##### kdevdesigner (executable) #################
+##### tdevdesigner (executable) #################
 
-tde_add_executable( kdevdesigner AUTOMOC
-  SOURCES main.cpp kdevdesigner.cpp
+tde_add_executable( tdevdesigner AUTOMOC
+  SOURCES main.cpp tdevdesigner.cpp
   LINK tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdevdesigner/src/Makefile.am b/tdevdesigner/src/Makefile.am
index e5e68a98..c88a016d 100644
--- a/kdevdesigner/src/Makefile.am
+++ b/tdevdesigner/src/Makefile.am
@@ -2,13 +2,13 @@
 INCLUDES = $(all_includes)
 
 # these are the headers for your project
-noinst_HEADERS = kdevdesigner.h
+noinst_HEADERS = tdevdesigner.h
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kdevdesigner.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdevdesigner.pot
 
 
 # this Makefile creates both a KPart application and a KPart
@@ -17,21 +17,21 @@ messages: rc.cpp
 #########################################################################
 # this is the program that gets installed.  it's name is used for all
 # of the other Makefile.am variables
-bin_PROGRAMS = kdevdesigner
+bin_PROGRAMS = tdevdesigner
 
 # the application source, library search path, and link libraries
-kdevdesigner_SOURCES = main.cpp kdevdesigner.cpp
-kdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kdevdesigner_LDADD   = $(LIB_TDEPARTS)
+tdevdesigner_SOURCES = main.cpp tdevdesigner.cpp
+tdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdevdesigner_LDADD   = $(LIB_TDEPARTS)
 
 # this is where the desktop file will go 
 #shelldesktopdir = $(kde_appsdir)/Development
-#shelldesktop_DATA = kdevdesigner.desktop
-xdg_apps_DATA = kdevdesigner.desktop
+#shelldesktop_DATA = tdevdesigner.desktop
+xdg_apps_DATA = tdevdesigner.desktop
 
 # this is where the shell's XML-GUI resource file goes
-shellrcdir = $(kde_datadir)/kdevdesigner
-shellrc_DATA = kdevdesigner_shell.rc
+shellrcdir = $(kde_datadir)/tdevdesigner
+shellrc_DATA = tdevdesigner_shell.rc
 
 #########################################################################
 # KPART SECTION
@@ -44,4 +44,4 @@ shellrc_DATA = kdevdesigner_shell.rc
 partdesktopdir   = $(kde_servicesdir)
 
 # this is where the part's XML-GUI resource file goes
-partrcdir   = $(kde_datadir)/kdevdesignerpart
+partrcdir   = $(kde_datadir)/tdevdesignerpart
diff --git a/kdevdesigner/src/main.cpp b/tdevdesigner/src/main.cpp
index f70b9285..0ada9f98 100644
--- a/kdevdesigner/src/main.cpp
+++ b/tdevdesigner/src/main.cpp
@@ -20,7 +20,7 @@
 #include <tqsplashscreen.h>
 
 #include <kxmlguiclient.h>
-#include "kdevdesigner.h"
+#include "tdevdesigner.h"
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
@@ -40,8 +40,8 @@ static TDECmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    TDEAboutData about("kdevdesigner", I18N_NOOP("KDevDesigner"), version, description,
-                     TDEAboutData::License_GPL, "KDevDesigner Copyright: (C) 2004-2005 Alexander Dymo\nTQt Designer Copyright: (C) 2000-2005 Trolltech AS All Rights Reserved", 0, 0);
+    TDEAboutData about("tdevdesigner", I18N_NOOP("TDevDesigner"), version, description,
+                     TDEAboutData::License_GPL, "TDevDesigner Copyright: (C) 2004-2005 Alexander Dymo\nTQt Designer Copyright: (C) 2000-2005 Trolltech AS All Rights Reserved", 0, 0);
     about.addAuthor( "Trolltech AS", "TQt Designer code (Free Edition)" );
     about.addAuthor( "Alexander Dymo", "Port to KDE, partification", "adymo@kdevelop.org" );
     TDECmdLineArgs::init(argc, argv, &about);
@@ -51,13 +51,13 @@ int main(int argc, char **argv)
     // see if we are starting with session management
     if (app.isRestored())
     {
-        RESTORE(KDevDesigner);
+        RESTORE(TDevDesigner);
     }
     else
     {
         // no session.. just start up normally
         TQSplashScreen * splash = 0;
-        TQString splashFile = locate("data", "tdevelop/pics/kdevdesigner-splash.png");
+        TQString splashFile = locate("data", "tdevelop/pics/tdevdesigner-splash.png");
         if (!splashFile.isNull())
         {
             TQPixmap pm;
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
 
         if ( args->count() == 0 )
         {
-            KDevDesigner *widget = new KDevDesigner;
+            TDevDesigner *widget = new TDevDesigner;
             widget->show();
         }
         else
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
             int i = 0;
             for (; i < args->count(); i++ )
             {
-                KDevDesigner *widget = new KDevDesigner;
+                TDevDesigner *widget = new TDevDesigner;
                 widget->show();
                 widget->load( args->url( i ) );
             }
diff --git a/kdevdesigner/src/kdevdesigner.cpp b/tdevdesigner/src/tdevdesigner.cpp
index f846e99b..bcc9423d 100644
--- a/kdevdesigner/src/kdevdesigner.cpp
+++ b/tdevdesigner/src/tdevdesigner.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include "kdevdesigner.h"
+#include "tdevdesigner.h"
 
 #include <kxmlguiclient.h>
 #include <kkeydialog.h>
@@ -37,11 +37,11 @@
 #include <kstatusbar.h>
 #include <tdelocale.h>
 
-KDevDesigner::KDevDesigner()
-    : KParts::MainWindow( 0L, "KDevDesigner" )
+TDevDesigner::TDevDesigner()
+    : KParts::MainWindow( 0L, "TDevDesigner" )
 {
     // set the shell's ui resource file
-    setXMLFile("kdevdesigner_shell.rc");
+    setXMLFile("tdevdesigner_shell.rc");
 
     // then, setup our actions
     setupActions();
@@ -52,7 +52,7 @@ KDevDesigner::KDevDesigner()
     // this routine will find and load our Part.  it finds the Part by
     // name which is a bad idea usually.. but it's alright in this
     // case since our Part is made for this Shell
-    KLibFactory *factory = KLibLoader::self()->factory("libkdevdesignerpart");
+    KLibFactory *factory = KLibLoader::self()->factory("libtdevdesignerpart");
     if (factory)
     {
         // now that the Part is loaded, we cast it to a Part to get
@@ -60,7 +60,7 @@ KDevDesigner::KDevDesigner()
         TQStringList args;
         args.append("in shell");
         m_part = static_cast<KParts::ReadWritePart *>(factory->create(TQT_TQOBJECT(this),
-                                "kdevdesigner_part", "KParts::ReadWritePart", args));
+                                "tdevdesigner_part", "KParts::ReadWritePart", args));
 
         if (m_part)
         {
@@ -75,7 +75,7 @@ KDevDesigner::KDevDesigner()
     {
         // if we couldn't find our Part, we exit since the Shell by
         // itself can't do anything useful
-        KMessageBox::error(this, i18n("Could not find the KDevDesigner part."));
+        KMessageBox::error(this, i18n("Could not find the TDevDesigner part."));
         kapp->quit();
         // we return here, cause kapp->quit() only means "exit the
         // next time we enter the event loop...
@@ -88,16 +88,16 @@ KDevDesigner::KDevDesigner()
     setAutoSaveSettings();
 }
 
-KDevDesigner::~KDevDesigner()
+TDevDesigner::~TDevDesigner()
 {
 }
 
-void KDevDesigner::load(const KURL& url)
+void TDevDesigner::load(const KURL& url)
 {
     m_part->openURL( url );
 }
 
-void KDevDesigner::setupActions()
+void TDevDesigner::setupActions()
 {
 /*    KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
     KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());*/
@@ -111,14 +111,14 @@ void KDevDesigner::setupActions()
     KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 }
 
-void KDevDesigner::saveProperties(TDEConfig* /*config*/)
+void TDevDesigner::saveProperties(TDEConfig* /*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
     // later when this app is restored
 }
 
-void KDevDesigner::readProperties(TDEConfig* /*config*/)
+void TDevDesigner::readProperties(TDEConfig* /*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
@@ -126,7 +126,7 @@ void KDevDesigner::readProperties(TDEConfig* /*config*/)
     // in 'saveProperties'
 }
 
-void KDevDesigner::fileNew()
+void TDevDesigner::fileNew()
 {
     // this slot is called whenever the File->New menu is selected,
     // the New shortcut is pressed (usually CTRL+N) or the New toolbar
@@ -138,12 +138,12 @@ void KDevDesigner::fileNew()
     // in its initial state.  This is what we do here..
     if ( ! m_part->url().isEmpty() || m_part->isModified() )
     {
-        (new KDevDesigner)->show();
+        (new TDevDesigner)->show();
     };
 }
 
 
-void KDevDesigner::optionsShowToolbar()
+void TDevDesigner::optionsShowToolbar()
 {
     // this is all very cut and paste code for showing/hiding the
     // toolbar
@@ -153,7 +153,7 @@ void KDevDesigner::optionsShowToolbar()
         toolBar()->hide();
 }
 
-void KDevDesigner::optionsShowStatusbar()
+void TDevDesigner::optionsShowStatusbar()
 {
     // this is all very cut and paste code for showing/hiding the
     // statusbar
@@ -163,12 +163,12 @@ void KDevDesigner::optionsShowStatusbar()
         statusBar()->hide();
 }
 
-void KDevDesigner::optionsConfigureKeys()
+void TDevDesigner::optionsConfigureKeys()
 {
-    KKeyDialog::configureKeys(m_part->actionCollection(), "kdevdesigner_part.rc");
+    KKeyDialog::configureKeys(m_part->actionCollection(), "tdevdesigner_part.rc");
 }
 
-void KDevDesigner::optionsConfigureToolbars()
+void TDevDesigner::optionsConfigureToolbars()
 {
     saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 
@@ -179,12 +179,12 @@ void KDevDesigner::optionsConfigureToolbars()
     dlg.exec();
 }
 
-void KDevDesigner::applyNewToolbarConfig()
+void TDevDesigner::applyNewToolbarConfig()
 {
     applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 }
 
-void KDevDesigner::fileOpen()
+void TDevDesigner::fileOpen()
 {
     // this slot is called whenever the File->Open menu is selected,
     // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar
@@ -206,11 +206,11 @@ void KDevDesigner::fileOpen()
         else
         {
             // we open the file in a new window...
-            KDevDesigner* newWin = new KDevDesigner;
+            TDevDesigner* newWin = new TDevDesigner;
             newWin->load( url );
             newWin->show();
         }
     }
 }
 
-#include "kdevdesigner.moc"
+#include "tdevdesigner.moc"
diff --git a/kdevdesigner/src/kdevdesigner.desktop b/tdevdesigner/src/tdevdesigner.desktop
index 1cd245f1..d2989142 100644
--- a/kdevdesigner/src/kdevdesigner.desktop
+++ b/tdevdesigner/src/tdevdesigner.desktop
@@ -55,10 +55,10 @@ GenericName[sv]=Gränssnittsdesign
 GenericName[tr]=Arayüz Tasarlayıcısı
 GenericName[zh_CN]=界面设计师
 GenericName[zh_TW]=介面設計器
-Exec=kdevdesigner %i -caption "%c"
-Icon=kdevdesigner
+Exec=tdevdesigner %i -caption "%c"
+Icon=tdevdesigner
 Type=Application
-DocPath=kdevdesigner/index.html
+DocPath=tdevdesigner/index.html
 Comment=GUI Designer for Qt/TDE
 Comment[ca]=Dissenyador de IGU per Qt/TDE
 Comment[da]=Grafisk brugerfladedesigner til Qt/TDE
diff --git a/kdevdesigner/src/kdevdesigner.h b/tdevdesigner/src/tdevdesigner.h
index a497dc5c..dc5113fe 100644
--- a/kdevdesigner/src/kdevdesigner.h
+++ b/tdevdesigner/src/tdevdesigner.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef _KDEVDESIGNER_H_
-#define _KDEVDESIGNER_H_
+#ifndef _TDEVDESIGNER_H_
+#define _TDEVDESIGNER_H_
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -39,7 +39,7 @@ class TDEToggleAction;
  * @author Alexander Dymo <cloudtemple@mksat.net>
  * @version 0.1
  */
-class KDevDesigner : public KParts::MainWindow
+class TDevDesigner : public KParts::MainWindow
 {
     Q_OBJECT
   
@@ -47,12 +47,12 @@ public:
     /**
      * Default Constructor
      */
-    KDevDesigner();
+    TDevDesigner();
 
     /**
      * Default Destructor
      */
-    virtual ~KDevDesigner();
+    virtual ~TDevDesigner();
 
     /**
      * Use this method to load whatever file/URL you have
@@ -94,4 +94,4 @@ private:
     TDEToggleAction *m_statusbarAction;
 };
 
-#endif // _KDEVDESIGNER_H_
+#endif // _TDEVDESIGNER_H_
diff --git a/kdevdesigner/src/kdevdesigner_shell.rc b/tdevdesigner/src/tdevdesigner_shell.rc
index 1bb33a25..a6a81fd3 100644
--- a/kdevdesigner/src/kdevdesigner_shell.rc
+++ b/tdevdesigner/src/tdevdesigner_shell.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kdevdesigner_shell" version="2">
+<kpartgui name="tdevdesigner_shell" version="2">
 <MenuBar>
   <Menu noMerge="1" name="file"><text>&amp;File</text>
     <Merge/>
diff --git a/kdevdesigner/uilib/CMakeLists.txt b/tdevdesigner/uilib/CMakeLists.txt
index 3aa1c78f..588c2366 100644
--- a/kdevdesigner/uilib/CMakeLists.txt
+++ b/tdevdesigner/uilib/CMakeLists.txt
@@ -10,18 +10,18 @@
 #################################################
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/kdevdesigner/shared
+  ${CMAKE_SOURCE_DIR}/tdevdesigner/shared
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
 
 
-##### kdevqui (static) ##########################
+##### tdevqui (static) ##########################
 
 set( SRCS database.cpp qwidgetfactory.cpp )
 
 tde_moc( SRCS database2.h )
 
-tde_add_library( kdevqui STATIC_PIC
+tde_add_library( tdevqui STATIC_PIC
   SOURCES ${SRCS}
 )
diff --git a/tdevdesigner/uilib/Makefile.am b/tdevdesigner/uilib/Makefile.am
new file mode 100644
index 00000000..d58d4dcb
--- /dev/null
+++ b/tdevdesigner/uilib/Makefile.am
@@ -0,0 +1,9 @@
+KDE_CXXFLAGS=-UQT_NO_ASCII_CAST
+
+INCLUDES = -I$(top_srcdir)/tdevdesigner/shared $(all_includes)
+METASOURCES = AUTO
+
+noinst_LTLIBRARIES =  libtdevqui.la
+libtdevqui_la_SOURCES =  database.cpp qwidgetfactory.cpp
+
+libtdevqui_la_LDFLAGS = $(all_libraries)
diff --git a/kdevdesigner/uilib/database.cpp b/tdevdesigner/uilib/database.cpp
index 2b1956a9..2b1956a9 100644
--- a/kdevdesigner/uilib/database.cpp
+++ b/tdevdesigner/uilib/database.cpp
diff --git a/kdevdesigner/uilib/database2.h b/tdevdesigner/uilib/database2.h
index 865a7f8f..865a7f8f 100644
--- a/kdevdesigner/uilib/database2.h
+++ b/tdevdesigner/uilib/database2.h
diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/tdevdesigner/uilib/qwidgetfactory.cpp
index 56649616..56649616 100644
--- a/kdevdesigner/uilib/qwidgetfactory.cpp
+++ b/tdevdesigner/uilib/qwidgetfactory.cpp
diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/tdevdesigner/uilib/qwidgetfactory.h
index 8f2b1427..8f2b1427 100644
--- a/kdevdesigner/uilib/qwidgetfactory.h
+++ b/tdevdesigner/uilib/qwidgetfactory.h
diff --git a/tdevelop_kde_cpp.desktop b/tdevelop_tde_cpp.desktop
index c73f2f06..301af04f 100644
--- a/tdevelop_kde_cpp.desktop
+++ b/tdevelop_tde_cpp.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=tdevelop --profile KDECppIDE %u
+Exec=tdevelop --profile TDECppIDE %u
 MimeType=application/x-tdevelop;
 Icon=tdevelop
 DocPath=tdevelop/index.html
diff --git a/kdevprj2tdevelop b/tdevprj2tdevelop
index 09d3ebaa..79966df0 100755..100644
--- a/kdevprj2tdevelop
+++ b/tdevprj2tdevelop
@@ -98,7 +98,7 @@ if ($project_type eq "normal_c"
 }
 
 # Choose project management
-$projectmanagement = "KDevCustomProject";
+$projectmanagement = "TDevCustomProject";
 if ($project_type =~ /normal_kde|mini_kde|normalogl_kde|normal_kde2|mini_kde2|mdi_kde2/
     || $project_type =~ /kde2_normal|kicker_app|tdeio_slave|kc_module|kpart_plugin|ktheme/) {
         $projectmanagement = "KDevTDEAutoProject";
@@ -175,7 +175,7 @@ if ($projectmanagement eq "KDevAutoProject" || $projectmanagement eq "KDevTDEAut
 EOF
 }
 
-if ($project_management eq "KDevCustomProject") {
+if ($project_management eq "TDevCustomProject") {
       print FILE <<EOF;
  <kdevcustomproject>
   <general>
@@ -194,7 +194,7 @@ EOF
 
 # file view
 print FILE <<EOF;
- <kdevfileview>
+ <tdevfileview>
   <groups>
 EOF
 
@@ -209,8 +209,8 @@ EOF
 
 print FILE <<EOF;
   </groups>
- </kdevfileview>
- <kdevdoctreeview>
+ </tdevfileview>
+ <tdevdoctreeview>
   <ignoretocs>
    <toc>gtk</toc>
    <toc>gnustep</toc>
@@ -218,7 +218,7 @@ print FILE <<EOF;
    <toc>php</toc>
    <toc>perl</toc>
   </ignoretocs>
- </kdevdoctreeview>
+ </tdevdoctreeview>
 EOF
 
 if ($projectmanagement eq "KDevAutoProject"
@@ -242,7 +242,7 @@ close FILE;
 ## Write file list
 ##
 
-if ($projectmanagement eq "KDevCustomProject") {
+if ($projectmanagement eq "TDevCustomProject") {
         $filelistfilename = $filename;
         $filelistfilename =~ s/^(.*).kdevprj$/$1.filelist/;
         open(FILE, ">$filelistfilename");
diff --git a/vcs/clearcase/CMakeLists.txt b/vcs/clearcase/CMakeLists.txt
index 4dbed390..94ca0536 100644
--- a/vcs/clearcase/CMakeLists.txt
+++ b/vcs/clearcase/CMakeLists.txt
@@ -27,15 +27,15 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevclearcase.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevclearcase.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevclearcase (module) #################
+##### libtdevclearcase (module) #################
 
-tde_add_kpart( libkdevclearcase AUTOMOC
+tde_add_kpart( libtdevclearcase AUTOMOC
   SOURCES
     clearcasepart.cpp commentdlg.cpp
     clearcasefileinfoprovider.cpp clearcasemanipulator.cpp
-  LINK kdevextensions-static tdevelop-shared
+  LINK tdevextensions-static tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/clearcase/Makefile.am b/vcs/clearcase/Makefile.am
index 630a1346..36a2e7b6 100644
--- a/vcs/clearcase/Makefile.am
+++ b/vcs/clearcase/Makefile.am
@@ -3,16 +3,16 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevclearcase.la
-libkdevclearcase_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevclearcase_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
+kde_module_LTLIBRARIES = libtdevclearcase.la
+libtdevclearcase_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevclearcase_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
 
-libkdevclearcase_la_SOURCES = clearcasepart.cpp commentdlg.cpp \
+libtdevclearcase_la_SOURCES = clearcasepart.cpp commentdlg.cpp \
 	clearcasefileinfoprovider.cpp clearcasemanipulator.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevclearcase.desktop
+service_DATA = tdevclearcase.desktop
 
 SUBDIRS = integrator
diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp
index 1e18f8e1..db7cbcc1 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.cpp
+++ b/vcs/clearcase/clearcasefileinfoprovider.cpp
@@ -11,13 +11,13 @@
 //
 #include "clearcasefileinfoprovider.h"
 #include "clearcasepart.h"
-#include "kdevversioncontrol.h"
+#include "tdevversioncontrol.h"
 
 #include <kprocess.h>
 #include <tqapplication.h>
 
 ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent)
-	: KDevVCSFileInfoProvider( (KDevVersionControl*) parent, "clearcasefileinfoprovider")
+	: TDevVCSFileInfoProvider( (TDevVersionControl*) parent, "clearcasefileinfoprovider")
 {
     vcsInfo_ = NULL;
 
diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h
index 0f6f7d06..4c29da44 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.h
+++ b/vcs/clearcase/clearcasefileinfoprovider.h
@@ -19,7 +19,7 @@
 /**
 @author KDevelop Authors
 */
-class ClearcaseFileinfoProvider : public KDevVCSFileInfoProvider
+class ClearcaseFileinfoProvider : public TDevVCSFileInfoProvider
 {
   Q_OBJECT
   
diff --git a/vcs/clearcase/clearcasemanipulator.h b/vcs/clearcase/clearcasemanipulator.h
index 0cb795e3..42a5cee0 100644
--- a/vcs/clearcase/clearcasemanipulator.h
+++ b/vcs/clearcase/clearcasemanipulator.h
@@ -12,7 +12,7 @@
 #ifndef CLEARCASEMANIPULATOR_H
 #define CLEARCASEMANIPULATOR_H
 
-#include "kdevversioncontrol.h"
+#include "tdevversioncontrol.h"
 
 #include <kprocess.h>
 
diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp
index aeb1eea9..338675d5 100644
--- a/vcs/clearcase/clearcasepart.cpp
+++ b/vcs/clearcase/clearcasepart.cpp
@@ -17,33 +17,33 @@
 
 #include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <tdelocale.h>
 #include <kprocess.h>
 #include <tdemessagebox.h>
 #include <tdeapplication.h>
 
-#include "kdevcore.h"
-#include "kdevmakefrontend.h"
-#include "kdevdifffrontend.h"
-#include "kdevappfrontend.h"
+#include "tdevcore.h"
+#include "tdevmakefrontend.h"
+#include "tdevdifffrontend.h"
+#include "tdevappfrontend.h"
 #include "execcommand.h"
 #include "domutil.h"
-#include "kdevmainwindow.h"
-#include "kdevproject.h"
-#include "kdevplugininfo.h"
+#include "tdevmainwindow.h"
+#include "tdevproject.h"
+#include "tdevplugininfo.h"
 
 #include "clearcasefileinfoprovider.h"
 #include "clearcasemanipulator.h"
 
 
-static const KDevPluginInfo data("kdevclearcase");
+static const TDevPluginInfo data("tdevclearcase");
 
-typedef KDevGenericFactory<ClearcasePart> ClearcaseFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) )
+typedef TDevGenericFactory<ClearcasePart> ClearcaseFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevclearcase, ClearcaseFactory( data ) )
 
 ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & )
-        : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ),
+        : TDevVersionControl( &data, parent, name ? name : "ClearcasePart" ),
           default_checkin(""),
           default_checkout(""),
           default_uncheckout("-rm"),
@@ -144,7 +144,7 @@ void ClearcasePart::slotCheckin()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 }
 
@@ -176,7 +176,7 @@ void ClearcasePart::slotCheckout()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
     emit finishedFetching(dir);
@@ -199,7 +199,7 @@ void ClearcasePart::slotUncheckout()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
     emit finishedFetching(dir);
@@ -228,7 +228,7 @@ void ClearcasePart::slotCreate()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
     emit finishedFetching(dir);
@@ -255,7 +255,7 @@ void ClearcasePart::slotRemove()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
     emit finishedFetching(dir);
@@ -279,7 +279,7 @@ void ClearcasePart::slotListHistory()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 }
 
@@ -333,7 +333,7 @@ void ClearcasePart::slotDiffFinished( const TQString& diff, const TQString& err
         return;
     }
 
-    if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("TDevelop/DiffFrontend"))
+    if (TDevDiffFrontend *diffFrontend = extension<TDevDiffFrontend>("TDevelop/DiffFrontend"))
         diffFrontend->showDiff( diff );
 }
 
@@ -354,7 +354,7 @@ void ClearcasePart::slotListCheckouts()
     command += " && cleartool lsco ";
     command += DomUtil::readEntry(dom, "/kdevclearcase/lscheckout_options", default_lscheckout);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
 }
diff --git a/vcs/clearcase/clearcasepart.h b/vcs/clearcase/clearcasepart.h
index be63e674..52129141 100644
--- a/vcs/clearcase/clearcasepart.h
+++ b/vcs/clearcase/clearcasepart.h
@@ -12,12 +12,12 @@
 #ifndef _CLEARCASEPART_H_
 #define _CLEARCASEPART_H_
 
-#include <kdevversioncontrol.h>
+#include <tdevversioncontrol.h>
 
 class Context;
 class TQPopupMenu;
 
-class ClearcasePart : public KDevVersionControl {
+class ClearcasePart : public TDevVersionControl {
     Q_OBJECT
   
 
@@ -36,7 +36,7 @@ public:
 
     virtual void createNewProject(const TQString& dir) {}
     virtual bool fetchFromRepository() { return true; }
-    virtual KDevVCSFileInfoProvider *fileInfoProvider() const { return fileInfoProvider_; }
+    virtual TDevVCSFileInfoProvider *fileInfoProvider() const { return fileInfoProvider_; }
     virtual bool isValidDirectory(const TQString &dirPath) const;
 
 private slots:
@@ -60,7 +60,7 @@ private:
     TQString popupfile_;
     TQString viewname;
 
-    KDevVCSFileInfoProvider *fileInfoProvider_;
+    TDevVCSFileInfoProvider *fileInfoProvider_;
 };
 
 #endif
diff --git a/vcs/clearcase/integrator/CMakeLists.txt b/vcs/clearcase/integrator/CMakeLists.txt
index ccc3348f..bd527272 100644
--- a/vcs/clearcase/integrator/CMakeLists.txt
+++ b/vcs/clearcase/integrator/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevclearcaseintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevclearcaseintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
 ##### libclearcaseintegrator (module) ###########
@@ -35,6 +35,6 @@ tde_add_kpart( libclearcaseintegrator AUTOMOC
   SOURCES
     clearcaseintegrator.cpp ccintegratordlgbase.ui
     ccintegratordlg.cpp
-  LINK kdevextras-shared tdevelop-shared
+  LINK tdevextras-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/clearcase/integrator/Makefile.am b/vcs/clearcase/integrator/Makefile.am
index a9d50a98..98e39465 100644
--- a/vcs/clearcase/integrator/Makefile.am
+++ b/vcs/clearcase/integrator/Makefile.am
@@ -5,9 +5,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = libclearcaseintegrator.la
 libclearcaseintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libclearcaseintegrator_la_LIBADD =\
-	$(top_builddir)/lib/interfaces/extras/libkdevextras.la\
+	$(top_builddir)/lib/interfaces/extras/libtdevextras.la\
 	$(top_builddir)/lib/libtdevelop.la
-kde_services_DATA = kdevclearcaseintegrator.desktop
+kde_services_DATA = tdevclearcaseintegrator.desktop
 noinst_HEADERS = clearcaseintegrator.h ccintegratordlg.h
 libclearcaseintegrator_la_SOURCES = clearcaseintegrator.cpp \
 	ccintegratordlgbase.ui ccintegratordlg.cpp
diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h
index f427b2b3..2eb1e2e3 100644
--- a/vcs/clearcase/integrator/ccintegratordlg.h
+++ b/vcs/clearcase/integrator/ccintegratordlg.h
@@ -21,7 +21,7 @@
 #define CCINTEGRATORDLG_H
 
 #include "ccintegratordlgbase.h"
-#include <kdevvcsintegrator.h>
+#include <tdevvcsintegrator.h>
 
 class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
diff --git a/vcs/clearcase/integrator/clearcaseintegrator.cpp b/vcs/clearcase/integrator/clearcaseintegrator.cpp
index 4e8c1a0b..f00783b4 100644
--- a/vcs/clearcase/integrator/clearcaseintegrator.cpp
+++ b/vcs/clearcase/integrator/clearcaseintegrator.cpp
@@ -19,19 +19,19 @@
  ***************************************************************************/
 #include "clearcaseintegrator.h"
 
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 
 #include "ccintegratordlg.h"
 
-static const KDevPluginInfo data("kdevclearcaseintegrator");
-typedef KDevGenericFactory<ClearcaseIntegrator> ClearcaseIntegratorFactory;
+static const TDevPluginInfo data("tdevclearcaseintegrator");
+typedef TDevGenericFactory<ClearcaseIntegrator> ClearcaseIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libclearcaseintegrator, ClearcaseIntegratorFactory(data) )
 
 ClearcaseIntegrator::ClearcaseIntegrator(TQObject* parent, const char* name,
     const TQStringList // args
                                          )
-    :KDevVCSIntegrator(parent, name)
+    :TDevVCSIntegrator(parent, name)
 {
 }
 
diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h
index 3859c1f9..4e431da6 100644
--- a/vcs/clearcase/integrator/clearcaseintegrator.h
+++ b/vcs/clearcase/integrator/clearcaseintegrator.h
@@ -20,11 +20,11 @@
 #ifndef CLEARCASEINTEGRATOR_H
 #define CLEARCASEINTEGRATOR_H
 
-#include <kdevvcsintegrator.h>
+#include <tdevvcsintegrator.h>
 
 #include <tqstringlist.h>
 
-class ClearcaseIntegrator : public KDevVCSIntegrator
+class ClearcaseIntegrator : public TDevVCSIntegrator
 {
 Q_OBJECT
   
diff --git a/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop b/vcs/clearcase/integrator/tdevclearcaseintegrator.desktop
index 4bc49cfc..4bc49cfc 100644
--- a/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop
+++ b/vcs/clearcase/integrator/tdevclearcaseintegrator.desktop
diff --git a/vcs/clearcase/kdevclearcase.desktop b/vcs/clearcase/tdevclearcase.desktop
index 9b3df9df..687e5c67 100644
--- a/vcs/clearcase/kdevclearcase.desktop
+++ b/vcs/clearcase/tdevclearcase.desktop
@@ -77,6 +77,6 @@ GenericName[tr]=ClearCase Bütünleştirmesi
 GenericName[zh_CN]=ClearCase集成
 GenericName[zh_TW]=ClearCase 整合
 ServiceTypes=TDevelop/VersionControl
-X-TDE-Library=libkdevclearcase
+X-TDE-Library=libtdevclearcase
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS,ClearcaseVCS
diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt
index dc50d646..c8cd2b35 100644
--- a/vcs/cvsservice/CMakeLists.txt
+++ b/vcs/cvsservice/CMakeLists.txt
@@ -30,14 +30,14 @@ link_directories(
 ##### other data ################################
 
 tde_install_icons( )
-install( FILES kdevcvsservice.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdev_cvs.png DESTINATION ${DATA_INSTALL_DIR}/kdevcvsservice/pics )
-install( FILES buildcvs.sh DESTINATION ${DATA_INSTALL_DIR}/kdevcvsservice )
+install( FILES tdevcvsservice.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdev_cvs.png DESTINATION ${DATA_INSTALL_DIR}/tdevcvsservice/pics )
+install( FILES buildcvs.sh DESTINATION ${DATA_INSTALL_DIR}/tdevcvsservice )
 
 
-##### libkdevcvsservice (module) ################
+##### libtdevcvsservice (module) ################
 
-tde_add_kpart( libkdevcvsservice AUTOMOC
+tde_add_kpart( libtdevcvsservice AUTOMOC
   SOURCES
     cvspart.cpp cvspartimpl.cpp cvsformbase.ui cvsform.cpp
     commitdialogbase.ui commitdlg.cpp cvsoptionswidgetbase.ui
@@ -52,7 +52,7 @@ tde_add_kpart( libkdevcvsservice AUTOMOC
     editorsdialogbase.ui editorsdialog.cpp annotatedialog.cpp
     annotatepage.cpp annotateview.cpp
   LINK
-    kdevextensions-static kdevwidgets-shared tdevelop-shared
+    tdevextensions-static tdevwidgets-shared tdevelop-shared
     cvsservice tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/cvsservice/Makefile.am b/vcs/cvsservice/Makefile.am
index 63560056..3ce9dc40 100644
--- a/vcs/cvsservice/Makefile.am
+++ b/vcs/cvsservice/Makefile.am
@@ -3,12 +3,12 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes) -I$(kde_includes)/tde
 
-kde_module_LTLIBRARIES = libkdevcvsservice.la
-libkdevcvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevcvsservice_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) -lcvsservice $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
+kde_module_LTLIBRARIES = libtdevcvsservice.la
+libtdevcvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevcvsservice_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) -lcvsservice $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
 
-libkdevcvsservice_la_SOURCES = cvspart.cpp cvspartimpl.cpp cvsformbase.ui \
+libtdevcvsservice_la_SOURCES = cvspart.cpp cvspartimpl.cpp cvsformbase.ui \
 	cvsform.cpp commitdialogbase.ui commitdlg.cpp cvsoptionswidgetbase.ui \
 	cvsoptionswidget.cpp cvsprocesswidget.cpp cvsentry.cpp cvsdir.cpp changelog.cpp \
 	cvsoptions.cpp checkoutdialogbase.ui checkoutdialog.cpp tagdialog.cpp tagdialogbase.ui \
@@ -29,12 +29,12 @@ METASOURCES = AUTO
 ICONS = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevcvsservice.desktop
+service_DATA = tdevcvsservice.desktop
 
-servicepicsdir = $(kde_datadir)/kdevcvsservice/pics
-servicepics_DATA = kdev_cvs.png
+servicepicsdir = $(kde_datadir)/tdevcvsservice/pics
+servicepics_DATA = tdev_cvs.png
 
-rcdir = $(kde_datadir)/kdevcvsservice
+rcdir = $(kde_datadir)/tdevcvsservice
 rc_DATA = buildcvs.sh
 
 SUBDIRS = integrator
diff --git a/vcs/cvsservice/README.dox b/vcs/cvsservice/README.dox
index 1ff0b528..bb6dfd60 100644
--- a/vcs/cvsservice/README.dox
+++ b/vcs/cvsservice/README.dox
@@ -37,7 +37,7 @@ Implementation of this component is done by:
     one wants to perform: exception to this are the cvslog* classes which do start
     cvs jobs independently archiving parallelism with the CvsProcesssWidget.
   - CVSDir and CVSEntry provide abstraction for accessing to local CVS information
-  - CVSFileInfoProvider is an implementation of KDevVCSFileInfoProvider interface
+  - CVSFileInfoProvider is an implementation of TDevVCSFileInfoProvider interface
     and collects data about files stats: for CVS, both synch (fetch data from local sandbox)
     and asynch (fetch from repository server) are working with some minor bugs in the parsing
     of 'cvs status' output for the latter. (Sync means that information are collected
diff --git a/vcs/cvsservice/bufferedstringreader.h b/vcs/cvsservice/bufferedstringreader.h
index c7548b59..05ce6ad6 100644
--- a/vcs/cvsservice/bufferedstringreader.h
+++ b/vcs/cvsservice/bufferedstringreader.h
@@ -16,7 +16,7 @@
 
 class CvsServicePart;
 class TDEConfig;
-class KDevProject;
+class TDevProject;
 
 /* This class helps when we have to collect a string list from a text
  * stream, just as many cvs commands do. The problem is that the these commands
diff --git a/vcs/cvsservice/cvsentry.h b/vcs/cvsservice/cvsentry.h
index 9a2e4d6d..d4e51de8 100644
--- a/vcs/cvsservice/cvsentry.h
+++ b/vcs/cvsservice/cvsentry.h
@@ -15,7 +15,7 @@
 
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <kdevversioncontrol.h>
+#include <tdevversioncontrol.h>
 
 class CVSDir;
 
diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp
index cbfc726f..2e0c960a 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.cpp
+++ b/vcs/cvsservice/cvsfileinfoprovider.cpp
@@ -15,7 +15,7 @@
 #include <kdebug.h>
 
 #include <urlutil.h>
-#include <kdevproject.h>
+#include <tdevproject.h>
 
 #include <dcopref.h>
 #include <cvsjob_stub.h>
@@ -32,7 +32,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService )
-    : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ),
+    : TDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ),
     m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 )
 {
     connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&)));
diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h
index 8bc3a6fe..09b7b9b8 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.h
+++ b/vcs/cvsservice/cvsfileinfoprovider.h
@@ -14,7 +14,7 @@
 
 #include <tqmap.h>
 
-#include <kdevversioncontrol.h>
+#include <tdevversioncontrol.h>
 #include "cvsservicedcopIface.h"
 #include "cvsdir.h"
 #include "bufferedstringreader.h"
@@ -28,7 +28,7 @@ Provider for CVS file information
 
 @author Mario Scalas
 */
-class CVSFileInfoProvider : public KDevVCSFileInfoProvider, virtual public CVSServiceDCOPIface
+class CVSFileInfoProvider : public TDevVCSFileInfoProvider, virtual public CVSServiceDCOPIface
 {
     Q_OBJECT
   
diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp
index 2cdf5c92..6511a38f 100644
--- a/vcs/cvsservice/cvsoptions.cpp
+++ b/vcs/cvsservice/cvsoptions.cpp
@@ -17,7 +17,7 @@
 #include <tdelocale.h>
 
 #include "domutil.h"
-#include "kdevproject.h"
+#include "tdevproject.h"
 #include "cvsoptions.h"
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -80,9 +80,9 @@ CvsOptions* CvsOptions::instance()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsOptions::save( KDevProject *project )
+void CvsOptions::save( TDevProject *project )
 {
-    kdDebug( 9006 ) << " **** CvsOptions::save( KDevProject* ) here" << endl;
+    kdDebug( 9006 ) << " **** CvsOptions::save( TDevProject* ) here" << endl;
     Q_ASSERT( project );
 
     TQDomDocument &dom = *project->projectDom();
@@ -105,9 +105,9 @@ void CvsOptions::save( KDevProject *project )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsOptions::load( KDevProject *project )
+void CvsOptions::load( TDevProject *project )
 {
-    kdDebug( 9006 ) << " **** CvsOptions::load( KDevProject* ) here" << endl;
+    kdDebug( 9006 ) << " **** CvsOptions::load( TDevProject* ) here" << endl;
     Q_ASSERT( project );
     TQDomDocument &dom = *project->projectDom();
 
diff --git a/vcs/cvsservice/cvsoptions.h b/vcs/cvsservice/cvsoptions.h
index c4daf301..f54e6273 100644
--- a/vcs/cvsservice/cvsoptions.h
+++ b/vcs/cvsservice/cvsoptions.h
@@ -17,7 +17,7 @@
 
 class CvsServicePart;
 class TDEConfig;
-class KDevProject;
+class TDevProject;
 
 /* This class represents the command line options for the used cvs commands.
  * It uses the singleton pattern.
@@ -32,9 +32,9 @@ public:
 
     virtual ~CvsOptions();
 
-    void save( KDevProject *project );
+    void save( TDevProject *project );
     /// \FIXME parameter should be const!!
-    void load( KDevProject *project );
+    void load( TDevProject *project );
 
     void setRecursiveWhenCommitRemove( bool b );
     bool recursiveWhenCommitRemove() const;
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index 2bda55f1..276a4d15 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -37,17 +37,17 @@
 #include <cvsjob_stub.h>
 
 #include <tdeparts/part.h>
-#include <kdevpartcontroller.h>
-#include <kdevgenericfactory.h>
-
-#include "kdevcore.h"
-#include "kdevmakefrontend.h"
-#include "kdevdifffrontend.h"
-#include "kdevappfrontend.h"
-#include "kdevplugininfo.h"
+#include <tdevpartcontroller.h>
+#include <tdevgenericfactory.h>
+
+#include "tdevcore.h"
+#include "tdevmakefrontend.h"
+#include "tdevdifffrontend.h"
+#include "tdevappfrontend.h"
+#include "tdevplugininfo.h"
 #include "domutil.h"
-#include "kdevmainwindow.h"
-#include "kdevproject.h"
+#include "tdevmainwindow.h"
+#include "tdevproject.h"
 #include "urlutil.h"
 
 #include "cvsform.h"
@@ -72,16 +72,16 @@ bool g_projectWasJustCreated = false;
 // Plugin factory
 ///////////////////////////////////////////////////////////////////////////////
 
-static const KDevPluginInfo data("kdevcvsservice");
-typedef KDevGenericFactory<CvsServicePart> CvsFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) )
+static const TDevPluginInfo data("tdevcvsservice");
+typedef TDevGenericFactory<CvsServicePart> CvsFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevcvsservice, CvsFactory( data ) )
 
 ///////////////////////////////////////////////////////////////////////////////
 // class CvsServicePart
 ///////////////////////////////////////////////////////////////////////////////
 
 CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & )
-	: KDevVersionControl( &data, parent,
+	: TDevVersionControl( &data, parent,
 						  name ? name : "CvsService" ),
     actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ),
     actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ),
@@ -126,10 +126,10 @@ void CvsServicePart::init()
         this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
     connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)),
         this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
-    connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
-        this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
+    connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
+        this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) );
 
-    m_impl->m_widget->setIcon( UserIcon( "kdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) );
+    m_impl->m_widget->setIcon( UserIcon( "tdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) );
     TQWhatsThis::add( m_impl->processWidget(), i18n("<b>CVS</b><p>Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") );
     m_impl->processWidget()->setCaption(i18n("CvsService Output"));
     mainWindow()->embedOutputView( m_impl->processWidget(), i18n("CvsService"), i18n("cvs output") );
@@ -243,7 +243,7 @@ bool CvsServicePart::fetchFromRepository()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-KDevVCSFileInfoProvider *CvsServicePart::fileInfoProvider() const
+TDevVCSFileInfoProvider *CvsServicePart::fileInfoProvider() const
 {
     return m_impl->fileInfoProvider();
 }
@@ -704,7 +704,7 @@ void CvsServicePart::slotRemoveFromIgnoreList()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void CvsServicePart::slotStopButtonClicked( KDevPlugin* which )
+void CvsServicePart::slotStopButtonClicked( TDevPlugin* which )
 {
     if ( which != 0 && which != this )
         return;
diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h
index e2df8ce0..61015fda 100644
--- a/vcs/cvsservice/cvspart.h
+++ b/vcs/cvsservice/cvspart.h
@@ -17,7 +17,7 @@
 #include <tqguardedptr.h>
 #include <tqcstring.h>
 #include <kurl.h>
-#include "kdevversioncontrol.h"
+#include "tdevversioncontrol.h"
 
 class Context;
 class TQPopupMenu;
@@ -34,7 +34,7 @@ class CvsService_stub;
 class Repository_stub;
 class CvsServicePartImpl;
 
-class CvsServicePart : public KDevVersionControl
+class CvsServicePart : public TDevVersionControl
 {
     Q_OBJECT
   
@@ -63,7 +63,7 @@ public:
     /**
     * @return the info provider for VCS sandboxes
     */
-    virtual KDevVCSFileInfoProvider *fileInfoProvider() const;
+    virtual TDevVCSFileInfoProvider *fileInfoProvider() const;
     /**
     * @param dirPath absolute path of the directory
     * @return true if the the directory is a valid CVS sandbox
@@ -129,7 +129,7 @@ private slots:
     void projectConfigWidget( KDialogBase *dlg );
 
     //! Called when the user wishes to stop an operation.
-    void slotStopButtonClicked( KDevPlugin* );
+    void slotStopButtonClicked( TDevPlugin* );
 
 private slots:
     void init();
diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp
index 01c85df3..112ea997 100644
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@@ -29,12 +29,12 @@
 #include <cvsjob_stub.h>
 // KDevelop SDK stuff
 #include <urlutil.h>
-#include <kdevproject.h>
-#include <kdevmainwindow.h>
-#include <kdevcore.h>
-#include <kdevdifffrontend.h>
-#include <kdevmakefrontend.h>
-#include <kdevpartcontroller.h>
+#include <tdevproject.h>
+#include <tdevmainwindow.h>
+#include <tdevcore.h>
+#include <tdevdifffrontend.h>
+#include <tdevmakefrontend.h>
+#include <tdevpartcontroller.h>
 // Part's widgets
 #include "cvsprocesswidget.h"
 #include "checkoutdialog.h"
@@ -309,7 +309,7 @@ CvsProcessWidget *CvsServicePartImpl::processWidget() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-KDevMainWindow *CvsServicePartImpl::mainWindow() const
+TDevMainWindow *CvsServicePartImpl::mainWindow() const
 {
     return m_part->mainWindow();
 }
@@ -323,16 +323,16 @@ TQString CvsServicePartImpl::projectDirectory() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-KDevCore *CvsServicePartImpl::core() const
+TDevCore *CvsServicePartImpl::core() const
 {
     return m_part->core();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-KDevDiffFrontend *CvsServicePartImpl::diffFrontend() const
+TDevDiffFrontend *CvsServicePartImpl::diffFrontend() const
 {
-    return m_part->extension<KDevDiffFrontend>("TDevelop/DiffFrontend");
+    return m_part->extension<TDevDiffFrontend>("TDevelop/DiffFrontend");
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -774,7 +774,7 @@ void CvsServicePartImpl::createNewProject( const TQString &dirName,
     kdDebug( 9006 ) << "  ** Will run the following command: " << endl << cmdLine << endl;
     kdDebug( 9006 ) << "  ** on directory: " << dirName << endl;
 
-    if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand( dirName, cmdLine );
 }
 
@@ -902,7 +902,7 @@ void CvsServicePartImpl::emitFileStateModified( const KURL::List &/*urls*/, VCSF
 
 ///////////////////////////////////////////////////////////////////////////////
 
-KDevVCSFileInfoProvider *CvsServicePartImpl::fileInfoProvider() const
+TDevVCSFileInfoProvider *CvsServicePartImpl::fileInfoProvider() const
 {
     return m_fileInfoProvider;
 }
diff --git a/vcs/cvsservice/cvspartimpl.h b/vcs/cvsservice/cvspartimpl.h
index ade7ffe4..32ee04f5 100644
--- a/vcs/cvsservice/cvspartimpl.h
+++ b/vcs/cvsservice/cvspartimpl.h
@@ -17,18 +17,18 @@
 #include <tqguardedptr.h>
 #include <kurl.h>
 
-#include <kdevversioncontrol.h>
+#include <tdevversioncontrol.h>
 
 class CvsServicePart;
 class KDialogBase;
 class KURL;
 class CvsProcessWidget;
-class KDevMainWindow;
-class KDevCore;
-class KDevDiffFrontend;
+class TDevMainWindow;
+class TDevCore;
+class TDevDiffFrontend;
 class TQDir;
 class JobScheduler;
-class KDevVCSFileInfoProvider;
+class TDevVCSFileInfoProvider;
 class CVSFileInfoProvider;
 
 /**
@@ -183,7 +183,7 @@ public:
     /**
     * @return a reference to the custom FileInforProvider object (FORWARDER)
     */
-    KDevVCSFileInfoProvider *fileInfoProvider() const;
+    TDevVCSFileInfoProvider *fileInfoProvider() const;
 
 
 // Helpers
@@ -309,10 +309,10 @@ private:
     static const TQString changeLogPrependString;
 
     // Internal short-cuts
-    KDevMainWindow *mainWindow() const;
-    KDevCore *core() const;
+    TDevMainWindow *mainWindow() const;
+    TDevCore *core() const;
     TQString projectDirectory() const;
-    KDevDiffFrontend *diffFrontend() const;
+    TDevDiffFrontend *diffFrontend() const;
 
     /** Locate and setup DCOP CvsService */
     bool requestCvsService();
diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp
index bb8fb459..e218e00e 100644
--- a/vcs/cvsservice/cvsprocesswidget.cpp
+++ b/vcs/cvsservice/cvsprocesswidget.cpp
@@ -18,9 +18,9 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 
-#include "kdevpartcontroller.h"
-#include "kdevmainwindow.h"
-#include "kdevcore.h"
+#include "tdevpartcontroller.h"
+#include "tdevmainwindow.h"
+#include "tdevcore.h"
 
 #include "cvspart.h"
 #include "cvsprocesswidget.h"
diff --git a/vcs/cvsservice/integrator/CMakeLists.txt b/vcs/cvsservice/integrator/CMakeLists.txt
index a17393d8..e615784e 100644
--- a/vcs/cvsservice/integrator/CMakeLists.txt
+++ b/vcs/cvsservice/integrator/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevcvsserviceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevcvsserviceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
 ##### libcvsserviceintegrator (module) ##########
@@ -35,6 +35,6 @@ tde_add_kpart( libcvsserviceintegrator AUTOMOC
     cvsserviceintegrator.cpp integratordlgbase.ui
     fetcherdlgbase.ui integratordlg.cpp initdlg.ui
   LINK
-    kdevextras-shared tdevelop-shared cvsservice
+    tdevextras-shared tdevelop-shared cvsservice
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/cvsservice/integrator/Makefile.am b/vcs/cvsservice/integrator/Makefile.am
index f3eb47fe..36f5dcee 100644
--- a/vcs/cvsservice/integrator/Makefile.am
+++ b/vcs/cvsservice/integrator/Makefile.am
@@ -5,8 +5,8 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = libcvsserviceintegrator.la
 libcvsserviceintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libcvsserviceintegrator_la_LIBADD = \
-	$(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/libtdevelop.la -lcvsservice
+	$(top_builddir)/lib/interfaces/extras/libtdevextras.la $(top_builddir)/lib/libtdevelop.la -lcvsservice
 noinst_HEADERS = cvsserviceintegrator.h integratordlg.h
 libcvsserviceintegrator_la_SOURCES = cvsserviceintegrator.cpp \
 	integratordlgbase.ui fetcherdlgbase.ui integratordlg.cpp initdlg.ui
-kde_services_DATA = kdevcvsserviceintegrator.desktop
+kde_services_DATA = tdevcvsserviceintegrator.desktop
diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
index 1bbc3b11..7f2fbbeb 100644
--- a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
+++ b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
@@ -19,18 +19,18 @@
  ***************************************************************************/
 #include "cvsserviceintegrator.h"
 
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 
 #include "integratordlg.h"
 
-static const KDevPluginInfo data("kdevcvsserviceintegrator");
-typedef KDevGenericFactory<CVSServiceIntegrator> CVSIntegratorFactory;
+static const TDevPluginInfo data("tdevcvsserviceintegrator");
+typedef TDevGenericFactory<CVSServiceIntegrator> CVSIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libcvsserviceintegrator, CVSIntegratorFactory(data) )
 
 CVSServiceIntegrator::CVSServiceIntegrator(TQObject* parent, const char* name, 
     const TQStringList args)
-    :KDevVCSIntegrator(parent, name)
+    :TDevVCSIntegrator(parent, name)
 {
 }
 
diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h
index ebf4224e..b3a8af9a 100644
--- a/vcs/cvsservice/integrator/cvsserviceintegrator.h
+++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h
@@ -20,11 +20,11 @@
 #ifndef CVSSERVICEINTEGRATOR_H
 #define CVSSERVICEINTEGRATOR_H
 
-#include <kdevvcsintegrator.h>
+#include <tdevvcsintegrator.h>
 
 #include <tqstringlist.h>
 
-class CVSServiceIntegrator: public KDevVCSIntegrator {
+class CVSServiceIntegrator: public TDevVCSIntegrator {
 Q_OBJECT
   
 public:
diff --git a/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop b/vcs/cvsservice/integrator/tdevcvsserviceintegrator.desktop
index a6f189f7..a6f189f7 100644
--- a/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop
+++ b/vcs/cvsservice/integrator/tdevcvsserviceintegrator.desktop
diff --git a/vcs/cvsservice/kdev_cvs.png b/vcs/cvsservice/tdev_cvs.png
index 921b0674..921b0674 100644
--- a/vcs/cvsservice/kdev_cvs.png
+++ b/vcs/cvsservice/tdev_cvs.png
diff --git a/vcs/cvsservice/kdev_cvs.xcf b/vcs/cvsservice/tdev_cvs.xcf
index aafee609..aafee609 100644
--- a/vcs/cvsservice/kdev_cvs.xcf
+++ b/vcs/cvsservice/tdev_cvs.xcf
diff --git a/vcs/cvsservice/kdevcvsservice.desktop b/vcs/cvsservice/tdevcvsservice.desktop
index 921e91d1..5b8bb530 100644
--- a/vcs/cvsservice/kdevcvsservice.desktop
+++ b/vcs/cvsservice/tdevcvsservice.desktop
@@ -72,6 +72,6 @@ GenericName[zh_CN]=CVS 集成(Cervisia)
 GenericName[zh_TW]=CVS 整合（Cervisia）
 Icon=cervisia
 ServiceTypes=TDevelop/VersionControl
-X-TDE-Library=libkdevcvsservice
+X-TDE-Library=libtdevcvsservice
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS,CVSService
diff --git a/vcs/cvsservice/kdevcvsservicepart.rc b/vcs/cvsservice/tdevcvsservicepart.rc
index a1bce434..a1bce434 100644
--- a/vcs/cvsservice/kdevcvsservicepart.rc
+++ b/vcs/cvsservice/tdevcvsservicepart.rc
diff --git a/vcs/perforce/CMakeLists.txt b/vcs/perforce/CMakeLists.txt
index 549eadb8..f0964379 100644
--- a/vcs/perforce/CMakeLists.txt
+++ b/vcs/perforce/CMakeLists.txt
@@ -27,13 +27,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevperforce.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevperforce.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkdevperforce (module) ##################
+##### libtdevperforce (module) ##################
 
-tde_add_kpart( libkdevperforce AUTOMOC
+tde_add_kpart( libtdevperforce AUTOMOC
   SOURCES perforcepart.cpp commitdlg.cpp
-  LINK kdevextensions-static tdevelop-shared
+  LINK tdevextensions-static tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/perforce/Makefile.am b/vcs/perforce/Makefile.am
index 36e19325..09fb0e9e 100644
--- a/vcs/perforce/Makefile.am
+++ b/vcs/perforce/Makefile.am
@@ -3,17 +3,17 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevperforce.la
-libkdevperforce_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevperforce_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
+kde_module_LTLIBRARIES = libtdevperforce.la
+libtdevperforce_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevperforce_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
 
-libkdevperforce_la_SOURCES = perforcepart.cpp commitdlg.cpp
+libtdevperforce_la_SOURCES = perforcepart.cpp commitdlg.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevperforce.desktop
+service_DATA = tdevperforce.desktop
 
-rcdir = $(kde_datadir)/kdevperforce
+rcdir = $(kde_datadir)/tdevperforce
 
 SUBDIRS = integrator
diff --git a/vcs/perforce/integrator/CMakeLists.txt b/vcs/perforce/integrator/CMakeLists.txt
index e939e3ba..95985418 100644
--- a/vcs/perforce/integrator/CMakeLists.txt
+++ b/vcs/perforce/integrator/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevperforceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevperforceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
 ##### libperforceintegrator (module) ############
@@ -35,6 +35,6 @@ tde_add_kpart( libperforceintegrator AUTOMOC
   SOURCES
     perforceintegrator.cpp pfintegratordlgbase.ui
     pfintegratordlg.cpp
-  LINK kdevextras-shared tdevelop-shared
+  LINK tdevextras-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/perforce/integrator/Makefile.am b/vcs/perforce/integrator/Makefile.am
index 38e80bcd..e400e241 100644
--- a/vcs/perforce/integrator/Makefile.am
+++ b/vcs/perforce/integrator/Makefile.am
@@ -5,9 +5,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = libperforceintegrator.la
 libperforceintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libperforceintegrator_la_LIBADD =\
-	$(top_builddir)/lib/interfaces/extras/libkdevextras.la\
+	$(top_builddir)/lib/interfaces/extras/libtdevextras.la\
 	$(top_builddir)/lib/libtdevelop.la
-kde_services_DATA = kdevperforceintegrator.desktop
+kde_services_DATA = tdevperforceintegrator.desktop
 noinst_HEADERS = perforceintegrator.h pfintegratordlg.h
 libperforceintegrator_la_SOURCES = perforceintegrator.cpp \
 	pfintegratordlgbase.ui pfintegratordlg.cpp
diff --git a/vcs/perforce/integrator/perforceintegrator.cpp b/vcs/perforce/integrator/perforceintegrator.cpp
index bc7c0988..74fdf54f 100644
--- a/vcs/perforce/integrator/perforceintegrator.cpp
+++ b/vcs/perforce/integrator/perforceintegrator.cpp
@@ -19,19 +19,19 @@
  ***************************************************************************/
 #include "perforceintegrator.h"
 
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 
 #include "pfintegratordlg.h"
 
-static const KDevPluginInfo data("kdevperforceintegrator");
-typedef KDevGenericFactory<PerforceIntegrator> PerforceIntegratorFactory;
+static const TDevPluginInfo data("tdevperforceintegrator");
+typedef TDevGenericFactory<PerforceIntegrator> PerforceIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libperforceintegrator, PerforceIntegratorFactory(data) )
 
 PerforceIntegrator::PerforceIntegrator(TQObject* parent, const char* name,
     const TQStringList // args
                                        )
-    :KDevVCSIntegrator(parent, name)
+    :TDevVCSIntegrator(parent, name)
 {
 }
 
diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h
index 2b82046f..c97ff82f 100644
--- a/vcs/perforce/integrator/perforceintegrator.h
+++ b/vcs/perforce/integrator/perforceintegrator.h
@@ -20,11 +20,11 @@
 #ifndef PERFORCEINTEGRATOR_H
 #define PERFORCEINTEGRATOR_H
 
-#include <kdevvcsintegrator.h>
+#include <tdevvcsintegrator.h>
 
 #include <tqstringlist.h>
 
-class PerforceIntegrator : public KDevVCSIntegrator
+class PerforceIntegrator : public TDevVCSIntegrator
 {
 Q_OBJECT
   
diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h
index 3e7bf4de..5398475b 100644
--- a/vcs/perforce/integrator/pfintegratordlg.h
+++ b/vcs/perforce/integrator/pfintegratordlg.h
@@ -21,7 +21,7 @@
 #define PFINTEGRATORDLG_H
 
 #include "pfintegratordlgbase.h"
-#include <kdevvcsintegrator.h>
+#include <tdevvcsintegrator.h>
 
 class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
diff --git a/vcs/perforce/integrator/kdevperforceintegrator.desktop b/vcs/perforce/integrator/tdevperforceintegrator.desktop
index 78ad9bf2..78ad9bf2 100644
--- a/vcs/perforce/integrator/kdevperforceintegrator.desktop
+++ b/vcs/perforce/integrator/tdevperforceintegrator.desktop
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index f92666b6..72672b1e 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -17,7 +17,7 @@
 #include <tqregexp.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <kprocess.h>
 #include <tdemessagebox.h>
 #include <tdeapplication.h>
@@ -25,21 +25,21 @@
 #include <kurl.h>
 #include <tdeparts/part.h>
 
-#include "kdevpartcontroller.h"
-#include "kdevcore.h"
-#include "kdevmakefrontend.h"
-#include "kdevdifffrontend.h"
-#include "kdevplugininfo.h"
+#include "tdevpartcontroller.h"
+#include "tdevcore.h"
+#include "tdevmakefrontend.h"
+#include "tdevdifffrontend.h"
+#include "tdevplugininfo.h"
 #include "commitdlg.h"
 #include "execcommand.h"
 
-static const KDevPluginInfo data("kdevperforce");
+static const TDevPluginInfo data("tdevperforce");
 
-typedef KDevGenericFactory<PerforcePart> PerforceFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) )
+typedef TDevGenericFactory<PerforcePart> PerforceFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevperforce, PerforceFactory( data ) )
 
 PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & )
-    : KDevVersionControl( &data, parent, name ? name : "PerforcePart" )
+    : TDevVersionControl( &data, parent, name ? name : "PerforcePart" )
 {
     setInstance(PerforceFactory::instance());
     setupActions();
@@ -140,7 +140,7 @@ void PerforcePart::execCommand( const TQString& cmd, const TQString& filename )
     command += " && p4 " + cmd + " ";
     command += name;
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 }
 
@@ -183,7 +183,7 @@ void PerforcePart::commit( const TQString& filename )
     TQString command("echo " + message);
     command += " | p4 submit -i";
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand("", command);
 }
 
@@ -208,7 +208,7 @@ void PerforcePart::update( const TQString& filename )
     command += " && p4 sync ";
     command += name;
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
+    if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 }
 
@@ -277,7 +277,7 @@ void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err )
     TQString strippedDiff = diff;
     strippedDiff.replace( rx, "--- \\2\n+++ \\2\n" );
 
-    if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("TDevelop/DiffFrontend"))
+    if (TDevDiffFrontend *diffFrontend = extension<TDevDiffFrontend>("TDevelop/DiffFrontend"))
         diffFrontend->showDiff( strippedDiff );
 }
 
diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h
index 7c034424..2af8ff5f 100644
--- a/vcs/perforce/perforcepart.h
+++ b/vcs/perforce/perforcepart.h
@@ -13,14 +13,14 @@
 #ifndef _PERFORCEPART_H_
 #define _PERFORCEPART_H_
 
-#include <kdevversioncontrol.h>
+#include <tdevversioncontrol.h>
 #include <tdelocale.h>
 
 class Context;
 class TQPopupMenu;
 class TDEAction;
 
-class PerforcePart : public KDevVersionControl
+class PerforcePart : public TDevVersionControl
 {
     Q_OBJECT
   
@@ -34,7 +34,7 @@ public:
 
     virtual void createNewProject(const TQString& /* dir */) {}
     virtual bool fetchFromRepository() { return true; }
-    virtual KDevVCSFileInfoProvider *fileInfoProvider() const { return 0; }
+    virtual TDevVCSFileInfoProvider *fileInfoProvider() const { return 0; }
     virtual bool isValidDirectory(const TQString& /* dirPath*/) const
     { return true; }
 
diff --git a/vcs/perforce/kdevperforce.desktop b/vcs/perforce/tdevperforce.desktop
index d837faeb..4f73f5e9 100644
--- a/vcs/perforce/kdevperforce.desktop
+++ b/vcs/perforce/tdevperforce.desktop
@@ -77,6 +77,6 @@ GenericName[tr]=Perforce Bütünleştirmesi
 GenericName[zh_CN]=Perforce 集成
 GenericName[zh_TW]=Perforce 整合
 ServiceTypes=TDevelop/VersionControl
-X-TDE-Library=libkdevperforce
+X-TDE-Library=libtdevperforce
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS,PerforceVCS
diff --git a/vcs/perforce/kdevperforcepart.rc b/vcs/perforce/tdevperforcepart.rc
index 27b5fe08..27b5fe08 100644
--- a/vcs/perforce/kdevperforcepart.rc
+++ b/vcs/perforce/tdevperforcepart.rc
diff --git a/vcs/subversion/CMakeLists.txt b/vcs/subversion/CMakeLists.txt
index fb51fe3d..63ffad4b 100644
--- a/vcs/subversion/CMakeLists.txt
+++ b/vcs/subversion/CMakeLists.txt
@@ -31,19 +31,19 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    kdevsubversion.desktop kdevsvn+file.protocol
-    kdevsvn+http.protocol kdevsvn+https.protocol
-    kdevsvn+ssh.protocol kdevsvn+svn.protocol
+    tdevsubversion.desktop tdevsvn+file.protocol
+    tdevsvn+http.protocol tdevsvn+https.protocol
+    tdevsvn+ssh.protocol tdevsvn+svn.protocol
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 install( FILES
-    kdevsvnd.desktop
+    tdevsvnd.desktop
   DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 
 
-##### libkdevsubversion (module) ################
+##### libtdevsubversion (module) ################
 
-tde_add_kpart( libkdevsubversion AUTOMOC
+tde_add_kpart( libtdevsubversion AUTOMOC
   SOURCES
     subversion_core.cpp subversion_fileinfo.cpp
     subversion_fileinfo.skel subversion_part.cpp
@@ -54,14 +54,14 @@ tde_add_kpart( libkdevsubversion AUTOMOC
     svn_logviewoptiondlgbase.ui svn_logviewwidget.cpp
     svn_mergeoptiondlgbase.ui svn_mergewidget.cpp
     svn_switchdlgbase.ui svn_switchwidget.cpp
-  LINK kdevextensions-static tdevelop-shared
+  LINK tdevextensions-static tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
-##### tdeio_kdevsvn (module) ######################
+##### tdeio_tdevsvn (module) ######################
 
-tde_add_kpart( tdeio_kdevsvn AUTOMOC
+tde_add_kpart( tdeio_tdevsvn AUTOMOC
   SOURCES
     svn_tdeio.cpp
   LINK tdeio-shared ${SVN_LIBRARIES} ${APR_LIBRARIES}
@@ -69,12 +69,12 @@ tde_add_kpart( tdeio_kdevsvn AUTOMOC
 )
 
 
-##### kded_kdevsvnd (module) ####################
+##### kded_tdevsvnd (module) ####################
 
-tde_add_kpart( kded_kdevsvnd AUTOMOC
+tde_add_kpart( kded_tdevsvnd AUTOMOC
   SOURCES
-    commitdlg.cpp commitdlgbase.ui kdevsvnd.cpp kdevsvnd.skel
-    kdevsvnd_widgets.cpp svnssltrustpromptbase.ui
+    commitdlg.cpp commitdlgbase.ui tdevsvnd.cpp tdevsvnd.skel
+    tdevsvnd_widgets.cpp svnssltrustpromptbase.ui
   LINK tdeio-shared tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/subversion/Makefile.am b/vcs/subversion/Makefile.am
index a66b80dd..2f650195 100644
--- a/vcs/subversion/Makefile.am
+++ b/vcs/subversion/Makefile.am
@@ -2,37 +2,37 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util -I$(top_srcdi
 
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = libkdevsubversion.la tdeio_kdevsvn.la kded_kdevsvnd.la
+kde_module_LTLIBRARIES = libtdevsubversion.la tdeio_tdevsvn.la kded_tdevsvnd.la
 
-libkdevsubversion_la_SOURCES = subversion_core.cpp subversion_fileinfo.cpp \
+libtdevsubversion_la_SOURCES = subversion_core.cpp subversion_fileinfo.cpp \
 	subversion_fileinfo.skel subversion_part.cpp subversion_widget.cpp subversiondiff.ui \
 	subversionprojectwidget.ui svn_blamewidget.cpp svn_co.ui svn_commitdlgbase.ui svn_copydlgwidget.ui \
 	svn_copywidget.cpp svn_fileselectdlg_commit.cpp svn_logviewoptiondlgbase.ui \
 	svn_logviewwidget.cpp svn_mergeoptiondlgbase.ui svn_mergewidget.cpp svn_switchdlgbase.ui \
 	svn_switchwidget.cpp
-libkdevsubversion_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
-libkdevsubversion_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevsubversion_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
+libtdevsubversion_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
 	
-tdeio_kdevsvn_la_SOURCES = svn_tdeio.cpp
-tdeio_kdevsvn_la_LIBADD = $(LIB_TDEIO)
-tdeio_kdevsvn_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(SVN_LIB)
+tdeio_tdevsvn_la_SOURCES = svn_tdeio.cpp
+tdeio_tdevsvn_la_LIBADD = $(LIB_TDEIO)
+tdeio_tdevsvn_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(SVN_LIB)
 
-kded_kdevsvnd_la_SOURCES = commitdlg.cpp commitdlgbase.ui kdevsvnd.cpp \
-	kdevsvnd.skel kdevsvnd_widgets.cpp svnssltrustpromptbase.ui
-kded_kdevsvnd_la_LIBADD = $(LIB_TDEIO) -ltdeinit_kded
-kded_kdevsvnd_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+kded_tdevsvnd_la_SOURCES = commitdlg.cpp commitdlgbase.ui tdevsvnd.cpp \
+	tdevsvnd.skel tdevsvnd_widgets.cpp svnssltrustpromptbase.ui
+kded_tdevsvnd_la_LIBADD = $(LIB_TDEIO) -ltdeinit_kded
+kded_tdevsvnd_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
 
 kdeddir = $(kde_servicesdir)/kded
-kded_DATA = kdevsvnd.desktop
+kded_DATA = tdevsvnd.desktop
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevsubversion.desktop
+service_DATA = tdevsubversion.desktop
 
 protocoldir = $(kde_servicesdir)
-protocol_DATA = kdevsvn+file.protocol kdevsvn+http.protocol kdevsvn+https.protocol kdevsvn+ssh.protocol kdevsvn+svn.protocol
+protocol_DATA = tdevsvn+file.protocol tdevsvn+http.protocol tdevsvn+https.protocol tdevsvn+ssh.protocol tdevsvn+svn.protocol
 
 
 SUBDIRS = integrator
-noinst_HEADERS = commitdlg.h kdevsvnd.h svn_blamewidget.h svn_copywidget.h \
+noinst_HEADERS = commitdlg.h tdevsvnd.h svn_blamewidget.h svn_copywidget.h \
 	svn_fileselectdlg_commit.h svn_logviewwidget.h svn_mergewidget.h svn_switchwidget.h
diff --git a/vcs/subversion/integrator/CMakeLists.txt b/vcs/subversion/integrator/CMakeLists.txt
index 2256b8e3..3d6c7ad3 100644
--- a/vcs/subversion/integrator/CMakeLists.txt
+++ b/vcs/subversion/integrator/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevsubversionintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevsubversionintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
 ##### libsubversionintegrator (module) ##########
@@ -35,6 +35,6 @@ tde_add_kpart( libsubversionintegrator AUTOMOC
   SOURCES
     subversionintegrator.cpp svnintegratordlgbase.ui
     svnintegratordlg.cpp
-  LINK kdevextras-shared tdevelop-shared
+  LINK tdevextras-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/subversion/integrator/Makefile.am b/vcs/subversion/integrator/Makefile.am
index 231dc3c7..aded8465 100644
--- a/vcs/subversion/integrator/Makefile.am
+++ b/vcs/subversion/integrator/Makefile.am
@@ -6,9 +6,9 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = libsubversionintegrator.la
 libsubversionintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libsubversionintegrator_la_LIBADD =\
-	$(top_builddir)/lib/interfaces/extras/libkdevextras.la\
+	$(top_builddir)/lib/interfaces/extras/libtdevextras.la\
 	$(top_builddir)/lib/libtdevelop.la
-kde_services_DATA = kdevsubversionintegrator.desktop
+kde_services_DATA = tdevsubversionintegrator.desktop
 noinst_HEADERS = subversionintegrator.h svnintegratordlg.h
 libsubversionintegrator_la_SOURCES = subversionintegrator.cpp \
 	svnintegratordlgbase.ui svnintegratordlg.cpp
diff --git a/vcs/subversion/integrator/subversionintegrator.cpp b/vcs/subversion/integrator/subversionintegrator.cpp
index 32d28d27..da8fed8c 100644
--- a/vcs/subversion/integrator/subversionintegrator.cpp
+++ b/vcs/subversion/integrator/subversionintegrator.cpp
@@ -19,19 +19,19 @@
  ***************************************************************************/
 #include "subversionintegrator.h"
 
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 
 #include "svnintegratordlg.h"
 
-static const KDevPluginInfo data("kdevsubversionintegrator");
-typedef KDevGenericFactory<SubversionIntegrator> SubversionIntegratorFactory;
+static const TDevPluginInfo data("tdevsubversionintegrator");
+typedef TDevGenericFactory<SubversionIntegrator> SubversionIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libsubversionintegrator, SubversionIntegratorFactory(data) )
 
 SubversionIntegrator::SubversionIntegrator(TQObject* parent, const char* name,
     const TQStringList // args
                                            )
-    :KDevVCSIntegrator(parent, name)
+    :TDevVCSIntegrator(parent, name)
 {
 }
 
diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h
index 01c43516..6c7d16ac 100644
--- a/vcs/subversion/integrator/subversionintegrator.h
+++ b/vcs/subversion/integrator/subversionintegrator.h
@@ -20,11 +20,11 @@
 #ifndef SUBVERSIONINTEGRATOR_H
 #define SUBVERSIONINTEGRATOR_H
 
-#include <kdevvcsintegrator.h>
+#include <tdevvcsintegrator.h>
 
 #include <tqstringlist.h>
 
-class SubversionIntegrator : public KDevVCSIntegrator
+class SubversionIntegrator : public TDevVCSIntegrator
 {
 Q_OBJECT
   
diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp
index 87ccf488..35e4216b 100644
--- a/vcs/subversion/integrator/svnintegratordlg.cpp
+++ b/vcs/subversion/integrator/svnintegratordlg.cpp
@@ -47,7 +47,7 @@ SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name )
 void SvnIntegratorDlg::accept()
 {
     // to let ioslave know which protocol it should start.
-    KURL protocolUrl = KURL("kdevsvn+svn://blah/");
+    KURL protocolUrl = KURL("tdevsvn+svn://blah/");
     KURL servURL( repos1->url() );
     if ( servURL.isEmpty() ) return;
     
diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h
index ccf1686f..bc8e8407 100644
--- a/vcs/subversion/integrator/svnintegratordlg.h
+++ b/vcs/subversion/integrator/svnintegratordlg.h
@@ -21,7 +21,7 @@
 #define SVNINTEGRATORDLG_H
 
 #include "svnintegratordlgbase.h"
-#include <kdevvcsintegrator.h>
+#include <tdevvcsintegrator.h>
 
 class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
diff --git a/vcs/subversion/integrator/kdevsubversionintegrator.desktop b/vcs/subversion/integrator/tdevsubversionintegrator.desktop
index 6e666667..6e666667 100644
--- a/vcs/subversion/integrator/kdevsubversionintegrator.desktop
+++ b/vcs/subversion/integrator/tdevsubversionintegrator.desktop
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index e9c89ece..108bf298 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -18,15 +18,15 @@
 	 */
 
 #include <tdeparts/part.h>
-#include <kdevcore.h>
-#include <kdevproject.h>
+#include <tdevcore.h>
+#include <tdevproject.h>
 #include "subversion_part.h"
 #include "subversion_core.h"
 #include "subversion_widget.h"
 #include "svn_blamewidget.h"
 #include "svn_logviewwidget.h"
 #include "subversiondiff.h"
-#include <kdevmainwindow.h>
+#include <tdevmainwindow.h>
 #include "svn_co.h"
 #include <kurlrequester.h>
 #include <klineedit.h>
@@ -82,7 +82,7 @@ subversionCore::~subversionCore() {
 	//FIXME delete m_fileInfoProvider here?
 }
 
-KDevVCSFileInfoProvider *subversionCore::fileInfoProvider() const {
+TDevVCSFileInfoProvider *subversionCore::fileInfoProvider() const {
     return m_fileInfoProvider;
 }
 
@@ -114,8 +114,8 @@ subversionWidget *subversionCore::processWidget() const {
 void subversionCore::resolve( const KURL::List& list ) {
 	KURL servURL = m_part->baseURL();
 	if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/";
-	if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) {
-		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
+	if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) {
+		servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 	}
 	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl;
 	for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {
@@ -248,8 +248,8 @@ void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2,
 void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplocks ) {
 	KURL servURL = m_part->baseURL();
 	if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/";
-	if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) {
-		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
+	if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) {
+		servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 	}
 	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl;
 	TQByteArray parms;
@@ -277,8 +277,8 @@ void subversionCore::svnLog( const KURL::List& list,
         clientInfo( KURL(m_part->project()->projectDirectory()), false, m_part->m_prjInfoMap );
 	KURL servURL = m_part->baseURL();
 	if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/";
-	if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) {
-		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
+	if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) {
+		servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 	}
 	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl;
 	TQByteArray parms;
@@ -304,8 +304,8 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQStrin
 {
 	KURL servURL = m_part->baseURL();
 	if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/";
-	if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) {
-		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
+	if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) {
+		servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 	}
 	kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl;
 	TQByteArray parms;
@@ -374,7 +374,7 @@ void subversionCore::checkout() {
 		int cmd = 1;
 		int rev = -1;
 		s << cmd << servURL << KURL( wcPath ) << rev << TQString( "HEAD" );
-		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
+		servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
 		SimpleJob * job = TDEIO::special(servURL,parms, true);
 		job->setWindow( m_part->mainWindow()->main() );
 		connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( TDEIO::Job * ) ) );
diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h
index f2f3f6da..60cd8cfc 100644
--- a/vcs/subversion/subversion_core.h
+++ b/vcs/subversion/subversion_core.h
@@ -29,7 +29,7 @@
 #include "subversion_fileinfo.h"
 #include "subversion_global.h"
 
-class KDevProject;
+class TDevProject;
 class subversionPart;
 class subversionWidget;
 class TDEApplication;
@@ -76,7 +76,7 @@ public:
     // Return true on success. Otherwise return false.
     bool clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, SvnGlobal::SvnInfoHolder> &holderMap );
 	void createNewProject( const TQString& dirName, const KURL& importURL, bool init );
-    KDevVCSFileInfoProvider *fileInfoProvider() const;
+    TDevVCSFileInfoProvider *fileInfoProvider() const;
 	
 	void initProcessDlg( TDEIO::Job *job, const TQString &src, const TQString &dest );
 // k_dcop:
diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp
index 45d44d1e..c41ff9ef 100644
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@@ -22,10 +22,10 @@
 #include <kdebug.h>
 #include <tqfileinfo.h>
 #include <tqdir.h>
-#include <kdevproject.h>
+#include <tdevproject.h>
 #include <unistd.h>
 #include <tdeapplication.h>
-#include <kdevmainwindow.h>
+#include <tdevmainwindow.h>
 #include <tdemainwindow.h>
 #include <tqregexp.h>
 
@@ -33,7 +33,7 @@
 #include <tdelocale.h>
 
 SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *parent, const char *name)
-    : KDevVCSFileInfoProvider( parent, "svnfileinfoprovider" ),
+    : TDevVCSFileInfoProvider( parent, "svnfileinfoprovider" ),
 	m_cachedDirEntries( 0 ), m_recursiveDirEntries(0) {
 	Q_UNUSED(name);
 	m_part = parent;
diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h
index 9b322463..1d144270 100644
--- a/vcs/subversion/subversion_fileinfo.h
+++ b/vcs/subversion/subversion_fileinfo.h
@@ -23,7 +23,7 @@
 
 #include <tqmap.h>
 
-#include <kdevversioncontrol.h>
+#include <tdevversioncontrol.h>
 #include <tdeio/job.h>
 #include <dcopclient.h>
 #include <dcopobject.h>
@@ -34,7 +34,7 @@ Provider for SVN file information
 
 @author Mickael Marchand
 */
-class SVNFileInfoProvider : public KDevVCSFileInfoProvider, public DCOPObject/*, virtual public DCOPClient*/
+class SVNFileInfoProvider : public TDevVCSFileInfoProvider, public DCOPObject/*, virtual public DCOPClient*/
 {
     Q_OBJECT
 //    
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index f3f43cd9..3df326d9 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -21,18 +21,18 @@
 #include <tqwhatsthis.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
+#include <tdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 
-#include "kdevcore.h"
-#include "kdevmainwindow.h"
+#include "tdevcore.h"
+#include "tdevmainwindow.h"
 #include "subversion_core.h"
 #include "subversion_widget.h"
 #include "subversionprojectwidget.h"
 #include "subversion_fileinfo.h"
 #include "subversion_global.h"
-#include "kdevversioncontrol.h"
+#include "tdevversioncontrol.h"
 #include "svn_fileselectdlg_commit.h"
 #include "svn_logviewwidget.h"
 #include "svn_switchwidget.h"
@@ -43,28 +43,28 @@
 #include <tqvbox.h>
 #include <kdialogbase.h>
 #include <tdeparts/part.h>
-#include <kdevpartcontroller.h>
-#include <kdevproject.h>
+#include <tdevpartcontroller.h>
+#include <tdevproject.h>
 #include <domutil.h>
 #include <kurlrequester.h>
 #include <tqradiobutton.h>
 #include <kdebug.h>
 #include <tqwidget.h>
-#include <kdevplugininfo.h>
+#include <tdevplugininfo.h>
 
 #include <tdemessagebox.h>
 
 using namespace SvnGlobal;
 
-static const KDevPluginInfo data("kdevsubversion");
+static const TDevPluginInfo data("tdevsubversion");
 
-typedef KDevGenericFactory<subversionPart> subversionFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) )
+typedef TDevGenericFactory<subversionPart> subversionFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevsubversion, subversionFactory( data ) )
 
 //bool g_projectWasJustCreated = false;
 
 subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& )
-	: KDevVersionControl(&data, parent, name ? name : "Subversion" ) {
+	: TDevVersionControl(&data, parent, name ? name : "Subversion" ) {
 	setInstance(subversionFactory::instance());
 	m_projWidget = 0;
 
@@ -79,7 +79,7 @@ subversionPart::subversionPart(TQObject *parent, const char *name, const TQStrin
 	// Context menu
 	connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 	connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
-	connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
+	connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)), this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) );
 	connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) );
 	connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) );
 
@@ -177,7 +177,7 @@ bool subversionPart::fetchFromRepository() {
         return true;
 }
 
-KDevVCSFileInfoProvider * subversionPart::fileInfoProvider() const {
+TDevVCSFileInfoProvider * subversionPart::fileInfoProvider() const {
 	return m_impl->fileInfoProvider();
 }
 
diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h
index 1847567d..9296152a 100644
--- a/vcs/subversion/subversion_part.h
+++ b/vcs/subversion/subversion_part.h
@@ -16,16 +16,16 @@
 	 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 	 Boston, MA 02110-1301, USA.
 	 */
-#ifndef __KDEVPART_SUBVERSION_H__
-#define __KDEVPART_SUBVERSION_H__
+#ifndef __TDEVPART_SUBVERSION_H__
+#define __TDEVPART_SUBVERSION_H__
 
 
 #include <tqguardedptr.h>
-#include <kdevplugin.h>
+#include <tdevplugin.h>
 #include <kurl.h>
 #include <tqpopupmenu.h>
 #include <kdialogbase.h>
-#include "kdevversioncontrol.h"
+#include "tdevversioncontrol.h"
 
 class subversionCore;
 class subversionOptionsWidget;
@@ -36,7 +36,7 @@ namespace SvnGlobal
 class SvnInfoHolder;
 };
 
-class subversionPart : public KDevVersionControl
+class subversionPart : public TDevVersionControl
 {
 	Q_OBJECT
   
@@ -49,7 +49,7 @@ public:
 		TQWidget* newProjectWidget( TQWidget* parent );
 		void createNewProject( const TQString& dirname );
 		bool fetchFromRepository();
-		KDevVCSFileInfoProvider * fileInfoProvider() const;
+		TDevVCSFileInfoProvider * fileInfoProvider() const;
 		bool urlFocusedDocument( KURL &url );
 		void restorePartialProjectSession(const TQDomElement* );
 		void savePartialProjectSession(TQDomElement* );
diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp
index 95b31f6b..9b29e1fa 100644
--- a/vcs/subversion/subversion_widget.cpp
+++ b/vcs/subversion/subversion_widget.cpp
@@ -18,7 +18,7 @@
 	 */
 
 #include <tdeparts/part.h>
-#include <kdevcore.h>
+#include <tdevcore.h>
 #include <kdebug.h>
 #include <klineedit.h>
 
diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp
index e042df84..9c210a37 100644
--- a/vcs/subversion/svn_fileselectdlg_commit.cpp
+++ b/vcs/subversion/svn_fileselectdlg_commit.cpp
@@ -29,10 +29,10 @@
 #include <tqcheckbox.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include "kdevmainwindow.h"
+#include "tdevmainwindow.h"
 #include <tdelocale.h>
 
-#include <kdevproject.h>
+#include <tdevproject.h>
 
 SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* parent)
 	:SvnCommitDlgBase( parent, "svnfileselectcommitdlg", true )
diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp
index 10e55a9f..e872a586 100644
--- a/vcs/subversion/svn_logviewwidget.cpp
+++ b/vcs/subversion/svn_logviewwidget.cpp
@@ -22,7 +22,7 @@
 #include "svn_blamewidget.h"
 #include "subversion_core.h"
 #include "subversion_global.h"
-#include <kdevproject.h>
+#include <tdevproject.h>
 #include <ktextedit.h>
 #include <tdemessagebox.h>
 #include <kdebug.h>
diff --git a/vcs/subversion/svn_tdeio.cpp b/vcs/subversion/svn_tdeio.cpp
index 23f1d2ff..0abac2b8 100644
--- a/vcs/subversion/svn_tdeio.cpp
+++ b/vcs/subversion/svn_tdeio.cpp
@@ -124,7 +124,7 @@ tdeio_svnProtocol::tdeio_svnProtocol(const TQCString &pool_socket, const TQCStri
 		apr_initialize();
                 // Make sure to properly initialize svn client, besides other things, this sets up
                 // NLS support for environments that don't use UTF-8
-                svn_cmdline_init("kdevsvnd",NULL);
+                svn_cmdline_init("tdevsvnd",NULL);
 		// CleanUP ctx preventing crash in svn_client_update and other
 		memset(&ctx, 0, sizeof(ctx));
 		pool = svn_pool_create (NULL);
@@ -1861,7 +1861,7 @@ svn_error_t *tdeio_svnProtocol::commitLogPrompt( const char **log_msg, const cha
 
 	kdDebug(9036) << " __TIME__ " << __TIME__ << endl;
 	if ( !p->dcopClient()->call( "kded","kdevsvnd","commitDialog(TQString)", params, replyType, reply ) ) {
-		kdWarning() << "Communication with KDED:KDevSvnd failed" << endl;
+		kdWarning() << "Communication with KDED:TDevSvnd failed" << endl;
 		svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL,
 											 apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP. If this is your first problem, try to restart KDE" ) );
 		return err;
diff --git a/vcs/subversion/kdevpart_subversion.rc b/vcs/subversion/tdevpart_subversion.rc
index ad957e99..ad957e99 100644
--- a/vcs/subversion/kdevpart_subversion.rc
+++ b/vcs/subversion/tdevpart_subversion.rc
diff --git a/vcs/subversion/kdevsubversion.desktop b/vcs/subversion/tdevsubversion.desktop
index bf52db8c..7643c755 100644
--- a/vcs/subversion/kdevsubversion.desktop
+++ b/vcs/subversion/tdevsubversion.desktop
@@ -29,6 +29,6 @@ GenericName[ta]=துணை பதிப்பு
 GenericName[tg]=Зер-ривоят
 Icon=misc
 ServiceTypes=TDevelop/VersionControl
-X-TDE-Library=libkdevsubversion
+X-TDE-Library=libtdevsubversion
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS,SubversionVCS
diff --git a/vcs/subversion/kdevsvn+file.protocol b/vcs/subversion/tdevsvn+file.protocol
index 412c3800..412c3800 100644
--- a/vcs/subversion/kdevsvn+file.protocol
+++ b/vcs/subversion/tdevsvn+file.protocol
diff --git a/vcs/subversion/kdevsvn+http.protocol b/vcs/subversion/tdevsvn+http.protocol
index 5a063b85..5a063b85 100644
--- a/vcs/subversion/kdevsvn+http.protocol
+++ b/vcs/subversion/tdevsvn+http.protocol
diff --git a/vcs/subversion/kdevsvn+https.protocol b/vcs/subversion/tdevsvn+https.protocol
index d064e575..d064e575 100644
--- a/vcs/subversion/kdevsvn+https.protocol
+++ b/vcs/subversion/tdevsvn+https.protocol
diff --git a/vcs/subversion/kdevsvn+ssh.protocol b/vcs/subversion/tdevsvn+ssh.protocol
index 512b4a90..512b4a90 100644
--- a/vcs/subversion/kdevsvn+ssh.protocol
+++ b/vcs/subversion/tdevsvn+ssh.protocol
diff --git a/vcs/subversion/kdevsvn+svn.protocol b/vcs/subversion/tdevsvn+svn.protocol
index 8f496854..8f496854 100644
--- a/vcs/subversion/kdevsvn+svn.protocol
+++ b/vcs/subversion/tdevsvn+svn.protocol
diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/tdevsvnd.cpp
index c1faf65e..ea42667b 100644
--- a/vcs/subversion/kdevsvnd.cpp
+++ b/vcs/subversion/tdevsvnd.cpp
@@ -30,24 +30,24 @@
 
 #include "config.h"
 
-#include "kdevsvnd.h"
+#include "tdevsvnd.h"
 
-#include "kdevsvnd_widgets.h"
+#include "tdevsvnd_widgets.h"
 #include "commitdlg.h"
 
 extern "C" {
     KDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) {
-       return new KDevSvnd(name);
+       return new TDevSvnd(name);
     }
 }
 
-KDevSvnd::KDevSvnd(const TQCString &name)
+TDevSvnd::TDevSvnd(const TQCString &name)
  : KDEDModule(name) {
 }
-KDevSvnd::~KDevSvnd()
+TDevSvnd::~TDevSvnd()
 {}
 
-TQString KDevSvnd::commitDialog(TQString modifiedFiles) {
+TQString TDevSvnd::commitDialog(TQString modifiedFiles) {
 	CommitDlg commitDlg;
 	commitDlg.setCaption(i18n("Enter Commit Log Message:"));
 	commitDlg.listMessage->setText( modifiedFiles );
@@ -57,7 +57,7 @@ TQString KDevSvnd::commitDialog(TQString modifiedFiles) {
 	} else
 		return TQString();
 }
-int KDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert )
+int TDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert )
 {
 	SvnSSLTrustPrompt dlg;
 	dlg.setupCertInfo( hostname, fingerPrint, validfrom, validuntil, issuerName, ascii_cert );
@@ -69,12 +69,12 @@ int KDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString
 		return -1;
 	}
 }
-TQString KDevSvnd::sslCertFile()
+TQString TDevSvnd::sslCertFile()
 {
 	TQString fileName = KFileDialog::getOpenFileName(TQString(),TQString(),0, i18n("Open SSL certificate file"));
 	return fileName;
 }
-TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
+TQCString TDevSvnd::sslPasswdDlg(TQString promptMsg)
 {
 	TQCString passwd;
 	int ret = KPasswordDialog::getPassword( passwd,promptMsg );
@@ -90,7 +90,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 }
 
 
-// void KDevSvnd::registerMe(const TQCString &app)
+// void TDevSvnd::registerMe(const TQCString &app)
 // {
 // 	insert(app, "test", new TestObject(app));
 //    // When 'app' unregisters with DCOP, the TestObject will get deleted.
@@ -391,4 +391,4 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // }
 // #endif
 
-#include "kdevsvnd.moc"
+#include "tdevsvnd.moc"
diff --git a/vcs/subversion/kdevsvnd.desktop b/vcs/subversion/tdevsvnd.desktop
index 9ba3e877..9ba3e877 100644
--- a/vcs/subversion/kdevsvnd.desktop
+++ b/vcs/subversion/tdevsvnd.desktop
diff --git a/vcs/subversion/kdevsvnd.h b/vcs/subversion/tdevsvnd.h
index 438520e1..4bec5ae7 100644
--- a/vcs/subversion/kdevsvnd.h
+++ b/vcs/subversion/tdevsvnd.h
@@ -26,7 +26,7 @@
 #include <kurl.h>
 #include <tqstringlist.h>
 
-class KDevSvnd : public KDEDModule
+class TDevSvnd : public KDEDModule
 {
 Q_OBJECT
 //
@@ -36,8 +36,8 @@ K_DCOP
   //note: InSVN means parent is added.  InRepos  means itself is added
 	enum { SomeAreFiles = 1, SomeAreFolders = 2,  SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 };
 public:
-	KDevSvnd(const TQCString &);
-	~KDevSvnd();
+	TDevSvnd(const TQCString &);
+	~TDevSvnd();
 
 k_dcop:
 //  void addAuthInfo(TDEIO::AuthInfo, long);
diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/tdevsvnd_widgets.cpp
index 0fd2c20b..ba688423 100644
--- a/vcs/subversion/kdevsvnd_widgets.cpp
+++ b/vcs/subversion/tdevsvnd_widgets.cpp
@@ -12,7 +12,7 @@
  *  Library General Public License for more details.
  */
  
-#include "kdevsvnd_widgets.h"
+#include "tdevsvnd_widgets.h"
 #include <tqpushbutton.h>
 #include <tqlistview.h>
 #include <tqlabel.h>
@@ -67,4 +67,4 @@ void SvnSSLTrustPrompt::setRejected()
 {
 	m_code = -1;
 }
-#include "kdevsvnd_widgets.moc"
+#include "tdevsvnd_widgets.moc"
diff --git a/vcs/subversion/kdevsvnd_widgets.h b/vcs/subversion/tdevsvnd_widgets.h
index 3967cb35..da7942b2 100644
--- a/vcs/subversion/kdevsvnd_widgets.h
+++ b/vcs/subversion/tdevsvnd_widgets.h
@@ -12,8 +12,8 @@
  *  Library General Public License for more details.
  */
 
-#ifndef KDEVSVND_WIDGETS_H
-#define KDEVSVND_WIDGETS_H
+#ifndef TDEVSVND_WIDGETS_H
+#define TDEVSVND_WIDGETS_H
 
 #include "svnssltrustpromptbase.h"