diff --git a/src/blackcore/context_runtime.cpp b/src/blackcore/context_runtime.cpp
index 921ce4d54..ff37989fe 100644
--- a/src/blackcore/context_runtime.cpp
+++ b/src/blackcore/context_runtime.cpp
@@ -230,7 +230,7 @@ namespace BlackCore
         if (this->getIContextSimulator())
         {
             disconnect(this->getIContextSimulator());
-            this->getIContextSimulator()->disconnectFrom();
+            this->getIContextSimulator()->disconnectFromSimulator();
             this->getIContextSimulator()->deleteLater();
             this->m_contextSimulator = nullptr;
         }
diff --git a/src/blackcore/context_simulator.h b/src/blackcore/context_simulator.h
index 8b7f2da7e..c5da15496 100644
--- a/src/blackcore/context_simulator.h
+++ b/src/blackcore/context_simulator.h
@@ -104,13 +104,13 @@ namespace BlackCore
         virtual bool canConnect() const = 0;
 
         //! Connect to simulator
-        virtual bool connectTo() = 0;
+        virtual bool connectToSimulator() = 0;
 
         //! Connect to simulator (asynchronous version)
-        virtual void asyncConnectTo() = 0;
+        virtual void asyncConnectToSimulator() = 0;
 
         //! Disconnect from simulator
-        virtual bool disconnectFrom() = 0;
+        virtual bool disconnectFromSimulator() = 0;
 
         //! Returns true when simulator is running / simulating
         virtual bool isSimulating() const = 0;
diff --git a/src/blackcore/context_simulator_impl.cpp b/src/blackcore/context_simulator_impl.cpp
index 628ec1600..4e33f56aa 100644
--- a/src/blackcore/context_simulator_impl.cpp
+++ b/src/blackcore/context_simulator_impl.cpp
@@ -42,7 +42,7 @@ namespace BlackCore
 
     CContextSimulator::~CContextSimulator()
     {
-        disconnectFrom();
+        disconnectFromSimulator();
         unloadSimulatorPlugin();
     }
 
@@ -71,21 +71,21 @@ namespace BlackCore
         return m_simulator->canConnect();
     }
 
-    bool CContextSimulator::connectTo()
+    bool CContextSimulator::connectToSimulator()
     {
         CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO;
         if (!m_simulator) return false;
         return m_simulator->connectTo();
     }
 
-    void CContextSimulator::asyncConnectTo()
+    void CContextSimulator::asyncConnectToSimulator()
     {
         CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO;
         if (!m_simulator || m_canConnectResult.isRunning()) return; // already checking
         m_simulator->asyncConnectTo();
     }
 
-    bool CContextSimulator::disconnectFrom()
+    bool CContextSimulator::disconnectFromSimulator()
     {
         CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO;
         if (!m_simulator) return false;
@@ -250,7 +250,7 @@ namespace BlackCore
         this->settingsChanged(static_cast<uint>(IContextSettings::SettingsSimulator));
 
         // try to connect
-        asyncConnectTo();
+        asyncConnectToSimulator();
 
         // info about what is going on
         CLogMessage(this).info("Simulator plugin loaded: '%1'") << this->m_simulator->getSimulatorInfo().toQString(true);
diff --git a/src/blackcore/context_simulator_impl.h b/src/blackcore/context_simulator_impl.h
index a87176143..33b244f6c 100644
--- a/src/blackcore/context_simulator_impl.h
+++ b/src/blackcore/context_simulator_impl.h
@@ -13,10 +13,10 @@
 #define BLACKCORE_CONTEXTSIMULATOR_IMPL_H
 
 #include "blackcore/context_simulator.h"
-#include "blackcore/context_network.h"
 #include "blackcore/simulator.h"
 #include "blacksim/simulatorinfo.h"
 #include "blacksim/simulatorinfolist.h"
+#include "blackmisc/nwtextmessagelist.h"
 #include "blackmisc/pixmap.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 #include <QTimer>
@@ -51,13 +51,13 @@ namespace BlackCore
         virtual bool canConnect() const override;
 
         //! \copydoc IContextSimulator::connectTo
-        virtual bool connectTo() override;
+        virtual bool connectToSimulator() override;
 
         //! \copydoc IContextSimulator::asyncConnectTo
-        virtual void asyncConnectTo() override;
+        virtual void asyncConnectToSimulator() override;
 
         //! \copydoc IContextSimulator::disconnectFrom
-        virtual bool disconnectFrom() override;
+        virtual bool disconnectFromSimulator() override;
 
         //! \copydoc IContextSimulator::isPaused
         virtual bool isPaused() const override;
diff --git a/src/blackcore/context_simulator_proxy.cpp b/src/blackcore/context_simulator_proxy.cpp
index 55714eb8c..8e4935368 100644
--- a/src/blackcore/context_simulator_proxy.cpp
+++ b/src/blackcore/context_simulator_proxy.cpp
@@ -72,19 +72,19 @@ namespace BlackCore
         return m_dBusInterface->callDBusRet<bool>(QLatin1Literal("canConnect"));
     }
 
-    bool CContextSimulatorProxy::connectTo()
+    bool CContextSimulatorProxy::connectToSimulator()
     {
-        return m_dBusInterface->callDBusRet<bool>(QLatin1Literal("connectTo"));
+        return m_dBusInterface->callDBusRet<bool>(QLatin1Literal("connectToSimulator"));
     }
 
-    void CContextSimulatorProxy::asyncConnectTo()
+    void CContextSimulatorProxy::asyncConnectToSimulator()
     {
-        m_dBusInterface->callDBus(QLatin1Literal("asyncConnectTo"));
+        m_dBusInterface->callDBus(QLatin1Literal("asyncConnectToSimulator"));
     }
 
-    bool CContextSimulatorProxy::disconnectFrom()
+    bool CContextSimulatorProxy::disconnectFromSimulator()
     {
-        return m_dBusInterface->callDBusRet<bool>(QLatin1Literal("disconnectFrom"));
+        return m_dBusInterface->callDBusRet<bool>(QLatin1Literal("disconnectFromSimulator"));
     }
 
     BlackMisc::Simulation::CAircraftModel CContextSimulatorProxy::getOwnAircraftModel() const
diff --git a/src/blackcore/context_simulator_proxy.h b/src/blackcore/context_simulator_proxy.h
index 1c6c61a75..fa99337f3 100644
--- a/src/blackcore/context_simulator_proxy.h
+++ b/src/blackcore/context_simulator_proxy.h
@@ -54,13 +54,13 @@ namespace BlackCore
         virtual bool canConnect() const override;
 
         //! \copydoc IContextSimulator::connectTo
-        virtual bool connectTo() override;
+        virtual bool connectToSimulator() override;
 
         //! \copydoc IContextSimulator::asyncConnectTo
-        virtual void asyncConnectTo() override;
+        virtual void asyncConnectToSimulator() override;
 
         //! \copydoc IContextSimulator::disconnectFrom
-        virtual bool disconnectFrom() override;
+        virtual bool disconnectFromSimulator() override;
 
         //! \copydoc IContextSimulator::isSimulating
         virtual bool isSimulating() const override;