Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r1bc34c23575fe101b85c851cff245436394d7123 -r8457901952a1d732c4688da471ae98e1d4f3024f
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 1bc34c23575fe101b85c851cff245436394d7123)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 8457901952a1d732c4688da471ae98e1d4f3024f)
@@ -71,7 +71,7 @@
     readonly property bool visibleDeviceRegistration    :   onlyManufacturing   &&  loggedIn
     readonly property bool visibleInstitutionalRecord   :   true
     readonly property bool visibleLocalization          :                           loggedIn
-    readonly property bool visibleUserModes             :                           loggedIn
+    readonly property bool visibleAdvancedModes         :                           loggedIn
 
     readonly property string settingsTitle              : _GuiView.manufactSetup ? qsTr("Manufacturing Setup")  : _GuiView.updateSetup
                                                                                  ? qsTr("Software Update")      : qsTr("Device Settings")
@@ -95,7 +95,7 @@
         FactoryReset        ,
         Decommission        ,
         InstitutionalRecord ,
-        UserMode
+        AdvancedMode
     }
     property var itemsText  : [
         qsTr("Device Information"           ), // Device Information
@@ -116,7 +116,7 @@
         qsTr("Factory Reset"                ), // FactoryReset
         qsTr("Decommissioning"              ), // Decommission
         qsTr("Institutional Configurations" ), // Institutional Configurations
-        qsTr("User Modes"                   ), // User Modes
+        qsTr("Advanced Mode"                ), // Advanced Modes
     ]
 
     property var itemsVisible  : [
@@ -138,7 +138,7 @@
         visibleFactoryReset                 , // FactoryReset
         visibleDecommission                 , // Decommission
         visibleInstitutionalRecord          , // Institutional Record
-        visibleUserModes                    , //  User Modes
+        visibleAdvancedModes                , // Advanced Modes
     ]
 
     // TODO: SRS 405/406 Test Mode instead add Q_PROPERTY to monitor state???
@@ -240,8 +240,8 @@
                 push( _settingLocalization )
                 break
 
-            case SettingsStack.UserMode:
-                push( _settingUserMode )
+            case SettingsStack.AdvancedMode:
+                push( _settingAdvancedMode )
                 break
 
             default:
@@ -267,7 +267,7 @@
     SettingsDecommission        { id: _serviceDecommission          }
     SettingsInstitutionalRecord { id: _settingsInstitutionalRecord  }
     SettingsLocalization        { id: _settingLocalization          }
-    SettingsUserMode            { id: _settingUserMode              }
+    SettingsAdvancedMode        { id: _settingAdvancedMode          }
 
     function gotoServiceMode( vservice ) {
         //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth)