diff --git a/kimagemapeditor/main.cpp b/kimagemapeditor/main.cpp
index 36ab97f6..be0c7b8a 100644
--- a/kimagemapeditor/main.cpp
+++ b/kimagemapeditor/main.cpp
@@ -28,7 +28,7 @@ static const char *description =
   I18N_NOOP("An HTML imagemap editor");
 
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "c", 0, 0 },
   { "stdout", I18N_NOOP("Write HTML-Code to stdout on exit"), 0 },
diff --git a/klinkstatus/src/main.cpp b/klinkstatus/src/main.cpp
index 55983fe3..5e75262c 100644
--- a/klinkstatus/src/main.cpp
+++ b/klinkstatus/src/main.cpp
@@ -35,10 +35,10 @@ static const char description[] =
 
 static const char version[] = "0.3.2";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
     {
         { "+[URL]", I18N_NOOP( "Document to open" ), 0 },
-        KCmdLineLastOption
+        TDECmdLineLastOption
     };
 
 int main(int argc, char *argv[])
diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index dad1f004..aee3a0ab 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -32,7 +32,7 @@ static const char *description =
 static const char *text =
   I18N_NOOP("Based on TQt Designer, (C) 2000 Trolltech AS.");
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "+file", I18N_NOOP("Dialog to open"), 0 },
   { 0, 0, 0 }
diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp
index 18dd256e..7dc1758a 100644
--- a/kommander/executor/main.cpp
+++ b/kommander/executor/main.cpp
@@ -45,12 +45,12 @@ static const char *description =
 	I18N_NOOP("Executor is a component of the Kommander dialog system that executes .kmdr files given as arguments or via stdin");
 // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "!stdin", I18N_NOOP("Read dialog from standard input"), 0},
   { "c <catalog>", I18N_NOOP("Use given catalog for translation"), 0},      
   { "+[file]", I18N_NOOP("Dialog to open"), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc, char *argv[])
diff --git a/kommander/pluginmanager/main.cpp b/kommander/pluginmanager/main.cpp
index 600febfa..d8857ce1 100644
--- a/kommander/pluginmanager/main.cpp
+++ b/kommander/pluginmanager/main.cpp
@@ -40,7 +40,7 @@ static const char *description =
 // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE
 
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "a", 0, 0},
   { "add <file>", I18N_NOOP("Register given library"), 0},      
@@ -50,7 +50,7 @@ static KCmdLineOptions options[] =
   { "check", I18N_NOOP("Check all installed plugins and remove those missing"), 0},
   { "l", 0, 0},
   { "list", I18N_NOOP("List all installed plugins"), 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc, char *argv[])
diff --git a/kxsldbg/main.cpp b/kxsldbg/main.cpp
index 29b286c7..0875794a 100644
--- a/kxsldbg/main.cpp
+++ b/kxsldbg/main.cpp
@@ -9,12 +9,12 @@ static const char *description =
     I18N_NOOP("A TDE KPart Application for xsldbg, an XSLT debugger");
 
 static const char *version = VERSION;
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
     { "+XSLSource", 	I18N_NOOP("XSL script to run"), 0},
     { "+XMLData",       I18N_NOOP("XML data to be transformed"), 0},
     { "+OutputFile",    I18N_NOOP("File to save results to"), 0},
-    KCmdLineLastOption // End of options.
+    TDECmdLineLastOption // End of options.
 };
 
 int main(int argc, char **argv)
diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp
index f1b678a3..cdf299ef 100644
--- a/kxsldbg/xsldbgmain.cpp
+++ b/kxsldbg/xsldbgmain.cpp
@@ -52,7 +52,7 @@ static const char *description = I18N_NOOP("A TDE console application for xsldbg
 
 static const char *version = VERSION;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
     { "shell",		I18N_NOOP("Start a shell"), 0},
     { "cd <path>",	I18N_NOOP("Path to change into before loading files"), 0},
@@ -96,7 +96,7 @@ static const KCmdLineOptions options[] =
     { "noautorestart", 	I18N_NOOP("Disable the automatic restarting of execution when current processing pass is complete"), 0},
     { "+XSLSource", 	I18N_NOOP("XSL script to run"), 0},
     { "+XMLData",       I18N_NOOP("XML data to be transformed"), 0},
-    KCmdLineLastOption // End of options.
+    TDECmdLineLastOption // End of options.
 };
 
 class XsldbgApp : public TDEApplication
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index 968ad81d..932b6d99 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -51,13 +51,13 @@ versions of Quanta. \
 
 static const char *developers = I18N_NOOP("The Quanta+ developers");
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "+[File]", I18N_NOOP("File to open"), 0 },
   { "unique", I18N_NOOP("Whether we start as a one-instance application"), 0 },
   { "nologo", I18N_NOOP("Do not show the nice logo during startup"), 0 },
   { "resetlayout", I18N_NOOP("Reset the layout of the user interface to the default"), 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
   // INSERT YOUR COMMANDLINE OPTIONS HERE
 };
 
diff --git a/tdefilereplace/main.cpp b/tdefilereplace/main.cpp
index 4b12eba0..673b431b 100644
--- a/tdefilereplace/main.cpp
+++ b/tdefilereplace/main.cpp
@@ -26,10 +26,10 @@ static const char description[] =
 
 static const char version[] = "0.1";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
     {
         { "+[PATH]", I18N_NOOP( "Starting folder" ), 0 },
-        KCmdLineLastOption
+        TDECmdLineLastOption
     };
 
 int main(int argc, char *argv[])