diff --git a/src/blackcore/context/context.h b/src/blackcore/context/context.h
index 0c11614d4..ddfa73cf0 100644
--- a/src/blackcore/context/context.h
+++ b/src/blackcore/context/context.h
@@ -50,7 +50,7 @@ namespace BlackCore
             //! Using local implementing object?
             bool isUsingImplementingObject() const
             {
-                return m_mode == CCoreFacadeConfig::Local || m_mode == CCoreFacadeConfig::LocalInDbusServer;
+                return m_mode == CCoreFacadeConfig::Local || m_mode == CCoreFacadeConfig::LocalInDBusServer;
             }
 
             //! Local or remote object?
diff --git a/src/blackcore/context/contextapplication.cpp b/src/blackcore/context/contextapplication.cpp
index 42240fedc..52725ea87 100644
--- a/src/blackcore/context/contextapplication.cpp
+++ b/src/blackcore/context/contextapplication.cpp
@@ -37,7 +37,7 @@ namespace BlackCore
             switch (mode)
             {
             case CCoreFacadeConfig::Local:
-            case CCoreFacadeConfig::LocalInDbusServer:
+            case CCoreFacadeConfig::LocalInDBusServer:
                 return (new CContextApplication(mode, parent))->registerWithDBus(server);
             case CCoreFacadeConfig::Remote:
                 return new CContextApplicationProxy(BlackMisc::CDBusServer::coreServiceName(), connection, mode, parent);
diff --git a/src/blackcore/context/contextapplicationimpl.cpp b/src/blackcore/context/contextapplicationimpl.cpp
index 259a3feff..4d6344ad0 100644
--- a/src/blackcore/context/contextapplicationimpl.cpp
+++ b/src/blackcore/context/contextapplicationimpl.cpp
@@ -34,7 +34,7 @@ namespace BlackCore
 
         CContextApplication *CContextApplication::registerWithDBus(BlackMisc::CDBusServer *server)
         {
-            if (!server || m_mode != CCoreFacadeConfig::LocalInDbusServer) { return this; }
+            if (!server || m_mode != CCoreFacadeConfig::LocalInDBusServer) { return this; }
             server->addObject(IContextApplication::ObjectPath(), this);
             return this;
         }
diff --git a/src/blackcore/context/contextaudio.cpp b/src/blackcore/context/contextaudio.cpp
index 233f65a6f..88eada105 100644
--- a/src/blackcore/context/contextaudio.cpp
+++ b/src/blackcore/context/contextaudio.cpp
@@ -50,7 +50,7 @@ namespace BlackCore
             switch (mode)
             {
             case CCoreFacadeConfig::Local:
-            case CCoreFacadeConfig::LocalInDbusServer:
+            case CCoreFacadeConfig::LocalInDBusServer:
                 return (new CContextAudio(mode, runtime))->registerWithDBus(server);
             case CCoreFacadeConfig::Remote:
                 return new CContextAudioProxy(BlackMisc::CDBusServer::coreServiceName(), conn, mode, runtime);
diff --git a/src/blackcore/context/contextaudioimpl.cpp b/src/blackcore/context/contextaudioimpl.cpp
index 24a94eaf3..d380c97ed 100644
--- a/src/blackcore/context/contextaudioimpl.cpp
+++ b/src/blackcore/context/contextaudioimpl.cpp
@@ -94,7 +94,7 @@ namespace BlackCore
 
         CContextAudio *CContextAudio::registerWithDBus(CDBusServer *server)
         {
-            if (!server || m_mode != CCoreFacadeConfig::LocalInDbusServer) { return this; }
+            if (!server || m_mode != CCoreFacadeConfig::LocalInDBusServer) { return this; }
             server->addObject(IContextAudio::ObjectPath(), this);
             return this;
         }
diff --git a/src/blackcore/context/contextnetwork.cpp b/src/blackcore/context/contextnetwork.cpp
index 3ecdbfa19..7f676b4a9 100644
--- a/src/blackcore/context/contextnetwork.cpp
+++ b/src/blackcore/context/contextnetwork.cpp
@@ -23,7 +23,7 @@ namespace BlackCore
             switch (mode)
             {
             case CCoreFacadeConfig::Local:
-            case CCoreFacadeConfig::LocalInDbusServer:
+            case CCoreFacadeConfig::LocalInDBusServer:
                 return (new CContextNetwork(mode, runtime))->registerWithDBus(server);
             case CCoreFacadeConfig::Remote:
                 return new CContextNetworkProxy(BlackMisc::CDBusServer::coreServiceName(), connection, mode, runtime);
diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp
index 1ddd6ae3c..c465152f6 100644
--- a/src/blackcore/context/contextnetworkimpl.cpp
+++ b/src/blackcore/context/contextnetworkimpl.cpp
@@ -94,7 +94,7 @@ namespace BlackCore
 
         CContextNetwork *CContextNetwork::registerWithDBus(BlackMisc::CDBusServer *server)
         {
-            if (!server || m_mode != CCoreFacadeConfig::LocalInDbusServer) return this;
+            if (!server || m_mode != CCoreFacadeConfig::LocalInDBusServer) return this;
             server->addObject(IContextNetwork::ObjectPath(), this);
             return this;
         }
diff --git a/src/blackcore/context/contextownaircraft.cpp b/src/blackcore/context/contextownaircraft.cpp
index 76fd73c6f..3f29b3a1e 100644
--- a/src/blackcore/context/contextownaircraft.cpp
+++ b/src/blackcore/context/contextownaircraft.cpp
@@ -30,7 +30,7 @@ namespace BlackCore
             switch (mode)
             {
             case CCoreFacadeConfig::Local:
-            case CCoreFacadeConfig::LocalInDbusServer:
+            case CCoreFacadeConfig::LocalInDBusServer:
                 return (new CContextOwnAircraft(mode, parent))->registerWithDBus(server);
             case CCoreFacadeConfig::Remote:
                 return new CContextOwnAircraftProxy(BlackMisc::CDBusServer::coreServiceName(), conn, mode, parent);
diff --git a/src/blackcore/context/contextownaircraftimpl.cpp b/src/blackcore/context/contextownaircraftimpl.cpp
index 2109c6d2e..9fecf8fc7 100644
--- a/src/blackcore/context/contextownaircraftimpl.cpp
+++ b/src/blackcore/context/contextownaircraftimpl.cpp
@@ -73,7 +73,7 @@ namespace BlackCore
 
         CContextOwnAircraft *CContextOwnAircraft::registerWithDBus(CDBusServer *server)
         {
-            if (!server || m_mode != CCoreFacadeConfig::LocalInDbusServer) return this;
+            if (!server || m_mode != CCoreFacadeConfig::LocalInDBusServer) return this;
             server->addObject(IContextOwnAircraft::ObjectPath(), this);
             return this;
         }
diff --git a/src/blackcore/context/contextsimulator.cpp b/src/blackcore/context/contextsimulator.cpp
index a434bd8e1..d21152eae 100644
--- a/src/blackcore/context/contextsimulator.cpp
+++ b/src/blackcore/context/contextsimulator.cpp
@@ -45,7 +45,7 @@ namespace BlackCore
             switch (mode)
             {
             case CCoreFacadeConfig::Local:
-            case CCoreFacadeConfig::LocalInDbusServer:
+            case CCoreFacadeConfig::LocalInDBusServer:
                 return (new CContextSimulator(mode, parent))->registerWithDBus(server);
             case CCoreFacadeConfig::Remote:
                 return new CContextSimulatorProxy(BlackMisc::CDBusServer::coreServiceName(), conn, mode, parent);
diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp
index 4c1b22e41..2e90d8a1c 100644
--- a/src/blackcore/context/contextsimulatorimpl.cpp
+++ b/src/blackcore/context/contextsimulatorimpl.cpp
@@ -70,7 +70,7 @@ namespace BlackCore
 
         CContextSimulator *CContextSimulator::registerWithDBus(CDBusServer *server)
         {
-            if (!server || this->m_mode != CCoreFacadeConfig::LocalInDbusServer) return this;
+            if (!server || this->m_mode != CCoreFacadeConfig::LocalInDBusServer) return this;
             server->addObject(CContextSimulator::ObjectPath(), this);
             return this;
         }
diff --git a/src/blackcore/corefacadeconfig.cpp b/src/blackcore/corefacadeconfig.cpp
index 4cd31d96b..72e505d1a 100644
--- a/src/blackcore/corefacadeconfig.cpp
+++ b/src/blackcore/corefacadeconfig.cpp
@@ -15,12 +15,12 @@ namespace BlackCore
     {
         return (
                    // those 3 should decide whether we are running the server
-                   this->m_network == LocalInDbusServer ||
-                   this->m_ownAircraft == LocalInDbusServer ||
-                   this->m_simulator == LocalInDbusServer ||
+                   this->m_network == LocalInDBusServer ||
+                   this->m_ownAircraft == LocalInDBusServer ||
+                   this->m_simulator == LocalInDBusServer ||
 
                    // added as work around
-                   this->m_audio == LocalInDbusServer
+                   this->m_audio == LocalInDBusServer
                );
     }
 
@@ -61,7 +61,7 @@ namespace BlackCore
     CCoreFacadeConfig CCoreFacadeConfig::remoteLocalAudio(const QString &dbusBootstrapAddress)
     {
         CCoreFacadeConfig cfg = CCoreFacadeConfig(CCoreFacadeConfig(CCoreFacadeConfig::Remote, dbusBootstrapAddress));
-        cfg.m_audio = CCoreFacadeConfig::LocalInDbusServer;
+        cfg.m_audio = CCoreFacadeConfig::LocalInDBusServer;
         return cfg;
     }
 
diff --git a/src/blackcore/corefacadeconfig.h b/src/blackcore/corefacadeconfig.h
index 3442646ac..e3dcdea60 100644
--- a/src/blackcore/corefacadeconfig.h
+++ b/src/blackcore/corefacadeconfig.h
@@ -27,7 +27,7 @@ namespace BlackCore
         {
             NotUsed,           //!< during shutdown or not used at all
             Local,             //!< in same process
-            LocalInDbusServer, //!< in same process, also registered in DBus, will be accessed by proxy objects too
+            LocalInDBusServer, //!< in same process, also registered in DBus, will be accessed by proxy objects too
             Remote             //!< proxy object
         };
 
@@ -72,7 +72,7 @@ namespace BlackCore
         ContextMode getModeSimulator() const { return this->m_simulator; }
 
         //! local settings?
-        bool hasLocalSettings() const { return this->m_settings == Local || this->m_settings == LocalInDbusServer; }
+        bool hasLocalSettings() const { return this->m_settings == Local || this->m_settings == LocalInDBusServer; }
 
         //! requires server (at least one in server)?
         bool requiresDBusSever() const;
diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp
index 184f99d60..8d0c282f1 100644
--- a/src/swiftguistandard/swiftguistd.cpp
+++ b/src/swiftguistandard/swiftguistd.cpp
@@ -391,7 +391,7 @@ void SwiftGuiStd::navigatorClosed()
     this->showNormal();
 }
 
-void SwiftGuiStd::verifyDataAvailability()
+void SwiftGuiStd::verifyModelSet()
 {
     const CSimulatorInfo sims = sGui->getIContextSimulator()->simulatorsWithInitializedModelSet();
     if (sims.isNoSimulator())
diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h
index d76f719aa..0d2c28716 100644
--- a/src/swiftguistandard/swiftguistd.h
+++ b/src/swiftguistandard/swiftguistd.h
@@ -246,8 +246,8 @@ private:
     //! Navigator dialog has been closed
     void navigatorClosed();
 
-    //! Checks if data such as model set etc. are available
-    void verifyDataAvailability();
+    //! Checks if model set is available
+    void verifyModelSet();
 
     //! The shared info objects have been loaded
     void sharedInfoObjectsLoaded();
diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp
index d0f4b5cd4..414a51d38 100644
--- a/src/swiftguistandard/swiftguistdinit.cpp
+++ b/src/swiftguistandard/swiftguistdinit.cpp
@@ -154,7 +154,7 @@ void SwiftGuiStd::init()
 
     emit sGui->startUpCompleted(true);
     m_init = true;
-    QTimer::singleShot(2500, this, &SwiftGuiStd::verifyDataAvailability);
+    QTimer::singleShot(2500, this, &SwiftGuiStd::verifyModelSet);
 
     if (!sGui->isNetworkAccessible())
     {