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',
             },
           ],
         },