diff --git a/src/blackcore/application.h b/src/blackcore/application.h
index 1096fb7be..d558e3648 100644
--- a/src/blackcore/application.h
+++ b/src/blackcore/application.h
@@ -561,7 +561,7 @@ namespace BlackCore
         QCommandLineParser m_parser;                           //!< cmd parser
         QCommandLineOption m_cmdHelp {"help"};                 //!< help option
         QCommandLineOption m_cmdVersion {"version"};           //!< version option
-        QCommandLineOption m_cmdDBusAddress {"empty"};         //!< DBus address
+        QCommandLineOption m_cmdDBusAddress {"emptyDBus"};     //!< DBus address
         QCommandLineOption m_cmdDevelopment {"dev"};           //!< Development flag
         QCommandLineOption m_cmdSharedDir {"shared"};          //!< Shared directory
         QCommandLineOption m_cmdClearCache {"clearcache"};     //!< Clear cache
diff --git a/src/blackgui/guiapplication.h b/src/blackgui/guiapplication.h
index c10c9f2ce..cf7676137 100644
--- a/src/blackgui/guiapplication.h
+++ b/src/blackgui/guiapplication.h
@@ -281,10 +281,10 @@ namespace BlackGui
         int m_fontPointSize;       //!< current font size
         int m_minWidthChars  = -1; //!< min. width characters (based on current font metrics)
         int m_minHeightChars = -1; //!< min. height characters (based on current font metrics)
-        QCommandLineOption m_cmdWindowStateMinimized { "empty" }; //!< window state (minimized)
-        QCommandLineOption m_cmdWindowMode      { "empty" };      //!< window mode (flags: frameless ...)
-        QCommandLineOption m_cmdWindowSizeReset { "empty" };      //!< window size reset
-        QCommandLineOption m_cmdWindowScaleSize { "empty" };      //!< window scale size
+        QCommandLineOption m_cmdWindowStateMinimized { "emptyMinimized" }; //!< window state (minimized)
+        QCommandLineOption m_cmdWindowMode      { "emptyWindowMode" };     //!< window mode (flags: frameless ...)
+        QCommandLineOption m_cmdWindowSizeReset { "emptySizeReset" };      //!< window size reset
+        QCommandLineOption m_cmdWindowScaleSize { "emptyScale" };          //!< window scale size
         CStyleSheetUtility m_styleSheetUtility {{}, this};        //!< style sheet utility
         bool m_uiSetupCompleted = false;                          //!< ui setup completed
         bool m_saveMainWidgetState = true;                        //!< save/restore main widget's state