diff --git a/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp b/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp
index 06e9919f5..3ca9aaf79 100644
--- a/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp
+++ b/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp
@@ -28,34 +28,31 @@ namespace BlackMisc{
 
         Simulation::CAircraftModelList AircraftModelLoaderFlightgear::parseFlyableAirplanes(const QString &rootDirectory, const QStringList &excludeDirectories)
         {
-            Q_UNUSED(excludeDirectories);
-            if (rootDirectory.isEmpty()) { return {}; }
+            //Q_UNUSED(excludeDirectories);
+            //if (rootDirectory.isEmpty()) { return {}; }
 
             Simulation::CAircraftModelList installedModels;
 
-            QDir searchPath(rootDirectory, fileFilterFlyable());
-            QDirIterator aircraftIt(searchPath, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+            //QDir searchPath(rootDirectory, fileFilterFlyable());
+            //QDirIterator aircraftIt(searchPath, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
 
-            int i = 0;
-            while (aircraftIt.hasNext()) {
-                aircraftIt.next();
-                if (CFileUtils::isExcludedDirectory(aircraftIt.fileInfo(), excludeDirectories, Qt::CaseInsensitive)) { continue; }
-                i++;
-                Simulation::CAircraftModel model;
-                model.setAircraftIcaoCode(QString::fromStdString("A320"));
-                model.setDescription(QString::fromStdString("Flyable"));
-                model.setName(aircraftIt.fileName());
-                model.setModelString(QString::fromStdString(std::to_string(i)));
+            //while (aircraftIt.hasNext()) {
+                //aircraftIt.next();
+                //if (CFileUtils::isExcludedDirectory(aircraftIt.fileInfo(), excludeDirectories, Qt::CaseInsensitive)) { continue; }
+                //Simulation::CAircraftModel model;
+                //model.setAircraftIcaoCode(QString::fromStdString("A320"));
+                //model.setDescription(QString::fromStdString("Flyable"));
+                //model.setName(aircraftIt.fileName());
                 //model.setModelString(aircraftIt.filePath() + aircraftIt.fileName());
-                model.setModelType(CAircraftModel::TypeOwnSimulatorModel);
-                model.setSimulator(CSimulatorInfo::fg());
+                //model.setModelType(CAircraftModel::TypeOwnSimulatorModel);
+                //model.setSimulator(CSimulatorInfo::fg());
                 //model.setCG(PhysicalQuantities::CLength());
-                model.setFileDetailsAndTimestamp(aircraftIt.fileInfo());
-                model.setModelMode(CAircraftModel::Include);
+                //model.setFileDetailsAndTimestamp(aircraftIt.fileInfo());
+                //model.setModelMode(CAircraftModel::Include);
 
-                addUniqueModel(model,installedModels);
+                //addUniqueModel(model,installedModels);
                 //TODO Add livery adding
-            }
+            //}
 
             return installedModels;
         }
@@ -74,9 +71,6 @@ namespace BlackMisc{
             while (aircraftIt.hasNext()) {
                 aircraftIt.next();
                 if (CFileUtils::isExcludedDirectory(aircraftIt.fileInfo(), excludeDirectories, Qt::CaseInsensitive)) { continue; }
-                //QString base = "main";
-                //if(base.compare(aircraftIt.fileName())){ continue;}
-
                 Simulation::CAircraftModel model;
                 model.setDescription(QString::fromStdString("AI"));
                 std::string modelName = aircraftIt.fileName().toStdString();
@@ -121,7 +115,7 @@ namespace BlackMisc{
             CAircraftModelList allModels;
             for (const QString &rootDirectory : rootDirectories)
             {
-                //TODO Make paths variable
+                //TODO Make paths changeable (using env variable)
                 allModels.push_back(parseAIAirplanes("X:/Flightsim/Flightgear/2018.3/data/AI/Aircraft", excludeDirectories));
                 //allModels.push_back(parseFlyableAirplanes("X:/Flightsim/Flightgear/2018.3/data/Aircraft", excludeDirectories));
             }
diff --git a/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.h b/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.h
index 9584d20f8..3a6739d26 100644
--- a/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.h
+++ b/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.h
@@ -40,5 +40,4 @@ namespace BlackMisc{
     }
 
 
-}
-
+}
\ No newline at end of file
diff --git a/src/blackmisc/simulation/settings/mysettings.h b/src/blackmisc/simulation/settings/fgsettings.h
similarity index 100%
rename from src/blackmisc/simulation/settings/mysettings.h
rename to src/blackmisc/simulation/settings/fgsettings.h
diff --git a/src/plugins/simulator/flightgear/xswiftbusserviceproxy.cpp b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp
similarity index 99%
rename from src/plugins/simulator/flightgear/xswiftbusserviceproxy.cpp
rename to src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp
index e9619fe38..c3d17c30c 100644
--- a/src/plugins/simulator/flightgear/xswiftbusserviceproxy.cpp
+++ b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp
@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "xswiftbusserviceproxy.h"
-#include "simulatorxplane.h"
+#include "fgswiftbusserviceproxy.h"
+#include "simulatorflightgear.h"
 
 #include <QLatin1String>
 #include <QPointer>
diff --git a/src/plugins/simulator/flightgear/xswiftbusserviceproxy.h b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h
similarity index 100%
rename from src/plugins/simulator/flightgear/xswiftbusserviceproxy.h
rename to src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h
diff --git a/src/plugins/simulator/flightgear/xswiftbustrafficproxy.cpp b/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp
similarity index 99%
rename from src/plugins/simulator/flightgear/xswiftbustrafficproxy.cpp
rename to src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp
index fdbf58223..1aad19987 100644
--- a/src/plugins/simulator/flightgear/xswiftbustrafficproxy.cpp
+++ b/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp
@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "xswiftbustrafficproxy.h"
+#include "fgswiftbustrafficproxy.h"
 #include <QLatin1String>
 #include <QDBusConnection>
 
diff --git a/src/plugins/simulator/flightgear/xswiftbustrafficproxy.h b/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h
similarity index 100%
rename from src/plugins/simulator/flightgear/xswiftbustrafficproxy.h
rename to src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h
diff --git a/src/plugins/simulator/flightgear/xswiftbusweatherproxy.cpp b/src/plugins/simulator/flightgear/fgswiftbusweatherproxy.cpp
similarity index 98%
rename from src/plugins/simulator/flightgear/xswiftbusweatherproxy.cpp
rename to src/plugins/simulator/flightgear/fgswiftbusweatherproxy.cpp
index 223c4b5cf..5c1a76fca 100644
--- a/src/plugins/simulator/flightgear/xswiftbusweatherproxy.cpp
+++ b/src/plugins/simulator/flightgear/fgswiftbusweatherproxy.cpp
@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "xswiftbusweatherproxy.h"
+#include "fgswiftbusweatherproxy.h"
 
 #include <QLatin1String>
 
diff --git a/src/plugins/simulator/flightgear/xswiftbusweatherproxy.h b/src/plugins/simulator/flightgear/fgswiftbusweatherproxy.h
similarity index 100%
rename from src/plugins/simulator/flightgear/xswiftbusweatherproxy.h
rename to src/plugins/simulator/flightgear/fgswiftbusweatherproxy.h
diff --git a/src/plugins/simulator/flightgear/flightgear.pro b/src/plugins/simulator/flightgear/flightgear.pro
index 1d2e680f3..70693befa 100644
--- a/src/plugins/simulator/flightgear/flightgear.pro
+++ b/src/plugins/simulator/flightgear/flightgear.pro
@@ -18,7 +18,7 @@ unix:!macx {
 
 SOURCES += *.cpp
 HEADERS += *.h
-DISTFILES += simulatorxplane.json
+DISTFILES += simulatorflightgear.json
 DESTDIR = $$DestRoot/bin/plugins/simulator
 
 win32 {
diff --git a/src/plugins/simulator/flightgear/xplanempaircraft.cpp b/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp
similarity index 98%
rename from src/plugins/simulator/flightgear/xplanempaircraft.cpp
rename to src/plugins/simulator/flightgear/flightgearmpaircraft.cpp
index 92f89a728..02c6a05fa 100644
--- a/src/plugins/simulator/flightgear/xplanempaircraft.cpp
+++ b/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp
@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "xplanempaircraft.h"
+#include "flightgearmpaircraft.h"
 #include "blackcore/simulator.h"
 #include "blackmisc/simulation/interpolatormulti.h"
 
diff --git a/src/plugins/simulator/flightgear/xplanempaircraft.h b/src/plugins/simulator/flightgear/flightgearmpaircraft.h
similarity index 100%
rename from src/plugins/simulator/flightgear/xplanempaircraft.h
rename to src/plugins/simulator/flightgear/flightgearmpaircraft.h
diff --git a/src/plugins/simulator/flightgear/simulatorxplane.cpp b/src/plugins/simulator/flightgear/simulatorflightgear.cpp
similarity index 99%
rename from src/plugins/simulator/flightgear/simulatorxplane.cpp
rename to src/plugins/simulator/flightgear/simulatorflightgear.cpp
index f7eb92d51..b4fb9b779 100644
--- a/src/plugins/simulator/flightgear/simulatorxplane.cpp
+++ b/src/plugins/simulator/flightgear/simulatorflightgear.cpp
@@ -7,11 +7,11 @@
  * contained in the LICENSE file.
  */
 
-#include "simulatorxplane.h"
+#include "simulatorflightgear.h"
 #include "qcompilerdetection.h"
-#include "xswiftbusserviceproxy.h"
-#include "xswiftbustrafficproxy.h"
-#include "xswiftbusweatherproxy.h"
+#include "fgswiftbusserviceproxy.h"
+#include "fgswiftbustrafficproxy.h"
+#include "fgswiftbusweatherproxy.h"
 #include "blackcore/aircraftmatcher.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
diff --git a/src/plugins/simulator/flightgear/simulatorxplane.h b/src/plugins/simulator/flightgear/simulatorflightgear.h
similarity index 98%
rename from src/plugins/simulator/flightgear/simulatorxplane.h
rename to src/plugins/simulator/flightgear/simulatorflightgear.h
index a9beb4078..8a2d0dfe5 100644
--- a/src/plugins/simulator/flightgear/simulatorxplane.h
+++ b/src/plugins/simulator/flightgear/simulatorflightgear.h
@@ -12,13 +12,13 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_XPLANE_H
 #define BLACKSIMPLUGIN_SIMULATOR_XPLANE_H
 
-#include "xplanempaircraft.h"
-#include "plugins/simulator/xplaneconfig/simulatorxplaneconfig.h"
+#include "flightgearmpaircraft.h"
+#include "plugins/simulator/flightgearconfig/simulatorflightgearconfig.h"
 #include "plugins/simulator/plugincommon/simulatorplugincommon.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/data/modelcaches.h"
 #include "blackmisc/simulation/settings/simulatorsettings.h"
-#include "blackmisc/simulation/settings/mysettings.h"
+#include "blackmisc/simulation/settings/fgsettings.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 #include "blackmisc/weather/weathergrid.h"
 #include "blackmisc/aviation/airportlist.h"
@@ -294,7 +294,7 @@ namespace BlackSimPlugin
         class CSimulatorXPlaneFactory : public QObject, public BlackCore::ISimulatorFactory
         {
             Q_OBJECT
-            Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatorxplane.json")
+            Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatorflightgear.json")
             Q_INTERFACES(BlackCore::ISimulatorFactory)
 
         public:
diff --git a/src/plugins/simulator/flightgear/simulatorxplane.json b/src/plugins/simulator/flightgear/simulatorflightgear.json
similarity index 100%
rename from src/plugins/simulator/flightgear/simulatorxplane.json
rename to src/plugins/simulator/flightgear/simulatorflightgear.json
diff --git a/src/plugins/simulator/flightgearconfig/flightgearconfig.pro b/src/plugins/simulator/flightgearconfig/flightgearconfig.pro
index 41a787ff4..f172b7083 100644
--- a/src/plugins/simulator/flightgearconfig/flightgearconfig.pro
+++ b/src/plugins/simulator/flightgearconfig/flightgearconfig.pro
@@ -14,7 +14,7 @@ INCLUDEPATH += . $$SourceRoot/src
 SOURCES += *.cpp
 HEADERS += *.h
 FORMS += *.ui
-DISTFILES += simulatorxplaneconfig.json
+DISTFILES += simulatorflightgearconfig.json
 
 DESTDIR = $$DestRoot/bin/plugins/simulator
 
diff --git a/src/plugins/simulator/flightgearconfig/simulatorxplaneconfig.cpp b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp
similarity index 91%
rename from src/plugins/simulator/flightgearconfig/simulatorxplaneconfig.cpp
rename to src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp
index 35dd47dc1..f3b530eb7 100644
--- a/src/plugins/simulator/flightgearconfig/simulatorxplaneconfig.cpp
+++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp
@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "simulatorxplaneconfig.h"
-#include "simulatorxplaneconfigwindow.h"
+#include "simulatorflightgearconfig.h"
+#include "simulatorflightgearconfigwindow.h"
 
 class QWidget;
 
diff --git a/src/plugins/simulator/flightgearconfig/simulatorxplaneconfig.h b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h
similarity index 96%
rename from src/plugins/simulator/flightgearconfig/simulatorxplaneconfig.h
rename to src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h
index 3f156bf38..c4a704872 100644
--- a/src/plugins/simulator/flightgearconfig/simulatorxplaneconfig.h
+++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h
@@ -31,7 +31,7 @@ namespace BlackSimPlugin
         class CSimulatorXPlaneConfig : public QObject, public BlackGui::IPluginConfig
         {
             Q_OBJECT
-            Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorxplaneconfig.json")
+            Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorflightgearconfig.json")
             Q_INTERFACES(BlackGui::IPluginConfig)
 
         public:
diff --git a/src/plugins/simulator/flightgearconfig/simulatorxplaneconfig.json b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.json
similarity index 100%
rename from src/plugins/simulator/flightgearconfig/simulatorxplaneconfig.json
rename to src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.json
diff --git a/src/plugins/simulator/flightgearconfig/simulatorxplaneconfigwindow.cpp b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp
similarity index 95%
rename from src/plugins/simulator/flightgearconfig/simulatorxplaneconfigwindow.cpp
rename to src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp
index 52202115e..7d2f3878d 100644
--- a/src/plugins/simulator/flightgearconfig/simulatorxplaneconfigwindow.cpp
+++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp
@@ -7,9 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "simulatorxplaneconfigwindow.h"
+#include "simulatorflightgearconfigwindow.h"
 #include "blackcore/application.h"
-#include "ui_simulatorxplaneconfigwindow.h"
+#include "ui_simulatorflightgearconfigwindow.h"
 #include "blackmisc/simulation/xplane/xswiftbusconfigwriter.h"
 
 #include <QComboBox>
diff --git a/src/plugins/simulator/flightgearconfig/simulatorxplaneconfigwindow.h b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h
similarity index 94%
rename from src/plugins/simulator/flightgearconfig/simulatorxplaneconfigwindow.h
rename to src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h
index f24ddca4e..7feffac79 100644
--- a/src/plugins/simulator/flightgearconfig/simulatorxplaneconfigwindow.h
+++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h
@@ -13,8 +13,8 @@
 #define BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
 
 #include "blackgui/pluginconfigwindow.h"
-#include "blackmisc/simulation/settings/mysettings.h"
-#include "simulatorxplaneconfig.h"
+#include "blackmisc/simulation/settings/fgsettings.h"
+#include "simulatorflightgearconfig.h"
 #include <QObject>
 #include <QScopedPointer>
 
diff --git a/src/plugins/simulator/flightgearconfig/simulatorxplaneconfigwindow.ui b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.ui
similarity index 100%
rename from src/plugins/simulator/flightgearconfig/simulatorxplaneconfigwindow.ui
rename to src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.ui