diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index 8bd35024..5b0a8e2b 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -119,7 +119,7 @@ void KQApplication::slotSplashTimeout()
 }
 
 KQUniqueApplication::KQUniqueApplication()
- : KUniqueApplication()
+ : TDEUniqueApplication()
 {
   TDEGlobal::dirs()->addPrefix(PREFIX);
   dcopClient()->registerAs("quanta", false);
diff --git a/quanta/src/kqapp.h b/quanta/src/kqapp.h
index 625bdaf6..bc97576d 100644
--- a/quanta/src/kqapp.h
+++ b/quanta/src/kqapp.h
@@ -20,7 +20,7 @@
 #define KTQAPPLICATION_H
 
 #include <tqframe.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 
 class TDECmdLineArgs;
 class KSplashScreen;
@@ -62,7 +62,7 @@ class KQApplication : public TDEApplication, KQApplicationPrivate
     void slotSplashTimeout();
 };
 
-class KQUniqueApplication : public KUniqueApplication, KQApplicationPrivate
+class KQUniqueApplication : public TDEUniqueApplication, KQApplicationPrivate
 {
   TQ_OBJECT
   
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index 183b2149..07489b58 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
   for ( int i = 1; i < argc; i++ ) {
     if ( strcmp(argv[i], uniq) == 0 ) {
       isUnique = true;
-      KUniqueApplication::addCmdLineOptions(); // before calling parsedArgs!
+      TDEUniqueApplication::addCmdLineOptions(); // before calling parsedArgs!
       break;
     }
   }
@@ -196,8 +196,8 @@ int main(int argc, char *argv[])
   TDEApplication::disableAutoDcopRegistration();
 
   if (isUnique) {
-      KUniqueApplication::dcopClient()->registerAs("quanta-foo");
-      if (KUniqueApplication::dcopClient()->isApplicationRegistered("quanta"))
+      TDEUniqueApplication::dcopClient()->registerAs("quanta-foo");
+      if (TDEUniqueApplication::dcopClient()->isApplicationRegistered("quanta"))
       {
           TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
            for (int i = 0; i < args->count(); i++)
diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp
index 84679f0d..44a6d5f0 100644
--- a/quanta/utility/quantacommon.cpp
+++ b/quanta/utility/quantacommon.cpp
@@ -593,7 +593,7 @@ DCOPReply QuantaCommon::callDCOPMethod(const TQString& interface, const TQString
 {
   TQStringList argumentList = TQStringList::split(",", arguments, true);
   TQString app = "quanta";
-  if (!kapp->inherits("KUniqueApplication"))
+  if (!kapp->inherits("TDEUniqueApplication"))
   {
     pid_t pid = ::getpid();
     app += TQString("-%1").arg(pid);
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index 71eb0e41..ed5a9513 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -336,7 +336,7 @@ bool TagAction::slotActionActivated(TDEAction::ActivationReason reason, TQt::But
             }
 
             pid_t pid = ::getpid();
-            if (kapp->inherits("KUniqueApplication"))
+            if (kapp->inherits("TDEUniqueApplication"))
             {
                 command.replace("%pid", TQString("unique %1").arg(pid));
             } else
@@ -590,7 +590,7 @@ bool TagAction::slotActionActivated()
     }
 
     pid_t pid = ::getpid();
-    if (kapp->inherits("KUniqueApplication"))
+    if (kapp->inherits("TDEUniqueApplication"))
     {
       command.replace("%pid", TQString("unique %1").arg(pid));
     } else