8 files changed, 32 insertions, 32 deletions
diff --git a/languages/csharp/CMakeLists.txt b/languages/csharp/CMakeLists.txt
index 361ce1a1..5e148431 100644
--- a/languages/csharp/CMakeLists.txt
+++ b/languages/csharp/CMakeLists.txt
@@ -31,17 +31,17 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    tdevcsharpsupport.desktop csharpdoc.protocol
+    kdevcsharpsupport.desktop csharpdoc.protocol
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 install( FILES
-    tdevcsharpsupport.rc
-  DESTINATION ${DATA_INSTALL_DIR}/tdevcsharpsupport )
+    kdevcsharpsupport.rc
+  DESTINATION ${DATA_INSTALL_DIR}/kdevcsharpsupport )
 
 
-##### libtdevcsharpsupport (module) #############
+##### libkdevcsharpsupport (module) #############
 
-tde_add_kpart( libtdevcsharpsupport AUTOMOC
+tde_add_kpart( libkdevcsharpsupport AUTOMOC
   SOURCES
     csharpsupportpart.cpp csharpconfigwidget.cpp
     csharpconfigwidgetbase.ui
diff --git a/languages/csharp/Makefile.am b/languages/csharp/Makefile.am
index 313e8bca..75ba9513 100644
--- a/languages/csharp/Makefile.am
+++ b/languages/csharp/Makefile.am
@@ -6,11 +6,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 SUBDIRS = app_templates file_templates doc
 
 
-kde_module_LTLIBRARIES = libtdevcsharpsupport.la tdeio_csharpdoc.la
-libtdevcsharpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevcsharpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevcsharpsupport.la tdeio_csharpdoc.la
+libkdevcsharpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevcsharpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevcsharpsupport_la_SOURCES = csharpsupportpart.cpp csharpconfigwidget.cpp csharpconfigwidgetbase.ui
+libkdevcsharpsupport_la_SOURCES = csharpsupportpart.cpp csharpconfigwidget.cpp csharpconfigwidgetbase.ui
 
 tdeio_csharpdoc_la_SOURCES = csharpdoc.cpp
 tdeio_csharpdoc_la_LIBADD = $(LIB_TDEIO)
@@ -19,7 +19,7 @@ tdeio_csharpdoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevcsharpsupport.desktop csharpdoc.protocol
+service_DATA = kdevcsharpsupport.desktop csharpdoc.protocol
 
-rcdir = $(kde_datadir)/tdevcsharpsupport
-rc_DATA = tdevcsharpsupport.rc
+rcdir = $(kde_datadir)/kdevcsharpsupport
+rc_DATA = kdevcsharpsupport.rc
diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
index d410441b..154ff911 100644
--- a/languages/csharp/csharpsupportpart.cpp
+++ b/languages/csharp/csharpsupportpart.cpp
@@ -19,24 +19,24 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kinputdialog.h>
 #include <tdelocale.h>
 #include <tqregexp.h>
 #include <codemodel.h>
 #include <tqprogressbar.h>
 #include <kstatusbar.h>
-#include "tdevmainwindow.h"
+#include "kdevmainwindow.h"
 
 #include <kprocess.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevpartcontroller.h"
-#include "tdevplugininfo.h"
-#include "tdevappfrontend.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevpartcontroller.h"
+#include "kdevplugininfo.h"
+#include "kdevappfrontend.h"
 //#include "classstore.h"
 //#include "parsedclass.h"
 //#include "parsedmethod.h"
@@ -44,16 +44,16 @@
 #include "domutil.h"
 //#include "programmingbycontract.h"
 
-typedef TDevGenericFactory<CSharpSupportPart> CSharpSupportFactory;
-static const TDevPluginInfo data("tdevcsharpsupport");
-K_EXPORT_COMPONENT_FACTORY( libtdevcsharpsupport, CSharpSupportFactory( data ) )
+typedef KDevGenericFactory<CSharpSupportPart> CSharpSupportFactory;
+static const KDevPluginInfo data("kdevcsharpsupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) )
 
 CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart")
+    : KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart")
 {
     setInstance(CSharpSupportFactory::instance());
 
-    setXMLFile("tdevcsharpsupport.rc");
+    setXMLFile("kdevcsharpsupport.rc");
 
     connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
     connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
@@ -174,9 +174,9 @@ void CSharpSupportPart::savedFile(const KURL &fileName)
 }
 
 
-TDevLanguageSupport::Features CSharpSupportPart::features()
+KDevLanguageSupport::Features CSharpSupportPart::features()
 {
-    return TDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/);
+    return KDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/);
 //    return Functions;
 }
 
@@ -193,7 +193,7 @@ TQString CSharpSupportPart::interpreter()
 void CSharpSupportPart::startApplication(const TQString &program)
 {
     bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevcsharpsupport/run/terminal");
-    if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend"))
+    if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
         appFrontend->startAppCommand(TQString(), program, inTerminal);
 }
 
diff --git a/languages/csharp/csharpsupportpart.h b/languages/csharp/csharpsupportpart.h
index 2256480b..18e5a663 100644
--- a/languages/csharp/csharpsupportpart.h
+++ b/languages/csharp/csharpsupportpart.h
@@ -12,11 +12,11 @@
 #ifndef _CSHARPSUPPORTPART_H_
 #define _CSHARPSUPPORTPART_H_
 
-#include "tdevlanguagesupport.h"
+#include "kdevlanguagesupport.h"
 #include <codemodel.h>
 // #include "csharpparser.h"
 
-class CSharpSupportPart : public TDevLanguageSupport
+class CSharpSupportPart : public KDevLanguageSupport
 {
     Q_OBJECT
   
diff --git a/languages/csharp/doc/Makefile.am b/languages/csharp/doc/Makefile.am
index 1e8dbe53..e0dfb9eb 100644
--- a/languages/csharp/doc/Makefile.am
+++ b/languages/csharp/doc/Makefile.am
@@ -1,4 +1,4 @@
-tocdir = ${kde_datadir}/tdevdocumentation/tocs
+tocdir = ${kde_datadir}/kdevdocumentation/tocs
 toc_DATA = 
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
diff --git a/languages/csharp/file_templates/Makefile.am b/languages/csharp/file_templates/Makefile.am
index 40ad2f23..b4f0a30c 100644
--- a/languages/csharp/file_templates/Makefile.am
+++ b/languages/csharp/file_templates/Makefile.am
@@ -1,4 +1,4 @@
-templatedir = $(kde_datadir)/tdevfilecreate/file-templates
+templatedir = $(kde_datadir)/kdevfilecreate/file-templates
 template_DATA = 
 
 
diff --git a/languages/csharp/tdevcsharpsupport.desktop b/languages/csharp/kdevcsharpsupport.desktop
index c072003e..a5627cc3 100644
--- a/languages/csharp/tdevcsharpsupport.desktop
+++ b/languages/csharp/kdevcsharpsupport.desktop
@@ -51,7 +51,7 @@ GenericName[sr@Latn]=Podrška za CSharp
 GenericName[sv]=C#-stöd
 GenericName[zh_TW]=C# 支援
 ServiceTypes=TDevelop/LanguageSupport
-X-TDE-Library=libtdevcsharpsupport
+X-TDE-Library=libkdevcsharpsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=CSharp
 
diff --git a/languages/csharp/tdevcsharpsupport.rc b/languages/csharp/kdevcsharpsupport.rc
index b5f735e2..b5f735e2 100644
--- a/languages/csharp/tdevcsharpsupport.rc
+++ b/languages/csharp/kdevcsharpsupport.rc