diff --git a/doc/kommander/extending.docbook b/doc/kommander/extending.docbook
index 8425dd82..039d1b48 100644
--- a/doc/kommander/extending.docbook
+++ b/doc/kommander/extending.docbook
@@ -234,7 +234,7 @@ QString AboutDialog::handleDCOP(int function, const QStringList& args)
     {
       if (m_aboutData)
       {        
-        KAboutApplication dialog(m_aboutData, this);
+        TDEAboutApplication dialog(m_aboutData, this);
         dialog.exec();
       }
       break;
diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp
index 2d233666..62f72fbc 100644
--- a/klinkstatus/src/klinkstatus_part.cpp
+++ b/klinkstatus/src/klinkstatus_part.cpp
@@ -160,7 +160,7 @@ void KLinkStatusPart::slotAbout()
 {
     if(m_dlgAbout == 0)
     {
-        m_dlgAbout = new KAboutApplication(createAboutData(), tabwidget_, "about_app");
+        m_dlgAbout = new TDEAboutApplication(createAboutData(), tabwidget_, "about_app");
         if(m_dlgAbout == 0)
             return;
     }
diff --git a/klinkstatus/src/klinkstatus_part.h b/klinkstatus/src/klinkstatus_part.h
index 58ee4833..c2e14d36 100644
--- a/klinkstatus/src/klinkstatus_part.h
+++ b/klinkstatus/src/klinkstatus_part.h
@@ -31,7 +31,7 @@ class TQPainter;
 
 class KURL;
 class TDEAboutData;
-class KAboutApplication;
+class TDEAboutApplication;
 class TDEAction;
 
 class KLinkStatusPart: public KParts::ReadOnlyPart
@@ -82,7 +82,7 @@ private:
     ActionManager* action_manager_;
 
     TabWidgetSession* tabwidget_;
-    KAboutApplication* m_dlgAbout;
+    TDEAboutApplication* m_dlgAbout;
 };
 
 #endif // _KLINKSTATUSPART_H_
diff --git a/kommander/ChangeLog b/kommander/ChangeLog
index 4813f4d9..9998c15f 100644
--- a/kommander/ChangeLog
+++ b/kommander/ChangeLog
@@ -219,7 +219,7 @@ Sun 14 Nov 2004 22:39:38 CET - Michal Rudolf <mrudolf@tdewebdev.org>
 	o massive cleanup and KDE-ification of Editor
 	o most actions converted to TDEActions, some were standarized
 	o some obsolete dialogs removed
-	o About dialog changed to use KAboutDialog
+	o About dialog changed to use TDEAboutDialog
 
 Wed 03 Nov 2004 14:28:39 CET - Michal Rudolf <mrudolf@tdewebdev.org>
 	o fix some problems detected by kdetestsscripts
diff --git a/kommander/Kommander-TODO.kno b/kommander/Kommander-TODO.kno
index 9f5f352c..4207a210 100644
--- a/kommander/Kommander-TODO.kno
+++ b/kommander/Kommander-TODO.kno
@@ -206,7 +206,7 @@
 <li><span style="color:#ffff00">Code completion? If easy to do, otherwise we recommend users try the Kate completion plugin</span></li>
 <li><span style="color:#ffff00">D&amp;D of text/selection data</span></li>
 <li>simple DCOP functions in editor to enable Kommander based tools to call the editor and open a dialog to edit - otherwise any interfaces can at least make use of D&amp;D from file manager (KPart) views</li>
-<li><span style="color:#ff0000">Additional XML fields in dialog for author name, version of Kommander required, etc... - not required as KAbout would be better</span></li></ul>
+<li><span style="color:#ff0000">Additional XML fields in dialog for author name, version of Kommander required, etc... - not required as TDEAbout would be better</span></li></ul>
 </body></html>
 
 \NewEntry 1 Bugs to squish
diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index 66056c90..f345806e 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -228,7 +228,7 @@ void AboutDialog::execute()
 {
   if (m_aboutData)
   {        
-    KAboutApplication dialog(m_aboutData, this);
+    TDEAboutApplication dialog(m_aboutData, this);
     dialog.exec();
   }
 }
@@ -281,7 +281,7 @@ TQString AboutDialog::handleDCOP(int function, const TQStringList& args)
     {
       if (m_aboutData)
       {        
-        KAboutApplication dialog(m_aboutData, this);
+        TDEAboutApplication dialog(m_aboutData, this);
         dialog.exec();
       }
       break;
diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h
index 079ef849..d22771ea 100644
--- a/kommander/widgets/aboutdialog.h
+++ b/kommander/widgets/aboutdialog.h
@@ -15,7 +15,7 @@
 #include <tqlabel.h>
 #include <kommanderwidget.h>
 
-class KAboutApplication;
+class TDEAboutApplication;
 class TDEAboutData;
 
 /**
diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index 36f41cb8..f0ef5666 100644
--- a/tdefilereplace/tdefilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -431,7 +431,7 @@ void KFileReplacePart::slotOptionPreferences()
 
 void KFileReplacePart::showAboutApplication()
 {
-  m_aboutDlg = new KAboutApplication(createAboutData(), (TQWidget *)0, (const char *)0, false);
+  m_aboutDlg = new TDEAboutApplication(createAboutData(), (TQWidget *)0, (const char *)0, false);
   if(m_aboutDlg == 0)
     return;
 
diff --git a/tdefilereplace/tdefilereplacepart.h b/tdefilereplace/tdefilereplacepart.h
index bc507088..4ab3ab3b 100644
--- a/tdefilereplace/tdefilereplacepart.h
+++ b/tdefilereplace/tdefilereplacepart.h
@@ -19,7 +19,7 @@
 
 // KDE
 #include <tdeparts/part.h>
-class KAboutApplication;
+class TDEAboutApplication;
 class TDEAboutData;
 class TDEConfig;
 
@@ -39,7 +39,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart
     TQWidget* m_parentWidget,
            * m_w;
     TDEConfig* m_config;
-    KAboutApplication* m_aboutDlg;
+    TDEAboutApplication* m_aboutDlg;
     KeyValueMap m_replacementMap;
     RCOptions* m_option;
     bool m_stop,