diff --git a/ark/main.cpp b/ark/main.cpp
index f5281c8..b010124 100644
--- a/ark/main.cpp
+++ b/ark/main.cpp
@@ -45,7 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // ark includes
 #include "arkapp.h"
 
-static KCmdLineOptions option[] =
+static TDECmdLineOptions option[] =
 {
     { "extract", I18N_NOOP( "Open extract dialog, quit when finished" ), 0 },
     { "extract-to", I18N_NOOP( "Extract 'archive' to 'folder'. Quit when finished.\n"
@@ -59,7 +59,7 @@ static KCmdLineOptions option[] =
     { "+[folder]", I18N_NOOP( "Folder to extract to" ), 0 },
     { "+[files]", I18N_NOOP( "Files to be added" ), 0 },
     { "+[archive]", I18N_NOOP( "Open 'archive'" ), 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 extern "C" KDE_EXPORT int kdemain( int argc, char *argv[]  )
diff --git a/kdessh/kdessh.cpp b/kdessh/kdessh.cpp
index 0f48f1a..6a010d3 100644
--- a/kdessh/kdessh.cpp
+++ b/kdessh/kdessh.cpp
@@ -33,7 +33,7 @@
 
 #include "sshdlg.h"
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "+host", I18N_NOOP("Specifies the remote host"), 0 },
     { "+command", I18N_NOOP("The command to run"), 0 },
@@ -42,7 +42,7 @@ static KCmdLineOptions options[] =
     { "n", I18N_NOOP("Do not keep password"), 0 },
     { "q", I18N_NOOP("Stop the daemon (forgets all passwords)"), 0 },
     { "t", I18N_NOOP("Enable terminal output (no password keeping)"), 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index 94559d1..8145e15 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -49,9 +49,9 @@ static const char description[] =
 
 static const char version[] = "0.2";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 /*****************************************************************************/
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index 4e81d04..cd5dbeb 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -1252,11 +1252,11 @@ void TopLevel::toggle_overwrite(){
 
 static const char description[] = I18N_NOOP("TDE text editor");
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
 	{ "encoding <encoding>", I18N_NOOP("Encoding to use for the following documents"), 0 },
 	{ "+file", I18N_NOOP("File or URL to open"), 0 },
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 extern "C" KDE_EXPORT int kdemain (int argc, char **argv)
diff --git a/kfloppy/main.cpp b/kfloppy/main.cpp
index 0fdf949..2a49da3 100644
--- a/kfloppy/main.cpp
+++ b/kfloppy/main.cpp
@@ -33,10 +33,10 @@
 static const char description[] =
 	I18N_NOOP("TDE Floppy Disk Utility");
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
 	{ "+[device]", I18N_NOOP("Default device"), 0 },
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 int main( int argc, char *argv[] )
diff --git a/kgpg/main.cpp b/kgpg/main.cpp
index a440b32..0d0e635 100644
--- a/kgpg/main.cpp
+++ b/kgpg/main.cpp
@@ -31,7 +31,7 @@ static const char description[] =
 
 static const char version[] = "1.2.2";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
         {
                 { "e", I18N_NOOP("Encrypt file"), 0 },
                 { "k", I18N_NOOP("Open key manager"), 0 },
@@ -40,7 +40,7 @@ static KCmdLineOptions options[] =
                 { "V", I18N_NOOP("Verify signature"), 0 },
                 { "X", I18N_NOOP("Shred file"), 0 },
                 { "+[File]", I18N_NOOP("File to open"), 0 },
-                KCmdLineLastOption
+                TDECmdLineLastOption
                 // INSERT YOUR COMMANDLINE OPTIONS HERE
         };
 
diff --git a/khexedit/main.cc b/khexedit/main.cc
index 0f5e644..d687ce9 100644
--- a/khexedit/main.cc
+++ b/khexedit/main.cc
@@ -35,11 +35,11 @@ static const char description[] =
 
 static const char version[] = APP_VERSION_STRING;
 
-static KCmdLineOptions option[] =
+static TDECmdLineOptions option[] =
 {
    { "offset <offset>", I18N_NOOP("Jump to 'offset'"), 0 },
    { "+[file(s)]", I18N_NOOP("File(s) to open"), 0 },
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 static uint parseDecimalOrHexadecimal( char *buf );
diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp
index f4215f0..e1c19b0 100644
--- a/superkaramba/src/main.cpp
+++ b/superkaramba/src/main.cpp
@@ -44,7 +44,7 @@ static const char *description =
 
 static const char *version = "0.42";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   // { "+[URL]", I18N_NOOP( "Document to open" ), 0 },
   // { "!nosystray", I18N_NOOP("Disable systray icon"), 0 },
diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp
index 7498b41..95a40a1 100644
--- a/superkaramba/src/taskbartest.cpp
+++ b/superkaramba/src/taskbartest.cpp
@@ -39,7 +39,7 @@ static const char *description =
 
 static const char *version = "0.17";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
     {
         //    { "+[URL]", I18N_NOOP( "Document to open" ), 0 },
         { "+file", I18N_NOOP("A required argument 'file'"), 0 },
diff --git a/tdewallet/main.cpp b/tdewallet/main.cpp
index 2279783..7d47c39 100644
--- a/tdewallet/main.cpp
+++ b/tdewallet/main.cpp
@@ -41,11 +41,11 @@ class MyApp : public KUniqueApplication {
 };
 
 int main(int argc, char **argv) {
-	static KCmdLineOptions options[] = {
+	static TDECmdLineOptions options[] = {
 		{"show", I18N_NOOP("Show window on startup"), 0},
 		{"tdewalletd", I18N_NOOP("For use by tdewalletd only"), 0},
 		{"+name", I18N_NOOP("A wallet name"), 0},
-		KCmdLineLastOption
+		TDECmdLineLastOption
 	};
 
 	TDEAboutData about("tdewalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1",