diff --git a/Documentation/ConduitProgrammingTutorial/mal-factory.cc b/Documentation/ConduitProgrammingTutorial/mal-factory.cc
index a55a0e6..1fc5337 100644
--- a/Documentation/ConduitProgrammingTutorial/mal-factory.cc
+++ b/Documentation/ConduitProgrammingTutorial/mal-factory.cc
@@ -30,7 +30,7 @@ void *init_libmalconduit()
 
 
 // A number of static variables
-KAboutData *MALConduitFactory::fAbout = 0L;
+TDEAboutData *MALConduitFactory::fAbout = 0L;
 const char *MALConduitFactory::fGroup = "MAL-conduit";
 const char *MALConduitFactory::fLastSync = "Last MAL Sync";
 const char *MALConduitFactory::fSyncTime = "Sync Frequency";
@@ -45,12 +45,12 @@ MALConduitFactory::MALConduitFactory(TQObject *p, const char *n) :
 {
     FUNCTIONSETUP;
 
-    fInstance = new KInstance("MALconduit");
-    fAbout = new KAboutData("MALconduit",
+    fInstance = new TDEInstance("MALconduit");
+    fAbout = new TDEAboutData("MALconduit",
         I18N_NOOP("MAL Synchronization Conduit for KPilot"),
         KPILOT_VERSION,
         I18N_NOOP("Synchronizes the content from MAL Servers like AvantGo to the Handheld"),
-        KAboutData::License_GPL,
+        TDEAboutData::License_GPL,
         "(C) 2002, Reinhold Kainhofer");
     fAbout->addAuthor("Reinhold Kainhofer",
         I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");
diff --git a/Documentation/ConduitProgrammingTutorial/mal-factory.h b/Documentation/ConduitProgrammingTutorial/mal-factory.h
index f38cb5c..dac91d0 100644
--- a/Documentation/ConduitProgrammingTutorial/mal-factory.h
+++ b/Documentation/ConduitProgrammingTutorial/mal-factory.h
@@ -9,8 +9,8 @@
 
 #include <klibloader.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class MALConduitFactory : public KLibFactory
 {
@@ -20,7 +20,7 @@ public:
     MALConduitFactory(TQObject * = 0L,const char * = 0L);
     virtual ~MALConduitFactory();
 
-    static KAboutData *about() { return fAbout; } ;
+    static TDEAboutData *about() { return fAbout; } ;
     static const char *lastSync() { return fLastSync; };
     static const char *syncTime() {return fSyncTime;};
     static const char *proxyType() {return fProxyType;};
@@ -39,8 +39,8 @@ protected:
         const char* classname = "TQObject",
         const TQStringList &args = TQStringList() );
 private:
-    KInstance *fInstance;
-    static KAboutData *fAbout;
+    TDEInstance *fInstance;
+    static TDEAboutData *fAbout;
     // KConfig entry keys.
     static const char *fGroup;
     static const char *fLastSync, *fSyncTime, 
diff --git a/conduits/abbrowserconduit/abbrowser-setup.cc b/conduits/abbrowserconduit/abbrowser-setup.cc
index b275d3b..1f30edb 100644
--- a/conduits/abbrowserconduit/abbrowser-setup.cc
+++ b/conduits/abbrowserconduit/abbrowser-setup.cc
@@ -42,13 +42,13 @@
 
 
 
-static KAboutData *createAbout()
+static TDEAboutData *createAbout()
 {
-	KAboutData *fAbout = new KAboutData("abbrowserconduit",
+	TDEAboutData *fAbout = new TDEAboutData("abbrowserconduit",
 		I18N_NOOP("Abbrowser Conduit for KPilot"),
 		KPILOT_VERSION,
 		I18N_NOOP("Configures the Abbrowser Conduit for KPilot"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(C) 2001, Dan Pilone\n(C) 2002-2003, Reinhold Kainhofer");
 	fAbout->addAuthor("Greg Stern",
 		I18N_NOOP("Primary Author"));
diff --git a/conduits/abbrowserconduit/abbrowser-setup.h b/conduits/abbrowserconduit/abbrowser-setup.h
index 47eff1c..4960620 100644
--- a/conduits/abbrowserconduit/abbrowser-setup.h
+++ b/conduits/abbrowserconduit/abbrowser-setup.h
@@ -33,7 +33,7 @@
 #include "plugin.h"
 
 class AbbrowserWidget;
-class KAboutData;
+class TDEAboutData;
 
 class AbbrowserWidgetSetup : public ConduitConfigBase
 {
@@ -45,7 +45,7 @@ public:
 	static ConduitConfigBase *create(TQWidget *,const char *);
 private:
 	AbbrowserWidget *fConfigWidget;
-	KAboutData *fAbout;
+	TDEAboutData *fAbout;
 } ;
 
 #endif
diff --git a/conduits/docconduit/doc-factory.cc b/conduits/docconduit/doc-factory.cc
index cfab20f4d..db3c105 100644
--- a/conduits/docconduit/doc-factory.cc
+++ b/conduits/docconduit/doc-factory.cc
@@ -47,7 +47,7 @@ extern "C" {
 
 
 // A number of static variables
-KAboutData * DOCConduitFactory::fAbout = 0L;
+TDEAboutData * DOCConduitFactory::fAbout = 0L;
 
 const char *DOCConduitFactory::dbDOCtype = "TEXt";
 const char *DOCConduitFactory::dbDOCcreator = "REAd";
@@ -58,11 +58,11 @@ DOCConduitFactory::DOCConduitFactory(TQObject * p, const char *n):
 KLibFactory(p, n)
 {
 	FUNCTIONSETUP;
-	fInstance = new KInstance("docconduit");
-	fAbout =new KAboutData("docconduit",
+	fInstance = new TDEInstance("docconduit");
+	fAbout =new TDEAboutData("docconduit",
 		I18N_NOOP("Palm DOC Conduit for KPilot"), KPILOT_VERSION,
 		I18N_NOOP("Configures the DOC Conduit for KPilot"),
-		KAboutData::License_GPL, "(C) 2002, Reinhold Kainhofer");
+		TDEAboutData::License_GPL, "(C) 2002, Reinhold Kainhofer");
 
 	fAbout->addAuthor("Reinhold Kainhofer",
 		I18N_NOOP("Maintainer"), "reinhold@kainhofer.com",
diff --git a/conduits/docconduit/doc-factory.h b/conduits/docconduit/doc-factory.h
index f8968d9..1a7d2ba 100644
--- a/conduits/docconduit/doc-factory.h
+++ b/conduits/docconduit/doc-factory.h
@@ -31,8 +31,8 @@
 	
 #include <klibloader.h>
 	
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 
 class DOCConduitFactory:public KLibFactory 
@@ -44,7 +44,7 @@ public:
 	DOCConduitFactory(TQObject * = 0L, const char * = 0L);
 	virtual ~ DOCConduitFactory();
 	
-	static KAboutData *about() { 
+	static TDEAboutData *about() { 
 		return fAbout;
 	};
 
@@ -61,8 +61,8 @@ protected:
 		const TQStringList & args = TQStringList());
  
 private:
-	KInstance * fInstance;
-	static KAboutData *fAbout;
+	TDEInstance * fInstance;
+	static TDEAboutData *fAbout;
 };
 
 
diff --git a/conduits/docconduit/kpalmdoc.cpp b/conduits/docconduit/kpalmdoc.cpp
index f686aa4..f43b9c4 100644
--- a/conduits/docconduit/kpalmdoc.cpp
+++ b/conduits/docconduit/kpalmdoc.cpp
@@ -39,9 +39,9 @@
 int main(int argc, char *argv[])
 {
 
-	KAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1",
+	TDEAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1",
 		"KPalmDOC - KDE Converter for PalmDOC texts.\n\n",
-		KAboutData::License_GPL, "(c) 2003, Reinhold Kainhofer");
+		TDEAboutData::License_GPL, "(c) 2003, Reinhold Kainhofer");
 	about.addAuthor("Reinhold Kainhofer", I18N_NOOP("Main Developer"),
 		"reinhold@kainhofer.com", "http://reinhold.kainhofer.com/Linux/");
 	about.addCredit("Adriaan de Groot", I18N_NOOP("Maintainer of KPilot"),
diff --git a/conduits/knotes/knotes-factory.cc b/conduits/knotes/knotes-factory.cc
index 9601e81..dc7f8f3 100644
--- a/conduits/knotes/knotes-factory.cc
+++ b/conduits/knotes/knotes-factory.cc
@@ -55,19 +55,19 @@ void *init_conduit_knotes()
 }
 
 
-/* static */ KAboutData *KNotesConduitFactory::fAbout = 0L;
+/* static */ TDEAboutData *KNotesConduitFactory::fAbout = 0L;
 
 KNotesConduitFactory::KNotesConduitFactory(TQObject *p, const char *n) :
 	KLibFactory(p,n)
 {
 	FUNCTIONSETUP;
 
-	fInstance = new KInstance("knotesconduit");
-	fAbout = new KAboutData("knotesconduit",
+	fInstance = new TDEInstance("knotesconduit");
+	fAbout = new TDEAboutData("knotesconduit",
 		I18N_NOOP("KNotes Conduit for KPilot"),
 		KPILOT_VERSION,
 		I18N_NOOP("Configures the KNotes Conduit for KPilot"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(C) 2001, Adriaan de Groot");
 	fAbout->addAuthor("Adriaan de Groot",
 		I18N_NOOP("Primary Author"),
diff --git a/conduits/knotes/knotes-factory.h b/conduits/knotes/knotes-factory.h
index 5fc6a09..3df3c06 100644
--- a/conduits/knotes/knotes-factory.h
+++ b/conduits/knotes/knotes-factory.h
@@ -31,8 +31,8 @@
 
 #include <klibloader.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class KNotesConduitFactory : public KLibFactory
 {
@@ -43,7 +43,7 @@ public:
 	KNotesConduitFactory(TQObject * = 0L,const char * = 0L);
 	virtual ~KNotesConduitFactory();
 
-	static KAboutData *about() { return fAbout; } ;
+	static TDEAboutData *about() { return fAbout; } ;
 
 	// The KNotes instance, unlike previous conduits (alphabetically)
 	// has const char * const members. The extra const prevents people
@@ -56,8 +56,8 @@ protected:
 		const char* classname = TQOBJECT_OBJECT_NAME_STRING,
 		const TQStringList &args = TQStringList() );
 private:
-	KInstance *fInstance;
-	static KAboutData *fAbout;
+	TDEInstance *fInstance;
+	static TDEAboutData *fAbout;
 } ;
 
 extern "C"
diff --git a/conduits/malconduit/mal-factory.cc b/conduits/malconduit/mal-factory.cc
index 3e363d2..d343fe3 100644
--- a/conduits/malconduit/mal-factory.cc
+++ b/conduits/malconduit/mal-factory.cc
@@ -58,19 +58,19 @@ unsigned long version_conduit_mal = Pilot::PLUGIN_API;
 
 // A number of static variables
 //
-KAboutData *MALConduitFactory::fAbout = 0L;
+TDEAboutData *MALConduitFactory::fAbout = 0L;
 
 MALConduitFactory::MALConduitFactory(TQObject *p, const char *n) :
 	KLibFactory(p,n)
 {
 	FUNCTIONSETUP;
 
-	fInstance = new KInstance("MALconduit");
-	fAbout = new KAboutData("MALconduit",
+	fInstance = new TDEInstance("MALconduit");
+	fAbout = new TDEAboutData("MALconduit",
 		I18N_NOOP("MAL Synchronization Conduit for KPilot"),
 		KPILOT_VERSION,
 		I18N_NOOP("Synchronizes the content from MAL Servers like AvantGo to the Handheld"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(C) 2002, Reinhold Kainhofer");
 	fAbout->addAuthor("Reinhold Kainhofer",
 		I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");
diff --git a/conduits/malconduit/mal-factory.h b/conduits/malconduit/mal-factory.h
index 8c4f235..4e0de33 100644
--- a/conduits/malconduit/mal-factory.h
+++ b/conduits/malconduit/mal-factory.h
@@ -34,8 +34,8 @@
 
 #include <klibloader.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class MALConduitFactory : public KLibFactory
 {
@@ -46,7 +46,7 @@ public:
 	MALConduitFactory(TQObject * = 0L,const char * = 0L);
 	virtual ~MALConduitFactory();
 
-	static KAboutData *about() { return fAbout; } ;
+	static TDEAboutData *about() { return fAbout; } ;
 
 protected:
 	virtual TQObject* createObject( TQObject* parent = 0,
@@ -54,8 +54,8 @@ protected:
 		const char* classname = TQOBJECT_OBJECT_NAME_STRING,
 		const TQStringList &args = TQStringList() );
 private:
-	KInstance *fInstance;
-	static KAboutData *fAbout;
+	TDEInstance *fInstance;
+	static TDEAboutData *fAbout;
 } ;
 
 extern "C"
diff --git a/conduits/memofileconduit/memofile-factory.cc b/conduits/memofileconduit/memofile-factory.cc
index 795edc3..c20da01 100644
--- a/conduits/memofileconduit/memofile-factory.cc
+++ b/conduits/memofileconduit/memofile-factory.cc
@@ -59,11 +59,11 @@ MemofileConduitConfig::MemofileConduitConfig(TQWidget *p, const char *n) :
 {
 	FUNCTIONSETUP;
 	fConduitName = i18n("Memofile");
-	KAboutData *about = new KAboutData("MemofileConduit",
+	TDEAboutData *about = new TDEAboutData("MemofileConduit",
 		I18N_NOOP("Memofile Conduit for KPilot"),
 		KPILOT_VERSION,
 		I18N_NOOP("Configures the Memofile Conduit for KPilot"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(C) 2004, Jason 'vanRijn' Kasper");
 	about->addAuthor("Jason 'vanRijn' Kasper",
 		I18N_NOOP("Primary Author"),
diff --git a/conduits/notepadconduit/notepad-factory.cc b/conduits/notepadconduit/notepad-factory.cc
index 0e1094b..b68eff2 100644
--- a/conduits/notepadconduit/notepad-factory.cc
+++ b/conduits/notepadconduit/notepad-factory.cc
@@ -59,15 +59,15 @@ protected:
 	NotepadWidget *fConfigWidget;
 } ;
 
-static KAboutData *createAbout()
+static TDEAboutData *createAbout()
 {
 	FUNCTIONSETUP;
 
-	KAboutData *fAbout = new KAboutData("NotepadConduit",
+	TDEAboutData *fAbout = new TDEAboutData("NotepadConduit",
 		I18N_NOOP("Saves notepads to png files"),
 		KPILOT_VERSION,
 		I18N_NOOP("Configures the Notepad Conduit for KPilot"),
-		KAboutData::License_LGPL,
+		TDEAboutData::License_LGPL,
 		"(C) 2004, Joern Ahrens");
 	fAbout->addAuthor("Joern Ahrens",
 		I18N_NOOP("Primary Author"),
diff --git a/conduits/null/null-factory.cc b/conduits/null/null-factory.cc
index c2d381d..aeed7c9 100644
--- a/conduits/null/null-factory.cc
+++ b/conduits/null/null-factory.cc
@@ -52,7 +52,7 @@ public:
 	virtual void load();
 protected:
 	NullWidget *fConfigWidget;
-	KAboutData *fAbout;
+	TDEAboutData *fAbout;
 } ;
 
 NullConduitConfig::NullConduitConfig(TQWidget *p, const char *n) :
@@ -61,11 +61,11 @@ NullConduitConfig::NullConduitConfig(TQWidget *p, const char *n) :
 {
 	FUNCTIONSETUP;
 	fConduitName = i18n("Null");
-	fAbout = new KAboutData("nullConduit",
+	fAbout = new TDEAboutData("nullConduit",
 		I18N_NOOP("Null Conduit for KPilot"),
 		KPILOT_VERSION,
 		I18N_NOOP("Configures the Null Conduit for KPilot"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(C) 2001, Adriaan de Groot");
 	fAbout->addAuthor("Adriaan de Groot",
 		I18N_NOOP("Primary Author"),
diff --git a/conduits/popmail/setupDialog.cc b/conduits/popmail/setupDialog.cc
index b8d3db7..ea8b113 100644
--- a/conduits/popmail/setupDialog.cc
+++ b/conduits/popmail/setupDialog.cc
@@ -64,11 +64,11 @@ PopMailWidgetConfig::PopMailWidgetConfig(TQWidget *p,const char *n) :
 {
 	FUNCTIONSETUP;
 	fConduitName = i18n("KMail");
-	KAboutData *fAbout = new KAboutData("popmailConduit",
+	TDEAboutData *fAbout = new TDEAboutData("popmailConduit",
 		I18N_NOOP("Mail Conduit for KPilot"),
 		KPILOT_VERSION,
 		I18N_NOOP("Configures the Mail Conduit for KPilot"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(C) 2001, Dan Pilone, Michael Kropfberger, Adriaan de Groot");
 	fAbout->addAuthor("Adriaan de Groot",
 		I18N_NOOP("Maintainer"),
diff --git a/conduits/recordconduit/factory.cc b/conduits/recordconduit/factory.cc
index 8337733..bf23de7 100644
--- a/conduits/recordconduit/factory.cc
+++ b/conduits/recordconduit/factory.cc
@@ -53,7 +53,7 @@ public:
 	virtual void load();
 protected:
 	RecordWidget *fConfigWidget;
-	KAboutData *fAbout;
+	TDEAboutData *fAbout;
 } ;
 
 ConduitConfig::ConduitConfig(TQWidget *p, const char *n) :
@@ -62,11 +62,11 @@ ConduitConfig::ConduitConfig(TQWidget *p, const char *n) :
 {
 	FUNCTIONSETUP;
 	fConduitName = i18n("Record Conduit");
-	fAbout = new KAboutData("recordConduit",
+	fAbout = new TDEAboutData("recordConduit",
 		I18N_NOOP("Record Conduit for KPilot"),
 		KPILOT_VERSION,
 		I18N_NOOP("Configures the Record Conduit for KPilot"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(C) 2005, Adriaan de Groot");
 	fAbout->addAuthor("Adriaan de Groot",
 		I18N_NOOP("Primary Author"),
diff --git a/conduits/sysinfoconduit/sysinfo-setup.cc b/conduits/sysinfoconduit/sysinfo-setup.cc
index 7818e09..2eef06f 100644
--- a/conduits/sysinfoconduit/sysinfo-setup.cc
+++ b/conduits/sysinfoconduit/sysinfo-setup.cc
@@ -91,11 +91,11 @@ SysInfoWidgetConfig::SysInfoWidgetConfig(TQWidget *w, const char *n) :
 {
 	FUNCTIONSETUP;
 
-	KAboutData *fAbout = new KAboutData("SysInfoConduit",
+	TDEAboutData *fAbout = new TDEAboutData("SysInfoConduit",
 		I18N_NOOP("KPilot System Information conduit"),
 		KPILOT_VERSION,
 		I18N_NOOP("Retrieves System, Hardware, and User Info from the Handheld and stores them to a file."),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(C) 2003, Reinhold Kainhofer");
 	fAbout->addAuthor("Reinhold Kainhofer",
 		I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");
diff --git a/conduits/timeconduit/time-setup.cc b/conduits/timeconduit/time-setup.cc
index 409cdc3..8da1b7b 100644
--- a/conduits/timeconduit/time-setup.cc
+++ b/conduits/timeconduit/time-setup.cc
@@ -42,13 +42,13 @@
 
 
 
-static KAboutData *createAbout()
+static TDEAboutData *createAbout()
 {
-	KAboutData *fAbout = new KAboutData("Timeconduit",
+	TDEAboutData *fAbout = new TDEAboutData("Timeconduit",
 		I18N_NOOP("Time Synchronization Conduit for KPilot"),
 		KPILOT_VERSION,
 		I18N_NOOP("Synchronizes the Time on the Handheld and the PC"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(C) 2002, Reinhold Kainhofer");
 	fAbout->addAuthor("Reinhold Kainhofer",
 		I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");
diff --git a/conduits/timeconduit/time-setup.h b/conduits/timeconduit/time-setup.h
index 7089624..06f2522 100644
--- a/conduits/timeconduit/time-setup.h
+++ b/conduits/timeconduit/time-setup.h
@@ -32,7 +32,7 @@
 #include "plugin.h"
 
 class TimeWidget;
-class KAboutData;
+class TDEAboutData;
 
 class TimeWidgetConfig : public ConduitConfigBase
 {
@@ -45,7 +45,7 @@ public:
 	static ConduitConfigBase *create(TQWidget *,const char *);
 protected:
 	TimeWidget *fConfigWidget;
-	KAboutData *fAbout;
+	TDEAboutData *fAbout;
 } ;
 
 #endif
diff --git a/conduits/vcalconduit/todo-setup.cc b/conduits/vcalconduit/todo-setup.cc
index 19a731c..f6a00e2 100644
--- a/conduits/vcalconduit/todo-setup.cc
+++ b/conduits/vcalconduit/todo-setup.cc
@@ -43,11 +43,11 @@ ToDoWidgetSetup::ToDoWidgetSetup(TQWidget *w, const char *n) :
 {
 	FUNCTIONSETUP;
 	fConduitName = i18n("To-do");
-	KAboutData *fAbout = new KAboutData("todoConduit",
+	TDEAboutData *fAbout = new TDEAboutData("todoConduit",
 		I18N_NOOP("To-do Conduit for KPilot"),
 		KPILOT_VERSION,
 		I18N_NOOP("Configures the To-do Conduit for KPilot"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(C) 2001, Adriaan de Groot\n(C) 2002-2003, Reinhold Kainhofer");
 	fAbout->addAuthor("Dan Pilone",
 		I18N_NOOP("Original Author"));
diff --git a/conduits/vcalconduit/vcal-setup.cc b/conduits/vcalconduit/vcal-setup.cc
index 0361c32..f103b4c 100644
--- a/conduits/vcalconduit/vcal-setup.cc
+++ b/conduits/vcalconduit/vcal-setup.cc
@@ -40,11 +40,11 @@
 VCalWidgetSetup::VCalWidgetSetup(TQWidget *w, const char *n) :
 	VCalWidgetSetupBase(w,n)
 {
-	KAboutData *fAbout = new KAboutData("vcalConduit",
+	TDEAboutData *fAbout = new TDEAboutData("vcalConduit",
 		I18N_NOOP("VCal Conduit for KPilot"),
 		KPILOT_VERSION,
 		I18N_NOOP("Configures the VCal Conduit for KPilot"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(C) 2001, Adriaan de Groot\n(C) 2002-2003, Reinhold Kainhofer");
 	fAbout->addAuthor("Adriaan de Groot",
 		I18N_NOOP("Maintainer"),
diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc
index edec208..d3722f2 100644
--- a/kpilot/kpilot.cc
+++ b/kpilot/kpilot.cc
@@ -1012,10 +1012,10 @@ int main(int argc, char **argv)
 {
 	FUNCTIONSETUP;
 
-	KAboutData about("kpilot", I18N_NOOP("KPilot"),
+	TDEAboutData about("kpilot", I18N_NOOP("KPilot"),
 		KPILOT_VERSION,
 		"KPilot - HotSync software for TDE\n\n",
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(c) 1998-2000,2001, Dan Pilone (c) 2000-2006, Adriaan de Groot",
 		0L,
 		"http://www.kpilot.org/"
diff --git a/kpilot/main-test.cc b/kpilot/main-test.cc
index fd8614e..d816eeb 100644
--- a/kpilot/main-test.cc
+++ b/kpilot/main-test.cc
@@ -343,11 +343,11 @@ int main(int argc, char **argv)
 	debug_level = 1;
 #endif
 	FUNCTIONSETUP;
-	KAboutData about("kpilotTest",
+	TDEAboutData about("kpilotTest",
 		I18N_NOOP("KPilotTest"),
 		KPILOT_VERSION,
 		"KPilot Tester",
-		KAboutData::License_GPL, "(C) 2001-2004, Adriaan de Groot");
+		TDEAboutData::License_GPL, "(C) 2001-2004, Adriaan de Groot");
 	about.addAuthor("Adriaan de Groot",
 		I18N_NOOP("KPilot Maintainer"),
 		"groot@kde.org", "http://www.kpilot.org/");
diff --git a/kpilot/pilotDaemon.cc b/kpilot/pilotDaemon.cc
index 70e08d0..38825e5 100644
--- a/kpilot/pilotDaemon.cc
+++ b/kpilot/pilotDaemon.cc
@@ -75,7 +75,7 @@
 
 #include "pilotDaemon.moc"
 
-static KAboutData *aboutData = 0L;
+static TDEAboutData *aboutData = 0L;
 
 PilotDaemonTray::PilotDaemonTray(PilotDaemon * p) :
 	KSystemTray(0, "pilotDaemon"),
@@ -1307,11 +1307,11 @@ int main(int argc, char **argv)
 
 	KLocale::setMainCatalogue("kpilot");
 
-	KAboutData about("kpilotDaemon",
+	TDEAboutData about("kpilotDaemon",
 		I18N_NOOP("KPilot Daemon"),
 		KPILOT_VERSION,
 		"KPilot - HotSync software for TDE\n\n",
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		"(c) 1998-2000,2001, Dan Pilone (c) 2000-2004, Adriaan de Groot",
 		0L,
 		"http://www.kpilot.org/"
diff --git a/lib/plugin.cc b/lib/plugin.cc
index afa0fd5..0e61b32 100644
--- a/lib/plugin.cc
+++ b/lib/plugin.cc
@@ -108,7 +108,7 @@ ConduitConfigBase::~ConduitConfigBase()
 	return true;
 }
 
-TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
+TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, TDEAboutData *ad)
 {
 	FUNCTIONSETUP;
 
@@ -117,7 +117,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
 	TQString s;
 	TQLabel *text;
 	KIconLoader *l = KGlobal::iconLoader();
-	const KAboutData *p = ad ? ad : KGlobal::instance()->aboutData();
+	const TDEAboutData *p = ad ? ad : KGlobal::instance()->aboutData();
 
 	TQGridLayout *grid = new TQGridLayout(w, 5, 4, SPACING);
 
@@ -251,7 +251,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
 }
 
 /* static */ void ConduitConfigBase::addAboutPage(TQTabWidget *tw,
-	KAboutData *ad)
+	TDEAboutData *ad)
 {
 	FUNCTIONSETUP;
 
diff --git a/lib/plugin.h b/lib/plugin.h
index 33cdee4..57761b2 100644
--- a/lib/plugin.h
+++ b/lib/plugin.h
@@ -43,7 +43,7 @@
 
 
 class TQTabWidget;
-class KAboutData;
+class TDEAboutData;
 class KLibrary;
 
 class PilotDatabase;
@@ -137,11 +137,11 @@ public:
 	* "About".
 	*
 	* @param w The tab widget to which the about page is added.
-	* @param data The KAboutData that is used.
+	* @param data The TDEAboutData that is used.
 	*
 	*/
 	static  void addAboutPage(TQTabWidget *w,
-		KAboutData *data=0L);
+		TDEAboutData *data=0L);
 
 	/**
 	* This creates the actual about widget. Again, public & static so
@@ -153,9 +153,9 @@ public:
 	* anywhere. Copied from KAboutDialog, mostly.
 	*
 	* @param parent The widget that holds the about widget.
-	* @param data The KAboutData that is used to populate the widget.
+	* @param data The TDEAboutData that is used to populate the widget.
 	*/
-	static TQWidget *aboutPage(TQWidget *parent, KAboutData *data=0L);
+	static TQWidget *aboutPage(TQWidget *parent, TDEAboutData *data=0L);
 
 protected:
 	/**
@@ -433,7 +433,7 @@ namespace PluginUtility
 *
 *
 * <pre>
-* 	static KAboutData *about() { return fAbout; } ;
+* 	static TDEAboutData *about() { return fAbout; } ;
 * </pre>
 *
 *
@@ -454,8 +454,8 @@ namespace PluginUtility
 * by about() above.
 *
 * <pre>
-* 	KInstance *fInstance;
-* 	static KAboutData *fAbout;
+* 	TDEInstance *fInstance;
+* 	static TDEAboutData *fAbout;
 * } ;
 * </pre>
 *
diff --git a/lib/pluginfactory.h b/lib/pluginfactory.h
index dbbe2ec..1afdf8c 100644
--- a/lib/pluginfactory.h
+++ b/lib/pluginfactory.h
@@ -47,7 +47,7 @@ template <class Widget, class Action> class ConduitFactory : public KLibFactory
 public:
 	ConduitFactory(TQObject *parent = 0, const char *name = 0) :
 		KLibFactory(parent,name)
-		{ fInstance = new KInstance(name); } ;
+		{ fInstance = new TDEInstance(name); } ;
 	virtual ~ConduitFactory()
 		{ delete fInstance; } ;
 
@@ -91,7 +91,7 @@ protected:
 		return 0L;
 	}
 
-	KInstance *fInstance;
+	TDEInstance *fInstance;
 } ;
 
 #endif
diff --git a/tests/exportdatebook.cc b/tests/exportdatebook.cc
index f3c602b..7034341 100644
--- a/tests/exportdatebook.cc
+++ b/tests/exportdatebook.cc
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
 
 	TDEApplication::disableAutoDcopRegistration();
 
-	KAboutData aboutData("exportdatebook","Emport Date Book","0.1");
+	TDEAboutData aboutData("exportdatebook","Emport Date Book","0.1");
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/tests/importaddresses.cc b/tests/importaddresses.cc
index c4f321e..74e4652 100644
--- a/tests/importaddresses.cc
+++ b/tests/importaddresses.cc
@@ -55,7 +55,7 @@ static const KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-	KAboutData aboutData("importaddresses","Import Address Book","0.1");
+	TDEAboutData aboutData("importaddresses","Import Address Book","0.1");
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/tests/importdatebook.cc b/tests/importdatebook.cc
index 9128afc..24281c0 100644
--- a/tests/importdatebook.cc
+++ b/tests/importdatebook.cc
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
 {
 	TDEApplication::disableAutoDcopRegistration();
 
-	KAboutData aboutData("importdatebook","Import Date Book","0.1");
+	TDEAboutData aboutData("importdatebook","Import Date Book","0.1");
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/tests/mergecalendars.cc b/tests/mergecalendars.cc
index 04d87be..c499a7d 100644
--- a/tests/mergecalendars.cc
+++ b/tests/mergecalendars.cc
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
 
 	TDEApplication::disableAutoDcopRegistration();
 
-	KAboutData aboutData("mergecalendars","Merge libkcal Calendars","0.1");
+	TDEAboutData aboutData("mergecalendars","Merge libkcal Calendars","0.1");
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/tests/testaddress.cc b/tests/testaddress.cc
index da00c65..318de98 100644
--- a/tests/testaddress.cc
+++ b/tests/testaddress.cc
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 {
 	TDEApplication::disableAutoDcopRegistration();
 
-	KAboutData aboutData("testaddress","Test Addresses","0.1");
+	TDEAboutData aboutData("testaddress","Test Addresses","0.1");
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/tests/testcategories.cc b/tests/testcategories.cc
index 83b8a7b..eb4728e 100644
--- a/tests/testcategories.cc
+++ b/tests/testcategories.cc
@@ -156,7 +156,7 @@ int main(int argc, char **argv)
 {
 	TDEApplication::disableAutoDcopRegistration();
 
-	KAboutData aboutData("testcategories","Test Categories","0.1");
+	TDEAboutData aboutData("testcategories","Test Categories","0.1");
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/tests/testdatabase.cc b/tests/testdatabase.cc
index 6986541..123eb2c 100644
--- a/tests/testdatabase.cc
+++ b/tests/testdatabase.cc
@@ -255,7 +255,7 @@ int main(int argc, char **argv)
 {
 	TDEApplication::disableAutoDcopRegistration();
 
-	KAboutData aboutData("testdatabase","Test Databases","0.1");
+	TDEAboutData aboutData("testdatabase","Test Databases","0.1");
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/tests/testdatebook.cc b/tests/testdatebook.cc
index 87c9b49..0335867 100644
--- a/tests/testdatebook.cc
+++ b/tests/testdatebook.cc
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 {
 	TDEApplication::disableAutoDcopRegistration();
 
-	KAboutData aboutData("testdatebook","Test Date Book","0.1");
+	TDEAboutData aboutData("testdatebook","Test Date Book","0.1");
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/tests/testidmapper.cc b/tests/testidmapper.cc
index 7365ccb..d5e460e 100644
--- a/tests/testidmapper.cc
+++ b/tests/testidmapper.cc
@@ -287,7 +287,7 @@ bool test7()
 int main(int argc, char **argv)
 {
 	TDEApplication::disableAutoDcopRegistration();
-	KAboutData aboutData("testidmapper","Test IDMapper","0.1");
+	TDEAboutData aboutData("testidmapper","Test IDMapper","0.1");
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 
 	TDEApplication app( false, false );