diff --git a/src/plugins/simulator/fs9/fs9_host.cpp b/src/plugins/simulator/fs9/fs9_host.cpp
index 1969f9c00..9dead288b 100644
--- a/src/plugins/simulator/fs9/fs9_host.cpp
+++ b/src/plugins/simulator/fs9/fs9_host.cpp
@@ -25,7 +25,7 @@ namespace BlackSimPlugin
     namespace Fs9
     {
         CFs9Host::CFs9Host(QObject *owner) :
-            CDirectPlayPeer(owner, CProject::systemNameAndVersion())
+            CDirectPlayPeer(owner, CProject::swiftVersionString())
         {
         }
 
@@ -80,7 +80,7 @@ namespace BlackSimPlugin
         {
             initDirectPlay();
             createHostAddress();
-            startHosting(CProject::systemNameAndVersion(), m_callsign.toQString());
+            startHosting(CProject::swiftVersionString(), m_callsign.toQString());
         }
 
         void CFs9Host::cleanup()
diff --git a/src/plugins/simulator/fs9/lobby_client.cpp b/src/plugins/simulator/fs9/lobby_client.cpp
index 8916ae6d7..d3ef66145 100644
--- a/src/plugins/simulator/fs9/lobby_client.cpp
+++ b/src/plugins/simulator/fs9/lobby_client.cpp
@@ -209,7 +209,7 @@ namespace BlackSimPlugin
             // Set the device addresses
             apDevAddress[0] = pDeviceAddress;
 
-            QString session = BlackMisc::CProject::systemNameAndVersion();
+            QString session = BlackMisc::CProject::swiftVersionString();
             QScopedArrayPointer<wchar_t> wstrSessionName(new wchar_t[session.size() + 1]);
             session.toWCharArray(wstrSessionName.data());
             wstrSessionName[session.size()] = 0;
diff --git a/src/plugins/simulator/fs9/simulator_fs9.cpp b/src/plugins/simulator/fs9/simulator_fs9.cpp
index 4a874d4e8..78f9197d3 100644
--- a/src/plugins/simulator/fs9/simulator_fs9.cpp
+++ b/src/plugins/simulator/fs9/simulator_fs9.cpp
@@ -63,7 +63,7 @@ namespace BlackSimPlugin
                                                "Boeing 737-400",
                                                CAircraftModel::TypeModelMatchingDefaultModel,
                                                "B737-400 default model",
-                                               CAircraftIcaoData(CAircraftIcaoCode("B734", "L2J"), CAirlineIcaoCode(), "FFFFFF")
+                                               CAircraftIcaoData(CAircraftIcaoCode("B734", "L2J"), CAirlineIcaoCode())
                                            ));
         }
 
diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp
index b212a8169..b6a117fe6 100644
--- a/src/plugins/simulator/fsx/simulator_fsx.cpp
+++ b/src/plugins/simulator/fsx/simulator_fsx.cpp
@@ -57,7 +57,7 @@ namespace BlackSimPlugin
                                                "Boeing 737-800 Paint1",
                                                CAircraftModel::TypeModelMatchingDefaultModel,
                                                "B737-800 default model",
-                                               CAircraftIcaoData(CAircraftIcaoCode("B738", "L2J"), CAirlineIcaoCode(), "FFFFFF")
+                                               CAircraftIcaoData(CAircraftIcaoCode("B738", "L2J"), CAirlineIcaoCode())
                                            ));
         }
 
@@ -80,7 +80,7 @@ namespace BlackSimPlugin
         bool CSimulatorFsx::connectTo()
         {
             if (this->isConnected()) { return true; }
-            if (FAILED(SimConnect_Open(&m_hSimConnect, BlackMisc::CProject::systemNameAndVersionChar(), nullptr, 0, 0, 0)))
+            if (FAILED(SimConnect_Open(&m_hSimConnect, BlackMisc::CProject::swiftVersionChar(), nullptr, 0, 0, 0)))
             {
                 // reset state as expected for unconnected
                 if (m_simconnectTimerId >= 0) { killTimer(m_simconnectTimerId); }
@@ -869,7 +869,7 @@ namespace BlackSimPlugin
         {
             Q_ASSERT_X(!BlackCore::isCurrentThreadApplicationThread(), Q_FUNC_INFO, "Expect to run in background");
             HANDLE hSimConnect;
-            HRESULT result = SimConnect_Open(&hSimConnect, BlackMisc::CProject::systemNameAndVersionChar(), nullptr, 0, 0, 0);
+            HRESULT result = SimConnect_Open(&hSimConnect, BlackMisc::CProject::swiftVersionChar(), nullptr, 0, 0, 0);
             SimConnect_Close(hSimConnect);
             if (result == S_OK)
             {
diff --git a/src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp b/src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp
index c38f17404..7eb34219c 100644
--- a/src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp
+++ b/src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp
@@ -43,7 +43,7 @@ namespace BlackSimPlugin
                                                      .arg(event->szApplicationName)
                                                      .arg(event->dwApplicationVersionMajor).arg(event->dwApplicationVersionMinor).arg(event->dwApplicationBuildMajor).arg(event->dwApplicationBuildMinor)
                                                      .arg(event->dwSimConnectVersionMajor).arg(event->dwSimConnectVersionMinor).arg(event->dwSimConnectBuildMajor).arg(event->dwSimConnectBuildMinor);
-                    CLogMessage(static_cast<CSimulatorFsx *>(nullptr)).info("Connect to FSX: %1") << CProject::systemNameAndVersion();
+                    CLogMessage(static_cast<CSimulatorFsx *>(nullptr)).info("Connect to FSX: %1") << CProject::swiftVersionString();
                     break;
                 }
             case SIMCONNECT_RECV_ID_EXCEPTION: