diff --git a/src/swiftgui_standard/swiftguistd.cpp b/src/swiftgui_standard/swiftguistd.cpp
index e78b98a3d..4225960ae 100644
--- a/src/swiftgui_standard/swiftguistd.cpp
+++ b/src/swiftgui_standard/swiftguistd.cpp
@@ -19,7 +19,6 @@
 #include "blackcore/context_application.h"
 #include "blackcore/context_ownaircraft.h"
 #include "blackcore/network.h"
-#include "blackmisc/aviation/aircraft.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/notificationsounds.h"
 #include <QMouseEvent>
diff --git a/src/swiftgui_standard/swiftguistd.h b/src/swiftgui_standard/swiftguistd.h
index 888547aa3..7ff91c8b8 100644
--- a/src/swiftgui_standard/swiftguistd.h
+++ b/src/swiftgui_standard/swiftguistd.h
@@ -119,7 +119,7 @@ private:
     bool m_contextNetworkAvailable = false;
     bool m_contextAudioAvailable   = false;
     QTimer *m_timerContextWatchdog = nullptr;     //!< core available?
-    BlackMisc::Aviation::CAircraft m_ownAircraft; //!< own aircraft's state
+    BlackMisc::Simulation::CSimulatedAircraft m_ownAircraft; //!< own aircraft's state
     QSize m_windowMinSizeWithMainPageShown;
     QSize m_windowMinSizeWithMainPageHidden;
 
diff --git a/src/swiftgui_standard/swiftguistd.ui b/src/swiftgui_standard/swiftguistd.ui
index 643497f67..1e12a2071 100644
--- a/src/swiftgui_standard/swiftguistd.ui
+++ b/src/swiftgui_standard/swiftguistd.ui
@@ -312,14 +312,14 @@
     <addaction name="menu_FileResetSettings"/>
     <addaction name="menu_FileReloadStyleSheets"/>
     <addaction name="separator"/>
-    <addaction name="menu_FileClose"/>
+    <addaction name="menu_FileExit"/>
    </widget>
    <widget class="QMenu" name="menu_InfoAreas">
     <property name="title">
      <string>Info areas</string>
     </property>
    </widget>
-   <widget class="QMenu" name="menuWindow">
+   <widget class="QMenu" name="menu_Window">
     <property name="title">
      <string>Window</string>
     </property>
@@ -329,7 +329,7 @@
     <addaction name="menu_WindowToggleNavigator"/>
    </widget>
    <addaction name="menu_File"/>
-   <addaction name="menuWindow"/>
+   <addaction name="menu_Window"/>
    <addaction name="menu_InfoAreas"/>
    <addaction name="menu_Help"/>
    <addaction name="menu_Test"/>
@@ -418,9 +418,9 @@
     <string>Position EDNX (Schleißheim, GER)</string>
    </property>
   </action>
-  <action name="menu_FileClose">
+  <action name="menu_FileExit">
    <property name="text">
-    <string>Close</string>
+    <string>Exit</string>
    </property>
   </action>
   <action name="menu_FileSettingsDirectory">
diff --git a/src/swiftgui_standard/swiftguistd_aircraft.cpp b/src/swiftgui_standard/swiftguistd_aircraft.cpp
index df2ef6708..7f20baaae 100644
--- a/src/swiftgui_standard/swiftguistd_aircraft.cpp
+++ b/src/swiftgui_standard/swiftguistd_aircraft.cpp
@@ -17,6 +17,7 @@ using namespace BlackMisc;
 using namespace BlackGui;
 using namespace BlackMisc::Network;
 using namespace BlackMisc::Aviation;
+using namespace BlackMisc::Simulation;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::Settings;
@@ -31,7 +32,7 @@ bool SwiftGuiStd::ps_reloadOwnAircraft()
 
     // check for changed aircraft
     bool changed = false;
-    CAircraft loadedAircraft = this->getIContextOwnAircraft()->getOwnAircraft();
+    CSimulatedAircraft loadedAircraft = this->getIContextOwnAircraft()->getOwnAircraft();
     if (loadedAircraft != this->m_ownAircraft)
     {
         this->m_ownAircraft = loadedAircraft;
diff --git a/src/swiftgui_standard/swiftguistd_init.cpp b/src/swiftgui_standard/swiftguistd_init.cpp
index 786526524..4c4847e72 100644
--- a/src/swiftgui_standard/swiftguistd_init.cpp
+++ b/src/swiftgui_standard/swiftguistd_init.cpp
@@ -167,7 +167,7 @@ void SwiftGuiStd::initGuiSignals()
     connect(this->ui->menu_TestLocationsEDNX, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
     connect(this->ui->menu_TestLocationsEDRY, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
     connect(this->ui->menu_TestInternals, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
-    connect(this->ui->menu_FileClose, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
+    connect(this->ui->menu_FileExit, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
     connect(this->ui->menu_FileSettingsDirectory, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
     connect(this->ui->menu_FileResetSettings, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
     connect(this->ui->menu_FileReloadStyleSheets, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
diff --git a/src/swiftgui_standard/swiftguistd_menus.cpp b/src/swiftgui_standard/swiftguistd_menus.cpp
index ccafca127..8a59b03d3 100644
--- a/src/swiftgui_standard/swiftguistd_menus.cpp
+++ b/src/swiftgui_standard/swiftguistd_menus.cpp
@@ -72,13 +72,13 @@ void SwiftGuiStd::ps_onMenuClicked()
     }
     else if (sender == this->ui->menu_WindowMinimize)
     {
-        this->ps_showMinimized();
+        this->showMinimized();
     }
     else if (sender == this->ui->menu_WindowToggleOnTop)
     {
         this->ps_toogleWindowStayOnTop();
     }
-    else if (sender == this->ui->menu_FileClose)
+    else if (sender == this->ui->menu_FileExit)
     {
         CLogMessage(this).info("Closing");
         this->close();