Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

92 files changed, 846 insertions, 846 deletions

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e9088337..0398ddf0 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 tdevutil-static tdevinterfaces-static
+  EMBED kdevutil-static kdevinterfaces-static
   LINK
-    tdevpropertyeditor-shared
+    kdevpropertyeditor-shared
     tdescript-shared tdeparts-shared tdetexteditor-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 55b974c5..d590051e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-# Here resides the library of general TDevelop-related utilities,
+# Here resides the library of general KDevelop-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/libtdevinterfaces.la \
-	$(top_builddir)/lib/widgets/propeditor/libtdevpropertyeditor.la $(LIB_TDEIO)
+libtdevelop_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \
+	$(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la $(LIB_TDEIO)
 
-#	$(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 \
+#	$(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 \
 #	-ltdetexteditor $(LIB_TDEPARTS) $(LIB_TDEIO)  -ltdescript
 libtdevelop_la_SOURCES = dummy.cpp
 
diff --git a/lib/catalog/CMakeLists.txt b/lib/catalog/CMakeLists.txt
index 13b008d1..5c1b4f2b 100644
--- a/lib/catalog/CMakeLists.txt
+++ b/lib/catalog/CMakeLists.txt
@@ -28,9 +28,9 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/catalog )
 
 
-##### tdevcatalog (shared) ######################
+##### kdevcatalog (shared) ######################
 
-tde_add_library( tdevcatalog SHARED AUTOMOC
+tde_add_library( kdevcatalog 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 e45a2530..c8c7ddc1 100644
--- a/lib/catalog/Makefile.am
+++ b/lib/catalog/Makefile.am
@@ -1,13 +1,13 @@
 INCLUDES = $(all_includes) $(DB3INCLUDES)
-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)
+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)
 
-tdevcatalogincludedir = $(includedir)/tdevelop/catalog
-tdevcataloginclude_HEADERS = catalog.h tag.h
+kdevcatalogincludedir = $(includedir)/tdevelop/catalog
+kdevcataloginclude_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 = tdev
+DOXYGEN_DOCDIRPREFIX = kdev
 include ../../Doxyfile.am
diff --git a/lib/cppparser/CMakeLists.txt b/lib/cppparser/CMakeLists.txt
index 20db36c5..3b53e900 100644
--- a/lib/cppparser/CMakeLists.txt
+++ b/lib/cppparser/CMakeLists.txt
@@ -31,13 +31,13 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/cppparser )
 
 
-##### tdevcppparser (shared) ####################
+##### kdevcppparser (shared) ####################
 
-tde_add_library( tdevcppparser SHARED AUTOMOC
+tde_add_library( kdevcppparser 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 tdevinterfaces-static tdeio-shared
+  LINK kdevinterfaces-static tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/lib/cppparser/Makefile.am b/lib/cppparser/Makefile.am
index 082c8227..4e62cebf 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 = 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 \
+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 \
 	lexer.cpp lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp
 
-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
+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
 
diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp
index 5f01a19e..5325c80f 100644
--- a/lib/cppparser/lexer.cpp
+++ b/lib/cppparser/lexer.cpp
@@ -30,7 +30,7 @@
 #if defined( KDEVELOP_BGPARSER )
 #include <tqthread.h>
 
-class TDevTread: public TQThread
+class KDevTread: public TQThread
 {
 public:
     static void yield()
@@ -41,7 +41,7 @@ public:
 
 inline void qthread_yield()
 {
-    TDevTread::yield();
+    KDevTread::yield();
 }
 
 #endif
diff --git a/lib/interfaces/CMakeLists.txt b/lib/interfaces/CMakeLists.txt
index 47d6855d..94b07bec 100644
--- a/lib/interfaces/CMakeLists.txt
+++ b/lib/interfaces/CMakeLists.txt
@@ -27,12 +27,12 @@ include_directories(
 ##### headers ###################################
 
 install( FILES
-    tdevlanguagesupport.h tdevmainwindow.h tdevpartcontroller.h
-    tdevplugin.h tdevproject.h tdevcore.h tdevcoderepository.h
+    kdevlanguagesupport.h kdevmainwindow.h kdevpartcontroller.h
+    kdevplugin.h kdevproject.h kdevcore.h kdevcoderepository.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
+    kdevgenericfactory.h kdevapi.h kdevdesignerintegration.h
+    kdevplugincontroller.h kdevplugininfo.h KDevCoreIface.h
+    KDevPartControllerIface.h katedocumentmanagerinterface.h
     hashedstring.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/interfaces )
 
@@ -42,20 +42,20 @@ install( FILES
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### tdevinterfaces (static) ###################
+##### kdevinterfaces (static) ###################
 
-tde_add_library( tdevinterfaces STATIC_PIC AUTOMOC
+tde_add_library( kdevinterfaces STATIC_PIC AUTOMOC
   SOURCES
-    tdevcore.cpp tdevproject.cpp tdevlanguagesupport.cpp
-    tdevpartcontroller.cpp tdevapi.cpp TDevCoreIface.skel
-    tdevmainwindow.cpp TDevPartControllerIface.skel
-    tdevplugin.cpp tdevcoderepository.cpp
+    kdevcore.cpp kdevproject.cpp kdevlanguagesupport.cpp
+    kdevpartcontroller.cpp kdevapi.cpp KDevCoreIface.skel
+    kdevmainwindow.cpp KDevPartControllerIface.skel
+    kdevplugin.cpp kdevcoderepository.cpp
     codemodel.cpp codemodel_treeparser.cpp
-    codemodel_utils.cpp tdevdesignerintegration.cpp
-    tdevplugincontroller.cpp tdevplugininfo.cpp
-    TDevCoreIface.cpp TDevPartControllerIface.cpp
+    codemodel_utils.cpp kdevdesignerintegration.cpp
+    kdevplugincontroller.cpp kdevplugininfo.cpp
+    KDevCoreIface.cpp KDevPartControllerIface.cpp
     katedocumentmanagerinterface.cpp
-    katedocumentmanagerinterface.skel tdevprojectiface.cpp
-    tdevprojectiface.skel tdevdesignerintegrationiface.cpp
-    tdevdesignerintegrationiface.skel hashedstring.cpp
+    katedocumentmanagerinterface.skel kdevprojectiface.cpp
+    kdevprojectiface.skel kdevdesignerintegrationiface.cpp
+    kdevdesignerintegrationiface.skel hashedstring.cpp
 )
diff --git a/lib/interfaces/TDevCoreIface.cpp b/lib/interfaces/KDevCoreIface.cpp
index 39d4bb97..aa70e01b 100644
--- a/lib/interfaces/TDevCoreIface.cpp
+++ b/lib/interfaces/KDevCoreIface.cpp
@@ -22,38 +22,38 @@
 */
 #include <kdebug.h>
 #include <dcopclient.h>
-#include "TDevCoreIface.h"
-#include "tdevcore.h"
+#include "KDevCoreIface.h"
+#include "kdevcore.h"
 
 
-TDevCoreIface::TDevCoreIface(TDevCore *core)
-    : TQObject(core), DCOPObject("TDevCore"), m_core(core)
+KDevCoreIface::KDevCoreIface(KDevCore *core)
+    : TQObject(core), DCOPObject("KDevCore"), m_core(core)
 {
     connect( m_core, TQT_SIGNAL(projectOpened()), this, TQT_SLOT(forwardProjectOpened()) );
     connect( m_core, TQT_SIGNAL(projectClosed()), this, TQT_SLOT(forwardProjectClosed()) );
 }
 
 
-TDevCoreIface::~TDevCoreIface()
+KDevCoreIface::~KDevCoreIface()
 {}
 
 
-void TDevCoreIface::forwardProjectOpened()
+void KDevCoreIface::forwardProjectOpened()
 {
     kdDebug(9000) << "dcop emitting project opened" << endl;
     emitDCOPSignal("projectOpened()", TQByteArray());
 }
 
 
-void TDevCoreIface::forwardProjectClosed()
+void KDevCoreIface::forwardProjectClosed()
 {
     kdDebug(9000) << "dcop emitting project closed" << endl;
     emitDCOPSignal("projectClosed()", TQByteArray());
 }
 
-void TDevCoreIface::openProject( const TQString & projectFileName )
+void KDevCoreIface::openProject( const TQString & projectFileName )
 {
     m_core->openProject(projectFileName);
 }
 
-#include "TDevCoreIface.moc"
+#include "KDevCoreIface.moc"
diff --git a/lib/interfaces/TDevCoreIface.h b/lib/interfaces/KDevCoreIface.h
index f259005a..612c8457 100644
--- a/lib/interfaces/TDevCoreIface.h
+++ b/lib/interfaces/KDevCoreIface.h
@@ -18,16 +18,16 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef _TDEVCOREIFACE_H_
-#define _TDEVCOREIFACE_H_
+#ifndef _KDEVCOREIFACE_H_
+#define _KDEVCOREIFACE_H_
 
 #include <dcopobject.h>
 #include <dcopref.h>
 
-class TDevCore;
+class KDevCore;
 
 
-class TDevCoreIface : public TQObject, public DCOPObject
+class KDevCoreIface : public TQObject, public DCOPObject
 {
     Q_OBJECT
 //    
@@ -35,8 +35,8 @@ class TDevCoreIface : public TQObject, public DCOPObject
     
 public:
     
-    TDevCoreIface( TDevCore *core );
-    ~TDevCoreIface();
+    KDevCoreIface( KDevCore *core );
+    ~KDevCoreIface();
     
 k_dcop:
     void openProject(const TQString& projectFileName);
@@ -46,7 +46,7 @@ private slots:
     void forwardProjectClosed();
     
 private:
-    TDevCore *m_core;
+    KDevCore *m_core;
 };
 
 #endif
diff --git a/lib/interfaces/TDevPartControllerIface.cpp b/lib/interfaces/KDevPartControllerIface.cpp
index e8bd1bb7..1b184453 100644
--- a/lib/interfaces/TDevPartControllerIface.cpp
+++ b/lib/interfaces/KDevPartControllerIface.cpp
@@ -21,12 +21,12 @@
 #include <kurl.h>
 
 
-#include "TDevPartControllerIface.h"
-#include "tdevpartcontroller.h"
+#include "KDevPartControllerIface.h"
+#include "kdevpartcontroller.h"
 
 
-TDevPartControllerIface::TDevPartControllerIface(TDevPartController *pc)
-  : TQObject(pc), DCOPObject("TDevPartController"), m_controller(pc)
+KDevPartControllerIface::KDevPartControllerIface(KDevPartController *pc)
+  : TQObject(pc), DCOPObject("KDevPartController"), 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 @@ TDevPartControllerIface::TDevPartControllerIface(TDevPartController *pc)
 }
 
 
-TDevPartControllerIface::~TDevPartControllerIface()
+KDevPartControllerIface::~KDevPartControllerIface()
 {
 }
 
 
-void TDevPartControllerIface::editDocument(const TQString &url, int lineNum)
+void KDevPartControllerIface::editDocument(const TQString &url, int lineNum)
 {
   m_controller->editDocument(KURL(url), lineNum);
 }
 
 
-void TDevPartControllerIface::showDocument(const TQString &url, bool newWin)
+void KDevPartControllerIface::showDocument(const TQString &url, bool newWin)
 {
   m_controller->showDocument(KURL(url), newWin);
 }
 
 
-void TDevPartControllerIface::saveAllFiles()
+void KDevPartControllerIface::saveAllFiles()
 {
   m_controller->saveAllFiles();
 }
 
 
-void TDevPartControllerIface::revertAllFiles()
+void KDevPartControllerIface::revertAllFiles()
 {
   m_controller->revertAllFiles();
 }
 
 
-void TDevPartControllerIface::forwardLoadedFile(const KURL &fileName)
+void KDevPartControllerIface::forwardLoadedFile(const KURL &fileName)
 {
   kdDebug(9000) << "dcop emitting loadedFile " << fileName << endl;
   emitDCOPSignal("projectOpened()", TQByteArray());
 }
 
 
-void TDevPartControllerIface::forwardSavedFile(const KURL &fileName)
+void KDevPartControllerIface::forwardSavedFile(const KURL &fileName)
 {
   kdDebug(9000) << "dcop emitting savedFile " << fileName << endl;
   emitDCOPSignal("projectClosed()", TQByteArray());
 }
 
-void TDevPartControllerIface::forwardClosedFile(const KURL &fileName)
+void KDevPartControllerIface::forwardClosedFile(const KURL &fileName)
 {
   kdDebug(9000) << "dcop emitting closedFile " << fileName << endl;
   emitDCOPSignal("projectClosed()", TQByteArray());
 }
 
-bool TDevPartControllerIface::closeAllFiles( )
+bool KDevPartControllerIface::closeAllFiles( )
 {
   return m_controller->closeAllFiles();
 }
 
-uint TDevPartControllerIface::documentState( const KURL & url )
+uint KDevPartControllerIface::documentState( const KURL & url )
 {
   return (uint) m_controller->documentState(url);
 }
 
-#include "TDevPartControllerIface.moc"
+#include "KDevPartControllerIface.moc"
diff --git a/lib/interfaces/TDevPartControllerIface.h b/lib/interfaces/KDevPartControllerIface.h
index 87a4e04e..8c3647ea 100644
--- a/lib/interfaces/TDevPartControllerIface.h
+++ b/lib/interfaces/KDevPartControllerIface.h
@@ -16,16 +16,16 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef _TDEVPARTCONTROLLERIFACE_H_
-#define _TDEVPARTCONTROLLERIFACE_H_
+#ifndef _KDEVPARTCONTROLLERIFACE_H_
+#define _KDEVPARTCONTROLLERIFACE_H_
 
 #include <dcopobject.h>
 #include <dcopref.h>
 #include <kurl.h>
 
-class TDevPartController;
+class KDevPartController;
 
-class TDevPartControllerIface : public TQObject, public DCOPObject
+class KDevPartControllerIface : public TQObject, public DCOPObject
 {
   Q_OBJECT
 //  
@@ -33,8 +33,8 @@ class TDevPartControllerIface : public TQObject, public DCOPObject
     
 public:
     
-  TDevPartControllerIface(TDevPartController *pc);
-  ~TDevPartControllerIface();
+  KDevPartControllerIface(KDevPartController *pc);
+  ~KDevPartControllerIface();
 
 
 k_dcop:
@@ -56,7 +56,7 @@ private slots:
 
 private:
   
-  TDevPartController *m_controller;
+  KDevPartController *m_controller;
     
 };
 
diff --git a/lib/interfaces/Makefile.am b/lib/interfaces/Makefile.am
index 93533492..1944f4f9 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 = libtdevinterfaces.la
+noinst_LTLIBRARIES = libkdevinterfaces.la
 
-libtdevinterfaces_la_SOURCES = tdevcore.cpp tdevproject.cpp \
-			tdevlanguagesupport.cpp tdevpartcontroller.cpp tdevapi.cpp TDevCoreIface.skel \
-			tdevmainwindow.cpp TDevPartControllerIface.skel tdevplugin.cpp tdevcoderepository.cpp \
+libkdevinterfaces_la_SOURCES = kdevcore.cpp kdevproject.cpp \
+			kdevlanguagesupport.cpp kdevpartcontroller.cpp kdevapi.cpp KDevCoreIface.skel \
+			kdevmainwindow.cpp KDevPartControllerIface.skel kdevplugin.cpp kdevcoderepository.cpp \
 			codemodel.cpp codemodel_treeparser.cpp codemodel_utils.cpp \
-			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 \
+			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 \
 	$(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEPARTS) -ltdetexteditor -ltdescript -lDCOP
 
 tdevelopincludedir = $(includedir)/tdevelop/interfaces
-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 \
+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 \
 	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 tdevutil designer_integration tdevcatalog tdevprofileslib tdevextensions
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions
 DOXYGEN_PROJECTNAME = TDevelop Interfaces Library
-DOXYGEN_DOCDIRPREFIX = tdev
+DOXYGEN_DOCDIRPREFIX = kdev
 include ../../Doxyfile.am
-noinst_HEADERS = tdevprojectiface.h tdevdesignerintegrationiface.h
+noinst_HEADERS = kdevprojectiface.h kdevdesignerintegrationiface.h 
diff --git a/lib/interfaces/extensions/CMakeLists.txt b/lib/interfaces/extensions/CMakeLists.txt
index cf5514be..459c1197 100644
--- a/lib/interfaces/extensions/CMakeLists.txt
+++ b/lib/interfaces/extensions/CMakeLists.txt
@@ -22,9 +22,9 @@ include_directories(
 ##### headers ###################################
 
 install( FILES
-    codebrowserfrontend.h tdevappfrontend.h tdevcreatefile.h
-    tdevdifffrontend.h tdevmakefrontend.h tdevquickopen.h
-    tdevsourceformatter.h tdevversioncontrol.h
+    codebrowserfrontend.h kdevappfrontend.h kdevcreatefile.h
+    kdevdifffrontend.h kdevmakefrontend.h kdevquickopen.h
+    kdevsourceformatter.h kdevversioncontrol.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/interfaces/extensions )
 
 install( FILES
@@ -35,20 +35,20 @@ install( FILES
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### tdevextensions (static) ###################
+##### kdevextensions (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 tdevversioncontrol.moc.cpp
+add_custom_command( OUTPUT kdevversioncontrol.moc.cpp
   COMMAND
-    ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tdevversioncontrol.h -o tdevversioncontrol.moc.cpp
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tdevversioncontrol.h )
+    ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h -o kdevversioncontrol.moc.cpp
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h )
 
-tde_add_library( tdevextensions STATIC_PIC AUTOMOC
+tde_add_library( kdevextensions STATIC_PIC AUTOMOC
   SOURCES
-    tdevappfrontend.cpp tdevappfrontend.cpp tdevmakefrontend.cpp
-    codebrowserfrontend.moc.cpp tdevversioncontrol.moc.cpp
+    kdevappfrontend.cpp kdevappfrontend.cpp kdevmakefrontend.cpp
+    codebrowserfrontend.moc.cpp kdevversioncontrol.moc.cpp
 )
diff --git a/lib/interfaces/extensions/Mainpage.dox b/lib/interfaces/extensions/Mainpage.dox
index 37c72c16..3b493fde 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 TDevApi and @ref TDevPlugin
-methods. Therefore extension instance can be obtained by @ref TDevPlugin::extension method.
+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.
 
 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 TDevPlugin {
+  class KDevMyExtension: public KDevPlugin {
   public:
-      KDevMyExtension(const TDevPluginInfo *info, QObject* parent, const char* name)
-          :TDevPlugin(info, parent, name) {}
+      KDevMyExtension(const KDevPluginInfo *info, QObject* parent, const char* name)
+          :KDevPlugin(info, parent, name) {}
       
       virtual void doSomething() = 0;
   };
diff --git a/lib/interfaces/extensions/Makefile.am b/lib/interfaces/extensions/Makefile.am
index 55f4d774..a6d00bc2 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 tdevappfrontend.h \
-	tdevcreatefile.h tdevdifffrontend.h tdevmakefrontend.h tdevquickopen.h \
-	tdevsourceformatter.h tdevversioncontrol.h
+tdevelopincludeext_HEADERS = codebrowserfrontend.h kdevappfrontend.h \
+	kdevcreatefile.h kdevdifffrontend.h kdevmakefrontend.h kdevquickopen.h \
+	kdevsourceformatter.h kdevversioncontrol.h
 
 servicetypedir = $(kde_servicetypesdir)
 servicetype_DATA = tdevelopappfrontend.desktop \
@@ -10,14 +10,14 @@ servicetype_DATA = tdevelopappfrontend.desktop \
 	tdevelopversioncontrol.desktop
 
 SUBDIRS = dcop
-libtdevextensions_la_LDFLAGS = $(all_libraries)
-noinst_LTLIBRARIES = libtdevextensions.la
-libtdevextensions_la_SOURCES = tdevappfrontend.cpp tdevmakefrontend.cpp
+libkdevextensions_la_LDFLAGS = $(all_libraries)
+noinst_LTLIBRARIES = libkdevextensions.la
+libkdevextensions_la_SOURCES = kdevappfrontend.cpp kdevmakefrontend.cpp
 INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces
-DOXYGEN_PROJECTNAME = TDevelop Extension Interfaces Library
-DOXYGEN_DOCDIRPREFIX = tdev
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces
+DOXYGEN_PROJECTNAME = KDevelop Extension Interfaces Library
+DOXYGEN_DOCDIRPREFIX = kdev
 include ../../../Doxyfile.am
 noinst_HEADERS = codebrowserfrontend.h
diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h
index 68c4e90f..e8158fe4 100644
--- a/lib/interfaces/extensions/codebrowserfrontend.h
+++ b/lib/interfaces/extensions/codebrowserfrontend.h
@@ -20,18 +20,18 @@
 #define CODEBROWSERRONTEND_H
 
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 #include <codemodel.h>
 
 namespace Extensions {
 
-class TDevCodeBrowserFrontend  : public TDevPlugin {
+class KDevCodeBrowserFrontend  : public KDevPlugin {
     Q_OBJECT
   
 
     public:
-        TDevCodeBrowserFrontend(const TDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-            :TDevPlugin(info, parent, name ? name : "CodeBrowserFrontend") {}
+        KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
+            :KDevPlugin(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 8658d320..b6255fc6 100644
--- a/lib/interfaces/extensions/dcop/CMakeLists.txt
+++ b/lib/interfaces/extensions/dcop/CMakeLists.txt
@@ -21,14 +21,14 @@ include_directories(
 ##### headers ###################################
 
 install( FILES
-    TDevAppFrontendIface.h TDevMakeFrontendIface.h
+    KDevAppFrontendIface.h KDevMakeFrontendIface.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/interfaces/extensions/dcop )
 
 
-##### tdevdcopextensions (static) ###############
+##### kdevdcopextensions (static) ###############
 
-tde_add_library( tdevdcopextensions STATIC_PIC
+tde_add_library( kdevdcopextensions STATIC_PIC
   SOURCES
-    TDevAppFrontendIface.cpp TDevMakeFrontendIface.cpp
-    TDevAppFrontendIface.skel TDevMakeFrontendIface.skel
+    KDevAppFrontendIface.cpp KDevMakeFrontendIface.cpp
+    KDevAppFrontendIface.skel KDevMakeFrontendIface.skel
 )
diff --git a/lib/interfaces/extensions/dcop/TDevAppFrontendIface.cpp b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp
index a42d0d7d..1eca4bfc 100644
--- a/lib/interfaces/extensions/dcop/TDevAppFrontendIface.cpp
+++ b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp
@@ -21,56 +21,56 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "TDevAppFrontendIface.h"
-#include "tdevappfrontend.h"
+#include "KDevAppFrontendIface.h"
+#include "kdevappfrontend.h"
 
 
-TDevAppFrontendIface::TDevAppFrontendIface(TDevAppFrontend *appFrontend)
-  : DCOPObject("TDevAppFrontend"), m_appFrontend(appFrontend)
+KDevAppFrontendIface::KDevAppFrontendIface(KDevAppFrontend *appFrontend)
+  : DCOPObject("KDevAppFrontend"), m_appFrontend(appFrontend)
 {
 }
 
 
-TDevAppFrontendIface::~TDevAppFrontendIface()
+KDevAppFrontendIface::~KDevAppFrontendIface()
 {}
 
 
-void TDevAppFrontendIface::startAppCommand(const TQString &directory, const TQString &command, bool inTerminal)
+void KDevAppFrontendIface::startAppCommand(const TQString &directory, const TQString &command, bool inTerminal)
 {
     m_appFrontend->startAppCommand(directory, command, inTerminal);
 }
 
-void TDevAppFrontendIface::stopApplication( )
+void KDevAppFrontendIface::stopApplication( )
 {
     m_appFrontend->stopApplication();
 }
 
-bool TDevAppFrontendIface::isRunning( )
+bool KDevAppFrontendIface::isRunning( )
 {
     return m_appFrontend->isRunning();
 }
 
-void TDevAppFrontendIface::clearView( )
+void KDevAppFrontendIface::clearView( )
 {
     m_appFrontend->clearView();
 }
 
-void TDevAppFrontendIface::insertStderrLine( const TQCString & line )
+void KDevAppFrontendIface::insertStderrLine( const TQCString & line )
 {
     m_appFrontend->insertStderrLine(line);
 }
 
-void TDevAppFrontendIface::insertStdoutLine( const TQCString & line )
+void KDevAppFrontendIface::insertStdoutLine( const TQCString & line )
 {
     m_appFrontend->insertStdoutLine(line);
 }
 
-void TDevAppFrontendIface::addPartialStderrLine( const TQCString& line )
+void KDevAppFrontendIface::addPartialStderrLine( const TQCString& line )
 {
     m_appFrontend->addPartialStderrLine(line);
 }
 
-void TDevAppFrontendIface::addPartialStdoutLine( const TQCString& line )
+void KDevAppFrontendIface::addPartialStdoutLine( const TQCString& line )
 {
     m_appFrontend->addPartialStdoutLine(line);
 }
diff --git a/lib/interfaces/extensions/dcop/TDevAppFrontendIface.h b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h
index 5061c782..3903e897 100644
--- a/lib/interfaces/extensions/dcop/TDevAppFrontendIface.h
+++ b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h
@@ -19,21 +19,21 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef _TDEVAPPFRONTENDIFACE_H_
-#define _TDEVAPPFRONTENDIFACE_H_
+#ifndef _KDEVAPPFRONTENDIFACE_H_
+#define _KDEVAPPFRONTENDIFACE_H_
 
 #include <dcopobject.h>
 
-class TDevAppFrontend;
+class KDevAppFrontend;
 
-class TDevAppFrontendIface : public DCOPObject
+class KDevAppFrontendIface : public DCOPObject
 {
     K_DCOP
     
 public:
     
-    TDevAppFrontendIface( TDevAppFrontend *appFrontend );
-    ~TDevAppFrontendIface();
+    KDevAppFrontendIface( KDevAppFrontend *appFrontend );
+    ~KDevAppFrontendIface();
 
 k_dcop:
     void startAppCommand(const TQString &directory, const TQString &command, bool inTerminal);
@@ -46,7 +46,7 @@ k_dcop:
     void addPartialStdoutLine(const TQCString &line);
     
 private:
-    TDevAppFrontend *m_appFrontend;
+    KDevAppFrontend *m_appFrontend;
 };
 
 #endif
diff --git a/lib/interfaces/extensions/dcop/TDevMakeFrontendIface.cpp b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp
index 06bd432f..73305e4a 100644
--- a/lib/interfaces/extensions/dcop/TDevMakeFrontendIface.cpp
+++ b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp
@@ -20,27 +20,27 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "TDevMakeFrontendIface.h"
-#include "tdevmakefrontend.h"
+#include "KDevMakeFrontendIface.h"
+#include "kdevmakefrontend.h"
 
 
-TDevMakeFrontendIface::TDevMakeFrontendIface(TDevMakeFrontend *makeFrontend)
-    : DCOPObject("TDevMakeFrontend")
+KDevMakeFrontendIface::KDevMakeFrontendIface(KDevMakeFrontend *makeFrontend)
+    : DCOPObject("KDevMakeFrontend")
 {
     m_makeFrontend = makeFrontend;
 }
 
 
-TDevMakeFrontendIface::~TDevMakeFrontendIface()
+KDevMakeFrontendIface::~KDevMakeFrontendIface()
 {}
 
 
-void TDevMakeFrontendIface::queueCommand(const TQString &dir, const TQString &command) 
+void KDevMakeFrontendIface::queueCommand(const TQString &dir, const TQString &command) 
 {
     m_makeFrontend->queueCommand(dir, command);
 }
 
-bool TDevMakeFrontendIface::isRunning( )
+bool KDevMakeFrontendIface::isRunning( )
 {
     return m_makeFrontend->isRunning();
 }
diff --git a/lib/interfaces/extensions/dcop/TDevMakeFrontendIface.h b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h
index 3aee75be..53217359 100644
--- a/lib/interfaces/extensions/dcop/TDevMakeFrontendIface.h
+++ b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h
@@ -18,28 +18,28 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef _TDEVMAKEFRONTENDIFACE_H_
-#define _TDEVMAKEFRONTENDIFACE_H_
+#ifndef _KDEVMAKEFRONTENDIFACE_H_
+#define _KDEVMAKEFRONTENDIFACE_H_
 
 #include <dcopobject.h>
 
-class TDevMakeFrontend;
+class KDevMakeFrontend;
 
-class TDevMakeFrontendIface : public DCOPObject
+class KDevMakeFrontendIface : public DCOPObject
 {
     K_DCOP
     
 public:
     
-    TDevMakeFrontendIface( TDevMakeFrontend *makeFrontend );
-    ~TDevMakeFrontendIface();
+    KDevMakeFrontendIface( KDevMakeFrontend *makeFrontend );
+    ~KDevMakeFrontendIface();
 
 k_dcop:
     void queueCommand(const TQString &dir, const TQString &command);
     bool isRunning();
 
 private:
-    TDevMakeFrontend *m_makeFrontend;
+    KDevMakeFrontend *m_makeFrontend;
 };
 
 #endif
diff --git a/lib/interfaces/extensions/dcop/Makefile.am b/lib/interfaces/extensions/dcop/Makefile.am
index e46606ac..116c4979 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 = libtdevdcopextensions.la
-libtdevdcopextensions_la_LDFLAGS = $(all_libraries)
-libtdevdcopextensions_la_SOURCES = TDevAppFrontendIface.cpp \
-		TDevMakeFrontendIface.cpp TDevAppFrontendIface.skel TDevMakeFrontendIface.skel 
+noinst_LTLIBRARIES = libkdevdcopextensions.la
+libkdevdcopextensions_la_LDFLAGS = $(all_libraries)
+libkdevdcopextensions_la_SOURCES = KDevAppFrontendIface.cpp \
+		KDevMakeFrontendIface.cpp KDevAppFrontendIface.skel KDevMakeFrontendIface.skel 
 
 dcopincludeextdir = $(includedir)/tdevelop/interfaces/extensions/dcop
-dcopincludeext_HEADERS = TDevAppFrontendIface.h TDevMakeFrontendIface.h
+dcopincludeext_HEADERS = KDevAppFrontendIface.h KDevMakeFrontendIface.h
diff --git a/lib/interfaces/extensions/kdevappfrontend.cpp b/lib/interfaces/extensions/kdevappfrontend.cpp
new file mode 100644
index 00000000..3d918fe2
--- /dev/null
+++ b/lib/interfaces/extensions/kdevappfrontend.cpp
@@ -0,0 +1,2 @@
+#include "kdevappfrontend.h"
+#include "kdevappfrontend.moc"
diff --git a/lib/interfaces/extensions/tdevappfrontend.h b/lib/interfaces/extensions/kdevappfrontend.h
index 085d3c9d..76952f35 100644
--- a/lib/interfaces/extensions/tdevappfrontend.h
+++ b/lib/interfaces/extensions/kdevappfrontend.h
@@ -23,14 +23,14 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVAPPFRONTEND_H
-#define TDEVAPPFRONTEND_H
+#ifndef KDEVAPPFRONTEND_H
+#define KDEVAPPFRONTEND_H
 
 #include <tqstringlist.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 /**
-@file tdevappfrontend.h
+@file kdevappfrontend.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
-TDevAppFrontend *apf = extension<TDevAppFrontend>("TDevelop/AppFrontend");
+KDevAppFrontend *apf = extension<KDevAppFrontend>("TDevelop/AppFrontend");
 if (apf) {
     // do something
 } else {
     // fail
 }
 @endcode
-@sa TDevPlugin::extension method documentation.
+@sa KDevPlugin::extension method documentation.
 */
-class TDevAppFrontend : public TDevPlugin
+class KDevAppFrontend : public KDevPlugin
 {
     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 TDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    TDevAppFrontend(const TDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-        :TDevPlugin(info, parent, name ? name : "TDevAppFrontend") {}
+    KDevAppFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
+        :KDevPlugin(info, parent, name ? name : "KDevAppFrontend") {}
 
     /**@return Whether the application is currently running.*/
     virtual bool isRunning() = 0;
diff --git a/lib/interfaces/extensions/tdevcreatefile.h b/lib/interfaces/extensions/kdevcreatefile.h
index b1148e94..35b98d19 100644
--- a/lib/interfaces/extensions/tdevcreatefile.h
+++ b/lib/interfaces/extensions/kdevcreatefile.h
@@ -17,15 +17,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVCREATEFILE_H
-#define TDEVCREATEFILE_H
+#ifndef KDEVCREATEFILE_H
+#define KDEVCREATEFILE_H
 
 #include <tqstring.h>
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 /**
-@file tdevcreatefile.h
+@file kdevcreatefile.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
-TDevCreateFile *cf = extension<TDevCreateFile>("TDevelop/CreateFile");
+KDevCreateFile *cf = extension<KDevCreateFile>("TDevelop/CreateFile");
 if (cf) {
     // do something
 } else {
     // fail
 }
 @endcode
-@sa TDevPlugin::extension method documentation.
+@sa KDevPlugin::extension method documentation.
 */
-class TDevCreateFile : public TDevPlugin
+class KDevCreateFile : public KDevPlugin
 {
 
 public:
-  /**File created with @ref TDevCreateFile implementation.*/
+  /**File created with @ref KDevCreateFile 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 TDevApi
+  @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
   interface. Otherwise the plugin will not be constructed.
   @param name The internal name which identifies the plugin.*/
-  TDevCreateFile(const TDevPluginInfo *info, TQObject * parent = 0, const char * name = 0)
-      :TDevPlugin(info, parent, name) {}
+  KDevCreateFile(const KDevPluginInfo *info, TQObject * parent = 0, const char * name = 0)
+      :KDevPlugin(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/tdevdifffrontend.cpp b/lib/interfaces/extensions/kdevdifffrontend.cpp
index aa7e0b19..745703e4 100644
--- a/lib/interfaces/extensions/tdevdifffrontend.cpp
+++ b/lib/interfaces/extensions/kdevdifffrontend.cpp
@@ -18,16 +18,16 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevdifffrontend.h"
+#include "kdevdifffrontend.h"
 
 
-TDevDiffFrontend::TDevDiffFrontend(const TDevPluginInfo *info, TQObject *parent, const char *name)
-    : TDevPlugin(info, parent, name ? name : "TDevDiffFrontend")
+KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *parent, const char *name)
+    : KDevPlugin(info, parent, name ? name : "KDevDiffFrontend")
 {
 }
 
-TDevDiffFrontend::~TDevDiffFrontend()
+KDevDiffFrontend::~KDevDiffFrontend()
 {
 }
 
-#include "tdevdifffrontend.moc"
+#include "kdevdifffrontend.moc"
diff --git a/lib/interfaces/extensions/tdevdifffrontend.h b/lib/interfaces/extensions/kdevdifffrontend.h
index c0c343cb..6d4cb2b6 100644
--- a/lib/interfaces/extensions/tdevdifffrontend.h
+++ b/lib/interfaces/extensions/kdevdifffrontend.h
@@ -18,14 +18,14 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVDIFFFRONTEND_H
-#define TDEVDIFFFRONTEND_H
+#ifndef KDEVDIFFFRONTEND_H
+#define KDEVDIFFFRONTEND_H
 
 #include <kurl.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 /**
-@file tdevdifffrontend.h
+@file kdevdifffrontend.h
 Diff frontend interface.
 */
 
@@ -36,16 +36,16 @@ files.
 
 Instances that implement this interface are available through extension architecture:
 @code
-TDevDiffFrontend *df = extension<TDevDiffFrontend>("TDevelop/DiffFrontend");
+KDevDiffFrontend *df = extension<KDevDiffFrontend>("TDevelop/DiffFrontend");
 if (df) {
     // do something
 } else {
     // fail
 }
 @endcode
-@sa TDevPlugin::extension method documentation.
+@sa KDevPlugin::extension method documentation.
 */
-class TDevDiffFrontend : public TDevPlugin
+class KDevDiffFrontend : public KDevPlugin
 {
 
 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 TDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    TDevDiffFrontend( const TDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-        :TDevPlugin(info, parent, name ? name : "TDevDiffFrontend") {}
+    KDevDiffFrontend( const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
+        :KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") {}
 
     /**Displays the patch.
     @param diff A string which contains a patch in unified format.*/
diff --git a/lib/interfaces/extensions/kdevmakefrontend.cpp b/lib/interfaces/extensions/kdevmakefrontend.cpp
new file mode 100644
index 00000000..5e035270
--- /dev/null
+++ b/lib/interfaces/extensions/kdevmakefrontend.cpp
@@ -0,0 +1,2 @@
+#include "kdevmakefrontend.h"
+#include "kdevmakefrontend.moc"
diff --git a/lib/interfaces/extensions/tdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h
index 47b14fc4..52afa3d3 100644
--- a/lib/interfaces/extensions/tdevmakefrontend.h
+++ b/lib/interfaces/extensions/kdevmakefrontend.h
@@ -23,14 +23,14 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVMAKEFRONTEND_H
-#define TDEVMAKEFRONTEND_H
+#ifndef KDEVMAKEFRONTEND_H
+#define KDEVMAKEFRONTEND_H
 
 #include <tqstringlist.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 /**
-@file tdevmakefrontend.h
+@file kdevmakefrontend.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
-TDevMakeFrontend *mf = extension<TDevMakeFrontend>("TDevelop/MakeFrontend");
+KDevMakeFrontend *mf = extension<KDevMakeFrontend>("TDevelop/MakeFrontend");
 if (mf) {
     // do something
 } else {
     // fail
 }
 @endcode
-@sa TDevPlugin::extension method documentation.
+@sa KDevPlugin::extension method documentation.
 */
-class TDevMakeFrontend : public TDevPlugin
+class KDevMakeFrontend : public KDevPlugin
 {
     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 TDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    TDevMakeFrontend(const TDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-        :TDevPlugin(info, parent, name ? name : "TDevMakeFrontend") {}
+    KDevMakeFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
+        :KDevPlugin(info, parent, name ? name : "KDevMakeFrontend") {}
 
     /**@return The widget where the make output is shown.*/
     virtual TQWidget* widget() { return 0L; }
diff --git a/lib/interfaces/extensions/tdevquickopen.h b/lib/interfaces/extensions/kdevquickopen.h
index e1fd2f65..91dce7ca 100644
--- a/lib/interfaces/extensions/tdevquickopen.h
+++ b/lib/interfaces/extensions/kdevquickopen.h
@@ -16,14 +16,14 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVQUICKOPEN_H
-#define TDEVQUICKOPEN_H
+#ifndef KDEVQUICKOPEN_H
+#define KDEVQUICKOPEN_H
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 #include <kurl.h>
 
 /**
-@file tdevquickopen.h
+@file kdevquickopen.h
 Source formatter interface.
 */
 
@@ -39,10 +39,10 @@ if (qo) {
     // fail
 }
 @endcode
-@sa @ref TDevPlugin::extension method documentation.
+@sa @ref KDevPlugin::extension method documentation.
 @sa @ref whatisextension and @ref creatingextension sections of Platform API documentation.
 */
-class KDevQuickOpen : public TDevPlugin
+class KDevQuickOpen : public KDevPlugin
 {
 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 TDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevQuickOpen(const TDevPluginInfo *info, TQObject* parent, const char* name)
-        :TDevPlugin(info, parent, name) {}
+    KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name)
+        :KDevPlugin(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 TDEVQUICKOPEN_H
-#define TDEVQUICKOPEN_H
+#ifndef KDEVQUICKOPEN_H
+#define KDEVQUICKOPEN_H
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 #include <kurl.h>
 
 /**
-@file tdevquickopen.h
+@file kdevquickopen.h
 Source formatter interface.
 */
 
@@ -104,10 +104,10 @@ if (qo) {
     // fail
 }
 @endcode
-@sa @ref TDevPlugin::extension method documentation.
+@sa @ref KDevPlugin::extension method documentation.
 @sa @ref whatisextension and @ref creatingextension sections of Platform API documentation.
 */
-class KDevQuickOpen : public TDevPlugin
+class KDevQuickOpen : public KDevPlugin
 {
 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 TDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevQuickOpen(const TDevPluginInfo *info, TQObject* parent, const char* name)
-        :TDevPlugin(info, parent, name) {}
+    KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name)
+        :KDevPlugin(info, parent, name) {}
 
     /**Shows the file selection dialog.
     @param text A list of urls to open.*/
diff --git a/lib/interfaces/extensions/tdevsourceformatter.h b/lib/interfaces/extensions/kdevsourceformatter.h
index 3403a5d2..c4a380cf 100644
--- a/lib/interfaces/extensions/tdevsourceformatter.h
+++ b/lib/interfaces/extensions/kdevsourceformatter.h
@@ -16,13 +16,13 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVSOURCEFORMATTER_H
-#define TDEVSOURCEFORMATTER_H
+#ifndef KDEVSOURCEFORMATTER_H
+#define KDEVSOURCEFORMATTER_H
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 /**
-@file tdevsourceformatter.h
+@file kdevsourceformatter.h
 Source formatter interface.
 */
 
@@ -39,10 +39,10 @@ if (sf) {
     // fail
 }
 @endcode
-@sa @ref TDevPlugin::extension method documentation.
+@sa @ref KDevPlugin::extension method documentation.
 @sa @ref whatisextension and @ref creatingextension sections of Platform API documentation.
 */
-class KDevSourceFormatter : public TDevPlugin
+class KDevSourceFormatter : public KDevPlugin
 {
 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 TDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevSourceFormatter(const TDevPluginInfo *info, TQObject* parent, const char* name)
-        :TDevPlugin(info, parent, name) {}
+    KDevSourceFormatter(const KDevPluginInfo *info, TQObject* parent, const char* name)
+        :KDevPlugin(info, parent, name) {}
 
     /**Formats the source.
     @param text A string with a code.
diff --git a/lib/interfaces/extensions/tdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h
index d796e31f..a19c6275 100644
--- a/lib/interfaces/extensions/tdevversioncontrol.h
+++ b/lib/interfaces/extensions/kdevversioncontrol.h
@@ -20,8 +20,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVVERSIONCONTROL_H
-#define TDEVVERSIONCONTROL_H
+#ifndef KDEVVERSIONCONTROL_H
+#define KDEVVERSIONCONTROL_H
 
 #include <tqobject.h>
 #include <tqstring.h>
@@ -29,10 +29,10 @@
 #include <tqmap.h>
 #include <tqvaluelist.h>
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 /**
-@file tdevversioncontrol.h
+@file kdevversioncontrol.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 TDevVCSFileInfoProvider;
+class KDevVCSFileInfoProvider;
 
 
 /**
@@ -123,16 +123,16 @@ VCS support plugins should implement this interface.
 
 Instances that implement this interface are available through extension architecture:
 @code
-TDevVersionControl *vcs = extension<TDevVersionControl>("TDevelop/VersionControl");
+KDevVersionControl *vcs = extension<KDevVersionControl>("TDevelop/VersionControl");
 if (vcs) {
     // do something
 } else {
     // fail
 }
 @endcode
-@sa TDevPlugin::extension method documentation.
+@sa KDevPlugin::extension method documentation.
 */
-class TDevVersionControl: public TDevPlugin
+class KDevVersionControl: public KDevPlugin
 {
     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 TDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    TDevVersionControl(const TDevPluginInfo *info, TQObject *parent, const char *name )
-        :TDevPlugin(info, parent, name ) {}
+    KDevVersionControl(const KDevPluginInfo *info, TQObject *parent, const char *name )
+        :KDevPlugin(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 TDevVCSFileInfoProvider *fileInfoProvider() const = 0;
+    virtual KDevVCSFileInfoProvider *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 TDevVCSFileInfoProvider: public TQObject
+class KDevVCSFileInfoProvider: public TQObject
 {
     Q_OBJECT
   
@@ -190,7 +190,7 @@ public:
     /**Constructor.
     @param parent The parent VCS plugin.
     @param name The name of a provider object.*/
-    TDevVCSFileInfoProvider(TDevVersionControl *parent, const char *name)
+    KDevVCSFileInfoProvider(KDevVersionControl *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.*/
-    TDevVersionControl *owner() const { return m_owner; }
+    KDevVersionControl *owner() const { return m_owner; }
 
 private:
-    TDevVersionControl *m_owner;
+    KDevVersionControl *m_owner;
 
 private:
-    TDevVCSFileInfoProvider( const TDevVCSFileInfoProvider & );
-    TDevVCSFileInfoProvider &operator=( const TDevVCSFileInfoProvider & );
+    KDevVCSFileInfoProvider( const KDevVCSFileInfoProvider & );
+    KDevVCSFileInfoProvider &operator=( const KDevVCSFileInfoProvider & );
 };
 
 #endif
diff --git a/lib/interfaces/extensions/tdevappfrontend.cpp b/lib/interfaces/extensions/tdevappfrontend.cpp
deleted file mode 100644
index 4f7c52a7..00000000
--- a/lib/interfaces/extensions/tdevappfrontend.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "tdevappfrontend.h"
-#include "tdevappfrontend.moc"
diff --git a/lib/interfaces/extensions/tdevmakefrontend.cpp b/lib/interfaces/extensions/tdevmakefrontend.cpp
deleted file mode 100644
index 140d074d..00000000
--- a/lib/interfaces/extensions/tdevmakefrontend.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "tdevmakefrontend.h"
-#include "tdevmakefrontend.moc"
diff --git a/lib/interfaces/external/Mainpage.dox b/lib/interfaces/external/Mainpage.dox
index 6c2fb2b9..4ed571dd 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 TDevDesignerIntegration *TDevLanguageSupport::designer(KInterfaceDesigner::DesignerType type)
+virtual KDevDesignerIntegration *KDevLanguageSupport::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 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.
+\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.
 .
 
-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.
+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.
 
-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.
+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.
 
 \section other Other information
 
diff --git a/lib/interfaces/extras/CMakeLists.txt b/lib/interfaces/extras/CMakeLists.txt
index afe233aa..eb4cdb75 100644
--- a/lib/interfaces/extras/CMakeLists.txt
+++ b/lib/interfaces/extras/CMakeLists.txt
@@ -22,7 +22,7 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    tdevcompileroptions.h tdevvcsintegrator.h
+    kdevcompileroptions.h kdevvcsintegrator.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/interfaces/extras )
 
 install( FILES
@@ -30,10 +30,10 @@ install( FILES
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### tdevextras (shared) #######################
+##### kdevextras (shared) #######################
 
-tde_add_library( tdevextras SHARED AUTOMOC
-  SOURCES tdevcompileroptions.cpp tdevvcsintegrator.cpp
+tde_add_library( kdevextras SHARED AUTOMOC
+  SOURCES kdevcompileroptions.cpp kdevvcsintegrator.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 c504621e..67615223 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
-libtdevextras_la_LIBADD = $(LIB_QT)
-libtdevextras_la_LDFLAGS = $(all_libraries)
-lib_LTLIBRARIES = libtdevextras.la
+libkdevextras_la_LIBADD = $(LIB_QT)
+libkdevextras_la_LDFLAGS = $(all_libraries)
+lib_LTLIBRARIES = libkdevextras.la
 tdevelopincludedir = $(includedir)/tdevelop/interfaces/extras
 servicetypedir = $(kde_servicetypesdir)
 
-tdevelopinclude_HEADERS = tdevcompileroptions.h tdevvcsintegrator.h
-libtdevextras_la_SOURCES = tdevcompileroptions.cpp tdevvcsintegrator.cpp
+tdevelopinclude_HEADERS = kdevcompileroptions.h kdevvcsintegrator.h
+libkdevextras_la_SOURCES = kdevcompileroptions.cpp kdevvcsintegrator.cpp
 servicetype_DATA = tdevelopcompileroptions.desktop \
 	tdevelopvcsintegrator.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces
 DOXYGEN_PROJECTNAME = TDevelop Extra Interfaces Library
-DOXYGEN_DOCDIRPREFIX = tdev
+DOXYGEN_DOCDIRPREFIX = kdev
 include ../../../Doxyfile.am
diff --git a/lib/interfaces/extras/kdevcompileroptions.cpp b/lib/interfaces/extras/kdevcompileroptions.cpp
new file mode 100644
index 00000000..22c701f1
--- /dev/null
+++ b/lib/interfaces/extras/kdevcompileroptions.cpp
@@ -0,0 +1,8 @@
+#include "kdevcompileroptions.h"
+
+KDevCompilerOptions::KDevCompilerOptions( TQObject * parent, const char * name )
+        :TQObject(parent, name)
+{
+}
+
+#include "kdevcompileroptions.moc"
diff --git a/lib/interfaces/extras/tdevcompileroptions.h b/lib/interfaces/extras/kdevcompileroptions.h
index b8509a99..6544c5d0 100644
--- a/lib/interfaces/extras/tdevcompileroptions.h
+++ b/lib/interfaces/extras/kdevcompileroptions.h
@@ -19,12 +19,12 @@
 */
 
 /**
-@file tdevcompileroptions.h
+@file kdevcompileroptions.h
 The interface to compiler options configuration.
 */
 
-#ifndef _TDEVCOMPILEROPTIONS_H_
-#define _TDEVCOMPILEROPTIONS_H_
+#ifndef _KDEVCOMPILEROPTIONS_H_
+#define _KDEVCOMPILEROPTIONS_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 TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent )
+static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent )
 {
     KService::Ptr service = KService::serviceByDesktopName( name );
     if ( !service )
@@ -50,17 +50,17 @@ static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
         args = TQStringList::split(" ", prop.toString());
 
     TQObject *obj = factory->create(parent, service->name().latin1(),
-                                   "TDevCompilerOptions", args);
+                                   "KDevCompilerOptions", args);
 
-    if (!obj->inherits("TDevCompilerOptions"))
+    if (!obj->inherits("KDevCompilerOptions"))
         return 0;
     
-    TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
+    KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
     return dlg;
 }
 
 ...
-TDevCompilerOptions *plugin = createCompilerOptions(compilerName, parent);
+KDevCompilerOptions *plugin = createCompilerOptions(compilerName, parent);
 TQString flags = ""; //old compiler flags
 if ( plugin )
 {
@@ -69,13 +69,13 @@ if ( plugin )
 }
 @endcode
 */
-class TDevCompilerOptions : public TQObject
+class KDevCompilerOptions : public TQObject
 {
     Q_OBJECT
   
 
 public:
-    TDevCompilerOptions( TQObject *parent=0, const char *name=0 );
+    KDevCompilerOptions( TQObject *parent=0, const char *name=0 );
 
     /**
      * Opens a dialog which allows the user to configure the
diff --git a/lib/interfaces/extras/tdevvcsintegrator.cpp b/lib/interfaces/extras/kdevvcsintegrator.cpp
index 26bf915d..5a6ab429 100644
--- a/lib/interfaces/extras/tdevvcsintegrator.cpp
+++ b/lib/interfaces/extras/kdevvcsintegrator.cpp
@@ -16,11 +16,11 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevvcsintegrator.h"
+#include "kdevvcsintegrator.h"
 
-TDevVCSIntegrator::TDevVCSIntegrator(TQObject *parent, const char *name)
+KDevVCSIntegrator::KDevVCSIntegrator(TQObject *parent, const char *name)
     :TQObject(parent, name)
 {
 }
 
-#include "tdevvcsintegrator.moc"
+#include "kdevvcsintegrator.moc"
diff --git a/lib/interfaces/extras/tdevvcsintegrator.h b/lib/interfaces/extras/kdevvcsintegrator.h
index 23ee6c22..793070b3 100644
--- a/lib/interfaces/extras/tdevvcsintegrator.h
+++ b/lib/interfaces/extras/kdevvcsintegrator.h
@@ -16,13 +16,13 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVVCSINTEGRATOR_H
-#define TDEVVCSINTEGRATOR_H
+#ifndef KDEVVCSINTEGRATOR_H
+#define KDEVVCSINTEGRATOR_H
 
 #include <tqobject.h>
 
 /**
-@file tdevvcsintegrator.h
+@file kdevvcsintegrator.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 TDevVCSIntegrator: public TQObject {
+class KDevVCSIntegrator: public TQObject {
     Q_OBJECT
   
 public:
-    TDevVCSIntegrator(TQObject *parent = 0, const char *name = 0);
+    KDevVCSIntegrator(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/extras/tdevcompileroptions.cpp b/lib/interfaces/extras/tdevcompileroptions.cpp
deleted file mode 100644
index 9eead32f..00000000
--- a/lib/interfaces/extras/tdevcompileroptions.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "tdevcompileroptions.h"
-
-TDevCompilerOptions::TDevCompilerOptions( TQObject * parent, const char * name )
-        :TQObject(parent, name)
-{
-}
-
-#include "tdevcompileroptions.moc"
diff --git a/lib/interfaces/katedocumentmanagerinterface.cpp b/lib/interfaces/katedocumentmanagerinterface.cpp
index 360be1c4..0afbcc81 100644
--- a/lib/interfaces/katedocumentmanagerinterface.cpp
+++ b/lib/interfaces/katedocumentmanagerinterface.cpp
@@ -17,7 +17,7 @@
   Boston, MA 02110-1301, USA.
 */
 #include "katedocumentmanagerinterface.h"
-#include "tdevpartcontroller.h"
+#include "kdevpartcontroller.h"
 #include <kurl.h>
 #include <dcopclient.h>
 #include <tdeapplication.h>
@@ -26,7 +26,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-KateDocumentManagerInterface::KateDocumentManagerInterface( TDevPartController *pc)
+KateDocumentManagerInterface::KateDocumentManagerInterface( KDevPartController *pc)
     : TQObject(pc), DCOPObject("KateDocumentManager"), m_controller(pc)
 {
 
diff --git a/lib/interfaces/katedocumentmanagerinterface.h b/lib/interfaces/katedocumentmanagerinterface.h
index 235c7738..8bdbdf8f 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 TDevPartController;
+class KDevPartController;
 
 /**
 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( TDevPartController *pc );
+    KateDocumentManagerInterface( KDevPartController *pc );
 
     ~KateDocumentManagerInterface();
 
@@ -53,7 +53,7 @@ k_dcop:
     uint documents();
 private:
 
-    TDevPartController *m_controller;
+    KDevPartController *m_controller;
 };
 
 #endif
diff --git a/lib/interfaces/tdevapi.cpp b/lib/interfaces/kdevapi.cpp
index 4f726107..04cf078d 100644
--- a/lib/interfaces/tdevapi.cpp
+++ b/lib/interfaces/kdevapi.cpp
@@ -17,15 +17,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevapi.h"
+#include "kdevapi.h"
 
-#include "tdevcoderepository.h"
+#include "kdevcoderepository.h"
 
 ///////////////////////////////////////////////////////////////////////////////
-// class TDevApi::Private
+// class KDevApi::Private
 ///////////////////////////////////////////////////////////////////////////////
 
-class TDevApi::Private
+class KDevApi::Private
 {
 public:
     Private()
@@ -34,60 +34,60 @@ public:
     {}
     
     TQDomDocument *m_projectDom;
-    TDevProject  *m_project;
-    TDevLanguageSupport *m_languageSupport;
-    TDevCodeRepository* m_codeRepository;
+    KDevProject  *m_project;
+    KDevLanguageSupport *m_languageSupport;
+    KDevCodeRepository* m_codeRepository;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-// class TDevApi
+// class KDevApi
 ///////////////////////////////////////////////////////////////////////////////
 
-TDevApi::TDevApi()
+KDevApi::KDevApi()
 {
-    d = new TDevApi::Private;
-    d->m_codeRepository = new TDevCodeRepository();
+    d = new KDevApi::Private;
+    d->m_codeRepository = new KDevCodeRepository();
 }
 
-TDevApi::~TDevApi()
+KDevApi::~KDevApi()
 {
     delete d->m_codeRepository;
     delete d;
 }
 
-TDevProject *TDevApi::project() const
+KDevProject *KDevApi::project() const
 {
   return d->m_project;
 }
 
-void TDevApi::setProject(TDevProject *project)
+void KDevApi::setProject(KDevProject *project)
 {
   d->m_project = project;
 }
 
-TDevLanguageSupport *TDevApi::languageSupport() const
+KDevLanguageSupport *KDevApi::languageSupport() const
 {
   return d->m_languageSupport;
 }
 
-void TDevApi::setLanguageSupport(TDevLanguageSupport *languageSupport)
+void KDevApi::setLanguageSupport(KDevLanguageSupport *languageSupport)
 {
   d->m_languageSupport = languageSupport;
 }
 
-TQDomDocument *TDevApi::projectDom() const
+TQDomDocument *KDevApi::projectDom() const
 {
     return d->m_projectDom;
 }
 
-void TDevApi::setProjectDom(TQDomDocument *dom)
+void KDevApi::setProjectDom(TQDomDocument *dom)
 {
     d->m_projectDom = dom;
 }
 
-TDevCodeRepository *TDevApi::codeRepository() const
+KDevCodeRepository *KDevApi::codeRepository() const
 {
     return d->m_codeRepository;
 }
 
-#include "tdevapi.moc"
+#include "kdevapi.moc"
diff --git a/lib/interfaces/tdevapi.h b/lib/interfaces/kdevapi.h
index a2e38f7c..d1f4f5cc 100644
--- a/lib/interfaces/tdevapi.h
+++ b/lib/interfaces/kdevapi.h
@@ -17,56 +17,56 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVAPI_H
-#define TDEVAPI_H
+#ifndef KDEVAPI_H
+#define KDEVAPI_H
 
 #include <tqobject.h>
 
 class TQStringList;
 class TQDomDocument;
-class TDevCore;
-class TDevProject;
-class TDevLanguageSupport;
+class KDevCore;
+class KDevProject;
+class KDevLanguageSupport;
 class CodeModel;
-class TDevPartController;
-class TDevMainWindow;
-class TDevCodeRepository;
-class TDevPlugin;
-class TDevPluginController;
+class KDevPartController;
+class KDevMainWindow;
+class KDevCodeRepository;
+class KDevPlugin;
+class KDevPluginController;
 
 /**
-@file tdevapi.h
+@file kdevapi.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 TDevPlugin already provides API convenience methods.
+class because @ref KDevPlugin already provides API convenience methods.
 */
-class TDevApi: public TQObject
+class KDevApi: public TQObject
 {
     Q_OBJECT
   
 public:
     /**Constructor.*/
-    TDevApi();
+    KDevApi();
 
     /**Destructor.*/
-    virtual ~TDevApi();
+    virtual ~KDevApi();
 
     /**@return A reference to the toplevel widget.*/
-    virtual TDevMainWindow *mainWindow() const = 0;
+    virtual KDevMainWindow *mainWindow() const = 0;
 
     /**@return A reference to the part controller which is used to manipulate loaded KParts.*/
-    virtual TDevPartController *partController() const = 0;
+    virtual KDevPartController *partController() const = 0;
 
     /**@return A reference to the plugin controller which is used to manipulate loaded plugin.*/
-    virtual TDevPluginController *pluginController() const = 0;
+    virtual KDevPluginController *pluginController() const = 0;
 
     /**@return A reference to the application core - an object which provides
     basic functionalities for inter-parts communications / cooperation.*/
-    virtual TDevCore *core() const = 0;
+    virtual KDevCore *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.*/
-    TDevProject *project() const;
+    KDevProject *project() const;
 
     /**Sets the current project.
     @param project The project plugin which becames the current project.*/
-    void setProject(TDevProject *project);
+    void setProject(KDevProject *project);
 
     /**@return A reference to the language support component or 0 if no support available.*/
-    TDevLanguageSupport *languageSupport() const;
+    KDevLanguageSupport *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(TDevLanguageSupport *languageSupport);
+    void setLanguageSupport(KDevLanguageSupport *languageSupport);
 
     /**@return A reference to the code repository (accessor to persistent symbol stores).*/
-    TDevCodeRepository *codeRepository() const;
+    KDevCodeRepository *codeRepository() const;
 
 private:
     class Private;
diff --git a/lib/interfaces/tdevcoderepository.cpp b/lib/interfaces/kdevcoderepository.cpp
index f5716294..26249544 100644
--- a/lib/interfaces/tdevcoderepository.cpp
+++ b/lib/interfaces/kdevcoderepository.cpp
@@ -16,56 +16,56 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevcoderepository.h"
+#include "kdevcoderepository.h"
 
-struct TDevCodeRepositoryData
+struct KDevCodeRepositoryData
 {
     Catalog* mainCatalog;
     TQValueList<Catalog*> catalogs;
     
-    TDevCodeRepositoryData(): mainCatalog( 0 ) {}
+    KDevCodeRepositoryData(): mainCatalog( 0 ) {}
 };
 
-TDevCodeRepository::TDevCodeRepository( )
-    : d( new TDevCodeRepositoryData )
+KDevCodeRepository::KDevCodeRepository( )
+    : d( new KDevCodeRepositoryData )
 {
 }
 
-TDevCodeRepository::~TDevCodeRepository( )
+KDevCodeRepository::~KDevCodeRepository( )
 {
     delete( d );
 }
 
-Catalog* TDevCodeRepository::mainCatalog()
+Catalog* KDevCodeRepository::mainCatalog()
 {
     return d->mainCatalog;
 }
 
-void TDevCodeRepository::setMainCatalog( Catalog * mainCatalog )
+void KDevCodeRepository::setMainCatalog( Catalog * mainCatalog )
 {
     d->mainCatalog = mainCatalog;
 }
 
-void TDevCodeRepository::registerCatalog( Catalog * catalog )
+void KDevCodeRepository::registerCatalog( Catalog * catalog )
 {
     d->catalogs.append( catalog );
     emit catalogRegistered( catalog );
 }
 
-void TDevCodeRepository::unregisterCatalog( Catalog * catalog )
+void KDevCodeRepository::unregisterCatalog( Catalog * catalog )
 {
     d->catalogs.remove( catalog );
     emit catalogUnregistered( catalog );
 }
 
-void TDevCodeRepository::touchCatalog( Catalog * catalog )
+void KDevCodeRepository::touchCatalog( Catalog * catalog )
 {
     emit catalogChanged( catalog );
 }
 
-TQValueList< Catalog * > TDevCodeRepository::registeredCatalogs( )
+TQValueList< Catalog * > KDevCodeRepository::registeredCatalogs( )
 {
     return d->catalogs;
 }
 
-#include "tdevcoderepository.moc"
+#include "kdevcoderepository.moc"
diff --git a/lib/interfaces/tdevcoderepository.h b/lib/interfaces/kdevcoderepository.h
index b87d66e8..4e1dd765 100644
--- a/lib/interfaces/tdevcoderepository.h
+++ b/lib/interfaces/kdevcoderepository.h
@@ -16,18 +16,18 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVCODEREPOSITORY_H
-#define TDEVCODEREPOSITORY_H
+#ifndef KDEVCODEREPOSITORY_H
+#define KDEVCODEREPOSITORY_H
 
 #include <tqobject.h>
 #include <tqvaluelist.h>
 
 /**
-@file tdevcoderepository.h
+@file kdevcoderepository.h
 Code repository - the persistent symbol store accessor.
 */
 
-class TDevCodeRepositoryData;
+class KDevCodeRepositoryData;
 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 TDevCodeRepository : public TQObject
+class KDevCodeRepository : public TQObject
 {
     Q_OBJECT
   
 public:
     /**Constructor.*/
-    TDevCodeRepository();
+    KDevCodeRepository();
     /**Destructor.*/
-    virtual ~TDevCodeRepository();
+    virtual ~KDevCodeRepository();
 
     /**@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:
-    TDevCodeRepositoryData* d;
+    KDevCodeRepositoryData* d;
 };
 
 #endif
diff --git a/lib/interfaces/tdevcore.cpp b/lib/interfaces/kdevcore.cpp
index 726bf2cb..dda66cbf 100644
--- a/lib/interfaces/tdevcore.cpp
+++ b/lib/interfaces/kdevcore.cpp
@@ -21,8 +21,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "TDevCoreIface.h"
-#include "tdevcore.h"
+#include "KDevCoreIface.h"
+#include "kdevcore.h"
 
 #include "urlutil.h"
 
@@ -282,17 +282,17 @@ const ProjectModelItem* ProjectModelItemContext::item() const
 
 
 ///////////////////////////////////////////////////////////////////////////////
-// class TDevCore
+// class KDevCore
 ///////////////////////////////////////////////////////////////////////////////
 
-TDevCore::TDevCore( TQObject *parent, const char *name )
+KDevCore::KDevCore( TQObject *parent, const char *name )
     : TQObject( parent, name )
 {
-    new TDevCoreIface(this);
+    new KDevCoreIface(this);
 }
 
-TDevCore::~TDevCore()
+KDevCore::~KDevCore()
 {
 }
 
-#include "tdevcore.moc"
+#include "kdevcore.moc"
diff --git a/lib/interfaces/tdevcore.h b/lib/interfaces/kdevcore.h
index fadcdfde..fad2891a 100644
--- a/lib/interfaces/tdevcore.h
+++ b/lib/interfaces/kdevcore.h
@@ -25,11 +25,11 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVCORE_H
-#define TDEVCORE_H
+#ifndef KDEVCORE_H
+#define KDEVCORE_H
 
 /**
-@file tdevcore.h
+@file kdevcore.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 TDevPlugin;
+class KDevPlugin;
 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 TDevCore::contextMenu(TQPopupMenu *, const Context *) signal to that slot in
+-# Connect KDevCore::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 TDevCore class defines an object which takes care about the cooperation
+A KDevCore 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 TDevCore: public TQObject
+class KDevCore: 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.*/
-    TDevCore(TQObject *parent=0, const char *name=0);
+    KDevCore(TQObject *parent=0, const char *name=0);
 
     /**Destructor.*/
-    virtual ~TDevCore();
+    virtual ~KDevCore();
 
     /**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 TDevPlugin::project() 
+    /**Closes the current project and open the new one. You cannot use the @ref KDevPlugin::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(TDevPlugin *which, bool runs) = 0;
+    virtual void running(KDevPlugin *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 TDevPlugin object to stop.*/
-    void stopButtonClicked(TDevPlugin *which);
+    @param which The KDevPlugin object to stop.*/
+    void stopButtonClicked(KDevPlugin *which);
 
     /**A context menu has been requested somewhere. Components
     may hook some entries into it. More information on the
diff --git a/lib/interfaces/tdevdesignerintegration.cpp b/lib/interfaces/kdevdesignerintegration.cpp
index 73fa7999..0ba325ab 100644
--- a/lib/interfaces/tdevdesignerintegration.cpp
+++ b/lib/interfaces/kdevdesignerintegration.cpp
@@ -16,25 +16,25 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevdesignerintegration.h"
-#include "tdevdesignerintegrationiface.h"
+#include "kdevdesignerintegration.h"
+#include "kdevdesignerintegrationiface.h"
 
-class TDevDesignerIntegration::TDevDesignerIntegrationPrivate {
+class KDevDesignerIntegration::KDevDesignerIntegrationPrivate {
 public:
-  	TDevDesignerIntegrationIface *m_iface;
+  	KDevDesignerIntegrationIface *m_iface;
 };
 
-TDevDesignerIntegration::TDevDesignerIntegration(TQObject *parent, const char *name)
+KDevDesignerIntegration::KDevDesignerIntegration(TQObject *parent, const char *name)
  : TQObject(parent, name)
 {
-  dptr = new TDevDesignerIntegrationPrivate();
+  dptr = new KDevDesignerIntegrationPrivate();
   
-  dptr->m_iface = new TDevDesignerIntegrationIface(this);
+  dptr->m_iface = new KDevDesignerIntegrationIface(this);
 }
 
-TDevDesignerIntegration::~TDevDesignerIntegration()
+KDevDesignerIntegration::~KDevDesignerIntegration()
 {
   delete dptr;
 }
 
-#include "tdevdesignerintegration.moc"
+#include "kdevdesignerintegration.moc"
diff --git a/lib/interfaces/tdevdesignerintegration.h b/lib/interfaces/kdevdesignerintegration.h
index 532d8b8b..528926cb 100644
--- a/lib/interfaces/tdevdesignerintegration.h
+++ b/lib/interfaces/kdevdesignerintegration.h
@@ -16,15 +16,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVDESIGNERINTEGRATION_H
-#define TDEVDESIGNERINTEGRATION_H
+#ifndef KDEVDESIGNERINTEGRATION_H
+#define KDEVDESIGNERINTEGRATION_H
 
 #include <designer.h>
 #include <tqobject.h>
 #include <tqdom.h>
 
 /**
-@file tdevdesignerintegration.h
+@file kdevdesignerintegration.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 TDevDesignerIntegration : public TQObject
+class KDevDesignerIntegration : public TQObject
 {
 Q_OBJECT
   
@@ -56,9 +56,9 @@ public:
     /**Constructor.
     @param parent Parent object.
     @param name Internal name.*/
-    TDevDesignerIntegration(TQObject *parent = 0, const char *name = 0);
+    KDevDesignerIntegration(TQObject *parent = 0, const char *name = 0);
     /**Destructor.*/
-    ~TDevDesignerIntegration();
+    ~KDevDesignerIntegration();
     
     /**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 TDevDesignerIntegrationPrivate;
-    TDevDesignerIntegrationPrivate *dptr;
+    class KDevDesignerIntegrationPrivate;
+    KDevDesignerIntegrationPrivate *dptr;
 };
 
 #endif
diff --git a/lib/interfaces/tdevdesignerintegrationiface.cpp b/lib/interfaces/kdevdesignerintegrationiface.cpp
index bd4f349b..964ca340 100644
--- a/lib/interfaces/tdevdesignerintegrationiface.cpp
+++ b/lib/interfaces/kdevdesignerintegrationiface.cpp
@@ -16,46 +16,46 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevdesignerintegrationiface.h"
+#include "kdevdesignerintegrationiface.h"
 #include <designer.h>
-#include "tdevdesignerintegration.h"
+#include "kdevdesignerintegration.h"
 
-TDevDesignerIntegrationIface::TDevDesignerIntegrationIface(TDevDesignerIntegration *p)
+KDevDesignerIntegrationIface::KDevDesignerIntegrationIface(KDevDesignerIntegration *p)
   : DCOPObject("GUIDesigner"), m_designer(p)
 {
   //FIXME figure out what number our interface is...
 }
 
 
-TDevDesignerIntegrationIface::~TDevDesignerIntegrationIface()
+KDevDesignerIntegrationIface::~KDevDesignerIntegrationIface()
 {
 }
 
-void TDevDesignerIntegrationIface::addFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type )
+void KDevDesignerIntegrationIface::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 TDevDesignerIntegrationIface::removeFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type )
+void KDevDesignerIntegrationIface::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 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 )
+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 )
 {
   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 TDevDesignerIntegrationIface::openFunction( const TQString & formName, const TQString & functionName )
+void KDevDesignerIntegrationIface::openFunction( const TQString & formName, const TQString & functionName )
 {
   m_designer->openFunction(formName,functionName);
 }
 
-void TDevDesignerIntegrationIface::openSource( const TQString & formName )
+void KDevDesignerIntegrationIface::openSource( const TQString & formName )
 {
   m_designer->openSource(formName);
 }
diff --git a/lib/interfaces/tdevdesignerintegrationiface.h b/lib/interfaces/kdevdesignerintegrationiface.h
index 0dd6f8d1..c6c8988a 100644
--- a/lib/interfaces/tdevdesignerintegrationiface.h
+++ b/lib/interfaces/kdevdesignerintegrationiface.h
@@ -16,23 +16,23 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVDESIGNERINTEGRATIONIFACE_H
-#define TDEVDESIGNERINTEGRATIONIFACE_H
+#ifndef KDEVDESIGNERINTEGRATIONIFACE_H
+#define KDEVDESIGNERINTEGRATIONIFACE_H
 
 #include <dcopobject.h>
-class TDevDesignerIntegration;
+class KDevDesignerIntegration;
 /**
 The dcop interface for GUI designers in KDevelop.
 
 @author KDevelop Authors
 */
-class TDevDesignerIntegrationIface : public DCOPObject
+class KDevDesignerIntegrationIface : public DCOPObject
 {
   K_DCOP
 public:
-  TDevDesignerIntegrationIface(TDevDesignerIntegration *p);
+  KDevDesignerIntegrationIface(KDevDesignerIntegration *p);
 
-    ~TDevDesignerIntegrationIface();
+    ~KDevDesignerIntegrationIface();
 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:
-    TDevDesignerIntegration *m_designer;
+    KDevDesignerIntegration *m_designer;
 };
 
 #endif
diff --git a/lib/interfaces/tdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h
index 7fdbdb28..6f8d3dc9 100644
--- a/lib/interfaces/tdevgenericfactory.h
+++ b/lib/interfaces/kdevgenericfactory.h
@@ -21,7 +21,7 @@
 #include <tdeaboutdata.h>
 
 /**
-@file tdevgenericfactory.h
+@file kdevgenericfactory.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 TDevGenericFactory<DummyPlugin> DummyPluginFactory;
-K_EXPORT_COMPONENT_FACTORY(libtdevdummyplugin, DummyPluginFactory( data ) )
+typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory;
+K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) )
 @endcode
 Data should be a const static object. This way it complies with the requirements
-for data objecs of TDevGenericFactory constructor.
+for data objecs of KDevGenericFactory constructor.
 
 <b>Important:</b><br>
 There is no need to create @ref TDEAboutData objects. It is more useful to create 
-a static const @ref TDevPluginInfo object which can be used also in the constructor
+a static const @ref KDevPluginInfo object which can be used also in the constructor
 of a plugin.
 
 For example, dummyplugin.cpp file could contain:
 @code
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
-static const TDevPluginInfo data("KDevDummyPlugin");
-typedef TDevGenericFactory<DummyPlugin> DummyPluginFactory;
-K_EXPORT_COMPONENT_FACTORY(libtdevdummyplugin, DummyPluginFactory( data ) )
+static const KDevPluginInfo data("KDevDummyPlugin");
+typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory;
+K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) )
 
 DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & )
-    :TDevPlugin(&data, parent, name)
+    :KDevPlugin(&data, parent, name)
 {
 }
 @endcode
 
-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.
+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.
 */
 template <class T, class ParentType = TQObject>
-class TDevGenericFactory: public KGenericFactory<T, ParentType>
+class KDevGenericFactory: public KGenericFactory<T, ParentType>
 {
 public:
     /**Constructor.
@@ -73,7 +73,7 @@ public:
     - license type number.
     .
     data object should live as long as factory lives.*/
-    TDevGenericFactory(TDEAboutData *data)
+    KDevGenericFactory(TDEAboutData *data)
         :KGenericFactory<T, ParentType>(data->appName()), aboutData(data)
     {
     }
diff --git a/lib/interfaces/tdevlanguagesupport.cpp b/lib/interfaces/kdevlanguagesupport.cpp
index d283a434..aa5b560c 100644
--- a/lib/interfaces/tdevlanguagesupport.cpp
+++ b/lib/interfaces/kdevlanguagesupport.cpp
@@ -26,141 +26,141 @@
 
 #include <kdebug.h>
 
-#include "tdevdesignerintegration.h"
-#include "tdevlanguagesupport.h"
+#include "kdevdesignerintegration.h"
+#include "kdevlanguagesupport.h"
 
-TDevLanguageSupport::TDevLanguageSupport(const TDevPluginInfo *info, TQObject *parent, const char *name)
-    : TDevPlugin(info, parent, name ? name : "TDevLanguageSupport" )
+KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name)
+    : KDevPlugin(info, parent, name ? name : "KDevLanguageSupport" )
 {
 }
 
-TDevLanguageSupport::~TDevLanguageSupport()
+KDevLanguageSupport::~KDevLanguageSupport()
 {
 }
 
-TDevLanguageSupport::Features TDevLanguageSupport::features()
+KDevLanguageSupport::Features KDevLanguageSupport::features()
 {
     return Features(0);
 }
 
-KMimeType::List TDevLanguageSupport::mimeTypes()
+KMimeType::List KDevLanguageSupport::mimeTypes()
 {
     return KMimeType::List();
 }
 
-TQString TDevLanguageSupport::formatTag( const Tag& /*tag*/ )
+TQString KDevLanguageSupport::formatTag( const Tag& /*tag*/ )
 {
     return TQString();
 }
 
-TQString TDevLanguageSupport::formatClassName(const TQString &name)
+TQString KDevLanguageSupport::formatClassName(const TQString &name)
 {
     return name;
 }
 
-TQString TDevLanguageSupport::unformatClassName(const TQString &name)
+TQString KDevLanguageSupport::unformatClassName(const TQString &name)
 {
     return name;
 }
 
-bool TDevLanguageSupport::shouldSplitDocument(const KURL &url)
+bool KDevLanguageSupport::shouldSplitDocument(const KURL &url)
 {
     return false;
 }
 
-Qt::Orientation TDevLanguageSupport::splitOrientation() const
+Qt::Orientation KDevLanguageSupport::splitOrientation() const
 {
     return Qt::Vertical;
 }
 
-void TDevLanguageSupport::addClass()
+void KDevLanguageSupport::addClass()
 {
 }
 
-void TDevLanguageSupport::addMethod( ClassDom /*klass*/ )
+void KDevLanguageSupport::addMethod( ClassDom /*klass*/ )
 {
 }
 
-void TDevLanguageSupport::implementVirtualMethods( ClassDom /*klass*/ )
+void KDevLanguageSupport::implementVirtualMethods( ClassDom /*klass*/ )
 {
 }
 
-void TDevLanguageSupport::addAttribute( ClassDom /*klass*/ )
+void KDevLanguageSupport::addAttribute( ClassDom /*klass*/ )
 {
 }
 
-TQStringList TDevLanguageSupport::subclassWidget(const TQString& /*formName*/)
+TQStringList KDevLanguageSupport::subclassWidget(const TQString& /*formName*/)
 {
     return TQStringList();
 }
 
-TQStringList TDevLanguageSupport::updateWidget(const TQString& /*formName*/, const TQString& /*fileName*/)
+TQStringList KDevLanguageSupport::updateWidget(const TQString& /*formName*/, const TQString& /*fileName*/)
 {
     return TQStringList();
 }
 
-TQString TDevLanguageSupport::formatModelItem( const CodeModelItem *item, bool /*shortDescription*/ )
+TQString KDevLanguageSupport::formatModelItem( const CodeModelItem *item, bool /*shortDescription*/ )
 {
     return item->name();
 }
 
-void TDevLanguageSupport::addFunction( DesignerType type, const TQString & formName, Function function )
+void KDevLanguageSupport::addFunction( DesignerType type, const TQString & formName, Function function )
 {
-//    kdDebug() << "TDevLanguageSupport::addFunction: 1" << endl;
-    TDevDesignerIntegration *designerIntegration = designer(type);
-//    kdDebug() << "TDevLanguageSupport::addFunction: 2" << endl;
+//    kdDebug() << "KDevLanguageSupport::addFunction: 1" << endl;
+    KDevDesignerIntegration *designerIntegration = designer(type);
+//    kdDebug() << "KDevLanguageSupport::addFunction: 2" << endl;
     if (!designerIntegration)
     {
-//        kdDebug() << "TDevLanguageSupport::addFunction: x" << endl;
+//        kdDebug() << "KDevLanguageSupport::addFunction: x" << endl;
         return;
     }
-//    kdDebug() << "TDevLanguageSupport::addFunction: 3" << endl;
+//    kdDebug() << "KDevLanguageSupport::addFunction: 3" << endl;
     designerIntegration->addFunction(formName, function);
-//    kdDebug() << "TDevLanguageSupport::addFunction: 4" << endl;
+//    kdDebug() << "KDevLanguageSupport::addFunction: 4" << endl;
 }
 
-void TDevLanguageSupport::editFunction( DesignerType type, const TQString & formName, Function oldFunction, Function function )
+void KDevLanguageSupport::editFunction( DesignerType type, const TQString & formName, Function oldFunction, Function function )
 {
-    TDevDesignerIntegration *designerIntegration = designer(type);
+    KDevDesignerIntegration *designerIntegration = designer(type);
     if (!designerIntegration)
         return;
     designerIntegration->editFunction(formName, oldFunction, function);
 }
 
-void TDevLanguageSupport::removeFunction( DesignerType type, const TQString & formName, Function function )
+void KDevLanguageSupport::removeFunction( DesignerType type, const TQString & formName, Function function )
 {
-    TDevDesignerIntegration *designerIntegration = designer(type);
+    KDevDesignerIntegration *designerIntegration = designer(type);
     if (!designerIntegration)
         return;
     designerIntegration->removeFunction(formName, function);
 }
 
-TDevDesignerIntegration * TDevLanguageSupport::designer( DesignerType // type
+KDevDesignerIntegration * KDevLanguageSupport::designer( DesignerType // type
                                                          )
 {
     return 0;
 }
 
-void TDevLanguageSupport::openFunction( DesignerType type, const TQString & formName, const TQString & functionName )
+void KDevLanguageSupport::openFunction( DesignerType type, const TQString & formName, const TQString & functionName )
 {
-    TDevDesignerIntegration *designerIntegration = designer(type);
+    KDevDesignerIntegration *designerIntegration = designer(type);
     if (!designerIntegration)
         return;
     designerIntegration->openFunction(formName, functionName);
 }
 
-void TDevLanguageSupport::createAccessMethods( ClassDom // theClass
+void KDevLanguageSupport::createAccessMethods( ClassDom // theClass
                                                , VariableDom // theVariable
                                                )
 {
 }
 
-void TDevLanguageSupport::openSource( DesignerType type, const TQString & formName)
+void KDevLanguageSupport::openSource( DesignerType type, const TQString & formName)
 {
-    TDevDesignerIntegration *designerIntegration = designer(type);
+    KDevDesignerIntegration *designerIntegration = designer(type);
     if (!designerIntegration)
         return;
     designerIntegration->openSource(formName);
 }
 
-#include "tdevlanguagesupport.moc"
+#include "kdevlanguagesupport.moc"
diff --git a/lib/interfaces/tdevlanguagesupport.h b/lib/interfaces/kdevlanguagesupport.h
index a1778ff6..42221868 100644
--- a/lib/interfaces/tdevlanguagesupport.h
+++ b/lib/interfaces/kdevlanguagesupport.h
@@ -22,23 +22,23 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVLANGUAGESUPPORT_H
-#define TDEVLANGUAGESUPPORT_H
+#ifndef KDEVLANGUAGESUPPORT_H
+#define KDEVLANGUAGESUPPORT_H
 
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <kmimetype.h>
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 #include "codemodel.h"
 #include <designer.h>
 
 /**
-@file tdevlanguagesupport.h
+@file kdevlanguagesupport.h
 Interface to programming language specific features.
 */
 
 class Tag;
-class TDevDesignerIntegration;
+class KDevDesignerIntegration;
 
 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 TDevCodeRepository);
+(see @ref CodeModel and @ref KDevCodeRepository);
 - code wizards specific to a programming language (like new class wizard);
-- GUI designer integration (see @ref TDevLanguageSupport::designer method
-documentation and @ref TDevDesignerIntegration class documentation;
+- GUI designer integration (see @ref KDevLanguageSupport::designer method
+documentation and @ref KDevDesignerIntegration class documentation;
 - symbol (class, function, etc.) name formatting to a human-readable convention (pretty
 formatted name).
 .
 */
-class TDevLanguageSupport: public TDevPlugin
+class KDevLanguageSupport: public KDevPlugin
 {
     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 TDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    TDevLanguageSupport(const TDevPluginInfo *info, TQObject *parent, const char *name);
+    KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name);
     /**Destructor.*/
-    ~TDevLanguageSupport();
+    ~KDevLanguageSupport();
 
     /**@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
-    TDevDesignerIntegration *des = 0;
+    KDevDesignerIntegration *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 TDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type);
+    virtual KDevDesignerIntegration *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 TDevDesignerIntegration interface.
+    unless you want to use specific implementation of KDevDesignerIntegration 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 TDevDesignerIntegration interface.
+    unless you want to use specific implementation of KDevDesignerIntegration 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 TDevDesignerIntegration interface.
+    unless you want to use specific implementation of KDevDesignerIntegration 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 TDevDesignerIntegration interface.
+    unless you want to use specific implementation of KDevDesignerIntegration 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 TDevDesignerIntegration interface.
+    unless you want to use specific implementation of KDevDesignerIntegration 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/tdevmainwindow.cpp b/lib/interfaces/kdevmainwindow.cpp
index e73250e9..4b95f669 100644
--- a/lib/interfaces/tdevmainwindow.cpp
+++ b/lib/interfaces/kdevmainwindow.cpp
@@ -17,12 +17,12 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevmainwindow.h"
+#include "kdevmainwindow.h"
 
 #include <tdemainwindow.h>
 #include <kstatusbar.h>
 
-KStatusBar *TDevMainWindow::statusBar()
+KStatusBar *KDevMainWindow::statusBar()
 {
   return main()->statusBar();
 }
diff --git a/lib/interfaces/tdevmainwindow.h b/lib/interfaces/kdevmainwindow.h
index 83aef3b0..8138ab78 100644
--- a/lib/interfaces/tdevmainwindow.h
+++ b/lib/interfaces/kdevmainwindow.h
@@ -19,8 +19,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEV_MAINWINDOW_H
-#define TDEV_MAINWINDOW_H
+#ifndef KDEV_MAINWINDOW_H
+#define KDEV_MAINWINDOW_H
 
 #include <tqstring.h>
 
@@ -29,7 +29,7 @@ class KStatusBar;
 class TDEMainWindow;
 
 /**
-@file tdevmainwindow.h
+@file kdevmainwindow.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 TDevMainWindow
+class KDevMainWindow
 {
 public:
     /**Destroys the main window*/
-    virtual ~TDevMainWindow() {} // must be virtual!
+    virtual ~KDevMainWindow() {} // 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/tdevpartcontroller.cpp b/lib/interfaces/kdevpartcontroller.cpp
index e718ecf4..58f1dc2a 100644
--- a/lib/interfaces/tdevpartcontroller.cpp
+++ b/lib/interfaces/kdevpartcontroller.cpp
@@ -16,15 +16,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "TDevPartControllerIface.h"
-#include "tdevpartcontroller.h"
+#include "KDevPartControllerIface.h"
+#include "kdevpartcontroller.h"
 #include "katedocumentmanagerinterface.h"
 
-TDevPartController::TDevPartController(TQWidget *parent)
+KDevPartController::KDevPartController(TQWidget *parent)
   : KParts::PartManager(parent)
 {
-  new TDevPartControllerIface(this);
+  new KDevPartControllerIface(this);
   new KateDocumentManagerInterface(this);
 }
 
-#include "tdevpartcontroller.moc"
+#include "kdevpartcontroller.moc"
diff --git a/lib/interfaces/tdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h
index 2bb593e6..fd8e6830 100644
--- a/lib/interfaces/tdevpartcontroller.h
+++ b/lib/interfaces/kdevpartcontroller.h
@@ -22,15 +22,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEV_PARTCONTROLLER_H
-#define TDEV_PARTCONTROLLER_H
+#ifndef KDEV_PARTCONTROLLER_H
+#define KDEV_PARTCONTROLLER_H
 
 #include <kurl.h>
 #include <tdeparts/partmanager.h>
 #include <ktrader.h>
 
 /**
-@file tdevpartcontroller.h
+@file kdevpartcontroller.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 TDevPartController: public KParts::PartManager
+class KDevPartController: public KParts::PartManager
 {
     Q_OBJECT
   
@@ -61,7 +61,7 @@ class TDevPartController: public KParts::PartManager
 public:
     /**Constructor.
     @param parent The parent object.*/
-    TDevPartController(TQWidget *parent);
+    KDevPartController(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/tdevplugin.cpp b/lib/interfaces/kdevplugin.cpp
index 42d30cc8..31717446 100644
--- a/lib/interfaces/tdevplugin.cpp
+++ b/lib/interfaces/kdevplugin.cpp
@@ -24,13 +24,13 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 
-#include "tdevapi.h"
-#include "tdevcore.h"
-#include "tdevplugininfo.h"
-#include "tdevpartcontroller.h"
-#include "tdevplugincontroller.h"
+#include "kdevapi.h"
+#include "kdevcore.h"
+#include "kdevplugininfo.h"
+#include "kdevpartcontroller.h"
+#include "kdevplugincontroller.h"
 
 #include <tdeaction.h>
 #include <tdeglobal.h>
@@ -42,23 +42,23 @@
 #include <assert.h>
 
 ///////////////////////////////////////////////////////////////////////////////
-// struct TDevPlugin::Private
+// struct KDevPlugin::Private
 ///////////////////////////////////////////////////////////////////////////////
 
-struct TDevPlugin::Private
+struct KDevPlugin::Private
 {
-    const TDevPluginInfo *info;
+    const KDevPluginInfo *info;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-// class TDevPlugin
+// class KDevPlugin
 ///////////////////////////////////////////////////////////////////////////////
 
-TDevPlugin::TDevPlugin(const TDevPluginInfo *info, TQObject *parent, const char *name)
+KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name)
     :TQObject(parent, name), d(new Private)
 {
-    assert(parent->inherits( "TDevApi" ));
-    m_api = static_cast<TDevApi *>( parent );
+    assert(parent->inherits( "KDevApi" ));
+    m_api = static_cast<KDevApi *>( parent );
 
     actionCollection()->setHighlightingEnabled( true );
 
@@ -66,74 +66,74 @@ TDevPlugin::TDevPlugin(const TDevPluginInfo *info, TQObject *parent, const char
     TDEGlobal::iconLoader()->addAppDir("tdevelop");    
 }
 
-TDevPlugin::~TDevPlugin()
+KDevPlugin::~KDevPlugin()
 {
    delete( d );
 }
 
-TDevMainWindow *TDevPlugin::mainWindow()
+KDevMainWindow *KDevPlugin::mainWindow()
 {
     return m_api->mainWindow();
 }
 
-TDevCore *TDevPlugin::core() const
+KDevCore *KDevPlugin::core() const
 {
     return m_api->core();
 }
 
-TDevProject *TDevPlugin::project() const
+KDevProject *KDevPlugin::project() const
 {
     return m_api->project();
 }
 
-CodeModel *TDevPlugin::codeModel() const
+CodeModel *KDevPlugin::codeModel() const
 {
     return m_api->codeModel();
 }
 
-TQDomDocument *TDevPlugin::projectDom() const
+TQDomDocument *KDevPlugin::projectDom() const
 {
     return m_api->projectDom();
 }
 
-TDevLanguageSupport *TDevPlugin::languageSupport() const
+KDevLanguageSupport *KDevPlugin::languageSupport() const
 {
     return m_api->languageSupport();
 }
 
-TDevPartController *TDevPlugin::partController() const
+KDevPartController *KDevPlugin::partController() const
 {
     return m_api->partController();
 }
 
-TDevPluginController *TDevPlugin::pluginController() const
+KDevPluginController *KDevPlugin::pluginController() const
 {
     return m_api->pluginController();
 }
 
-void TDevPlugin::restorePartialProjectSession(const TQDomElement* /*el*/)
+void KDevPlugin::restorePartialProjectSession(const TQDomElement* /*el*/)
 {
     // there's still nothing to do in the base class
 }
 
-void TDevPlugin::savePartialProjectSession(TQDomElement* /*el*/)
+void KDevPlugin::savePartialProjectSession(TQDomElement* /*el*/)
 {
     // there's still nothing to do in the base class
 }
 
-TDevCodeRepository * TDevPlugin::codeRepository() const
+KDevCodeRepository * KDevPlugin::codeRepository() const
 {
     return m_api->codeRepository();
 }
 
-TDevPlugin * TDevPlugin::extension_internal(const TQString &serviceType, const TQString &constraint)
+KDevPlugin * KDevPlugin::extension_internal(const TQString &serviceType, const TQString &constraint)
 {
     return m_api->pluginController()->extension(serviceType, constraint);
 }
 
-const TDevPluginInfo *TDevPlugin::info()
+const KDevPluginInfo *KDevPlugin::info()
 {
     return d->info;
 }
 
-#include "tdevplugin.moc"
+#include "kdevplugin.moc"
diff --git a/lib/interfaces/tdevplugin.h b/lib/interfaces/kdevplugin.h
index eaa66146..31cc5550 100644
--- a/lib/interfaces/tdevplugin.h
+++ b/lib/interfaces/kdevplugin.h
@@ -17,26 +17,26 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVPLUGIN_H
-#define TDEVPLUGIN_H
+#ifndef KDEVPLUGIN_H
+#define KDEVPLUGIN_H
 
 #include <tqobject.h>
 #include <kxmlguiclient.h>
-#include "tdevapi.h"
-
-class TDevCore;
-class TDevProject;
-class TDevVersionControl;
-class TDevLanguageSupport;
-class TDevPartController;
-class TDevMainWindow;
-class TDevCodeRepository;
+#include "kdevapi.h"
+
+class KDevCore;
+class KDevProject;
+class KDevVersionControl;
+class KDevLanguageSupport;
+class KDevPartController;
+class KDevMainWindow;
+class KDevCodeRepository;
 class CodeModel;
-class TDevPluginInfo;
+class KDevPluginInfo;
 class TQDomElement;
 
 /**
-@file tdevplugin.h
+@file kdevplugin.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 TDevProject 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 KDevProject 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 TDevProject interface and/or operate on project-related information then this is the project plugin.
+If your plugin use @ref KDevProject interface and/or operate on project-related information then this is the project plugin.
 
-@sa TDevGenericFactory class documentation for an information about plugin instantiation
+@sa KDevGenericFactory class documentation for an information about plugin instantiation
 and writing factories for plugins.
 
-@sa TDevCore class documentation for an information about features which are available to plugins
+@sa KDevCore class documentation for an information about features which are available to plugins
 from shell applications.
 */
-class TDevPlugin: public TQObject, public KXMLGUIClient
+class KDevPlugin: 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 TDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    TDevPlugin(const TDevPluginInfo *info, TQObject *parent, const char *name = 0);
+    KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name = 0);
 
     /**Destructs a plugin.*/
-    virtual ~TDevPlugin();
+    virtual ~KDevPlugin();
 
     /**Provides an information about the plugin.
     @return TDEAboutData object which was initialized in the constructor.*/
-    const TDevPluginInfo* info();
+    const KDevPluginInfo* info();
 
     /**@return A reference to the toplevel widget.*/
-    TDevMainWindow *mainWindow();
+    KDevMainWindow *mainWindow();
 
     /**@return A reference to the application core - an object which provides
     basic functionalities for inter-parts communications / cooperation.*/
-    TDevCore *core() const;
+    KDevCore *core() const;
 
     /**@return A reference to the current project component or 0 if no project is loaded.*/
-    TDevProject *project() const;
+    KDevProject *project() const;
 
     /**@return A reference to the language support component or 0 if no support available.*/
-    TDevLanguageSupport *languageSupport() const;
+    KDevLanguageSupport *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.*/
-    TDevPartController *partController() const;
+    KDevPartController *partController() const;
 
     /**@return A reference to the plugin controller which is used to manipulate loaded plugin.*/
-    virtual TDevPluginController *pluginController() const;
+    virtual KDevPluginController *pluginController() const;
 
     /**@return A reference to the code repository (accessor to persistent symbol stores).*/
-    TDevCodeRepository* codeRepository() const;
+    KDevCodeRepository* 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 TDevPlugin.
+    is usually derived from a certain base class and not directly from KDevPlugin.
     @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:
-    TDevPlugin *extension_internal(const TQString &serviceType, const TQString &constraint = "");
+    KDevPlugin *extension_internal(const TQString &serviceType, const TQString &constraint = "");
 
-    TDevApi *m_api;
+    KDevApi *m_api;
     class Private;
     Private *d;
 };
diff --git a/lib/interfaces/tdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp
index bf1eb5e7..1cc6caa3 100644
--- a/lib/interfaces/tdevplugincontroller.cpp
+++ b/lib/interfaces/kdevplugincontroller.cpp
@@ -16,34 +16,34 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevplugincontroller.h"
+#include "kdevplugincontroller.h"
 
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 
-TDevPluginController::TDevPluginController()
+KDevPluginController::KDevPluginController()
 {
 }
 
-TDETrader::OfferList TDevPluginController::query(const TQString &serviceType,
+TDETrader::OfferList KDevPluginController::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 TDevPluginController::queryPlugins(const TQString &constraint)
+TDETrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint)
 {
     return query("TDevelop/Plugin", constraint);
 }
 
-KURL::List TDevPluginController::profileResources(const TQString &/*nameFilter*/)
+KURL::List KDevPluginController::profileResources(const TQString &/*nameFilter*/)
 {
     return KURL::List();
 }
 
-KURL::List TDevPluginController::profileResourcesRecursive(const TQString &/*nameFilter*/)
+KURL::List KDevPluginController::profileResourcesRecursive(const TQString &/*nameFilter*/)
 {
     return KURL::List();
 }
 
-#include "tdevplugincontroller.moc"
+#include "kdevplugincontroller.moc"
diff --git a/lib/interfaces/tdevplugincontroller.h b/lib/interfaces/kdevplugincontroller.h
index ee44764d..05ee050b 100644
--- a/lib/interfaces/tdevplugincontroller.h
+++ b/lib/interfaces/kdevplugincontroller.h
@@ -16,8 +16,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVPLUGINCONTROLLER_H
-#define TDEVPLUGINCONTROLLER_H
+#ifndef KDEVPLUGINCONTROLLER_H
+#define KDEVPLUGINCONTROLLER_H
 
 #include <tqobject.h>
 
@@ -25,18 +25,18 @@
 #include <ktrader.h>
 
 /**
-@file tdevplugincontroller.h
+@file kdevplugincontroller.h
 TDevelop plugin controller interface.
 */
 
-class TDevPlugin;
+class KDevPlugin;
 class ProfileEngine;
 
 /**
 The base class for TDevelop plugin controller.
 Plugin controller is responsible for quering, loading and unloading available plugins.
 */
-class TDevPluginController: public TQObject
+class KDevPluginController: 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 TDevPlugin * loadPlugin( const TQString & serviceType, const TQString & constraint ) = 0;
+    virtual KDevPlugin * 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<TDevPlugin*> loadedPlugins() = 0;
+    virtual const TQValueList<KDevPlugin*> 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 TDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "") = 0;
+    virtual KDevPlugin *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
-    TDevPluginController::query with serviceType set to "TDevelop/Plugin".
+    KDevPluginController::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.*/
-    TDevPluginController();
+    KDevPluginController();
 
 };
 
diff --git a/lib/interfaces/tdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp
index 2f607431..e80385cb 100644
--- a/lib/interfaces/tdevplugininfo.cpp
+++ b/lib/interfaces/kdevplugininfo.cpp
@@ -16,16 +16,16 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevplugininfo.h"
+#include "kdevplugininfo.h"
 
 #include <tqvariant.h>
 
 #include <kservice.h>
 #include <kdebug.h>
 
-#include "tdevplugincontroller.h"
+#include "kdevplugincontroller.h"
 
-struct TDevPluginInfo::Private {
+struct KDevPluginInfo::Private {
     TQString m_pluginName;
     TQString m_rawGenericName;
     
@@ -46,7 +46,7 @@ struct TDevPluginInfo::Private {
 };
 
 
-TDevPluginInfo::TDevPluginInfo(const TQString &pluginName)
+KDevPluginInfo::KDevPluginInfo(const TQString &pluginName)
     :d(new Private())
 {
     d->m_pluginName = pluginName;
@@ -89,92 +89,92 @@ TDevPluginInfo::TDevPluginInfo(const TQString &pluginName)
 }
 
 
-TDevPluginInfo::operator TDEAboutData *() const
+KDevPluginInfo::operator TDEAboutData *() const
 {
     return d->m_data;
 }
 
-TQString TDevPluginInfo::pluginName() const
+TQString KDevPluginInfo::pluginName() const
 {
     return d->m_pluginName;
 }
 
-TQString TDevPluginInfo::genericName() const
+TQString KDevPluginInfo::genericName() const
 {
     return d->m_genericName;
 }
 
-TQString TDevPluginInfo::icon() const
+TQString KDevPluginInfo::icon() const
 {
     return d->m_icon;
 }
 
-TQString TDevPluginInfo::description() const
+TQString KDevPluginInfo::description() const
 {
     return d->m_description;
 }
 
-TQString TDevPluginInfo::version() const
+TQString KDevPluginInfo::version() const
 {
     return d->m_version;
 }
 
-int TDevPluginInfo::licenseType() const
+int KDevPluginInfo::licenseType() const
 {
     return d->m_licenseType;
 }
 
-TQString TDevPluginInfo::license() const
+TQString KDevPluginInfo::license() const
 {
-    TDevPluginInfo &info = *const_cast<TDevPluginInfo*>(this);
+    KDevPluginInfo &info = *const_cast<KDevPluginInfo*>(this);
 //    return TDEAboutData(info).license();
     TDEAboutData *data = info;
     return data->license();
 }
 
-TQString TDevPluginInfo::copyrightStatement() const
+TQString KDevPluginInfo::copyrightStatement() const
 {
     return d->m_copyrightStatement;
 }
 
-TQString TDevPluginInfo::homePageAddress() const
+TQString KDevPluginInfo::homePageAddress() const
 {
     return d->m_homePageAddress;
 }
 
-TQString TDevPluginInfo::bugsEmailAddress() const
+TQString KDevPluginInfo::bugsEmailAddress() const
 {
     return d->m_bugsEmailAddress;
 }
 
-TQVariant TDevPluginInfo::property(const TQString &name) const
+TQVariant KDevPluginInfo::property(const TQString &name) const
 {
-    TDETrader::OfferList offers = TDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
+    TDETrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
     if (offers.count() == 1)
         return offers.first()->property(name);
     return TQVariant();
 }
 
-TQVariant TDevPluginInfo::operator [](const TQString &name) const
+TQVariant KDevPluginInfo::operator [](const TQString &name) const
 {
     return property(name);
 }
 
-TQStringList TDevPluginInfo::propertyNames( ) const
+TQStringList KDevPluginInfo::propertyNames( ) const
 {
-    TDETrader::OfferList offers = TDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
+    TDETrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
     if (offers.count() == 1)
         return offers.first()->propertyNames();
     return TQStringList();
 }
 
-void TDevPluginInfo::addAuthor(const char *name, const char *task,
+void KDevPluginInfo::addAuthor(const char *name, const char *task,
     const char *emailAddress, const char *webAddress)
 {
     d->m_authors.append(TDEAboutPerson(name, task, emailAddress, webAddress));
 }
 
-void TDevPluginInfo::addCredit(const char *name, const char *task,
+void KDevPluginInfo::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/tdevplugininfo.h b/lib/interfaces/kdevplugininfo.h
index 419d61aa..ffd1c46e 100644
--- a/lib/interfaces/tdevplugininfo.h
+++ b/lib/interfaces/kdevplugininfo.h
@@ -16,15 +16,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVPLUGININFO_H
-#define TDEVPLUGININFO_H
+#ifndef KDEVPLUGININFO_H
+#define KDEVPLUGININFO_H
 
 #include <tqvariant.h>
 
 #include <tdeaboutdata.h>
 
 /**
-@file tdevplugininfo.h
+@file kdevplugininfo.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 TDevPluginInfo::addAuthor and TDevPluginInfo::addCredit
+must be added manually using KDevPluginInfo::addAuthor and KDevPluginInfo::addCredit
 methods.
-@sa TDevPlugin class documentation for more information about .desktop files.
+@sa KDevPlugin class documentation for more information about .desktop files.
 */
-class TDevPluginInfo
+class KDevPluginInfo
 {
 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.*/
-    TDevPluginInfo(const TQString &pluginName);
+    KDevPluginInfo(const TQString &pluginName);
     
-    /**Casts TDevPluginInfo to TDEAboutData. Uses TDevPluginInfo::pluginName as TDEAboutData::appName,
-    TDevPluginInfo::rawGenericName as TDEAboutData::programName TDevPluginInfo::licenseType as TDEAboutData::licenseType. Other parameters are ignored.*/
+    /**Casts KDevPluginInfo to TDEAboutData. Uses KDevPluginInfo::pluginName as TDEAboutData::appName,
+    KDevPluginInfo::rawGenericName as TDEAboutData::programName KDevPluginInfo::licenseType as TDEAboutData::licenseType. Other parameters are ignored.*/
     operator TDEAboutData*() const;
     
     /**@return A name of a plugin (always untranslated).*/
diff --git a/lib/interfaces/tdevproject.cpp b/lib/interfaces/kdevproject.cpp
index 77136ca0..e8616df1 100644
--- a/lib/interfaces/tdevproject.cpp
+++ b/lib/interfaces/kdevproject.cpp
@@ -24,21 +24,21 @@
 
 #include <kdebug.h>
 
-#include "tdevproject.h"
+#include "kdevproject.h"
 #include <urlutil.h>
 #include <tqfileinfo.h>
 #include <tqtimer.h>
-#include "tdevprojectiface.h"
+#include "kdevprojectiface.h"
 
-struct TDevProject::Private {
+struct KDevProject::Private {
     TQMap<TQString, TQString> m_absToRel;
     TQStringList m_symlinkList;
     TQTimer *m_timer;
-    TDevProjectIface *m_iface;
+    KDevProjectIface *m_iface;
 };
 
-TDevProject::TDevProject(const TDevPluginInfo *info, TQObject *parent, const char *name)
-    : TDevPlugin(info, parent, name), d(new TDevProject::Private())
+KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name)
+    : KDevPlugin(info, parent, name), d(new KDevProject::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 @@ TDevProject::TDevProject(const TDevPluginInfo *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 TDevProjectIface(this);
+    d->m_iface = new KDevProjectIface(this);
 }
 
-TDevProject::~TDevProject()
+KDevProject::~KDevProject()
 {
     d->m_timer->stop();
     delete d->m_iface;
@@ -59,7 +59,7 @@ TDevProject::~TDevProject()
     delete d;
 }
 
-void TDevProject::changedFile( const TQString & fileName )
+void KDevProject::changedFile( const TQString & fileName )
 {
     TQStringList fileList;
     fileList.append ( fileName );
@@ -68,35 +68,35 @@ void TDevProject::changedFile( const TQString & fileName )
 
 }
 
-void TDevProject::changedFiles( const TQStringList & fileList )
+void KDevProject::changedFiles( const TQStringList & fileList )
 {
     emit changedFilesInProject( fileList );
 }
 
-TDevProject::Options TDevProject::options() const
+KDevProject::Options KDevProject::options() const
 {
-    return (TDevProject::Options)0;
+    return (KDevProject::Options)0;
 }
 
-bool TDevProject::isProjectFile( const TQString & absFileName )
+bool KDevProject::isProjectFile( const TQString & absFileName )
 {
     return d->m_absToRel.contains( absFileName );
 }
 
-TQString TDevProject::relativeProjectFile( const TQString & absFileName )
+TQString KDevProject::relativeProjectFile( const TQString & absFileName )
 {
     if( isProjectFile(absFileName) )
 	return d->m_absToRel[ absFileName ];
     return TQString();
 }
 
-void TDevProject::buildFileMap()
+void KDevProject::buildFileMap()
 {
     d->m_timer->stop();
     d->m_timer->start(0, true);
 }
 
-void TDevProject::slotBuildFileMap()
+void KDevProject::slotBuildFileMap()
 {
     kdDebug(9000) << k_funcinfo << endl;
 
@@ -115,22 +115,22 @@ void TDevProject::slotBuildFileMap()
     }
 }
 
-void TDevProject::openProject( const TQString & /*dirName*/, const TQString & /*projectName*/ )
+void KDevProject::openProject( const TQString & /*dirName*/, const TQString & /*projectName*/ )
 {
     buildFileMap();
 }
 
-TQStringList TDevProject::symlinkProjectFiles( )
+TQStringList KDevProject::symlinkProjectFiles( )
 {
     return d->m_symlinkList;
 }
 
-TQString TDevProject::defaultRunDirectory(const TQString& projectPluginName) const
+TQString KDevProject::defaultRunDirectory(const TQString& projectPluginName) const
 {
     return DomUtil::readEntry(*projectDom(), "/" + projectPluginName + "/run/globalcwd");
 }
 
-void TDevProject::slotAddFilesToFileMap( const TQStringList & fileList )
+void KDevProject::slotAddFilesToFileMap( const TQStringList & fileList )
 {
 	TQStringList::ConstIterator it = fileList.begin();
 	while( it != fileList.end() )
@@ -147,7 +147,7 @@ void TDevProject::slotAddFilesToFileMap( const TQStringList & fileList )
 	}
 }
 
-void TDevProject::slotRemoveFilesFromFileMap( const TQStringList & fileList )
+void KDevProject::slotRemoveFilesFromFileMap( const TQStringList & fileList )
 {
 	TQStringList::ConstIterator it = fileList.begin();
 	while( it != fileList.end() )
@@ -161,4 +161,4 @@ void TDevProject::slotRemoveFilesFromFileMap( const TQStringList & fileList )
 	}
 }
 
-#include "tdevproject.moc"
+#include "kdevproject.moc"
diff --git a/lib/interfaces/tdevproject.h b/lib/interfaces/kdevproject.h
index fa320edf..256b0c0c 100644
--- a/lib/interfaces/tdevproject.h
+++ b/lib/interfaces/kdevproject.h
@@ -22,17 +22,17 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVPROJECT_H
-#define TDEVPROJECT_H
+#ifndef KDEVPROJECT_H
+#define KDEVPROJECT_H
 
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 #include "domutil.h"
 
 #include <tqstringlist.h>
 #include <tqmap.h>
 
 /**
-@file tdevproject.h
+@file kdevproject.h
 KDevelop project interface.
 */
 
@@ -40,12 +40,12 @@ class TQTimer;
 
 /**
 KDevelop project interface.
-Plugins implementing the TDevProject interfaces are used to manage projects.
+Plugins implementing the KDevProject 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 TDevProject: public TDevPlugin
+class KDevProject: public KDevPlugin
 {
     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 TDevApi
+    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    TDevProject(const TDevPluginInfo *info, TQObject *parent=0, const char *name=0);
+    KDevProject(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0);
     /**Destructor.*/
-    virtual ~TDevProject();
+    virtual ~KDevProject();
 
     /**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 TDevProject::UsesOtherBuildSystem.*/
+    returns KDevProject::UsesOtherBuildSystem.*/
     virtual Options options() const;
 
     /**@return The canonical absolute directory of the project. Canonical means that
diff --git a/lib/interfaces/tdevprojectiface.cpp b/lib/interfaces/kdevprojectiface.cpp
index 625a4118..28d4501c 100644
--- a/lib/interfaces/tdevprojectiface.cpp
+++ b/lib/interfaces/kdevprojectiface.cpp
@@ -19,168 +19,168 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "tdevprojectiface.h"
-#include "tdevproject.h"
+#include "kdevprojectiface.h"
+#include "kdevproject.h"
 #include "domutil.h"
 
-TDevProjectIface::TDevProjectIface(TDevProject *prj)
-  : TQObject(prj), DCOPObject("TDevProject"), m_prj(prj)
+KDevProjectIface::KDevProjectIface(KDevProject *prj)
+  : TQObject(prj), DCOPObject("KDevProject"), m_prj(prj)
 {
 }
 
 
-TDevProjectIface::~TDevProjectIface()
+KDevProjectIface::~KDevProjectIface()
 {
 }
 
-void TDevProjectIface::openProject( const TQString & dirName, const TQString & projectName )
+void KDevProjectIface::openProject( const TQString & dirName, const TQString & projectName )
 {
   m_prj->openProject(dirName,projectName);
 }
 
-void TDevProjectIface::closeProject( )
+void KDevProjectIface::closeProject( )
 {
   m_prj->closeProject();
 }
 
-uint TDevProjectIface::options( ) const
+uint KDevProjectIface::options( ) const
 {
   return (uint)m_prj->options();
 }
 
-TQString TDevProjectIface::projectDirectory( ) const
+TQString KDevProjectIface::projectDirectory( ) const
 {
   return m_prj->projectDirectory();
 }
 
-TQString TDevProjectIface::projectName( ) const
+TQString KDevProjectIface::projectName( ) const
 {
   return m_prj->projectName();
 }
 
-TQString TDevProjectIface::mainProgram() const
+TQString KDevProjectIface::mainProgram() const
 {
   return m_prj->mainProgram();
 }
 
-TQString TDevProjectIface::runDirectory( ) const
+TQString KDevProjectIface::runDirectory( ) const
 {
   return m_prj->runDirectory();
 }
 
-TQString TDevProjectIface::activeDirectory( ) const
+TQString KDevProjectIface::activeDirectory( ) const
 {
   return m_prj->activeDirectory();
 }
 
-TQString TDevProjectIface::buildDirectory( ) const
+TQString KDevProjectIface::buildDirectory( ) const
 {
   return m_prj->buildDirectory();
 }
 
-TQStringList TDevProjectIface::allFiles( ) const
+TQStringList KDevProjectIface::allFiles( ) const
 {
   return m_prj->allFiles();
 }
 
-TQStringList TDevProjectIface::distFiles( ) const
+TQStringList KDevProjectIface::distFiles( ) const
 {
   return m_prj->distFiles();
 }
 
-void TDevProjectIface::addFiles( const TQStringList & fileList )
+void KDevProjectIface::addFiles( const TQStringList & fileList )
 {
   m_prj->addFiles(fileList);
 }
 
-void TDevProjectIface::addFile( const TQString & fileName )
+void KDevProjectIface::addFile( const TQString & fileName )
 {
   m_prj->addFile(fileName);
 }
 
-void TDevProjectIface::removeFiles( const TQStringList & fileList )
+void KDevProjectIface::removeFiles( const TQStringList & fileList )
 {
   m_prj->removeFiles(fileList);
 }
 
-void TDevProjectIface::removeFile( const TQString & fileName )
+void KDevProjectIface::removeFile( const TQString & fileName )
 {
   m_prj->removeFile(fileName);
 }
 
-void TDevProjectIface::changedFiles( const TQStringList & fileList )
+void KDevProjectIface::changedFiles( const TQStringList & fileList )
 {
   m_prj->changedFiles(fileList);
 }
 
-void TDevProjectIface::changedFile( const TQString & fileName )
+void KDevProjectIface::changedFile( const TQString & fileName )
 {
   m_prj->changedFile(fileName);
 }
 
-bool TDevProjectIface::isProjectFile( const TQString & absFileName )
+bool KDevProjectIface::isProjectFile( const TQString & absFileName )
 {
   return m_prj->isProjectFile(absFileName);
 }
 
-TQString TDevProjectIface::relativeProjectFile( const TQString & absFileName )
+TQString KDevProjectIface::relativeProjectFile( const TQString & absFileName )
 {
   return m_prj->relativeProjectFile(absFileName);
 }
 
-TQStringList TDevProjectIface::symlinkProjectFiles( )
+TQStringList KDevProjectIface::symlinkProjectFiles( )
 {
   return m_prj->symlinkProjectFiles();
 }
 
-TQString TDevProjectIface::readEntry( const TQString & path, const TQString & defaultEntry )
+TQString KDevProjectIface::readEntry( const TQString & path, const TQString & defaultEntry )
 {
   return DomUtil::readEntry( *m_prj->projectDom(), path, defaultEntry);
 }
 
-int TDevProjectIface::readIntEntry( const TQString & path, int defaultEntry )
+int KDevProjectIface::readIntEntry( const TQString & path, int defaultEntry )
 {
   return DomUtil::readIntEntry(*m_prj->projectDom(), path,defaultEntry);
 }
 
-bool TDevProjectIface::readBoolEntry( const TQString & path, bool defaultEntry )
+bool KDevProjectIface::readBoolEntry( const TQString & path, bool defaultEntry )
 {
   return DomUtil::readBoolEntry(*m_prj->projectDom(), path, defaultEntry);
 }
 
-TQStringList TDevProjectIface::readListEntry( const TQString & path, const TQString & tag )
+TQStringList KDevProjectIface::readListEntry( const TQString & path, const TQString & tag )
 {
   return DomUtil::readListEntry(*m_prj->projectDom(), path, tag);
 }
 
-TQMap< TQString, TQString > TDevProjectIface::readMapEntry( const TQString & path )
+TQMap< TQString, TQString > KDevProjectIface::readMapEntry( const TQString & path )
 {
   return DomUtil::readMapEntry(*m_prj->projectDom(), path);
 }
 
-void TDevProjectIface::writeEntry( const TQString & path, const TQString & value )
+void KDevProjectIface::writeEntry( const TQString & path, const TQString & value )
 {
   DomUtil::writeEntry(*m_prj->projectDom(), path, value);
 }
 
-void TDevProjectIface::writeIntEntry( const TQString & path, int value )
+void KDevProjectIface::writeIntEntry( const TQString & path, int value )
 {
   DomUtil::writeIntEntry(*m_prj->projectDom(), path, value);
 }
 
-void TDevProjectIface::writeBoolEntry( const TQString & path, bool value )
+void KDevProjectIface::writeBoolEntry( const TQString & path, bool value )
 {
   DomUtil::writeBoolEntry(*m_prj->projectDom(), path, value);
 }
 
-void TDevProjectIface::writeListEntry( const TQString & path, const TQString & tag, const TQStringList & value )
+void KDevProjectIface::writeListEntry( const TQString & path, const TQString & tag, const TQStringList & value )
 {
   DomUtil::writeListEntry(*m_prj->projectDom(), path, tag, value);
 }
 
-void TDevProjectIface::writeMapEntry( const TQString & path, const TQMap< TQString, TQString > & map )
+void KDevProjectIface::writeMapEntry( const TQString & path, const TQMap< TQString, TQString > & map )
 {
   DomUtil::writeMapEntry(*m_prj->projectDom(), path, map);
 }
 
-#include "tdevprojectiface.moc"
+#include "kdevprojectiface.moc"
diff --git a/lib/interfaces/tdevprojectiface.h b/lib/interfaces/kdevprojectiface.h
index c3e0ddd4..e30cd6cc 100644
--- a/lib/interfaces/tdevprojectiface.h
+++ b/lib/interfaces/kdevprojectiface.h
@@ -17,29 +17,29 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef TDEVPROJECTIFACE_H
-#define TDEVPROJECTIFACE_H
+#ifndef KDEVPROJECTIFACE_H
+#define KDEVPROJECTIFACE_H
 
 #include <dcopobject.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
 
-class TDevProject;
+class KDevProject;
 
 /**
-DCOP Interface for the @ref TDevProject object.
+DCOP Interface for the @ref KDevProject object.
 
 @author KDevelop Authors
 */
-class TDevProjectIface : public TQObject, public DCOPObject
+class KDevProjectIface : public TQObject, public DCOPObject
 {
   Q_OBJECT
 //  
       K_DCOP
 public:
-  TDevProjectIface(TDevProject *prj);
+  KDevProjectIface(KDevProject *prj);
 
-    ~TDevProjectIface();
+    ~KDevProjectIface();
 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:
-    TDevProject *m_prj;
+    KDevProject *m_prj;
 };
 
 #endif
diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt
index 0114b5ae..1eb17f35 100644
--- a/lib/util/CMakeLists.txt
+++ b/lib/util/CMakeLists.txt
@@ -26,13 +26,13 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/util )
 
 
-##### tdevutil (static) #########################
+##### kdevutil (static) #########################
 
-tde_add_library( tdevutil STATIC_PIC AUTOMOC
+tde_add_library( kdevutil STATIC_PIC AUTOMOC
   SOURCES
     blockingkprocess.cpp configwidgetproxy.cpp
     domutil.cpp execcommand.cpp filetemplate.cpp
-    tdeveditorutil.cpp tdevjobtimer.cpp
-    tdevshellwidget.cpp tdescriptactionmanager.cpp
+    kdeveditorutil.cpp kdevjobtimer.cpp
+    kdevshellwidget.cpp tdescriptactionmanager.cpp
     rurl.cpp settings.cpp urlutil.cpp
 )
diff --git a/lib/util/Makefile.am b/lib/util/Makefile.am
index 52ededb0..8bf28091 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 = libtdevutil.la
+noinst_LTLIBRARIES = libkdevutil.la
 
-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
+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
 
 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 tdevextensions tdevinterfaces
-DOXYGEN_PROJECTNAME = TDevelop Utility Library
-DOXYGEN_DOCDIRPREFIX = tdev
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevextensions kdevinterfaces
+DOXYGEN_PROJECTNAME = KDevelop Utility Library
+DOXYGEN_DOCDIRPREFIX = kdev
 include ../../Doxyfile.am
 
-noinst_HEADERS = blockingkprocess.h tdeveditorutil.h tdevjobtimer.h \
-	tdevshellwidget.h settings.h
+noinst_HEADERS = blockingkprocess.h kdeveditorutil.h kdevjobtimer.h \
+	kdevshellwidget.h settings.h
diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp
index c2251158..bea1c79a 100644
--- a/lib/util/configwidgetproxy.cpp
+++ b/lib/util/configwidgetproxy.cpp
@@ -26,13 +26,13 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 
-#include <tdevcore.h>
+#include <kdevcore.h>
 
 
 #include "configwidgetproxy.h"
 
 
-ConfigWidgetProxy::ConfigWidgetProxy( TDevCore * core )
+ConfigWidgetProxy::ConfigWidgetProxy( KDevCore * 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 f1ced178..7881f830 100644
--- a/lib/util/configwidgetproxy.h
+++ b/lib/util/configwidgetproxy.h
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <tqmap.h>
 
-class TDevCore;
+class KDevCore;
 class KDialogBase;
 
 /**
@@ -65,8 +65,8 @@ void MyPart::insertConfigWidget( TQObject const * dlg, TQWidget * page, unsigned
 }
 @endcode
 
-Note that this replaces the functionality of typical TDevCore::configWidget() and
-TDevCore::projectConfigWidget() slots.
+Note that this replaces the functionality of typical KDevCore::configWidget() and
+KDevCore::projectConfigWidget() slots.
 */
 class ConfigWidgetProxy : public TQObject
 {
@@ -76,7 +76,7 @@ Q_OBJECT
 public:
 	/**Constructor.
 	@param core An instance of KDevelop Core.*/
-	ConfigWidgetProxy( TDevCore * core );
+	ConfigWidgetProxy( KDevCore * core );
 	virtual ~ConfigWidgetProxy();
     
 	/**
diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp
index 4d0facdf..c2454580 100644
--- a/lib/util/filetemplate.cpp
+++ b/lib/util/filetemplate.cpp
@@ -27,12 +27,12 @@
 
 #include <kstandarddirs.h>
 
-#include "tdevplugin.h"
-#include "tdevproject.h"
+#include "kdevplugin.h"
+#include "kdevproject.h"
 #include "domutil.h"
 
 
-bool FileTemplate::exists(TDevPlugin *part, const TQString &name, Policy p)
+bool FileTemplate::exists(KDevPlugin *part, const TQString &name, Policy p)
 {
     //TQString fileName = (p == Default) ?
     //   (part->project()->projectDirectory() + "/templates/" + name) : name;
@@ -40,17 +40,17 @@ bool FileTemplate::exists(TDevPlugin *part, const TQString &name, Policy p)
     return TQFile::exists( fullPathForName(part,name,p) );
 }
 
-TQString FileTemplate::read(TDevPlugin *part, const TQString &name, Policy p)
+TQString FileTemplate::read(KDevPlugin *part, const TQString &name, Policy p)
 {
     
-  //TDevProject *project = part->project();
+  //KDevProject *project = part->project();
     //TQString fileName = (p == Default) ? (project->projectDirectory() +
 //					 "/templates/" + name) : name;
 
     return readFile(part, fullPathForName(part, name, p) );
 }
 
-TQString FileTemplate::readFile(TDevPlugin *part, const TQString &fileName)
+TQString FileTemplate::readFile(KDevPlugin *part, const TQString &fileName)
 {
     TQDomDocument &dom = *part->projectDom();
 
@@ -87,7 +87,7 @@ TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString &
 }
 
 
-bool FileTemplate::copy(TDevPlugin *part, const TQString &name,
+bool FileTemplate::copy(KDevPlugin *part, const TQString &name,
                         const TQString &dest, Policy p)
 {
     TQString text = read(part, name, p);
@@ -109,7 +109,7 @@ bool FileTemplate::copy(TDevPlugin *part, const TQString &name,
     return true;
 }
 
-TQString FileTemplate::fullPathForName(TDevPlugin *part, const TQString &name,
+TQString FileTemplate::fullPathForName(KDevPlugin *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(TDevPlugin *part, const TQString &name,
     }
 
     // next try global
-    TQString globalName = ::locate("data", "tdevfilecreate/file-templates/" + name);
+    TQString globalName = ::locate("data", "kdevfilecreate/file-templates/" + name);
     return globalName.isNull() ? fileName : globalName;
 }
diff --git a/lib/util/filetemplate.h b/lib/util/filetemplate.h
index 7802f9b7..8f863535 100644
--- a/lib/util/filetemplate.h
+++ b/lib/util/filetemplate.h
@@ -22,7 +22,7 @@
 
 #include <tqstring.h>
 
-class TDevPlugin;
+class KDevPlugin;
 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(TDevPlugin *part, const TQString &name, Policy p = Default);
+    static bool exists(KDevPlugin *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(TDevPlugin *part, const TQString &name, Policy p = Default);
+    static TQString read(KDevPlugin *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(TDevPlugin *part, const TQString &fileName);
+    static TQString readFile(KDevPlugin *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(TDevPlugin *part, const TQString &name,
+    static bool copy(KDevPlugin *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(TDevPlugin *part, const TQString &name, Policy p = Default);
+    static TQString fullPathForName(KDevPlugin *part, const TQString &name, Policy p = Default);
 };
 
 #endif
diff --git a/lib/util/tdeveditorutil.cpp b/lib/util/kdeveditorutil.cpp
index 455909f8..198e9a42 100644
--- a/lib/util/tdeveditorutil.cpp
+++ b/lib/util/kdeveditorutil.cpp
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "tdeveditorutil.h"
+#include "kdeveditorutil.h"
 
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/view.h>
@@ -17,7 +17,7 @@
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/selectioninterface.h>
 
-bool TDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * col, KTextEditor::Document * doc, KTextEditor::View * view )
+bool KDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * col, KTextEditor::Document * doc, KTextEditor::View * view )
 {
 	if ( !line || !col ) return false;
 
@@ -33,7 +33,7 @@ bool TDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * co
 	return true;
 }
 
-TQString TDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::View * view )
+TQString KDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::View * view )
 {
 	KTextEditor::EditInterface * editIface = dynamic_cast<KTextEditor::EditInterface*>( doc );
 	if ( !editIface ) return TQString();
@@ -50,7 +50,7 @@ TQString TDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::
 	return editIface->textLine(line);
 }
 
-TQString TDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::View * view )
+TQString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::View * view )
 {
 	KTextEditor::EditInterface * editIface = dynamic_cast<KTextEditor::EditInterface*>( doc );
 	if ( !editIface ) return TQString();
@@ -78,7 +78,7 @@ TQString TDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::
 }
 
 
-TQString TDevEditorUtil::currentSelection( KTextEditor::Document * doc )
+TQString KDevEditorUtil::currentSelection( KTextEditor::Document * doc )
 {
 	KTextEditor::SelectionInterface * selectIface = dynamic_cast<KTextEditor::SelectionInterface*>( doc );
 	return selectIface ? selectIface->selection() : TQString();
diff --git a/lib/util/tdeveditorutil.h b/lib/util/kdeveditorutil.h
index d69e914b..79a64fe1 100644
--- a/lib/util/tdeveditorutil.h
+++ b/lib/util/kdeveditorutil.h
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef TDEVEDITOR_H
-#define TDEVEDITOR_H
+#ifndef KDEVEDITOR_H
+#define KDEVEDITOR_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 TDevEditorUtil
+class KDevEditorUtil
 {
-    TDevEditorUtil() {}
+    KDevEditorUtil() {}
 public:
 
 	/**
diff --git a/lib/util/tdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp
index 0e1465e0..b0b78250 100644
--- a/lib/util/tdevjobtimer.cpp
+++ b/lib/util/kdevjobtimer.cpp
@@ -9,31 +9,31 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "tdevjobtimer.h"
+#include "kdevjobtimer.h"
 
-TDevJobTimer::TDevJobTimer( void * payload, TQObject *parent, const char *name)
+KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name)
  : TQTimer(parent, name)
 {
 	m_payload = payload;
 	connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) );
 }
 
-TDevJobTimer::~TDevJobTimer()
+KDevJobTimer::~KDevJobTimer()
 {
 }
 
-void TDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member, void * payload)
+void KDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member, void * payload)
 {
-	TDevJobTimer * p = new TDevJobTimer( payload );
+	KDevJobTimer * p = new KDevJobTimer( payload );
 	p->start( msec, true );
 	connect( p, TQT_SIGNAL(timeout(void*)), receiver, member );
 }
 
-void TDevJobTimer::slotTimeout()
+void KDevJobTimer::slotTimeout()
 {
 	emit timeout( m_payload );
 	m_payload = 0;
 	deleteLater();
 }
 
-#include "tdevjobtimer.moc"
+#include "kdevjobtimer.moc"
diff --git a/lib/util/tdevjobtimer.h b/lib/util/kdevjobtimer.h
index 313e56e5..b0fa829e 100644
--- a/lib/util/tdevjobtimer.h
+++ b/lib/util/kdevjobtimer.h
@@ -9,12 +9,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef TDEVJOBTIMER_H
-#define TDEVJOBTIMER_H
+#ifndef KDEVJOBTIMER_H
+#define KDEVJOBTIMER_H
 
 #include <tqtimer.h>
 
-class TDevJobTimer : public TQTimer
+class KDevJobTimer : public TQTimer
 {
 Q_OBJECT
   
@@ -25,8 +25,8 @@ signals:
 	void timeout(void*);
 
 private:
-	TDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0);
-	~TDevJobTimer();
+	KDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0);
+	~KDevJobTimer();
 
 private slots:
 	void slotTimeout();
diff --git a/lib/util/tdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp
index b5b8d195..b9220250 100644
--- a/lib/util/tdevshellwidget.cpp
+++ b/lib/util/kdevshellwidget.cpp
@@ -18,25 +18,25 @@
 #include <kde_terminal_interface.h>
 #include <kprocess.h>
 
-#include "tdevshellwidget.h"
+#include "kdevshellwidget.h"
 
-TDevShellWidget::TDevShellWidget(TQWidget *parent, const char *name)
+KDevShellWidget::KDevShellWidget(TQWidget *parent, const char *name)
  : TQVBox(parent, name), m_doAutoActivate( false ), m_isRunning( false )
 {
 }
 
 
-TDevShellWidget::~TDevShellWidget()
+KDevShellWidget::~KDevShellWidget()
 {
 }
 
-void TDevShellWidget::setShell( const TQString & shell, const TQStrList & arguments )
+void KDevShellWidget::setShell( const TQString & shell, const TQStrList & arguments )
 {
 	m_shellName = shell;
 	m_shellArguments = arguments;
 }
 
-void TDevShellWidget::activate( )
+void KDevShellWidget::activate( )
 {
 	KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
 	if ( !factory ) return;
@@ -67,7 +67,7 @@ void TDevShellWidget::activate( )
 
 }
 
-void TDevShellWidget::partDestroyed( )
+void KDevShellWidget::partDestroyed( )
 {
 	if ( m_doAutoActivate )
 	{
@@ -75,7 +75,7 @@ void TDevShellWidget::partDestroyed( )
 	}
 }
 
-void TDevShellWidget::processExited( TDEProcess * proc )
+void KDevShellWidget::processExited( TDEProcess * proc )
 {
 	m_isRunning = false;
 
@@ -89,7 +89,7 @@ void TDevShellWidget::processExited( TDEProcess * proc )
 		emit shellSignalled( proc->exitSignal() );
 }
 
-void TDevShellWidget::sendInput( const TQString & text )
+void KDevShellWidget::sendInput( const TQString & text )
 {
 	if ( !m_konsolePart ) return;
 	TerminalInterface* ti = static_cast<TerminalInterface*>( m_konsolePart->tqt_cast( "TerminalInterface" ) );
@@ -98,12 +98,12 @@ void TDevShellWidget::sendInput( const TQString & text )
 	ti->sendInput( text );
 }
 
-bool TDevShellWidget::isRunning( )
+bool KDevShellWidget::isRunning( )
 {
 	return m_isRunning;
 }
 
-void TDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate )
+void KDevShellWidget::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 TDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate )
 		m_doAutoActivate = false;
 }
 
-void TDevShellWidget::setAutoReactivateOnCloseDelayed( )
+void KDevShellWidget::setAutoReactivateOnCloseDelayed( )
 {
 	m_doAutoActivate = true;
 }
 
 
-#include "tdevshellwidget.moc"
+#include "kdevshellwidget.moc"
 
 // kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;
diff --git a/lib/util/tdevshellwidget.h b/lib/util/kdevshellwidget.h
index f6476814..6bb6a8d7 100644
--- a/lib/util/tdevshellwidget.h
+++ b/lib/util/kdevshellwidget.h
@@ -10,8 +10,8 @@
  ***************************************************************************/
 
 
-#ifndef TDEVSHELLWIDGET_H
-#define TDEVSHELLWIDGET_H
+#ifndef KDEVSHELLWIDGET_H
+#define KDEVSHELLWIDGET_H
 
 #include <tqstrlist.h>
 #include <tqvbox.h>
@@ -23,15 +23,15 @@ namespace KParts
 	class ReadOnlyPart;
 }
 
-class TDevShellWidget : public TQVBox
+class KDevShellWidget : public TQVBox
 {
 
 Q_OBJECT
   
 
 public:
-	TDevShellWidget(TQWidget *parent = 0, const char *name = 0);
-	virtual ~TDevShellWidget();
+	KDevShellWidget(TQWidget *parent = 0, const char *name = 0);
+	virtual ~KDevShellWidget();
 
 	/**
 	 * 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 86303b6d..30e0ba3e 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
-    tdevhtmlpart.h processlinemaker.h processwidget.h
+    kdevhtmlpart.h processlinemaker.h processwidget.h
     fancylistviewitem.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/widgets )
 
 
 ##### other data ################################
 
-install( FILES tdevhtml_partui.rc DESTINATION ${DATA_INSTALL_DIR}/tdevelop )
+install( FILES kdevhtml_partui.rc DESTINATION ${DATA_INSTALL_DIR}/tdevelop )
 
 
-##### tdevwidgets (shared) ######################
+##### kdevwidgets (shared) ######################
 
-tde_add_library( tdevwidgets SHARED AUTOMOC
+tde_add_library( kdevwidgets SHARED AUTOMOC
   SOURCES
     flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp
-    kcomboview.cpp resizablecombo.cpp tdevhtmlpart.cpp
+    kcomboview.cpp resizablecombo.cpp kdevhtmlpart.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 7181151e..69be7a11 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 = libtdevwidgets.la
+lib_LTLIBRARIES = libkdevwidgets.la
 
-tdevwidgetsincludedir = $(includedir)/tdevelop/widgets
+kdevwidgetsincludedir = $(includedir)/tdevelop/widgets
 
-libtdevwidgets_la_SOURCES = flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp \
-	kcomboview.cpp resizablecombo.cpp tdevhtmlpart.cpp processlinemaker.cpp \
+libkdevwidgets_la_SOURCES = flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp \
+	kcomboview.cpp resizablecombo.cpp kdevhtmlpart.cpp processlinemaker.cpp \
 	processwidget.cpp ksavealldialog.cpp fancylistviewitem.cpp
 
 
-tdevwidgetsinclude_HEADERS = tdelistviewaction.h qcomboview.h flagboxes.h \
-	ksavealldialog.h resizablecombo.h kcomboview.h tdevhtmlpart.h processlinemaker.h \
+kdevwidgetsinclude_HEADERS = tdelistviewaction.h qcomboview.h flagboxes.h \
+	ksavealldialog.h resizablecombo.h kcomboview.h kdevhtmlpart.h processlinemaker.h \
 	processwidget.h fancylistviewitem.h 
 	
 
 SUBDIRS = propeditor
 
-libtdevwidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la
-libtdevwidgets_la_LDFLAGS = -no-undefined $(all_libraries)
+libkdevwidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la
+libkdevwidgets_la_LDFLAGS = -no-undefined $(all_libraries)
 rcdir = $(kde_datadir)/tdevelop
 
-rc_DATA =  tdevhtml_partui.rc
+rc_DATA =  kdevhtml_partui.rc
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces
-DOXYGEN_PROJECTNAME = TDevelop Widgets Library
-DOXYGEN_DOCDIRPREFIX = tdev
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces
+DOXYGEN_PROJECTNAME = KDevelop Widgets Library
+DOXYGEN_DOCDIRPREFIX = kdev
 include ../../Doxyfile.am
diff --git a/lib/widgets/tdevhtml_partui.rc b/lib/widgets/kdevhtml_partui.rc
index a62fa22f..5a55b7bf 100644
--- a/lib/widgets/tdevhtml_partui.rc
+++ b/lib/widgets/kdevhtml_partui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui version="3" name="TDevHTMLPart" >
+<kpartgui version="3" name="KDevHTMLPart" >
 
 <MenuBar>
   <Menu name="file" noMerge="0"><text>&amp;File</text>
diff --git a/lib/widgets/tdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index 6ec74651..76697cfa 100644
--- a/lib/widgets/tdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -14,15 +14,15 @@
 #include <tdehtml_settings.h>
 #include <tdeconfig.h>
 
-#include <tdevmainwindow.h>
+#include <kdevmainwindow.h>
 
 
-#include "tdevhtmlpart.h"
+#include "kdevhtmlpart.h"
 
-TDevHTMLPart::TDevHTMLPart()
-  : TDEHTMLPart(0L, 0L, 0L, "TDevHTMLPart", DefaultGUI )
+KDevHTMLPart::KDevHTMLPart()
+  : TDEHTMLPart(0L, 0L, 0L, "KDevHTMLPart", DefaultGUI )
 {
-  setXMLFile(locate("data", "tdevelop/tdevhtml_partui.rc"), true);
+  setXMLFile(locate("data", "tdevelop/kdevhtml_partui.rc"), true);
   
   connect(browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)),
           this, TQT_SLOT(openURLRequest(const KURL &)) );
@@ -87,7 +87,7 @@ TDevHTMLPart::TDevHTMLPart()
   setZoomFactor(appConfig->readEntry("Zoom", "100").toInt());
 }
 
-void TDevHTMLPart::popup( const TQString & url, const TQPoint & p )
+void KDevHTMLPart::popup( const TQString & url, const TQPoint & p )
 {
 //  TDEPopupMenu popup( i18n( "Documentation Viewer" ), this->widget() );
   TDEPopupMenu popup(this->widget());
@@ -143,11 +143,11 @@ void TDevHTMLPart::popup( const TQString & url, const TQPoint & p )
         kdDebug() << "processing relative url: " << url << endl;
         if (url.startsWith("#"))
         {
-            kurl = KURL(TDevHTMLPart::url());
+            kurl = KURL(KDevHTMLPart::url());
             kurl.setRef(url.mid(1));
         }
         else
-            kurl = KURL(TDevHTMLPart::url().upURL().url(true)+url);
+            kurl = KURL(KDevHTMLPart::url().upURL().url(true)+url);
     }
     else
         kurl = KURL(url);
@@ -157,13 +157,13 @@ void TDevHTMLPart::popup( const TQString & url, const TQPoint & p )
   }
 }
 
-void TDevHTMLPart::setContext(const TQString &context)
+void KDevHTMLPart::setContext(const TQString &context)
 {
   m_context = context;
 }
 
 
-TQString TDevHTMLPart::context() const
+TQString KDevHTMLPart::context() const
 {
   return m_context;
 }
@@ -250,7 +250,7 @@ done:
 #undef I
 #undef X
 
-TQString TDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
+TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
 {
   // check for environment variables and make necessary translations
   TQString path = url;
@@ -318,7 +318,7 @@ TQString TDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
   return path;
 }
 
-bool TDevHTMLPart::openURL(const KURL &url)
+bool KDevHTMLPart::openURL(const KURL &url)
 {
   TQString path = resolveEnvVarsInURL(url.url());
   KURL newUrl(path);
@@ -339,47 +339,47 @@ bool TDevHTMLPart::openURL(const KURL &url)
   return retval;
 }
 
-void TDevHTMLPart::openURLRequest(const KURL &url)
+void KDevHTMLPart::openURLRequest(const KURL &url)
 {
 	openURL( url );
 }
 
-void TDevHTMLPart::slotReload( )
+void KDevHTMLPart::slotReload( )
 {
 	openURL( url() );
 }
 
-void TDevHTMLPart::slotStop( )
+void KDevHTMLPart::slotStop( )
 {
     closeURL();
 }
 
-void TDevHTMLPart::slotStarted( TDEIO::Job * )
+void KDevHTMLPart::slotStarted( TDEIO::Job * )
 {
     stopAction->setEnabled(true);
 }
 
-void TDevHTMLPart::slotCompleted( )
+void KDevHTMLPart::slotCompleted( )
 {
     stopAction->setEnabled(false);
 }
 
-void TDevHTMLPart::slotCancelled( const TQString & /*errMsg*/ )
+void KDevHTMLPart::slotCancelled( const TQString & /*errMsg*/ )
 {
     stopAction->setEnabled(false);
 }
 
-/*void TDevHTMLPart::slotDuplicate( )
+/*void KDevHTMLPart::slotDuplicate( )
 {
     PartController::getInstance()->showDocument(url(), true);
 }*/
 
-void TDevHTMLPart::slotPrint( )
+void KDevHTMLPart::slotPrint( )
 {
     view()->print();
 }
 
-void TDevHTMLPart::slotBack()
+void KDevHTMLPart::slotBack()
 {
 	if ( m_Current != m_history.begin() )
 	{
@@ -390,7 +390,7 @@ void TDevHTMLPart::slotBack()
 	}
 }
 
-void TDevHTMLPart::slotForward()
+void KDevHTMLPart::slotForward()
 {
 	if (  m_Current != m_history.fromLast() )
 	{
@@ -401,7 +401,7 @@ void TDevHTMLPart::slotForward()
 	}
 }
 
-void TDevHTMLPart::slotBackAboutToShow()
+void KDevHTMLPart::slotBackAboutToShow()
 {
 	TDEPopupMenu *popup = m_backAction->popupMenu();
 	popup->clear();
@@ -426,7 +426,7 @@ void TDevHTMLPart::slotBackAboutToShow()
 	} 
 }
 
-void TDevHTMLPart::slotForwardAboutToShow()
+void KDevHTMLPart::slotForwardAboutToShow()
 {
 	TDEPopupMenu *popup = m_forwardAction->popupMenu();
 	popup->clear();
@@ -451,7 +451,7 @@ void TDevHTMLPart::slotForwardAboutToShow()
 	} 
 }
 
-void TDevHTMLPart::slotPopupActivated( int id )
+void KDevHTMLPart::slotPopupActivated( int id )
 {
 	kdDebug(9000) << "id: " << id << endl;
 
@@ -471,7 +471,7 @@ void TDevHTMLPart::slotPopupActivated( int id )
 	}
 }
 
-void TDevHTMLPart::addHistoryEntry()
+void KDevHTMLPart::addHistoryEntry()
 {
 	TQValueList<DocumentationHistoryEntry>::Iterator it = m_Current;
 	
@@ -491,7 +491,7 @@ void TDevHTMLPart::addHistoryEntry()
 	}
 }
 
-void TDevHTMLPart::slotCopy( )
+void KDevHTMLPart::slotCopy( )
 {
     TQString text = selectedText();
     text.replace( TQChar( 0xa0 ), ' ' );
@@ -501,7 +501,7 @@ void TDevHTMLPart::slotCopy( )
     connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
 }
 
-void TDevHTMLPart::slotSelectionChanged( )
+void KDevHTMLPart::slotSelectionChanged( )
 {
     if (selectedText().isEmpty())
         copyAction->setEnabled(false);
@@ -509,4 +509,4 @@ void TDevHTMLPart::slotSelectionChanged( )
         copyAction->setEnabled(true);
 }
 
-#include "tdevhtmlpart.moc"
+#include "kdevhtmlpart.moc"
diff --git a/lib/widgets/tdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h
index e822488b..6c8f7dc3 100644
--- a/lib/widgets/tdevhtmlpart.h
+++ b/lib/widgets/kdevhtmlpart.h
@@ -1,5 +1,5 @@
-#ifndef __TDEVHTMLPART_H__
-#define __TDEVHTMLPART_H__
+#ifndef __KDEVHTMLPART_H__
+#define __KDEVHTMLPART_H__
 
 #include <stdlib.h>
 
@@ -8,7 +8,7 @@
 #include <tdehtml_part.h>
 
 /**
-@file tdevhtmlpart.h
+@file kdevhtmlpart.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 TDevHTMLPart : public TDEHTMLPart
+class KDevHTMLPart : public TDEHTMLPart
 {
     Q_OBJECT
   
@@ -50,7 +50,7 @@ public:
     
     enum Options { CanDuplicate=1, CanOpenInNewWindow=2 };
 
-    TDevHTMLPart();
+    KDevHTMLPart();
     
     void setContext(const TQString &context);
     TQString context() const;
diff --git a/lib/widgets/tdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp
index adfd4566..33c9f733 100644
--- a/lib/widgets/tdevtabwidget.cpp
+++ b/lib/widgets/kdevtabwidget.cpp
@@ -16,9 +16,9 @@
 #include <kicontheme.h>
 #include <kiconloader.h>
 
-#include "tdevtabwidget.h"
+#include "kdevtabwidget.h"
 
-TDevTabWidget::TDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(parent,name)
+KDevTabWidget::KDevTabWidget(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 = ((TDevTabWidget*)parent())->page(indexOf(tab->identifier() ) );
+    m_pPage = ((KDevTabWidget*)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 "tdevtabwidget.moc"
+#include "kdevtabwidget.moc"
diff --git a/lib/widgets/propeditor/CMakeLists.txt b/lib/widgets/propeditor/CMakeLists.txt
index 1cffb908..2620aaa0 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 )
 
 
-##### tdevpropertyeditor (shared) ###############
+##### kdevpropertyeditor (shared) ###############
 
-tde_add_library( tdevpropertyeditor SHARED AUTOMOC
+tde_add_library( kdevpropertyeditor 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 a01eb4d3..e07d5c69 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 =  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\
+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\
 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
 
-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
+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
 
 DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils
-DOXYGEN_PROJECTNAME = TDevelop Property Editing Library
+DOXYGEN_PROJECTNAME = KDevelop Property Editing Library
 include ../../../Doxyfile.am