diff --git a/kdict/main.cpp b/kdict/main.cpp
index 55b6899d..91a8d18d 100644
--- a/kdict/main.cpp
+++ b/kdict/main.cpp
@@ -20,12 +20,12 @@
 #include "application.h"
 #include "toplevel.h"
 
-static KCmdLineOptions knoptions[] =
+static TDECmdLineOptions knoptions[] =
 {
   { "c", 0, 0 },
   { "clipboard", I18N_NOOP("Define X11-clipboard content (selected text)"), 0 },
   { "+[word/phrase]", I18N_NOOP("Lookup the given word/phrase"), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 
diff --git a/kget/main.cpp b/kget/main.cpp
index 824bd9e6..5c107ec3 100644
--- a/kget/main.cpp
+++ b/kget/main.cpp
@@ -47,10 +47,10 @@ static const char description[] = I18N_NOOP("An advanced download manager for TD
 static const char version[] = KGETVERSION;
 
 
-static KCmdLineOptions option[] = {
+static TDECmdLineOptions option[] = {
                                       { "showDropTarget", I18N_NOOP("Start KGet with drop target"), 0 },
                                       {"+[URL(s)]", I18N_NOOP("URL(s) to download"), 0},
-                                      KCmdLineLastOption
+                                      TDECmdLineLastOption
                                   };
 
 static void cleanup(void);
diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp
index ae9c97b8..3a2b4bd5 100644
--- a/knewsticker/knewstickerstub/knewstickerstub.cpp
+++ b/knewsticker/knewstickerstub/knewstickerstub.cpp
@@ -25,11 +25,11 @@ static const char version[] = "0.3";
 static const char description[] = I18N_NOOP("A frontend to the KNewsTicker configuration");
 static const char copyright[] = I18N_NOOP("(c)2000, 2001 Frerich Raabe");
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
 	{"a", 0, 0},
 	{"addrdf <url>", I18N_NOOP("Add the RDF/RSS file referenced by <url>"), 0},
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 int main(int argc, char **argv)
diff --git a/kopete/kopete/main.cpp b/kopete/kopete/main.cpp
index 679277ad..27870226 100644
--- a/kopete/kopete/main.cpp
+++ b/kopete/kopete/main.cpp
@@ -29,7 +29,7 @@
 static const char description[] =
 	I18N_NOOP( "Kopete, the TDE Instant Messenger" );
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
 	{ "noplugins",              I18N_NOOP( "Do not load plugins. This option overrides all other options." ), 0 },
 	{ "noconnect",              I18N_NOOP( "Disable auto-connection" ), 0 },
@@ -44,7 +44,7 @@ static KCmdLineOptions options[] =
 //	{ "url <url>",              I18N_NOOP( "Load the given Kopete URL" ), 0 },
 //	{ "!+[plugin]",            I18N_NOOP( "Load specified plugins" ), 0 },
 	{ "!+[URL]",                 I18N_NOOP("URLs to pass to kopete / emoticon themes to install"), 0},
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 int main( int argc, char *argv[] )
diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
index 63c9929d..45f0b0f9 100644
--- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp
+++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
@@ -30,14 +30,14 @@
 
 static TQTextStream _out( stdout, IO_WriteOnly );
 
-static KCmdLineOptions opts[] =
+static TDECmdLineOptions opts[] =
 {
  { "id <id>", I18N_NOOP("Config group to store password in"), "TestAccount" },
  { "set <new>", I18N_NOOP("Set password to new"), 0 },
  { "error", I18N_NOOP("Claim password was erroneous"), 0 },
  { "prompt <prompt>", I18N_NOOP("Password prompt"), "Enter a password" },
  { "image <filename>", I18N_NOOP("Image to display in password dialog"), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
 };
 
 using namespace Kopete;
diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp
index 74380115..953124b0 100644
--- a/kopete/libkopete/tests/kopetewallettest_program.cpp
+++ b/kopete/libkopete/tests/kopetewallettest_program.cpp
@@ -63,7 +63,7 @@ int main( int argc, char *argv[] )
 {
 	TDEAboutData aboutData( "kopetewallettest", "kopetewallettest", "version" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
-	KCmdLineOptions opts[] = { {"+action",0,0}, KCmdLineLastOption };
+	TDECmdLineOptions opts[] = { {"+action",0,0}, TDECmdLineLastOption };
 	TDECmdLineArgs::addCmdLineOptions( opts );
 	TDEApplication app( "kopetewallettest" );
 
diff --git a/kopete/plugins/smpppdcs/unittest/main.cpp b/kopete/plugins/smpppdcs/unittest/main.cpp
index 5eda8cb2..eefcd731 100644
--- a/kopete/plugins/smpppdcs/unittest/main.cpp
+++ b/kopete/plugins/smpppdcs/unittest/main.cpp
@@ -25,7 +25,7 @@
 
 static const char description[] = I18N_NOOP("SMPPPDClientTests");
 static const char version[] = "0.1";
-static KCmdLineOptions options[] = { KCmdLineLastOption };
+static TDECmdLineOptions options[] = { TDECmdLineLastOption };
 
 int main( int argc, char** argv ) {
     TDEAboutData about("SMPPPDClientTests", I18N_NOOP("SMPPPDClientTests"), version, description,
diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp
index bdf55499..67f37cdf 100644
--- a/kppp/logview/main.cpp
+++ b/kppp/logview/main.cpp
@@ -39,10 +39,10 @@ static const char description[] =
 
 static const char version[] = "v0.0.2";
 
-static KCmdLineOptions option[] =
+static TDECmdLineOptions option[] =
 {
    { "kppp", I18N_NOOP("Run in KPPP mode"), 0 },
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 
diff --git a/kppp/main.cpp b/kppp/main.cpp
index f61b21ae..873a204d 100644
--- a/kppp/main.cpp
+++ b/kppp/main.cpp
@@ -65,7 +65,7 @@
 static const char description[] =
 	I18N_NOOP("A dialer and front-end to pppd");
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
    { "c <account_name>", I18N_NOOP("Connect using 'account_name'"), 0 },
    { "m <modem_name>", I18N_NOOP("Connect using 'modem_name'"), 0 },
@@ -74,7 +74,7 @@ static const KCmdLineOptions options[] =
    { "r <rule_file>", I18N_NOOP("Check syntax of rule_file"), 0 },
    { "T", I18N_NOOP("Enable test-mode"), 0 },
    { "dev <device_name>", I18N_NOOP("Use the specified device"), 0 },
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 
diff --git a/krdc/main.cpp b/krdc/main.cpp
index bb46c7d6..b856932d 100644
--- a/krdc/main.cpp
+++ b/krdc/main.cpp
@@ -45,7 +45,7 @@ KWallet::Wallet *wallet = 0;
 
 static const char description[] = I18N_NOOP("Remote desktop connection");
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
 	{ "f", 0, 0 },
 	{ "fullscreen", I18N_NOOP("Start in fullscreen mode"), 0 },
@@ -66,7 +66,7 @@ static KCmdLineOptions options[] =
 	{ "p", 0, 0 },
 	{ "password-file ", I18N_NOOP("Provide the password in a file"), 0 },
 	{ "+[host]", I18N_NOOP("The name of the host, e.g. 'localhost:1'"), 0 },
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 
diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp
index 36df4b2f..ee8fff85 100644
--- a/krfb/krfb/main.cpp
+++ b/krfb/krfb/main.cpp
@@ -47,10 +47,10 @@ static const char description[] = I18N_NOOP("VNC-compatible server to share "
 #define ARG_KINETD "kinetd"
 
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
 	{ ARG_KINETD " ", I18N_NOOP("Used for calling from kinetd"), 0},
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 void checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) {
diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp
index 1664f607..26de77de 100644
--- a/ksirc/ksirc.cpp
+++ b/ksirc/ksirc.cpp
@@ -35,14 +35,14 @@ static const char description[] =
 //TQDict<KSircTopLevel> TopList;
 //TQDict<KSircMessageReceiver> TopList;
 
-class KCmdLineOptions options[] =
+class TDECmdLineOptions options[] =
 {
     { "nick <nickname>", I18N_NOOP( "Nickname to use" ), 0 } ,
     { "server <server>", I18N_NOOP( "Server to connect to on startup" ), 0 },
     { "channel <#channel>", I18N_NOOP( "Channel to connect to on startup" ), 0 },
     { "o", 0, 0 },
     { "noautoconnect", I18N_NOOP( "Do not autoconnect on startup" ), 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 class KSircSessionManaged : public KSessionManaged
diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp
index 942c53dd..4c254b6c 100644
--- a/ktalkd/ktalkdlg/ktalkdlg.cpp
+++ b/ktalkd/ktalkdlg/ktalkdlg.cpp
@@ -60,11 +60,11 @@ class TimeoutDialog : public TQMessageBox {
             {TQT_TQOBJECT(this)->killTimers (); done (Rejected);}
 };
 
-static KCmdLineOptions option[] =
+static TDECmdLineOptions option[] =
 {
    { "+user@host", I18N_NOOP("Caller identification"), 0 },
    { "+[callee]", I18N_NOOP("Name of the callee, if he doesn't exist on this system (we're taking his call)"), 0 },
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 static const char description[] =
diff --git a/tdednssd/ioslave/dnssd.cpp b/tdednssd/ioslave/dnssd.cpp
index e33c810c..b8401b75 100644
--- a/tdednssd/ioslave/dnssd.cpp
+++ b/tdednssd/ioslave/dnssd.cpp
@@ -52,12 +52,12 @@
 
 #include "dnssd.h"
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
 	{ "+protocol", I18N_NOOP( "Protocol name" ), 0 },
 	{ "+pool", I18N_NOOP( "Socket name" ), 0 },
 	{ "+app", I18N_NOOP( "Socket name" ), 0 },
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 ZeroConfProtocol::ZeroConfProtocol(const TQCString& protocol, const TQCString &pool_socket, const TQCString &app_socket)
diff --git a/wifi/main.cpp b/wifi/main.cpp
index 5edc8a9f..b533f5b3 100644
--- a/wifi/main.cpp
+++ b/wifi/main.cpp
@@ -29,8 +29,8 @@ static const char description[] =
 I18N_NOOP ("KWiFiManager - Wireless LAN Manager for TDE");
 
 
-static KCmdLineOptions options[] = {
-  KCmdLineLastOption
+static TDECmdLineOptions options[] = {
+  TDECmdLineLastOption
 };
 
 int