diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index c9620f62cd94bed04edab4d3914fd0710cad5d94..870f12057139f0ea6c25b4fe15adec3a4511581f 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -179,10 +179,10 @@
         <file alias="Vehicle/GPSFact.json">src/Vehicle/GPSFact.json</file>
         <file alias="Vehicle/WindFact.json">src/Vehicle/WindFact.json</file>
         <file alias="Vehicle/VibrationFact.json">src/Vehicle/VibrationFact.json</file>
-        <file alias="SettingsGroup.app.json">src/Settings/SettingsGroup.app.json</file>
-        <file alias="SettingsGroup.autoConnect.json">src/Settings/SettingsGroup.autoConnect.json</file>
-        <file alias="SettingsGroup.units.json">src/Settings/SettingsGroup.units.json</file>
-        <file alias="SettingsGroup.video.json">src/Settings/SettingsGroup.video.json</file>
+        <file alias="App.SettingsGroup.json">src/Settings/App.SettingsGroup.json</file>
+        <file alias="AutoConnect.SettingsGroup.json">src/Settings/AutoConnect.SettingsGroup.json</file>
+        <file alias="Units.SettingsGroup.json">src/Settings/Units.SettingsGroup.json</file>
+        <file alias="Video.SettingsGroup.json">src/Settings/Video.SettingsGroup.json</file>
         <file alias="RallyPoint.FactMetaData.json">src/MissionManager/RallyPoint.FactMetaData.json</file>
         <file alias="FWLandingPattern.FactMetaData.json">src/MissionManager/FWLandingPattern.FactMetaData.json</file>
         <file alias="Survey.FactMetaData.json">src/MissionManager/Survey.FactMetaData.json</file>
diff --git a/src/Settings/SettingsGroup.app.json b/src/Settings/App.SettingsGroup.json
similarity index 100%
rename from src/Settings/SettingsGroup.app.json
rename to src/Settings/App.SettingsGroup.json
diff --git a/src/Settings/AppSettings.cc b/src/Settings/AppSettings.cc
index c0fb64fe8f3cf366dd18db0386b32a40159ed0f8..d2284a7b3e29f86c94cce6a9ae2c9c05dcc7546f 100644
--- a/src/Settings/AppSettings.cc
+++ b/src/Settings/AppSettings.cc
@@ -12,7 +12,7 @@
 #include <QQmlEngine>
 #include <QtQml>
 
-const char* AppSettings::appSettingsGroupName =                         "app";
+const char* AppSettings::appSettingsGroupName =                         "App";
 const char* AppSettings::offlineEditingFirmwareTypeSettingsName =       "OfflineEditingFirmwareType";
 const char* AppSettings::offlineEditingVehicleTypeSettingsName =        "OfflineEditingVehicleType";
 const char* AppSettings::offlineEditingCruiseSpeedSettingsName =        "OfflineEditingCruiseSpeed";
diff --git a/src/Settings/SettingsGroup.autoConnect.json b/src/Settings/AutoConnect.SettingsGroup.json
similarity index 100%
rename from src/Settings/SettingsGroup.autoConnect.json
rename to src/Settings/AutoConnect.SettingsGroup.json
diff --git a/src/Settings/AutoConnectSettings.cc b/src/Settings/AutoConnectSettings.cc
index 008c08e046b9945dedc2de18309f97e68766fe69..fc1247f84c289394c062b872b0d92ec4882a86fe 100644
--- a/src/Settings/AutoConnectSettings.cc
+++ b/src/Settings/AutoConnectSettings.cc
@@ -22,7 +22,7 @@ const char* AutoConnectSettings:: autoConnectPX4FlowSettingsName =      "Autocon
 const char* AutoConnectSettings:: autoConnectRTKGPSSettingsName =       "AutoconnectRTKGPS";
 const char* AutoConnectSettings:: autoConnectLibrePilotSettingsName =   "AutoconnectLibrePilot";
 
-const char* AutoConnectSettings::autoConnectSettingsGroupName = "autoConnect";
+const char* AutoConnectSettings::autoConnectSettingsGroupName = "AutoConnect";
 
 AutoConnectSettings::AutoConnectSettings(QObject* parent)
     : SettingsGroup(autoConnectSettingsGroupName, _settingsGroup, parent)
diff --git a/src/Settings/SettingsGroup.cc b/src/Settings/SettingsGroup.cc
index c29c42509378a547727c554054eea2a5f0c16299..e0f1ac231397146c46dbd31c3be6b44158b2d272 100644
--- a/src/Settings/SettingsGroup.cc
+++ b/src/Settings/SettingsGroup.cc
@@ -17,7 +17,7 @@ SettingsGroup::SettingsGroup(const QString& name, const QString& settingsGroup,
     , _settingsGroup(settingsGroup)
     , _visible(qgcApp()->toolbox()->corePlugin()->overrideSettingsGroupVisibility(name))
 {
-    QString jsonNameFormat(":/json/SettingsGroup.%1.json");
+    QString jsonNameFormat(":/json/%1.SettingsGroup.json");
 
     _nameToMetaDataMap = FactMetaData::createMapFromJsonFile(jsonNameFormat.arg(name), this);
 }
diff --git a/src/Settings/SettingsGroup.units.json b/src/Settings/Units.SettingsGroup.json
similarity index 100%
rename from src/Settings/SettingsGroup.units.json
rename to src/Settings/Units.SettingsGroup.json
diff --git a/src/Settings/UnitsSettings.cc b/src/Settings/UnitsSettings.cc
index 608e45cfd4650111aa8615d612117d3b4c759842..0d5c6e0d6df29fd8ecaf43ea5839bb286874866b 100644
--- a/src/Settings/UnitsSettings.cc
+++ b/src/Settings/UnitsSettings.cc
@@ -12,7 +12,7 @@
 #include <QQmlEngine>
 #include <QtQml>
 
-const char* UnitsSettings::unitsSettingsGroupName =     "units";
+const char* UnitsSettings::unitsSettingsGroupName =     "Units";
 const char* UnitsSettings::distanceUnitsSettingsName =  "DistanceUnits";
 const char* UnitsSettings::areaUnitsSettingsName =      "AreaUnits";
 const char* UnitsSettings::speedUnitsSettingsName =     "SpeedUnits";