diff --git a/src/Settings/AppSettings.cc b/src/Settings/AppSettings.cc
index 64716bca6b43e6784f54d7aec1a660c8b7c716b2..b9f341c7d62cc8a9e582c1bd4eb316af43269faf 100644
--- a/src/Settings/AppSettings.cc
+++ b/src/Settings/AppSettings.cc
@@ -15,7 +15,9 @@
 #include <QtQml>
 #include <QStandardPaths>
 
-const char* AppSettings::settingsGroup =                                "App";
+const char* AppSettings::name =                                         "App";
+const char* AppSettings::settingsGroup =                                ""; // settings are in root group
+
 const char* AppSettings::offlineEditingFirmwareTypeSettingsName =       "OfflineEditingFirmwareType";
 const char* AppSettings::offlineEditingVehicleTypeSettingsName =        "OfflineEditingVehicleType";
 const char* AppSettings::offlineEditingCruiseSpeedSettingsName =        "OfflineEditingCruiseSpeed";
@@ -58,7 +60,7 @@ const char* AppSettings::videoDirectory =           "Video";
 const char* AppSettings::crashDirectory =           "CrashLogs";
 
 AppSettings::AppSettings(QObject* parent)
-    : SettingsGroup                         (settingsGroup, QString() /* root settings group */, parent)
+    : SettingsGroup                         (name, settingsGroup, parent)
     , _offlineEditingFirmwareTypeFact       (NULL)
     , _offlineEditingVehicleTypeFact        (NULL)
     , _offlineEditingCruiseSpeedFact        (NULL)
diff --git a/src/Settings/AppSettings.h b/src/Settings/AppSettings.h
index 93bf1f5b819d13ef6e236c17d00bee85ff7c2f25..327ce30950dcb013741cfa63c7dbdd4db8d4d1b6 100644
--- a/src/Settings/AppSettings.h
+++ b/src/Settings/AppSettings.h
@@ -93,6 +93,7 @@ public:
     static MAV_AUTOPILOT offlineEditingFirmwareTypeFromFirmwareType(MAV_AUTOPILOT firmwareType);
     static MAV_TYPE offlineEditingVehicleTypeFromVehicleType(MAV_TYPE vehicleType);
 
+    static const char* name;
     static const char* settingsGroup;
 
     static const char* offlineEditingFirmwareTypeSettingsName;
diff --git a/src/Settings/AutoConnectSettings.cc b/src/Settings/AutoConnectSettings.cc
index cb5a403b2ff340e5c0ffdf582536f76be1f892c9..ef7050712d2c902225ebdab52ab7962e53611d22 100644
--- a/src/Settings/AutoConnectSettings.cc
+++ b/src/Settings/AutoConnectSettings.cc
@@ -13,7 +13,8 @@
 #include <QQmlEngine>
 #include <QtQml>
 
-const char* AutoConnectSettings::_settingsGroup =                       "LinkManager";
+const char* AutoConnectSettings::name =                                 "AutoConnect";
+const char* AutoConnectSettings::settingsGroup =                        "LinkManager";
 
 const char* AutoConnectSettings:: autoConnectUDPSettingsName =          "AutoconnectUDP";
 const char* AutoConnectSettings:: autoConnectPixhawkSettingsName =      "AutoconnectPixhawk";
@@ -27,10 +28,9 @@ const char* AutoConnectSettings:: udpListenPortName =                   "Autocon
 const char* AutoConnectSettings:: udpTargetHostIPName =                 "AutoconnectUDPTargetHostIP";
 const char* AutoConnectSettings:: udpTargetHostPortName =               "AutoconnectUDPTargetHostPort";
 
-const char* AutoConnectSettings::autoConnectSettingsGroupName = "AutoConnect";
 
 AutoConnectSettings::AutoConnectSettings(QObject* parent)
-    : SettingsGroup             (autoConnectSettingsGroupName, _settingsGroup, parent)
+    : SettingsGroup             (name, settingsGroup, parent)
     , _autoConnectUDPFact       (NULL)
     , _autoConnectPixhawkFact   (NULL)
     , _autoConnectSiKRadioFact  (NULL)
diff --git a/src/Settings/AutoConnectSettings.h b/src/Settings/AutoConnectSettings.h
index 74081bd76e9ab8107d91972f31b3afeb7f33c2c5..039d3b90b181a3aa05ca76500fca3e0d20b662e0 100644
--- a/src/Settings/AutoConnectSettings.h
+++ b/src/Settings/AutoConnectSettings.h
@@ -43,7 +43,8 @@ public:
     Fact* udpTargetHostIP       (void);
     Fact* udpTargetHostPort     (void);
 
-    static const char* autoConnectSettingsGroupName;
+    static const char* name;
+    static const char* settingsGroup;
 
     static const char* autoConnectUDPSettingsName;
     static const char* autoConnectPixhawkSettingsName;
@@ -69,8 +70,6 @@ private:
     SettingsFact* _udpListenPortFact;
     SettingsFact* _udpTargetHostIPFact;
     SettingsFact* _udpTargetHostPortFact;
-
-    static const char* _settingsGroup;
 };
 
 #endif
diff --git a/src/Settings/BrandImageSettings.cc b/src/Settings/BrandImageSettings.cc
index 20bdc6d3f3e81a8740ffdc64b34fd527e711bf2b..f660869c7e8487a4f2e2077c456839aaf4f98855 100644
--- a/src/Settings/BrandImageSettings.cc
+++ b/src/Settings/BrandImageSettings.cc
@@ -12,12 +12,14 @@
 #include <QQmlEngine>
 #include <QtQml>
 
-const char* BrandImageSettings::brandImageSettingsGroupName =   "BrandImage";
-const char* BrandImageSettings::userBrandImageIndoorName =      "UserBrandImageIndoor";
-const char* BrandImageSettings::userBrandImageOutdoorName =     "UserBrandImageOutdoor";
+const char* BrandImageSettings::name =                      "BrandImage";
+const char* BrandImageSettings::settingsGroup =             ""; // settings are in root group
+
+const char* BrandImageSettings::userBrandImageIndoorName =  "UserBrandImageIndoor";
+const char* BrandImageSettings::userBrandImageOutdoorName = "UserBrandImageOutdoor";
 
 BrandImageSettings::BrandImageSettings(QObject* parent)
-    : SettingsGroup(brandImageSettingsGroupName, QString() /* root settings group */, parent)
+    : SettingsGroup(name, settingsGroup, parent)
     , _userBrandImageIndoorFact(NULL)
     , _userBrandImageOutdoorFact(NULL)
 {
diff --git a/src/Settings/BrandImageSettings.h b/src/Settings/BrandImageSettings.h
index c2f66b3d36203b2574329aa5c46f875d41c51228..a1bb1b581fdf28d6543cb1fe15f3c1c472a530f3 100644
--- a/src/Settings/BrandImageSettings.h
+++ b/src/Settings/BrandImageSettings.h
@@ -25,7 +25,8 @@ public:
     Fact* userBrandImageIndoor      (void);
     Fact* userBrandImageOutdoor     (void);
 
-    static const char* brandImageSettingsGroupName;
+    static const char* name;
+    static const char* settingsGroup;
 
     static const char* userBrandImageIndoorName;
     static const char* userBrandImageOutdoorName;
diff --git a/src/Settings/FlightMapSettings.cc b/src/Settings/FlightMapSettings.cc
index 7f501614a2029cca46d829aa17880c6f78f8ab94..d2af25689c1b94858cdcc1e43735862240e2896c 100644
--- a/src/Settings/FlightMapSettings.cc
+++ b/src/Settings/FlightMapSettings.cc
@@ -16,13 +16,14 @@
 #include <QQmlEngine>
 #include <QtQml>
 
-const char* FlightMapSettings::flightMapSettingsGroupName =  "FlightMap";
-const char* FlightMapSettings::mapProviderSettingsName =     "MapProvider";
-const char* FlightMapSettings::mapTypeSettingsName =         "MapType";
-const char* FlightMapSettings::_settingsGroupName =          "FlightMap";
+const char* FlightMapSettings::name =                       "FlightMap";
+const char* FlightMapSettings::settingsGroup =              "FlightMap";
+
+const char* FlightMapSettings::mapProviderSettingsName =    "MapProvider";
+const char* FlightMapSettings::mapTypeSettingsName =        "MapType";
 
 FlightMapSettings::FlightMapSettings(QObject* parent)
-    : SettingsGroup(flightMapSettingsGroupName, QString(_settingsGroupName) /* root settings group */, parent)
+    : SettingsGroup(name, settingsGroup, parent)
     , _mapProviderFact(NULL)
     , _mapTypeFact(NULL)
 {
diff --git a/src/Settings/FlightMapSettings.h b/src/Settings/FlightMapSettings.h
index d7dc2a373a207479d408e090f834bece491124ef..edbc79391889bb6736398950e1c9c3afae0c70ef 100644
--- a/src/Settings/FlightMapSettings.h
+++ b/src/Settings/FlightMapSettings.h
@@ -43,7 +43,9 @@ public:
     Fact* mapProvider   (void);
     Fact* mapType       (void);
 
-    static const char* flightMapSettingsGroupName;
+    static const char* name;
+    static const char* settingsGroup;
+
     static const char* mapProviderSettingsName;
     static const char* mapTypeSettingsName;
 
@@ -61,8 +63,6 @@ private:
     SettingsFact*   _mapTypeFact;
     QStringList     _savedMapTypeStrings;
     QVariantList    _savedMapTypeValues;
-
-    static const char* _settingsGroupName;
 };
 
 #endif
diff --git a/src/Settings/GuidedSettings.cc b/src/Settings/GuidedSettings.cc
index 3aa93e2af65f3ea434eb2b2b0a6706c3836ede60..9c81519bb8f12de286da1a703871879f825a71b2 100644
--- a/src/Settings/GuidedSettings.cc
+++ b/src/Settings/GuidedSettings.cc
@@ -15,14 +15,16 @@
 #include <QtQml>
 #include <QStandardPaths>
 
-const char* GuidedSettings::guidedSettingsGroupName =       "Guided";
+const char* GuidedSettings::name =                          "Guided";
+const char* GuidedSettings::settingsGroup =                 ""; // settings are in root group
+
 const char* GuidedSettings::fixedWingMinimumAltitudeName =  "FixedWingMinimumAltitude";
 const char* GuidedSettings::fixedWingMaximumAltitudeName =  "FixedWingMaximumAltitude";
 const char* GuidedSettings::vehicleMinimumAltitudeName =    "VehicleMinimumAltitude";
 const char* GuidedSettings::vehicleMaximumAltitudeName =    "VehicleMaximumAltitude";
 
 GuidedSettings::GuidedSettings(QObject* parent)
-    : SettingsGroup(guidedSettingsGroupName, QString() /* root settings group */, parent)
+    : SettingsGroup(name, settingsGroup, parent)
     , _fixedWingMinimumAltitudeFact (NULL)
     , _fixedWingMaximumAltitudeFact (NULL)
     , _vehicleMinimumAltitudeFact   (NULL)
diff --git a/src/Settings/GuidedSettings.h b/src/Settings/GuidedSettings.h
index bc6b29de02dc7226fd0b1cece86d8402dfb13f30..52bba3829a2de7f36872d10eafc63d5bc0ad8030 100644
--- a/src/Settings/GuidedSettings.h
+++ b/src/Settings/GuidedSettings.h
@@ -31,7 +31,8 @@ public:
     Fact* vehicleMinimumAltitude    (void);
     Fact* vehicleMaximumAltitude    (void);
 
-    static const char* guidedSettingsGroupName;
+    static const char* name;
+    static const char* settingsGroup;
 
     static const char* fixedWingMinimumAltitudeName;
     static const char* fixedWingMaximumAltitudeName;
diff --git a/src/Settings/RTKSettings.cc b/src/Settings/RTKSettings.cc
index 1e8699162038ee57fb7dc005b840006a056397bd..c876da317af4f84f621dbfa08dd59477f10945a3 100644
--- a/src/Settings/RTKSettings.cc
+++ b/src/Settings/RTKSettings.cc
@@ -12,12 +12,14 @@
 #include <QQmlEngine>
 #include <QtQml>
 
-const char* RTKSettings::RTKSettingsGroupName =                 "RTK";
+const char* RTKSettings::name =                                 "RTK";
+const char* RTKSettings::settingsGroup =                        "RTK";
+
 const char* RTKSettings::surveyInAccuracyLimitName =            "SurveyInAccuracyLimit";
 const char* RTKSettings::surveyInMinObservationDurationName =   "SurveyInMinObservationDuration";
 
 RTKSettings::RTKSettings(QObject* parent)
-    : SettingsGroup(RTKSettingsGroupName, QString(RTKSettingsGroupName), parent)
+    : SettingsGroup(name, settingsGroup, parent)
     , _surveyInAccuracyLimitFact(NULL)
     , _surveyInMinObservationDurationFact(NULL)
 {
diff --git a/src/Settings/RTKSettings.h b/src/Settings/RTKSettings.h
index 467df27a1433cae4effe5294098e0de758334f54..6688c4ce7a170afb558008418e4e4241ebbd7b74 100644
--- a/src/Settings/RTKSettings.h
+++ b/src/Settings/RTKSettings.h
@@ -24,7 +24,8 @@ public:
     Fact* surveyInAccuracyLimit         (void);
     Fact* surveyInMinObservationDuration(void);
 
-    static const char* RTKSettingsGroupName;
+    static const char* name;
+    static const char* settingsGroup;
 
     static const char* surveyInAccuracyLimitName;
     static const char* surveyInMinObservationDurationName;
diff --git a/src/Settings/SettingsGroup.cc b/src/Settings/SettingsGroup.cc
index e0f1ac231397146c46dbd31c3be6b44158b2d272..0e56bdfb408cf550d68a1c00d45cff1d81a57016 100644
--- a/src/Settings/SettingsGroup.cc
+++ b/src/Settings/SettingsGroup.cc
@@ -12,18 +12,18 @@
 #include "QGCApplication.h"
 
 SettingsGroup::SettingsGroup(const QString& name, const QString& settingsGroup, QObject* parent)
-    : QObject(parent)
-    , _name(name)
+    : QObject       (parent)
+    , _name         (name)
     , _settingsGroup(settingsGroup)
-    , _visible(qgcApp()->toolbox()->corePlugin()->overrideSettingsGroupVisibility(name))
+    , _visible      (qgcApp()->toolbox()->corePlugin()->overrideSettingsGroupVisibility(_name))
 {
     QString jsonNameFormat(":/json/%1.SettingsGroup.json");
 
-    _nameToMetaDataMap = FactMetaData::createMapFromJsonFile(jsonNameFormat.arg(name), this);
+    _nameToMetaDataMap = FactMetaData::createMapFromJsonFile(jsonNameFormat.arg(_name), this);
 }
 
-SettingsFact* SettingsGroup::_createSettingsFact(const QString& name)
+SettingsFact* SettingsGroup::_createSettingsFact(const QString& factName)
 {
-    return new SettingsFact(_settingsGroup, _nameToMetaDataMap[name], this);
+    return new SettingsFact(_settingsGroup, _nameToMetaDataMap[factName], this);
 }
 
diff --git a/src/Settings/SettingsGroup.h b/src/Settings/SettingsGroup.h
index 048c0b1132fdb721cb48c5f962ad505776f2c934..db85bb427334d2effea47d2cc25b4c40b504ba30 100644
--- a/src/Settings/SettingsGroup.h
+++ b/src/Settings/SettingsGroup.h
@@ -31,10 +31,10 @@ public:
     Q_PROPERTY(bool visible MEMBER _visible CONSTANT)
 
 protected:
-    SettingsFact* _createSettingsFact(const QString& name);
+    SettingsFact* _createSettingsFact(const QString& factName);
 
-    QString _name;
-    QString _settingsGroup;
+    QString _name;              ///< Name for group. Used to generate name for loaded json meta data file.
+    QString _settingsGroup;     ///< QSettings group which contains these settings. empty for settings in root
     bool    _visible;
 
     QMap<QString, FactMetaData*> _nameToMetaDataMap;
diff --git a/src/Settings/UnitsSettings.cc b/src/Settings/UnitsSettings.cc
index cd5988891cbfadc336882b45e70f667bf769a0c9..e0e75a9b3c13d03177f005f496f0f9c84f591157 100644
--- a/src/Settings/UnitsSettings.cc
+++ b/src/Settings/UnitsSettings.cc
@@ -12,14 +12,16 @@
 #include <QQmlEngine>
 #include <QtQml>
 
-const char* UnitsSettings::unitsSettingsGroupName =     "Units";
-const char* UnitsSettings::distanceUnitsSettingsName =  "DistanceUnits";
-const char* UnitsSettings::areaUnitsSettingsName =      "AreaUnits";
-const char* UnitsSettings::speedUnitsSettingsName =     "SpeedUnits";
-const char* UnitsSettings::temperatureUnitsSettingsName = "TemperatureUnits";
+const char* UnitsSettings::name =                           "Units";
+const char* UnitsSettings::settingsGroup =                  ""; // settings are in root group
+
+const char* UnitsSettings::distanceUnitsSettingsName =      "DistanceUnits";
+const char* UnitsSettings::areaUnitsSettingsName =          "AreaUnits";
+const char* UnitsSettings::speedUnitsSettingsName =         "SpeedUnits";
+const char* UnitsSettings::temperatureUnitsSettingsName =   "TemperatureUnits";
 
 UnitsSettings::UnitsSettings(QObject* parent)
-    : SettingsGroup(unitsSettingsGroupName, QString() /* root settings group */, parent)
+    : SettingsGroup(name, settingsGroup, parent)
     , _distanceUnitsFact(NULL)
     , _areaUnitsFact(NULL)
     , _speedUnitsFact(NULL)
diff --git a/src/Settings/UnitsSettings.h b/src/Settings/UnitsSettings.h
index 1d09201c5cc49533689ddb620e77b1c352a58300..28c3d3dc93a08e15c2a9103dcaa563bc8a6e3c18 100644
--- a/src/Settings/UnitsSettings.h
+++ b/src/Settings/UnitsSettings.h
@@ -61,7 +61,8 @@ public:
     Fact* speedUnits                        (void);
     Fact* temperatureUnits                  (void);
 
-    static const char* unitsSettingsGroupName;
+    static const char* name;
+    static const char* settingsGroup;
 
     static const char* distanceUnitsSettingsName;
     static const char* areaUnitsSettingsName;
diff --git a/src/Settings/VideoSettings.cc b/src/Settings/VideoSettings.cc
index cb6ab514f1eeca4f5250f42d4d82017caf65d53e..a76d588a2d6dded9d5130cbef798a04c0069cb36 100644
--- a/src/Settings/VideoSettings.cc
+++ b/src/Settings/VideoSettings.cc
@@ -17,7 +17,8 @@
 #include <QCameraInfo>
 #endif
 
-const char* VideoSettings::videoSettingsGroupName = "Video";
+const char* VideoSettings::name =                   "Video";
+const char* VideoSettings::settingsGroup =          ""; // settings are in root group
 
 const char* VideoSettings::videoSourceName =        "VideoSource";
 const char* VideoSettings::udpPortName =            "VideoUDPPort";
@@ -40,7 +41,7 @@ const char* VideoSettings::videoSourceRTSP =        "RTSP Video Stream";
 const char* VideoSettings::videoSourceTCP =         "TCP-MPEG2 Video Stream";
 
 VideoSettings::VideoSettings(QObject* parent)
-    : SettingsGroup(videoSettingsGroupName, QString() /* root settings group */, parent)
+    : SettingsGroup(name, settingsGroup, parent)
     , _videoSourceFact(NULL)
     , _udpPortFact(NULL)
     , _tcpUrlFact(NULL)
diff --git a/src/Settings/VideoSettings.h b/src/Settings/VideoSettings.h
index 63b6840d165d5d110b478f0e34608c53f70dec5b..a8933972191192521e988a9444ddd49f50aacdbf 100644
--- a/src/Settings/VideoSettings.h
+++ b/src/Settings/VideoSettings.h
@@ -49,7 +49,8 @@ public:
     Fact* disableWhenDisarmed   (void);
     bool  streamConfigured      (void);
 
-    static const char* videoSettingsGroupName;
+    static const char* name;
+    static const char* settingsGroup;
 
     static const char* videoSourceName;
     static const char* udpPortName;
diff --git a/src/api/QGCCorePlugin.h b/src/api/QGCCorePlugin.h
index 63672b0d729f46c06794744bbdd41d7a5605290a..cb8b82a97f95fa2a674fe780c05b9cda0a1d0ace 100644
--- a/src/api/QGCCorePlugin.h
+++ b/src/api/QGCCorePlugin.h
@@ -67,12 +67,12 @@ public:
     virtual QGCOptions* options(void);
 
     /// Allows the core plugin to override the visibility for a settings group
-    ///     @param name - Setting group name
+    ///     @param name - SettingsGroup name
     /// @return true: Show settings ui, false: Hide settings ui
     virtual bool overrideSettingsGroupVisibility(QString name);
 
     /// Allows the core plugin to override the setting meta data before the setting fact is created.
-    ///     @param settingsGroup - Settings group which contains this value
+    ///     @param settingsGroup - QSettings group which contains this item
     ///     @param metaData - MetaData for setting fact
     /// @return true: Setting should be visible in ui, false: Setting should not be shown in ui
     virtual bool adjustSettingMetaData(const QString& settingsGroup, FactMetaData& metaData);