diff --git a/doc/html/classUniqueApp.html b/doc/html/classUniqueApp.html
index 9c49d5d..e70f430 100644
--- a/doc/html/classUniqueApp.html
+++ b/doc/html/classUniqueApp.html
@@ -100,7 +100,7 @@ Destructor
 <div class="memdoc">
 
 <p>
-overloaded method of KUniqueApplication. Creates a new instance of kshowmail. 
+overloaded method of TDEUniqueApplication. Creates a new instance of kshowmail. 
 </div>
 </div><p>
 <hr><h2>Member Data Documentation</h2>
diff --git a/doc/html/kshowmail_8h-source.html b/doc/html/kshowmail_8h-source.html
index e6148f8..d344cac 100644
--- a/doc/html/kshowmail_8h-source.html
+++ b/doc/html/kshowmail_8h-source.html
@@ -48,7 +48,7 @@
 <a name="l00026"></a>00026 <span class="comment">// include files for KDE</span>
 <a name="l00027"></a>00027 <span class="preprocessor">#include &lt;tdeapplication.h&gt;</span>
 <a name="l00028"></a>00028 <span class="preprocessor">#include &lt;tdemainwindow.h&gt;</span>
-<a name="l00029"></a>00029 <span class="preprocessor">#include &lt;kuniqueapplication.h&gt;</span>
+<a name="l00029"></a>00029 <span class="preprocessor">#include &lt;tdeuniqueapplication.h&gt;</span>
 <a name="l00030"></a>00030 <span class="preprocessor">#include &lt;tdeaction.h&gt;</span>
 <a name="l00031"></a>00031 <span class="preprocessor">#include &lt;kstdaction.h&gt;</span>
 <a name="l00032"></a>00032 <span class="preprocessor">#include &lt;tdelocale.h&gt;</span>
diff --git a/doc/html/main_8cpp-source.html b/doc/html/main_8cpp-source.html
index 2f8c875..5dc0c40 100644
--- a/doc/html/main_8cpp-source.html
+++ b/doc/html/main_8cpp-source.html
@@ -35,7 +35,7 @@
 <a name="l00018"></a>00018 <span class="comment">//KDE-Header</span>
 <a name="l00019"></a>00019 <span class="preprocessor">#include &lt;tdecmdlineargs.h&gt;</span>
 <a name="l00020"></a>00020 <span class="preprocessor">#include &lt;tdeaboutdata.h&gt;</span>
-<a name="l00021"></a>00021 <span class="preprocessor">#include &lt;kuniqueapplication.h&gt;</span>
+<a name="l00021"></a>00021 <span class="preprocessor">#include &lt;tdeuniqueapplication.h&gt;</span>
 <a name="l00022"></a>00022 <span class="preprocessor">#include &lt;tdelocale.h&gt;</span>
 <a name="l00023"></a>00023 <span class="preprocessor">#include &lt;kdebug.h&gt;</span>
 <a name="l00024"></a>00024 
@@ -103,15 +103,15 @@
 <a name="l00086"></a>00086   kdDebug () &lt;&lt; <span class="stringliteral">"KShowmail running in normal mode"</span> &lt;&lt; endl;
 <a name="l00087"></a>00087 
 <a name="l00088"></a>00088   <span class="comment">//add special command line options for unique KDE applications</span>
-<a name="l00089"></a>00089   KUniqueApplication::addCmdLineOptions();
+<a name="l00089"></a>00089   TDEUniqueApplication::addCmdLineOptions();
 <a name="l00090"></a>00090 
 <a name="l00091"></a>00091   <span class="comment">//test whether the new application to start is unique</span>
-<a name="l00092"></a>00092   <span class="keywordflow">if</span> (KUniqueApplication::start())
+<a name="l00092"></a>00092   <span class="keywordflow">if</span> (TDEUniqueApplication::start())
 <a name="l00093"></a>00093   {
 <a name="l00094"></a>00094     <span class="comment">//yes, wa can start a unique kshowmail instance</span>
 <a name="l00095"></a>00095 
 <a name="l00096"></a>00096     <span class="comment">//create a new unique appliction</span>
-<a name="l00097"></a>00097     <span class="comment">//UniqueApp is a inherited class of KUniqueApplication</span>
+<a name="l00097"></a>00097     <span class="comment">//UniqueApp is a inherited class of TDEUniqueApplication</span>
 <a name="l00098"></a>00098     <span class="comment">//see uniqueapp.h</span>
 <a name="l00099"></a>00099     <a class="code" href="classUniqueApp.html">UniqueApp</a>* app = <span class="keyword">new</span> <a class="code" href="classUniqueApp.html">UniqueApp</a> ();
 <a name="l00100"></a>00100 
diff --git a/doc/html/uniqueapp_8h-source.html b/doc/html/uniqueapp_8h-source.html
index db0cadd..80be95c 100644
--- a/doc/html/uniqueapp_8h-source.html
+++ b/doc/html/uniqueapp_8h-source.html
@@ -43,7 +43,7 @@
 <a name="l00021"></a>00021 <span class="comment">//KDE-Header</span>
 <a name="l00022"></a>00022 <span class="preprocessor">#include &lt;twin.h&gt;</span>
 <a name="l00023"></a>00023 <span class="preprocessor">#include &lt;tdecmdlineargs.h&gt;</span>
-<a name="l00024"></a>00024 <span class="preprocessor">#include &lt;kuniqueapplication.h&gt;</span>
+<a name="l00024"></a>00024 <span class="preprocessor">#include &lt;tdeuniqueapplication.h&gt;</span>
 <a name="l00025"></a>00025 
 <a name="l00026"></a>00026 <span class="comment">//KShowMail-Header</span>
 <a name="l00027"></a>00027 <span class="preprocessor">#include "<a class="code" href="kshowmail_8h.html">kshowmail.h</a>"</span>
@@ -51,7 +51,7 @@
 <a name="l00029"></a>00029 
 <a name="l00030"></a>00030 <span class="keyword">using namespace </span>Constants;
 <a name="l00031"></a>00031 
-<a name="l00037"></a><a class="code" href="classUniqueApp.html">00037</a> <span class="keyword">class </span><a class="code" href="classUniqueApp.html">UniqueApp</a> : <span class="keyword">public</span> KUniqueApplication  {
+<a name="l00037"></a><a class="code" href="classUniqueApp.html">00037</a> <span class="keyword">class </span><a class="code" href="classUniqueApp.html">UniqueApp</a> : <span class="keyword">public</span> TDEUniqueApplication  {
 <a name="l00038"></a>00038 
 <a name="l00039"></a>00039 <span class="keyword">public</span>: 
 <a name="l00040"></a>00040   
diff --git a/kshowmail/kshowmail.h b/kshowmail/kshowmail.h
index 230dcf9..c590789 100644
--- a/kshowmail/kshowmail.h
+++ b/kshowmail/kshowmail.h
@@ -26,7 +26,7 @@
 // include files for KDE
 #include <tdeapplication.h>
 #include <tdemainwindow.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdelocale.h>
diff --git a/kshowmail/main.cpp b/kshowmail/main.cpp
index 8e5d96a..ed4b1fb 100644
--- a/kshowmail/main.cpp
+++ b/kshowmail/main.cpp
@@ -18,7 +18,7 @@
 //KDE-Header
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 
@@ -86,15 +86,15 @@ int main(int argc, char *argv[])
   kdDebug () << "KShowmail running in normal mode" << endl;
 
   //add special command line options for unique KDE applications
-  KUniqueApplication::addCmdLineOptions();
+  TDEUniqueApplication::addCmdLineOptions();
 
   //test whether the new application to start is unique
-  if (KUniqueApplication::start())
+  if (TDEUniqueApplication::start())
   {
     //yes, wa can start a unique kshowmail instance
 
     //create a new unique appliction
-    //UniqueApp is a inherited class of KUniqueApplication
+    //UniqueApp is a inherited class of TDEUniqueApplication
     //see uniqueapp.h
     UniqueApp* app = new UniqueApp ();
 
diff --git a/kshowmail/uniqueapp.h b/kshowmail/uniqueapp.h
index 331119e..5cbbbc6 100644
--- a/kshowmail/uniqueapp.h
+++ b/kshowmail/uniqueapp.h
@@ -21,7 +21,7 @@
 //KDE-Header
 #include <twin.h>
 #include <tdecmdlineargs.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 
 //KShowMail-Header
 #include "kshowmail.h"
@@ -34,7 +34,7 @@ using namespace Constants;
   * @author Eggert Ehmke
   */
 
-class UniqueApp : public KUniqueApplication  {
+class UniqueApp : public TDEUniqueApplication  {
 
 public: 
   
@@ -49,7 +49,7 @@ public:
   ~UniqueApp();
   
   /**
-  * overloaded method of KUniqueApplication. Creates a new instance of kshowmail.
+  * overloaded method of TDEUniqueApplication. Creates a new instance of kshowmail.
   */
   virtual int newInstance ();