diff --git a/src/components/AppNavigation/AppNavigationMixin.js b/src/components/AppNavigation/AppNavigationMixin.js
index 935bd7e..b89f361 100644
--- a/src/components/AppNavigation/AppNavigationMixin.js
+++ b/src/components/AppNavigation/AppNavigationMixin.js
@@ -12,7 +12,7 @@
     iconLogs: IconTextLinkAnalysis,
     iconHealth: IconDataCheck,
     iconControl: IconSettingsAdjust,
-    iconConfiguration: IconSettings,
+    iconSettings: IconSettings,
     iconAccessControl: IconPassword,
     iconExpand: IconChevronUp,
   },
@@ -85,11 +85,6 @@
               route: '/operations/manage-power-usage',
             },
             {
-              id: 'power-restore-policy',
-              label: this.$t('appNavigation.powerRestorePolicy'),
-              route: '/operations/power-restore-policy',
-            },
-            {
               id: 'reboot-bmc',
               label: this.$t('appNavigation.rebootBmc'),
               route: '/operations/reboot-bmc',
@@ -112,29 +107,29 @@
           ],
         },
         {
-          id: 'configuration',
-          label: this.$t('appNavigation.configuration'),
-          icon: 'iconConfiguration',
+          id: 'settings',
+          label: this.$t('appNavigation.settings'),
+          icon: 'iconSettings',
           children: [
             {
-              id: 'date-time-settings',
-              label: this.$t('appNavigation.dateTimeSettings'),
-              route: '/configuration/date-time-settings',
+              id: 'date-time',
+              label: this.$t('appNavigation.dateTime'),
+              route: '/settings/date-time',
             },
             {
-              id: 'network-settings',
-              label: this.$t('appNavigation.networkSettings'),
-              route: '/configuration/network-settings',
+              id: 'network',
+              label: this.$t('appNavigation.network'),
+              route: '/settings/network',
+            },
+            {
+              id: 'power-restore-policy',
+              label: this.$t('appNavigation.powerRestorePolicy'),
+              route: '/settings/power-restore-policy',
             },
             {
               id: 'security-settings',
               label: this.$t('appNavigation.securitySettings'),
-              route: '/configuration/security-settings',
-            },
-            {
-              id: 'snmp-settings',
-              label: this.$t('appNavigation.snmpSettings'),
-              route: '/snmp-settings',
+              route: '/settings/security-settings',
             },
           ],
         },
diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js
index fa3891e..d6a6289 100644
--- a/src/env/components/AppNavigation/ibm.js
+++ b/src/env/components/AppNavigation/ibm.js
@@ -12,7 +12,7 @@
     iconLogs: IconTextLinkAnalysis,
     iconHealth: IconDataCheck,
     iconControl: IconSettingsAdjust,
-    iconConfiguration: IconSettings,
+    iconSettings: IconSettings,
     iconAccessControl: IconPassword,
     iconExpand: IconChevronUp,
   },
@@ -85,11 +85,6 @@
               route: '/operations/manage-power-usage',
             },
             {
-              id: 'power-restore-policy',
-              label: this.$t('appNavigation.powerRestorePolicy'),
-              route: '/operations/power-restore-policy',
-            },
-            {
               id: 'reboot-bmc',
               label: this.$t('appNavigation.rebootBmc'),
               route: '/operations/reboot-bmc',
@@ -107,29 +102,29 @@
           ],
         },
         {
-          id: 'configuration',
-          label: this.$t('appNavigation.configuration'),
-          icon: 'iconConfiguration',
+          id: 'settings',
+          label: this.$t('appNavigation.settings'),
+          icon: 'iconSettings',
           children: [
             {
-              id: 'date-time-settings',
-              label: this.$t('appNavigation.dateTimeSettings'),
-              route: '/configuration/date-time-settings',
+              id: 'date-time',
+              label: this.$t('appNavigation.dateTime'),
+              route: '/settings/date-time',
             },
             {
-              id: 'network-settings',
-              label: this.$t('appNavigation.networkSettings'),
-              route: '/configuration/network-settings',
+              id: 'network',
+              label: this.$t('appNavigation.network'),
+              route: '/settings/network',
+            },
+            {
+              id: 'power-restore-policy',
+              label: this.$t('appNavigation.powerRestorePolicy'),
+              route: '/settings/power-restore-policy',
             },
             {
               id: 'security-settings',
               label: this.$t('appNavigation.securitySettings'),
-              route: '/configuration/security-settings',
-            },
-            {
-              id: 'snmp-settings',
-              label: this.$t('appNavigation.snmpSettings'),
-              route: '/configuration/snmp-settings',
+              route: '/settings/security-settings',
             },
           ],
         },
diff --git a/src/env/components/AppNavigation/intel.js b/src/env/components/AppNavigation/intel.js
index 2c4188c..20aa4f2 100644
--- a/src/env/components/AppNavigation/intel.js
+++ b/src/env/components/AppNavigation/intel.js
@@ -12,7 +12,7 @@
     iconLogs: IconTextLinkAnalysis,
     iconHealth: IconDataCheck,
     iconControl: IconSettingsAdjust,
-    iconConfiguration: IconSettings,
+    iconSettings: IconSettings,
     iconAccessControl: IconPassword,
     iconExpand: IconChevronUp,
   },
@@ -97,24 +97,24 @@
           ],
         },
         {
-          id: 'configuration',
-          label: this.$t('appNavigation.configuration'),
-          icon: 'iconConfiguration',
+          id: 'settings',
+          label: this.$t('appNavigation.settings'),
+          icon: 'iconSettings',
           children: [
             {
-              id: 'date-time-settings',
-              label: this.$t('appNavigation.dateTimeSettings'),
-              route: '/configuration/date-time-settings',
+              id: 'date-time',
+              label: this.$t('appNavigation.dateTime'),
+              route: '/settings/date-time',
             },
             {
-              id: 'network-settings',
-              label: this.$t('appNavigation.networkSettings'),
-              route: '/configuration/network-settings',
+              id: 'network',
+              label: this.$t('appNavigation.network'),
+              route: '/settings/network',
             },
             {
               id: 'security-settings',
               label: this.$t('appNavigation.securitySettings'),
-              route: '/configuration/security-settings',
+              route: '/settings/security-settings',
             },
           ],
         },
diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js
index b0129ea..4149b97 100644
--- a/src/env/router/ibm.js
+++ b/src/env/router/ibm.js
@@ -2,7 +2,7 @@
 import ChangePassword from '@/views/ChangePassword';
 import ClientSessions from '@/views/AccessControl/ClientSessions';
 import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
-import DateTimeSettings from '@/views/Configuration/DateTimeSettings';
+import DateTime from '@/views/Settings/DateTime';
 import EventLogs from '@/views/Logs/EventLogs';
 import FactoryReset from '@/views/Operations/FactoryReset';
 import Firmware from '@/views/Operations/Firmware';
@@ -12,14 +12,14 @@
 import Login from '@/views/Login';
 import LoginLayout from '@/layouts/LoginLayout';
 import ManagePowerUsage from '@/views/Operations/ManagePowerUsage';
-import NetworkSettings from '@/views/Configuration/NetworkSettings';
+import Network from '@/views/Settings/Network';
 import Overview from '@/views/Overview';
 import PageNotFound from '@/views/PageNotFound';
 import PostCodeLogs from '@/views/Logs/PostCodeLogs';
-import PowerRestorePolicy from '@/views/Operations/PowerRestorePolicy';
+import PowerRestorePolicy from '@/views/Settings/PowerRestorePolicy';
 import ProfileSettings from '@/views/ProfileSettings';
 import RebootBmc from '@/views/Operations/RebootBmc';
-import SecuritySettings from '@/views/Configuration/SecuritySettings';
+import SecuritySettings from '@/views/Settings/SecuritySettings';
 import Sensors from '@/views/HardwareStatus/Sensors';
 import SerialOverLan from '@/views/Operations/SerialOverLan';
 import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole';
@@ -167,11 +167,11 @@
         },
       },
       {
-        path: '/configuration/date-time-settings',
-        name: 'date-time-settings',
-        component: DateTimeSettings,
+        path: '/settings/date-time',
+        name: 'date-time',
+        component: DateTime,
         meta: {
-          title: i18n.t('appPageTitle.dateTimeSettings'),
+          title: i18n.t('appPageTitle.dateTime'),
         },
       },
       {
@@ -191,7 +191,15 @@
         },
       },
       {
-        path: '/operations/power-restore-policy',
+        path: '/settings/network',
+        name: 'network',
+        component: Network,
+        meta: {
+          title: i18n.t('appPageTitle.network'),
+        },
+      },
+      {
+        path: '/settings/power-restore-policy',
         name: 'power-restore-policy',
         component: PowerRestorePolicy,
         meta: {
@@ -199,15 +207,7 @@
         },
       },
       {
-        path: '/configuration/network-settings',
-        name: 'network-settings',
-        component: NetworkSettings,
-        meta: {
-          title: i18n.t('appPageTitle.networkSettings'),
-        },
-      },
-      {
-        path: '/configuration/security-settings',
+        path: '/settings/security-settings',
         name: 'security-settings',
         component: SecuritySettings,
         meta: {
diff --git a/src/env/router/intel.js b/src/env/router/intel.js
index 04fc0ef..a8c5a2a 100644
--- a/src/env/router/intel.js
+++ b/src/env/router/intel.js
@@ -2,7 +2,7 @@
 import ChangePassword from '@/views/ChangePassword';
 import ClientSessions from '@/views/AccessControl/ClientSessions';
 import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
-import DateTimeSettings from '@/views/Configuration/DateTimeSettings';
+import DateTime from '@/views/Settings/DateTime';
 import EventLogs from '@/views/Logs/EventLogs';
 import Firmware from '@/views/Operations/Firmware';
 import Inventory from '@/views/HardwareStatus/Inventory';
@@ -12,12 +12,12 @@
 import Login from '@/views/Login';
 import LoginLayout from '@/layouts/LoginLayout';
 import ManagePowerUsage from '@/views/Operations/ManagePowerUsage';
-import NetworkSettings from '@/views/Configuration/NetworkSettings';
+import Network from '@/views/Settings/Network';
 import Overview from '@/views/Overview';
 import PageNotFound from '@/views/PageNotFound';
 import ProfileSettings from '@/views/ProfileSettings';
 import RebootBmc from '@/views/Operations/RebootBmc';
-import SecuritySettings from '@/views/Configuration/SecuritySettings';
+import SecuritySettings from '@/views/Settings/SecuritySettings';
 import Sensors from '@/views/HardwareStatus/Sensors';
 import SerialOverLan from '@/views/Operations/SerialOverLan';
 import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole';
@@ -147,11 +147,11 @@
         },
       },
       {
-        path: '/configuration/date-time-settings',
-        name: 'date-time-settings',
-        component: DateTimeSettings,
+        path: '/settings/date-time',
+        name: 'date-time',
+        component: DateTime,
         meta: {
-          title: i18n.t('appPageTitle.dateTimeSettings'),
+          title: i18n.t('appPageTitle.dateTime'),
         },
       },
       {
@@ -179,15 +179,15 @@
         },
       },
       {
-        path: '/configuration/network-settings',
-        name: 'network-settings',
-        component: NetworkSettings,
+        path: '/settings/network',
+        name: 'network',
+        component: Network,
         meta: {
-          title: i18n.t('appPageTitle.networkSettings'),
+          title: i18n.t('appPageTitle.network'),
         },
       },
       {
-        path: '/configuration/security-settings',
+        path: '/settings/security-settings',
         name: 'security-settings',
         component: SecuritySettings,
         meta: {
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index 856edb8..ed23aca 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -100,9 +100,9 @@
   "appNavigation": {
     "accessControl": "Access control",
     "clientSessions": "@:appPageTitle.clientSessions",
-    "configuration": "Configuration",
+    "settings": "Settings",
     "operations": "Operations",
-    "dateTimeSettings": "@:appPageTitle.dateTimeSettings",
+    "dateTime": "@:appPageTitle.dateTime",
     "dumps": "@:appPageTitle.dumps",
     "eventLogs": "@:appPageTitle.eventLogs",
     "factoryReset": "@:appPageTitle.factoryReset",
@@ -114,7 +114,7 @@
     "logs": "Logs",
     "localUserManagement": "@:appPageTitle.localUserManagement",
     "managePowerUsage": "@:appPageTitle.managePowerUsage",
-    "networkSettings": "@:appPageTitle.networkSettings",
+    "network": "@:appPageTitle.network",
     "overview": "@:appPageTitle.overview",
     "primaryNavigation": "Primary navigation",
     "postCodeLogs": "@:appPageTitle.postCodeLogs",
@@ -124,14 +124,13 @@
     "sensors": "@:appPageTitle.sensors",
     "serialOverLan": "SOL console",
     "serverPowerOperations": "@:appPageTitle.serverPowerOperations",
-    "snmpSettings": "SNMP settings",
     "sslCertificates": "@:appPageTitle.sslCertificates",
     "virtualMedia": "@:appPageTitle.virtualMedia"
   },
   "appPageTitle": {
     "changePassword": "Change password",
     "clientSessions": "Client sessions",
-    "dateTimeSettings": "Date and time settings",
+    "dateTime": "Date and time",
     "dumps": "Dumps",
     "eventLogs": "Event logs",
     "factoryReset": "Factory reset",
@@ -142,7 +141,7 @@
     "localUserManagement": "Local user management",
     "login": "Login",
     "managePowerUsage": "Manage power usage",
-    "networkSettings": "Network settings",
+    "network": "Network",
     "overview": "Overview",
     "pageNotFound": "Page not found",
     "postCodeLogs": "POST code logs",
@@ -184,7 +183,7 @@
       "successDelete": "Successfully disconnected %{count} session. | Successfully disconnected %{count} sessions."
     }
   },
-  "pageDateTimeSettings": {
+  "pageDateTime": {
     "alert": {
       "message": "To change how date and time are displayed (either UTC or browser offset) throughout the application, visit ",
       "link": "Profile Settings"
@@ -195,7 +194,7 @@
       "manual": "Manual",
       "time": {
         "label": "24-hour time",
-        "timezone": "@:pageDateTimeSettings.form.time.label (%{timezone})"
+        "timezone": "@:pageDateTime.form.time.label (%{timezone})"
       },
       "ntpServers": {
         "server1": "Server 1",
@@ -204,8 +203,8 @@
       }
     },
     "toast": {
-      "errorSaveDateTimeSettings": "Error saving date and time settings.",
-      "successSaveDateTimeSettings": "Successfully saved date and time settings."
+      "errorSaveDateTime": "Error saving date and time settings.",
+      "successSaveDateTime": "Successfully saved date and time settings."
     }
   },
   "pageDumps": {
@@ -630,7 +629,7 @@
     "powerCapSettingLabel": "Power cap setting",
     "powerConsumption": "Current power consumption"
   },
-  "pageNetworkSettings": {
+  "pageNetwork": {
     "dhcp": "DHCP",
     "ipv4": "IPV4",
     "ipv4Configuration": "IPV4 configuration",
diff --git a/src/router/routes.js b/src/router/routes.js
index f8461f3..a5cb7f2 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -1,7 +1,7 @@
 import AppLayout from '@/layouts/AppLayout.vue';
 import ChangePassword from '@/views/ChangePassword';
 import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
-import DateTimeSettings from '@/views/Configuration/DateTimeSettings';
+import DateTime from '@/views/Settings/DateTime';
 import EventLogs from '@/views/Logs/EventLogs';
 import FactoryReset from '@/views/Operations/FactoryReset';
 import Firmware from '@/views/Operations/Firmware';
@@ -14,14 +14,14 @@
 import Login from '@/views/Login';
 import LoginLayout from '@/layouts/LoginLayout';
 import ManagePowerUsage from '@/views/Operations/ManagePowerUsage';
-import NetworkSettings from '@/views/Configuration/NetworkSettings';
+import Network from '@/views/Settings/Network';
 import Overview from '@/views/Overview';
 import PageNotFound from '@/views/PageNotFound';
 import PostCodeLogs from '@/views/Logs/PostCodeLogs';
-import PowerRestorePolicy from '@/views/Operations/PowerRestorePolicy';
+import PowerRestorePolicy from '@/views/Settings/PowerRestorePolicy';
 import ProfileSettings from '@/views/ProfileSettings';
 import RebootBmc from '@/views/Operations/RebootBmc';
-import SecuritySettings from '@/views/Configuration/SecuritySettings';
+import SecuritySettings from '@/views/Settings/SecuritySettings';
 import Sensors from '@/views/HardwareStatus/Sensors';
 import SerialOverLan from '@/views/Operations/SerialOverLan';
 import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole';
@@ -167,11 +167,11 @@
         },
       },
       {
-        path: '/configuration/date-time-settings',
-        name: 'date-time-settings',
-        component: DateTimeSettings,
+        path: '/settings/date-time',
+        name: 'date-time',
+        component: DateTime,
         meta: {
-          title: i18n.t('appPageTitle.dateTimeSettings'),
+          title: i18n.t('appPageTitle.dateTime'),
         },
       },
       {
@@ -215,7 +215,15 @@
         },
       },
       {
-        path: '/operations/power-restore-policy',
+        path: '/settings/network',
+        name: 'network',
+        component: Network,
+        meta: {
+          title: i18n.t('appPageTitle.network'),
+        },
+      },
+      {
+        path: '/settings/power-restore-policy',
         name: 'power-restore-policy',
         component: PowerRestorePolicy,
         meta: {
@@ -223,14 +231,6 @@
         },
       },
       {
-        path: '/configuration/network-settings',
-        name: 'network-settings',
-        component: NetworkSettings,
-        meta: {
-          title: i18n.t('appPageTitle.networkSettings'),
-        },
-      },
-      {
         path: '/operations/reboot-bmc',
         name: 'reboot-bmc',
         component: RebootBmc,
diff --git a/src/store/index.js b/src/store/index.js
index fcfac59..2afadd0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -11,8 +11,8 @@
 import BootSettingsStore from './modules/Operations/BootSettingsStore';
 import ControlStore from './modules/Operations/ControlStore';
 import PowerControlStore from './modules/Operations/PowerControlStore';
-import PowerPolicyStore from './modules/Operations/PowerPolicyStore';
-import NetworkSettingStore from './modules/Configuration/NetworkSettingsStore';
+import PowerPolicyStore from './modules/Settings/PowerPolicyStore';
+import NetworkStore from './modules/Settings/NetworkStore';
 import EventLogStore from './modules/Logs/EventLogStore';
 import SensorsStore from './modules/HardwareStatus/SensorsStore';
 import ServerLedStore from './modules/HardwareStatus/ServerLedStore';
@@ -24,11 +24,11 @@
 import BmcStore from './modules/HardwareStatus/BmcStore';
 import ProcessorStore from './modules/HardwareStatus/ProcessorStore';
 import PostCodeLogsStore from './modules/Logs/PostCodeLogsStore';
-import SecuritySettingsStore from './modules/Configuration/SecuritySettingsStore';
+import SecuritySettingsStore from './modules/Settings/SecuritySettingsStore';
 import FactoryResetStore from './modules/Operations/FactoryResetStore';
 
 import WebSocketPlugin from './plugins/WebSocketPlugin';
-import DateTimeStore from './modules/Configuration/DateTimeSettingsStore';
+import DateTimeStore from './modules/Settings/DateTimeStore';
 import VirtualMediaStore from './modules/Operations/VirtualMediaStore';
 
 Vue.use(Vuex);
@@ -50,7 +50,7 @@
     powerControl: PowerControlStore,
     powerPolicy: PowerPolicyStore,
     powerSupply: PowerSupplyStore,
-    networkSettings: NetworkSettingStore,
+    network: NetworkStore,
     eventLog: EventLogStore,
     sensors: SensorsStore,
     sslCertificates: SslCertificatesStore,
diff --git a/src/store/modules/Configuration/DateTimeSettingsStore.js b/src/store/modules/Settings/DateTimeStore.js
similarity index 89%
rename from src/store/modules/Configuration/DateTimeSettingsStore.js
rename to src/store/modules/Settings/DateTimeStore.js
index f431a74..51b722a 100644
--- a/src/store/modules/Configuration/DateTimeSettingsStore.js
+++ b/src/store/modules/Settings/DateTimeStore.js
@@ -30,7 +30,7 @@
           console.log(error);
         });
     },
-    async updateDateTimeSettings({ state }, dateTimeForm) {
+    async updateDateTime({ state }, dateTimeForm) {
       const ntpData = {
         NTP: {
           ProtocolEnabled: dateTimeForm.ntpProtocolEnabled,
@@ -68,15 +68,11 @@
           }
         })
         .then(() => {
-          return i18n.t(
-            'pageDateTimeSettings.toast.successSaveDateTimeSettings'
-          );
+          return i18n.t('pageDateTime.toast.successSaveDateTime');
         })
         .catch((error) => {
           console.log(error);
-          throw new Error(
-            i18n.t('pageDateTimeSettings.toast.errorSaveDateTimeSettings')
-          );
+          throw new Error(i18n.t('pageDateTime.toast.errorSaveDateTime'));
         });
     },
   },
diff --git a/src/store/modules/Configuration/NetworkSettingsStore.js b/src/store/modules/Settings/NetworkStore.js
similarity index 92%
rename from src/store/modules/Configuration/NetworkSettingsStore.js
rename to src/store/modules/Settings/NetworkStore.js
index 159c5bf..4040658 100644
--- a/src/store/modules/Configuration/NetworkSettingsStore.js
+++ b/src/store/modules/Settings/NetworkStore.js
@@ -2,7 +2,7 @@
 import i18n from '@/i18n';
 import { find, remove } from 'lodash';
 
-const NetworkSettingsStore = {
+const NetworkStore = {
   namespaced: true,
   state: {
     defaultGateway: '',
@@ -100,16 +100,14 @@
         )
         .then(() => dispatch('getEthernetData'))
         .then(() => {
-          return i18n.t('pageNetworkSettings.toast.successSaveNetworkSettings');
+          return i18n.t('pageNetwork.toast.successSaveNetworkSettings');
         })
         .catch((error) => {
           console.log(error);
-          throw new Error(
-            i18n.t('pageNetworkSettings.toast.errorSaveNetworkSettings')
-          );
+          throw new Error(i18n.t('pageNetwork.toast.errorSaveNetworkSettings'));
         });
     },
   },
 };
 
-export default NetworkSettingsStore;
+export default NetworkStore;
diff --git a/src/store/modules/Operations/PowerPolicyStore.js b/src/store/modules/Settings/PowerPolicyStore.js
similarity index 100%
rename from src/store/modules/Operations/PowerPolicyStore.js
rename to src/store/modules/Settings/PowerPolicyStore.js
diff --git a/src/store/modules/Configuration/SecuritySettingsStore.js b/src/store/modules/Settings/SecuritySettingsStore.js
similarity index 100%
rename from src/store/modules/Configuration/SecuritySettingsStore.js
rename to src/store/modules/Settings/SecuritySettingsStore.js
diff --git a/src/views/Configuration/DateTimeSettings/index.js b/src/views/Configuration/DateTimeSettings/index.js
deleted file mode 100644
index c8b5c08..0000000
--- a/src/views/Configuration/DateTimeSettings/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import DateTimeSettings from './DateTimeSettings.vue';
-export default DateTimeSettings;
diff --git a/src/views/Configuration/NetworkSettings/index.js b/src/views/Configuration/NetworkSettings/index.js
deleted file mode 100644
index 1215e1c..0000000
--- a/src/views/Configuration/NetworkSettings/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import NetworkSettings from './NetworkSettings.vue';
-export default NetworkSettings;
diff --git a/src/views/Overview/OverviewNetwork.vue b/src/views/Overview/OverviewNetwork.vue
index 8caf1e8..bfb378a 100644
--- a/src/views/Overview/OverviewNetwork.vue
+++ b/src/views/Overview/OverviewNetwork.vue
@@ -45,11 +45,11 @@
   name: 'Network',
   computed: {
     ethernetData() {
-      return this.$store.getters['networkSettings/ethernetData'];
+      return this.$store.getters['network/ethernetData'];
     },
   },
   created() {
-    this.$store.dispatch('networkSettings/getEthernetData').finally(() => {
+    this.$store.dispatch('network/getEthernetData').finally(() => {
       this.$root.$emit('overview-network-complete');
     });
   },
diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue
index 9392c56..1dc2c98 100644
--- a/src/views/Overview/OverviewQuickLinks.vue
+++ b/src/views/Overview/OverviewQuickLinks.vue
@@ -30,7 +30,7 @@
     </div>
     <div>
       <b-button
-        to="/configuration/network-settings"
+        to="/settings/network"
         variant="secondary"
         data-test-id="overviewQuickLinks-button-networkSettings"
         class="d-flex justify-content-between align-items-center"
diff --git a/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue b/src/views/Settings/DateTime/DateTime.vue
similarity index 88%
rename from src/views/Configuration/DateTimeSettings/DateTimeSettings.vue
rename to src/views/Settings/DateTime/DateTime.vue
index 613953f..e62e344 100644
--- a/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue
+++ b/src/views/Settings/DateTime/DateTime.vue
@@ -5,9 +5,9 @@
       <b-col md="8" xl="6">
         <alert variant="info" class="mb-4">
           <span>
-            {{ $t('pageDateTimeSettings.alert.message') }}
+            {{ $t('pageDateTime.alert.message') }}
             <b-link to="/profile-settings">
-              {{ $t('pageDateTimeSettings.alert.link') }}</b-link
+              {{ $t('pageDateTime.alert.link') }}</b-link
             >
           </span>
         </alert>
@@ -17,21 +17,21 @@
       <b-row>
         <b-col lg="3">
           <dl>
-            <dt>{{ $t('pageDateTimeSettings.form.date') }}</dt>
+            <dt>{{ $t('pageDateTime.form.date') }}</dt>
             <dd v-if="bmcTime">{{ bmcTime | formatDate }}</dd>
             <dd v-else>--</dd>
           </dl>
         </b-col>
         <b-col lg="3">
           <dl>
-            <dt>{{ $t('pageDateTimeSettings.form.time.label') }}</dt>
+            <dt>{{ $t('pageDateTime.form.time.label') }}</dt>
             <dd v-if="bmcTime">{{ bmcTime | formatTime }}</dd>
             <dd v-else>--</dd>
           </dl>
         </b-col>
       </b-row>
     </page-section>
-    <page-section :section-title="$t('pageDateTimeSettings.configureSettings')">
+    <page-section :section-title="$t('pageDateTime.configureSettings')">
       <b-form novalidate @submit.prevent="submitForm">
         <b-form-group
           label="Configure date and time"
@@ -41,14 +41,14 @@
           <b-form-radio
             v-model="form.configurationSelected"
             value="manual"
-            data-test-id="dateTimeSettings-radio-configureManual"
+            data-test-id="dateTime-radio-configureManual"
           >
-            {{ $t('pageDateTimeSettings.form.manual') }}
+            {{ $t('pageDateTime.form.manual') }}
           </b-form-radio>
           <b-row class="mt-3 ml-3">
             <b-col sm="6" lg="4" xl="3">
               <b-form-group
-                :label="$t('pageDateTimeSettings.form.date')"
+                :label="$t('pageDateTime.form.date')"
                 label-for="input-manual-date"
               >
                 <b-form-text id="date-format-help">YYYY-MM-DD</b-form-text>
@@ -58,7 +58,7 @@
                     v-model="form.manual.date"
                     :state="getValidationState($v.form.manual.date)"
                     :disabled="ntpOptionSelected"
-                    data-test-id="dateTimeSettings-input-manualDate"
+                    data-test-id="dateTime-input-manualDate"
                     class="form-control-with-button"
                     @blur="$v.form.manual.date.$touch()"
                   />
@@ -97,9 +97,7 @@
             </b-col>
             <b-col sm="6" lg="4" xl="3">
               <b-form-group
-                :label="
-                  $t('pageDateTimeSettings.form.time.timezone', { timezone })
-                "
+                :label="$t('pageDateTime.form.time.timezone', { timezone })"
                 label-for="input-manual-time"
               >
                 <b-form-text id="time-format-help">HH:MM</b-form-text>
@@ -109,7 +107,7 @@
                     v-model="form.manual.time"
                     :state="getValidationState($v.form.manual.time)"
                     :disabled="ntpOptionSelected"
-                    data-test-id="dateTimeSettings-input-manualTime"
+                    data-test-id="dateTime-input-manualTime"
                     @blur="$v.form.manual.time.$touch()"
                   />
                   <b-form-invalid-feedback role="alert">
@@ -127,14 +125,14 @@
           <b-form-radio
             v-model="form.configurationSelected"
             value="ntp"
-            data-test-id="dateTimeSettings-radio-configureNTP"
+            data-test-id="dateTime-radio-configureNTP"
           >
             NTP
           </b-form-radio>
           <b-row class="mt-3 ml-3">
             <b-col sm="6" lg="4" xl="3">
               <b-form-group
-                :label="$t('pageDateTimeSettings.form.ntpServers.server1')"
+                :label="$t('pageDateTime.form.ntpServers.server1')"
                 label-for="input-ntp-1"
               >
                 <b-input-group>
@@ -143,7 +141,7 @@
                     v-model="form.ntp.firstAddress"
                     :state="getValidationState($v.form.ntp.firstAddress)"
                     :disabled="manualOptionSelected"
-                    data-test-id="dateTimeSettings-input-ntpServer1"
+                    data-test-id="dateTime-input-ntpServer1"
                     @blur="$v.form.ntp.firstAddress.$touch()"
                   />
                   <b-form-invalid-feedback role="alert">
@@ -156,7 +154,7 @@
             </b-col>
             <b-col sm="6" lg="4" xl="3">
               <b-form-group
-                :label="$t('pageDateTimeSettings.form.ntpServers.server2')"
+                :label="$t('pageDateTime.form.ntpServers.server2')"
                 label-for="input-ntp-2"
               >
                 <b-input-group>
@@ -164,14 +162,14 @@
                     id="input-ntp-2"
                     v-model="form.ntp.secondAddress"
                     :disabled="manualOptionSelected"
-                    data-test-id="dateTimeSettings-input-ntpServer2"
+                    data-test-id="dateTime-input-ntpServer2"
                   />
                 </b-input-group>
               </b-form-group>
             </b-col>
             <b-col sm="6" lg="4" xl="3">
               <b-form-group
-                :label="$t('pageDateTimeSettings.form.ntpServers.server3')"
+                :label="$t('pageDateTime.form.ntpServers.server3')"
                 label-for="input-ntp-3"
               >
                 <b-input-group>
@@ -179,7 +177,7 @@
                     id="input-ntp-3"
                     v-model="form.ntp.thirdAddress"
                     :disabled="manualOptionSelected"
-                    data-test-id="dateTimeSettings-input-ntpServer3"
+                    data-test-id="dateTime-input-ntpServer3"
                   />
                 </b-input-group>
               </b-form-group>
@@ -188,7 +186,7 @@
           <b-button
             variant="primary"
             type="submit"
-            data-test-id="dateTimeSettings-button-saveSettings"
+            data-test-id="dateTime-button-saveSettings"
           >
             {{ $t('global.action.saveSettings') }}
           </b-button>
@@ -216,7 +214,7 @@
 const isoTimeRegex = /^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$/;
 
 export default {
-  name: 'DateTimeSettings',
+  name: 'DateTime',
   components: { Alert, IconCalendar, PageTitle, PageSection },
   mixins: [
     BVToastMixin,
@@ -366,7 +364,7 @@
       }
 
       this.$store
-        .dispatch('dateTime/updateDateTimeSettings', dateTimeForm)
+        .dispatch('dateTime/updateDateTime', dateTimeForm)
         .then((success) => {
           this.successToast(success);
           if (!isNTPEnabled) return;
diff --git a/src/views/Settings/DateTime/index.js b/src/views/Settings/DateTime/index.js
new file mode 100644
index 0000000..2df21ea
--- /dev/null
+++ b/src/views/Settings/DateTime/index.js
@@ -0,0 +1,2 @@
+import DateTime from './DateTime.vue';
+export default DateTime;
diff --git a/src/views/Configuration/NetworkSettings/NetworkSettings.vue b/src/views/Settings/Network/Network.vue
similarity index 85%
rename from src/views/Configuration/NetworkSettings/NetworkSettings.vue
rename to src/views/Settings/Network/Network.vue
index d6da717..ab5003f 100644
--- a/src/views/Configuration/NetworkSettings/NetworkSettings.vue
+++ b/src/views/Settings/Network/Network.vue
@@ -1,18 +1,18 @@
 <template>
   <b-container fluid="xl">
-    <page-title :description="$t('pageNetworkSettings.pageDescription')" />
-    <page-section :section-title="$t('pageNetworkSettings.interface')">
+    <page-title :description="$t('pageNetwork.pageDescription')" />
+    <page-section :section-title="$t('pageNetwork.interface')">
       <b-row>
         <b-col lg="3">
           <b-form-group
             label-for="interface-select"
-            :label="$t('pageNetworkSettings.form.networkInterface')"
+            :label="$t('pageNetwork.form.networkInterface')"
           >
             <b-form-select
               id="interface-select"
               v-model="selectedInterfaceIndex"
               :disabled="loading"
-              data-test-id="networkSettings-select-interface"
+              data-test-id="network-select-interface"
               :options="interfaceSelectOptions"
               @change="selectInterface"
             >
@@ -23,17 +23,17 @@
     </page-section>
     <b-form novalidate @submit.prevent="submitForm">
       <b-form-group :disabled="loading">
-        <page-section :section-title="$t('pageNetworkSettings.system')">
+        <page-section :section-title="$t('pageNetwork.system')">
           <b-row>
             <b-col lg="3">
               <b-form-group
-                :label="$t('pageNetworkSettings.form.defaultGateway')"
+                :label="$t('pageNetwork.form.defaultGateway')"
                 label-for="default-gateway"
               >
                 <b-form-input
                   id="default-gateway"
                   v-model.trim="form.gateway"
-                  data-test-id="networkSettings-input-gateway"
+                  data-test-id="network-input-gateway"
                   type="text"
                   :state="getValidationState($v.form.gateway)"
                   @change="$v.form.gateway.$touch()"
@@ -50,13 +50,13 @@
             </b-col>
             <b-col lg="3">
               <b-form-group
-                :label="$t('pageNetworkSettings.form.hostname')"
+                :label="$t('pageNetwork.form.hostname')"
                 label-for="hostname-field"
               >
                 <b-form-input
                   id="hostname-field"
                   v-model.trim="form.hostname"
-                  data-test-id="networkSettings-input-hostname"
+                  data-test-id="network-input-hostname"
                   type="text"
                   :state="getValidationState($v.form.hostname)"
                   @change="$v.form.hostname.$touch()"
@@ -75,13 +75,13 @@
             </b-col>
             <b-col lg="3">
               <b-form-group
-                :label="$t('pageNetworkSettings.form.macAddress')"
+                :label="$t('pageNetwork.form.macAddress')"
                 label-for="mac-address"
               >
                 <b-form-input
                   id="mac-address"
                   v-model.trim="form.macAddress"
-                  data-test-id="networkSettings-input-macAddress"
+                  data-test-id="network-input-macAddress"
                   type="text"
                   :state="getValidationState($v.form.macAddress)"
                   @change="$v.form.macAddress.$touch()"
@@ -98,10 +98,10 @@
             </b-col>
           </b-row>
         </page-section>
-        <page-section :section-title="$t('pageNetworkSettings.ipv4')">
-          <b-form-group :label="$t('pageNetworkSettings.ipv4Configuration')">
+        <page-section :section-title="$t('pageNetwork.ipv4')">
+          <b-form-group :label="$t('pageNetwork.ipv4Configuration')">
             <b-form-text id="enable-secure-help-block">
-              {{ $t('pageNetworkSettings.ipv4Helper') }}
+              {{ $t('pageNetwork.ipv4Helper') }}
             </b-form-text>
             <b-form-radio
               v-model="form.dhcpEnabled"
@@ -109,7 +109,7 @@
               :value="true"
               @change="onChangeIpv4Config"
             >
-              {{ $t('pageNetworkSettings.dhcp') }}
+              {{ $t('pageNetwork.dhcp') }}
             </b-form-radio>
             <b-form-radio
               v-model="form.dhcpEnabled"
@@ -117,13 +117,13 @@
               :value="false"
               @change="onChangeIpv4Config"
             >
-              {{ $t('pageNetworkSettings.static') }}
+              {{ $t('pageNetwork.static') }}
             </b-form-radio>
           </b-form-group>
           <b-row>
             <b-col lg="9" class="mb-3">
               <h3 class="h4">
-                {{ $t('pageNetworkSettings.dhcp') }}
+                {{ $t('pageNetwork.dhcp') }}
               </h3>
               <b-table
                 responsive="md"
@@ -137,9 +137,9 @@
                 <template #cell(Address)="{ item, index }">
                   <b-form-input
                     v-model.trim="item.Address"
-                    :data-test-id="`networkSettings-input-dhcpIpv4-${index}`"
+                    :data-test-id="`network-input-dhcpIpv4-${index}`"
                     :aria-label="
-                      $t('pageNetworkSettings.table.dhcpIpv4AddressRow') +
+                      $t('pageNetwork.table.dhcpIpv4AddressRow') +
                       ' ' +
                       (index + 1)
                     "
@@ -149,9 +149,9 @@
                 <template #cell(SubnetMask)="{ item, index }">
                   <b-form-input
                     v-model.trim="item.SubnetMask"
-                    :data-test-id="`networkSettings-input-subnetMask-${index}`"
+                    :data-test-id="`network-input-subnetMask-${index}`"
                     :aria-label="
-                      $t('pageNetworkSettings.table.dhcpIpv4SubnetRow') +
+                      $t('pageNetwork.table.dhcpIpv4SubnetRow') +
                       ' ' +
                       (index + 1)
                     "
@@ -178,7 +178,7 @@
             </b-col>
             <b-col lg="9" class="mb-3">
               <h3 class="h4">
-                {{ $t('pageNetworkSettings.static') }}
+                {{ $t('pageNetwork.static') }}
               </h3>
               <b-table
                 responsive="md"
@@ -192,9 +192,9 @@
                 <template #cell(Address)="{ item, index }">
                   <b-form-input
                     v-model.trim="item.Address"
-                    :data-test-id="`networkSettings-input-staticIpv4-${index}`"
+                    :data-test-id="`network-input-staticIpv4-${index}`"
                     :aria-label="
-                      $t('pageNetworkSettings.table.staticIpv4AddressRow') +
+                      $t('pageNetwork.table.staticIpv4AddressRow') +
                       ' ' +
                       (index + 1)
                     "
@@ -231,9 +231,9 @@
                 <template #cell(SubnetMask)="{ item, index }">
                   <b-form-input
                     v-model.trim="item.SubnetMask"
-                    :data-test-id="`networkSettings-input-subnetMask-${index}`"
+                    :data-test-id="`network-input-subnetMask-${index}`"
                     :aria-label="
-                      $t('pageNetworkSettings.table.staticIpv4SubnetRow') +
+                      $t('pageNetwork.table.staticIpv4SubnetRow') +
                       ' ' +
                       (index + 1)
                     "
@@ -286,12 +286,12 @@
               </b-table>
               <b-button variant="link" @click="addIpv4StaticTableRow">
                 <icon-add />
-                {{ $t('pageNetworkSettings.table.addStaticIpv4Address') }}
+                {{ $t('pageNetwork.table.addStaticIpv4Address') }}
               </b-button>
             </b-col>
           </b-row>
         </page-section>
-        <page-section :section-title="$t('pageNetworkSettings.staticDns')">
+        <page-section :section-title="$t('pageNetwork.staticDns')">
           <b-row>
             <b-col lg="4" class="mb-3">
               <b-table
@@ -306,11 +306,9 @@
                 <template #cell(address)="{ item, index }">
                   <b-form-input
                     v-model.trim="item.address"
-                    :data-test-id="`networkSettings-input-dnsAddress-${index}`"
+                    :data-test-id="`network-input-dnsAddress-${index}`"
                     :aria-label="
-                      $t('pageNetworkSettings.table.staticDnsRow') +
-                      ' ' +
-                      (index + 1)
+                      $t('pageNetwork.table.staticDnsRow') + ' ' + (index + 1)
                     "
                     :state="
                       getValidationState(
@@ -357,7 +355,7 @@
                 </template>
               </b-table>
               <b-button variant="link" @click="addDnsTableRow">
-                <icon-add /> {{ $t('pageNetworkSettings.table.addDns') }}
+                <icon-add /> {{ $t('pageNetwork.table.addDns') }}
               </b-button>
             </b-col>
           </b-row>
@@ -365,7 +363,7 @@
         <b-button
           variant="primary"
           type="submit"
-          data-test-id="networkSettings-button-saveNetworkSettings"
+          data-test-id="network-button-saveNetworkSettings"
         >
           {{ $t('global.action.saveSettings') }}
         </b-button>
@@ -395,7 +393,7 @@
 const validateHostname = helpers.regex('validateHostname', /^\S{0,64}$/);
 
 export default {
-  name: 'NetworkSettings',
+  name: 'Network',
   components: {
     PageTitle,
     PageSection,
@@ -413,29 +411,29 @@
       ipv4DhcpTableFields: [
         {
           key: 'Address',
-          label: this.$t('pageNetworkSettings.table.ipAddress'),
+          label: this.$t('pageNetwork.table.ipAddress'),
         },
         {
           key: 'SubnetMask',
-          label: this.$t('pageNetworkSettings.table.subnet'),
+          label: this.$t('pageNetwork.table.subnet'),
         },
         { key: 'actions', label: '', tdClass: 'text-right' },
       ],
       ipv4StaticTableFields: [
         {
           key: 'Address',
-          label: this.$t('pageNetworkSettings.table.ipAddress'),
+          label: this.$t('pageNetwork.table.ipAddress'),
         },
         {
           key: 'SubnetMask',
-          label: this.$t('pageNetworkSettings.table.subnet'),
+          label: this.$t('pageNetwork.table.subnet'),
         },
         { key: 'actions', label: '', tdClass: 'text-right' },
       ],
       dnsTableFields: [
         {
           key: 'address',
-          label: this.$t('pageNetworkSettings.table.ipAddress'),
+          label: this.$t('pageNetwork.table.ipAddress'),
         },
         { key: 'actions', label: '', tdClass: 'text-right' },
       ],
@@ -483,7 +481,7 @@
     };
   },
   computed: {
-    ...mapState('networkSettings', [
+    ...mapState('network', [
       'ethernetData',
       'interfaceOptions',
       'defaultGateway',
@@ -505,7 +503,7 @@
   created() {
     this.startLoader();
     this.$store
-      .dispatch('networkSettings/getEthernetData')
+      .dispatch('network/getEthernetData')
       .finally(() => this.endLoader());
   },
   methods: {
@@ -534,7 +532,7 @@
             {
               value: 'delete',
               enabled: this.form.dhcpEnabled,
-              title: this.$t('pageNetworkSettings.table.deleteDns'),
+              title: this.$t('pageNetwork.table.deleteDns'),
             },
           ],
         };
@@ -548,7 +546,7 @@
           {
             value: 'delete',
             enabled: this.form.dhcpEnabled,
-            title: this.$t('pageNetworkSettings.table.deleteDns'),
+            title: this.$t('pageNetwork.table.deleteDns'),
           },
         ],
       });
@@ -572,7 +570,7 @@
               {
                 value: 'delete',
                 enabled: false,
-                title: this.$t('pageNetworkSettings.table.deleteDhcpIpv4'),
+                title: this.$t('pageNetwork.table.deleteDhcpIpv4'),
               },
             ],
           };
@@ -588,7 +586,7 @@
             {
               value: 'delete',
               enabled: this.form.dhcpEnabled,
-              title: this.$t('pageNetworkSettings.table.deleteStaticIpv4'),
+              title: this.$t('pageNetwork.table.deleteStaticIpv4'),
             },
           ],
         };
@@ -603,7 +601,7 @@
           {
             value: 'delete',
             enabled: this.form.dhcpEnabled,
-            title: this.$t('pageNetworkSettings.table.deleteStaticIpv4'),
+            title: this.$t('pageNetwork.table.deleteStaticIpv4'),
           },
         ],
       });
@@ -636,9 +634,7 @@
         networkSettingsForm.isDhcpEnabled = isDhcpEnabled;
       } else {
         networkSettingsForm.isDhcpEnabled = false;
-        this.errorToast(
-          this.$t('pageNetworkSettings.toast.errorSaveDhcpSettings')
-        );
+        this.errorToast(this.$t('pageNetwork.toast.errorSaveDhcpSettings'));
       }
       networkSettingsForm.staticIpv4 = this.form.ipv4StaticTableItems.map(
         (updateIpv4) => {
@@ -653,10 +649,7 @@
         }
       );
       this.$store
-        .dispatch(
-          'networkSettings/updateInterfaceSettings',
-          networkSettingsForm
-        )
+        .dispatch('network/updateInterfaceSettings', networkSettingsForm)
         .then((success) => {
           this.successToast(success);
         })
diff --git a/src/views/Settings/Network/index.js b/src/views/Settings/Network/index.js
new file mode 100644
index 0000000..97bf039
--- /dev/null
+++ b/src/views/Settings/Network/index.js
@@ -0,0 +1,2 @@
+import Network from './Network.vue';
+export default Network;
diff --git a/src/views/Operations/PowerRestorePolicy/PowerRestorePolicy.vue b/src/views/Settings/PowerRestorePolicy/PowerRestorePolicy.vue
similarity index 100%
rename from src/views/Operations/PowerRestorePolicy/PowerRestorePolicy.vue
rename to src/views/Settings/PowerRestorePolicy/PowerRestorePolicy.vue
diff --git a/src/views/Operations/PowerRestorePolicy/index.js b/src/views/Settings/PowerRestorePolicy/index.js
similarity index 100%
rename from src/views/Operations/PowerRestorePolicy/index.js
rename to src/views/Settings/PowerRestorePolicy/index.js
diff --git a/src/views/Configuration/SecuritySettings/SecuritySettings.vue b/src/views/Settings/SecuritySettings/SecuritySettings.vue
similarity index 100%
rename from src/views/Configuration/SecuritySettings/SecuritySettings.vue
rename to src/views/Settings/SecuritySettings/SecuritySettings.vue
diff --git a/src/views/Configuration/SecuritySettings/index.js b/src/views/Settings/SecuritySettings/index.js
similarity index 100%
rename from src/views/Configuration/SecuritySettings/index.js
rename to src/views/Settings/SecuritySettings/index.js
diff --git a/tests/unit/__snapshots__/AppNavigation.spec.js.snap b/tests/unit/__snapshots__/AppNavigation.spec.js.snap
index 0ab0c9a..d8cf57f 100644
--- a/tests/unit/__snapshots__/AppNavigation.spec.js.snap
+++ b/tests/unit/__snapshots__/AppNavigation.spec.js.snap
@@ -332,15 +332,6 @@
                 </a>
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-power-restore-policy"
-                  href="#/operations/power-restore-policy"
-                >
-                  
-                  appNavigation.powerRestorePolicy
-                
-                </a>
-                <a
-                  class="nav-link"
                   data-test-id="nav-item-reboot-bmc"
                   href="#/operations/reboot-bmc"
                 >
@@ -383,10 +374,10 @@
           class="nav-item"
         >
           <button
-            aria-controls="configuration"
+            aria-controls="settings"
             aria-expanded="false"
             class="btn btn-link collapsed"
-            data-test-id="nav-button-configuration"
+            data-test-id="nav-button-settings"
             type="button"
           >
             <svg
@@ -407,7 +398,7 @@
               />
             </svg>
             
-              appNavigation.configuration
+              appNavigation.settings
               
             <svg
               aria-hidden="true"
@@ -438,7 +429,7 @@
           >
             <ul
               class="collapse"
-              id="configuration"
+              id="settings"
               style="display: none;"
             >
               <li
@@ -446,40 +437,40 @@
               >
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-date-time-settings"
-                  href="#/configuration/date-time-settings"
+                  data-test-id="nav-item-date-time"
+                  href="#/settings/date-time"
                 >
                   
-                  appNavigation.dateTimeSettings
+                  appNavigation.dateTime
                 
                 </a>
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-network-settings"
-                  href="#/configuration/network-settings"
+                  data-test-id="nav-item-network"
+                  href="#/settings/network"
                 >
                   
-                  appNavigation.networkSettings
+                  appNavigation.network
+                
+                </a>
+                <a
+                  class="nav-link"
+                  data-test-id="nav-item-power-restore-policy"
+                  href="#/settings/power-restore-policy"
+                >
+                  
+                  appNavigation.powerRestorePolicy
                 
                 </a>
                 <a
                   class="nav-link"
                   data-test-id="nav-item-security-settings"
-                  href="#/configuration/security-settings"
+                  href="#/settings/security-settings"
                 >
                   
                   appNavigation.securitySettings
                 
                 </a>
-                <a
-                  class="nav-link"
-                  data-test-id="nav-item-snmp-settings"
-                  href="#/snmp-settings"
-                >
-                  
-                  appNavigation.snmpSettings
-                
-                </a>
               </li>
             </ul>
           </transition-stub>
@@ -935,15 +926,6 @@
                 </a>
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-power-restore-policy"
-                  href="#/operations/power-restore-policy"
-                >
-                  
-                  appNavigation.powerRestorePolicy
-                
-                </a>
-                <a
-                  class="nav-link"
                   data-test-id="nav-item-reboot-bmc"
                   href="#/operations/reboot-bmc"
                 >
@@ -986,10 +968,10 @@
           class="nav-item"
         >
           <button
-            aria-controls="configuration"
+            aria-controls="settings"
             aria-expanded="false"
             class="btn btn-link collapsed"
-            data-test-id="nav-button-configuration"
+            data-test-id="nav-button-settings"
             type="button"
           >
             <svg
@@ -1010,7 +992,7 @@
               />
             </svg>
             
-              appNavigation.configuration
+              appNavigation.settings
               
             <svg
               aria-hidden="true"
@@ -1041,7 +1023,7 @@
           >
             <ul
               class="collapse"
-              id="configuration"
+              id="settings"
               style="display: none;"
             >
               <li
@@ -1049,40 +1031,40 @@
               >
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-date-time-settings"
-                  href="#/configuration/date-time-settings"
+                  data-test-id="nav-item-date-time"
+                  href="#/settings/date-time"
                 >
                   
-                  appNavigation.dateTimeSettings
+                  appNavigation.dateTime
                 
                 </a>
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-network-settings"
-                  href="#/configuration/network-settings"
+                  data-test-id="nav-item-network"
+                  href="#/settings/network"
                 >
                   
-                  appNavigation.networkSettings
+                  appNavigation.network
+                
+                </a>
+                <a
+                  class="nav-link"
+                  data-test-id="nav-item-power-restore-policy"
+                  href="#/settings/power-restore-policy"
+                >
+                  
+                  appNavigation.powerRestorePolicy
                 
                 </a>
                 <a
                   class="nav-link"
                   data-test-id="nav-item-security-settings"
-                  href="#/configuration/security-settings"
+                  href="#/settings/security-settings"
                 >
                   
                   appNavigation.securitySettings
                 
                 </a>
-                <a
-                  class="nav-link"
-                  data-test-id="nav-item-snmp-settings"
-                  href="#/snmp-settings"
-                >
-                  
-                  appNavigation.snmpSettings
-                
-                </a>
               </li>
             </ul>
           </transition-stub>