diff --git a/components/lib/contextmenu/style/ContextMenuStyle.js b/components/lib/contextmenu/style/ContextMenuStyle.js
index 54e9244e0..69b48dc4c 100644
--- a/components/lib/contextmenu/style/ContextMenuStyle.js
+++ b/components/lib/contextmenu/style/ContextMenuStyle.js
@@ -79,8 +79,8 @@ const theme = ({ dt }) => `
 }
 
 .p-contextmenu-item.p-focus > .p-contextmenu-item-content {
-    color: ${dt('contextmenu.item.hover.color')};
-    background: ${dt('contextmenu.item.hover.background')};
+    color: ${dt('contextmenu.item.focus.color')};
+    background: ${dt('contextmenu.item.focus.background')};
 }
 
 .p-contextmenu-item.p-focus > .p-contextmenu-item-content .p-contextmenu-item-icon,
@@ -89,8 +89,8 @@ const theme = ({ dt }) => `
 }
 
 .p-contextmenu-item:not(.p-disabled) > .p-contextmenu-item-content:hover {
-    color: ${dt('contextmenu.item.hover.color')};
-    background: ${dt('contextmenu.item.hover.background')};
+    color: ${dt('contextmenu.item.focus.color')};
+    background: ${dt('contextmenu.item.focus.background')};
 }
 
 .p-contextmenu-item:not(.p-disabled) > .p-contextmenu-item-content:hover .p-contextmenu-item-icon,
@@ -99,8 +99,8 @@ const theme = ({ dt }) => `
 }
 
 .p-contextmenu-item-active > .p-contextmenu-item-content {
-    color: ${dt('contextmenu.item.hover.color')};
-    background: ${dt('contextmenu.item.hover.background')};
+    color: ${dt('contextmenu.item.focus.color')};
+    background: ${dt('contextmenu.item.focus.background')};
 }
 
 .p-contextmenu-item-active > .p-contextmenu-item-content .p-contextmenu-item-icon,
diff --git a/components/lib/megamenu/style/MegaMenuStyle.js b/components/lib/megamenu/style/MegaMenuStyle.js
index 9146d91c0..141aa47fe 100644
--- a/components/lib/megamenu/style/MegaMenuStyle.js
+++ b/components/lib/megamenu/style/MegaMenuStyle.js
@@ -46,8 +46,8 @@ const theme = ({ dt }) => `
 }
 
 .p-megamenu-item.p-focus > .p-megamenu-item-content {
-    color: ${dt('megamenu.item.hover.color')};
-    background: ${dt('megamenu.item.hover.background')};
+    color: ${dt('megamenu.item.focus.color')};
+    background: ${dt('megamenu.item.focus.background')};
 }
 
 .p-megamenu-item.p-focus > .p-megamenu-item-content .p-megamenu-item-icon,
@@ -56,8 +56,8 @@ const theme = ({ dt }) => `
 }
 
 .p-megamenu-item:not(.p-disabled) > .p-megamenu-item-content:hover {
-    color: ${dt('megamenu.item.hover.color')};
-    background: ${dt('megamenu.item.hover.background')};
+    color: ${dt('megamenu.item.focus.color')};
+    background: ${dt('megamenu.item.focus.background')};
 }
 
 .p-megamenu-item:not(.p-disabled) > .p-megamenu-item-content:hover .p-megamenu-item-icon,
@@ -66,8 +66,8 @@ const theme = ({ dt }) => `
 }
 
 .p-megamenu-item-active > .p-megamenu-item-content {
-    color: ${dt('megamenu.item.hover.color')};
-    background: ${dt('megamenu.item.hover.background')};
+    color: ${dt('megamenu.item.focus.color')};
+    background: ${dt('megamenu.item.focus.background')};
 }
 
 .p-megamenu-item-active > .p-megamenu-item-content .p-megamenu-item-icon,
diff --git a/components/lib/menu/style/MenuStyle.js b/components/lib/menu/style/MenuStyle.js
index 9e9aef85a..09372c113 100644
--- a/components/lib/menu/style/MenuStyle.js
+++ b/components/lib/menu/style/MenuStyle.js
@@ -57,8 +57,8 @@ const theme = ({ dt }) => `
 }
 
 .p-menu-item.p-focus .p-menu-item-content {
-    color: ${dt('menu.item.hover.color')};
-    background: ${dt('menu.item.hover.background')};
+    color: ${dt('menu.item.focus.color')};
+    background: ${dt('menu.item.focus.background')};
 }
 
 .p-menu-item.p-focus .p-menu-item-icon {
@@ -66,8 +66,8 @@ const theme = ({ dt }) => `
 }
 
 .p-menu-item:not(.p-disabled) .p-menu-item-content:hover {
-    color: ${dt('menu.item.hover.color')};
-    background: ${dt('menu.item.hover.background')};
+    color: ${dt('menu.item.focus.color')};
+    background: ${dt('menu.item.focus.background')};
 }
 
 .p-menu-item:not(.p-disabled) .p-menu-item-content:hover .p-menu-item-icon {
diff --git a/components/lib/menubar/style/MenubarStyle.js b/components/lib/menubar/style/MenubarStyle.js
index fbdb61934..7cbecf234 100644
--- a/components/lib/menubar/style/MenubarStyle.js
+++ b/components/lib/menubar/style/MenubarStyle.js
@@ -57,8 +57,8 @@ const theme = ({ dt }) => `
 }
 
 .p-menubar-item.p-focus > .p-menubar-item-content {
-    color: ${dt('menubar.item.hover.color')};
-    background: ${dt('menubar.item.hover.background')};
+    color: ${dt('menubar.item.focus.color')};
+    background: ${dt('menubar.item.focus.background')};
 }
 
 .p-menubar-item.p-focus > .p-menubar-item-content .p-menubar-item-icon,
@@ -67,8 +67,8 @@ const theme = ({ dt }) => `
 }
 
 .p-menubar-item:not(.p-disabled) > .p-menubar-item-content:hover {
-    color: ${dt('menubar.item.hover.color')};
-    background: ${dt('menubar.item.hover.background')};
+    color: ${dt('menubar.item.focus.color')};
+    background: ${dt('menubar.item.focus.background')};
 }
 
 .p-menubar-item:not(.p-disabled) > .p-menubar-item-content:hover .p-menubar-item-icon,
@@ -77,8 +77,8 @@ const theme = ({ dt }) => `
 }
 
 .p-menubar-item-active > .p-menubar-item-content {
-    color: ${dt('menubar.item.hover.color')};
-    background: ${dt('menubar.item.hover.background')};
+    color: ${dt('menubar.item.focus.color')};
+    background: ${dt('menubar.item.focus.background')};
 }
 
 .p-menubar-item-active > .p-menubar-item-content .p-menubar-item-icon,
diff --git a/components/lib/panelmenu/style/PanelMenuStyle.js b/components/lib/panelmenu/style/PanelMenuStyle.js
index 70664ee5b..fd37300bc 100644
--- a/components/lib/panelmenu/style/PanelMenuStyle.js
+++ b/components/lib/panelmenu/style/PanelMenuStyle.js
@@ -48,8 +48,8 @@ const theme = ({ dt }) => `
 }
 
 .p-panelmenu-header:not(.p-disabled):focus-visible .p-panelmenu-header-content {
-    background: ${dt('panelmenu.item.hover.background')};
-    color: ${dt('panelmenu.item.hover.color')};
+    background: ${dt('panelmenu.item.focus.background')};
+    color: ${dt('panelmenu.item.focus.color')};
 }
 
 .p-panelmenu-header:not(.p-disabled):focus-visible .p-panelmenu-header-content .p-panelmenu-submenu-icon,
@@ -58,8 +58,8 @@ const theme = ({ dt }) => `
 }
 
 .p-panelmenu-header:not(.p-disabled) .p-panelmenu-header-content:hover {
-    background: ${dt('panelmenu.item.hover.background')};
-    color: ${dt('panelmenu.item.hover.color')};
+    background: ${dt('panelmenu.item.focus.background')};
+    color: ${dt('panelmenu.item.focus.color')};
 }
 
 .p-panelmenu-header:not(.p-disabled) .p-panelmenu-header-content:hover .p-panelmenu-submenu-icon,
@@ -110,17 +110,17 @@ const theme = ({ dt }) => `
 }
 
 .p-panelmenu-item.p-focus > .p-panelmenu-item-content {
-    background: ${dt('panelmenu.item.hover.background')};
-    color: ${dt('panelmenu.item.hover.color')};
+    background: ${dt('panelmenu.item.focus.background')};
+    color: ${dt('panelmenu.item.focus.color')};
 }
 
 .p-panelmenu-item.p-focus > .p-panelmenu-item-icon {
-    color: ${dt('panelmenu.item.hover.color')};
+    color: ${dt('panelmenu.item.focus.color')};
 }
 
 .p-panelmenu-item:not(.p-disabled) > .p-panelmenu-item-content:hover {
-    background: ${dt('panelmenu.item.hover.background')};
-    color: ${dt('panelmenu.item.hover.color')};
+    background: ${dt('panelmenu.item.focus.background')};
+    color: ${dt('panelmenu.item.focus.color')};
 }
 
 .p-panelmenu-item:not(.p-disabled) > .p-panelmenu-item-content:hover .p-panelmenu-item-icon,
diff --git a/components/lib/themes/aura/contextmenu/index.js b/components/lib/themes/aura/contextmenu/index.js
index ce05e69c4..e0539fecb 100644
--- a/components/lib/themes/aura/contextmenu/index.js
+++ b/components/lib/themes/aura/contextmenu/index.js
@@ -5,9 +5,9 @@ export default {
         color: '{content.color}'
     },
     item: {
-        hoverBackground: '{navigation.item.hover.background}',
+        focusBackground: '{navigation.item.focus.background}',
         color: '{navigation.item.color}',
-        hoverColor: '{navigation.item.hover.color}',
+        focusColor: '{navigation.item.focus.color}',
         icon: {
             color: '{navigation.item.icon.color}',
             hoverColor: '{navigation.item.icon.hover.color}'
diff --git a/components/lib/themes/aura/index.js b/components/lib/themes/aura/index.js
index c78d977cd..1d965f8dd 100644
--- a/components/lib/themes/aura/index.js
+++ b/components/lib/themes/aura/index.js
@@ -225,12 +225,12 @@ export default {
                 },
                 navigation: {
                     item: {
-                        hoverBackground: '{surface.100}',
+                        focusBackground: '{surface.100}',
                         color: '{text.color}',
                         hoverColor: '{text.hover.color}',
                         icon: {
                             color: '{surface.400}',
-                            hoverColor: '{surface.500}'
+                            focusColor: '{surface.500}'
                         }
                     },
                     submenu: {
@@ -325,12 +325,12 @@ export default {
                 },
                 navigation: {
                     item: {
-                        hoverBackground: '{surface.800}',
+                        focusBackground: '{surface.800}',
                         color: '{text.color}',
                         hoverColor: '{text.hover.color}',
                         icon: {
                             color: '{surface.500}',
-                            hoverColor: '{surface.400}'
+                            focusColor: '{surface.400}'
                         }
                     },
                     submenu: {
diff --git a/components/lib/themes/aura/megamenu/index.js b/components/lib/themes/aura/megamenu/index.js
index d8e9e7387..575698534 100644
--- a/components/lib/themes/aura/megamenu/index.js
+++ b/components/lib/themes/aura/megamenu/index.js
@@ -5,9 +5,9 @@ export default {
         color: '{content.color}'
     },
     item: {
-        hoverBackground: '{navigation.item.hover.background}',
+        focusBackground: '{navigation.item.focus.background}',
         color: '{navigation.item.color}',
-        hoverColor: '{navigation.item.hover.color}',
+        focusColor: '{navigation.item.focus.color}',
         icon: {
             color: '{navigation.item.icon.color}',
             hoverColor: '{navigation.item.icon.hover.color}'
diff --git a/components/lib/themes/aura/menu/index.js b/components/lib/themes/aura/menu/index.js
index ce05e69c4..e0539fecb 100644
--- a/components/lib/themes/aura/menu/index.js
+++ b/components/lib/themes/aura/menu/index.js
@@ -5,9 +5,9 @@ export default {
         color: '{content.color}'
     },
     item: {
-        hoverBackground: '{navigation.item.hover.background}',
+        focusBackground: '{navigation.item.focus.background}',
         color: '{navigation.item.color}',
-        hoverColor: '{navigation.item.hover.color}',
+        focusColor: '{navigation.item.focus.color}',
         icon: {
             color: '{navigation.item.icon.color}',
             hoverColor: '{navigation.item.icon.hover.color}'
diff --git a/components/lib/themes/aura/menubar/index.js b/components/lib/themes/aura/menubar/index.js
index d8e9e7387..575698534 100644
--- a/components/lib/themes/aura/menubar/index.js
+++ b/components/lib/themes/aura/menubar/index.js
@@ -5,9 +5,9 @@ export default {
         color: '{content.color}'
     },
     item: {
-        hoverBackground: '{navigation.item.hover.background}',
+        focusBackground: '{navigation.item.focus.background}',
         color: '{navigation.item.color}',
-        hoverColor: '{navigation.item.hover.color}',
+        focusColor: '{navigation.item.focus.color}',
         icon: {
             color: '{navigation.item.icon.color}',
             hoverColor: '{navigation.item.icon.hover.color}'
diff --git a/components/lib/themes/aura/panelmenu/index.js b/components/lib/themes/aura/panelmenu/index.js
index 1351802ea..8054c8f76 100644
--- a/components/lib/themes/aura/panelmenu/index.js
+++ b/components/lib/themes/aura/panelmenu/index.js
@@ -5,9 +5,9 @@ export default {
         color: '{content.color}'
     },
     item: {
-        hoverBackground: '{navigation.item.hover.background}',
+        focusBackground: '{navigation.item.focus.background}',
         color: '{navigation.item.color}',
-        hoverColor: '{navigation.item.hover.color}',
+        focusColor: '{navigation.item.focus.color}',
         icon: {
             color: '{navigation.item.icon.color}',
             hoverColor: '{navigation.item.icon.hover.color}'
diff --git a/components/lib/themes/aura/tieredmenu/index.js b/components/lib/themes/aura/tieredmenu/index.js
index ce05e69c4..e0539fecb 100644
--- a/components/lib/themes/aura/tieredmenu/index.js
+++ b/components/lib/themes/aura/tieredmenu/index.js
@@ -5,9 +5,9 @@ export default {
         color: '{content.color}'
     },
     item: {
-        hoverBackground: '{navigation.item.hover.background}',
+        focusBackground: '{navigation.item.focus.background}',
         color: '{navigation.item.color}',
-        hoverColor: '{navigation.item.hover.color}',
+        focusColor: '{navigation.item.focus.color}',
         icon: {
             color: '{navigation.item.icon.color}',
             hoverColor: '{navigation.item.icon.hover.color}'
diff --git a/components/lib/tieredmenu/style/TieredMenuStyle.js b/components/lib/tieredmenu/style/TieredMenuStyle.js
index 38b32d446..eeefeba1e 100644
--- a/components/lib/tieredmenu/style/TieredMenuStyle.js
+++ b/components/lib/tieredmenu/style/TieredMenuStyle.js
@@ -79,8 +79,8 @@ const theme = ({ dt }) => `
 }
 
 .p-tieredmenu-item.p-focus > .p-tieredmenu-item-content {
-    color: ${dt('tieredmenu.item.hover.color')};
-    background: ${dt('tieredmenu.item.hover.background')};
+    color: ${dt('tieredmenu.item.focus.color')};
+    background: ${dt('tieredmenu.item.focus.background')};
 }
 
 .p-tieredmenu-item.p-focus > .p-tieredmenu-item-content .p-tieredmenu-item-icon,
@@ -89,8 +89,8 @@ const theme = ({ dt }) => `
 }
 
 .p-tieredmenu-item:not(.p-disabled) > .p-tieredmenu-item-content:hover {
-    color: ${dt('tieredmenu.item.hover.color')};
-    background: ${dt('tieredmenu.item.hover.background')};
+    color: ${dt('tieredmenu.item.focus.color')};
+    background: ${dt('tieredmenu.item.focus.background')};
 }
 
 .p-tieredmenu-item:not(.p-disabled) > .p-tieredmenu-item-content:hover .p-tieredmenu-item-icon,
@@ -99,8 +99,8 @@ const theme = ({ dt }) => `
 }
 
 .p-tieredmenu-item-active > .p-tieredmenu-item-content {
-    color: ${dt('tieredmenu.item.hover.color')};
-    background: ${dt('tieredmenu.item.hover.background')};
+    color: ${dt('tieredmenu.item.focus.color')};
+    background: ${dt('tieredmenu.item.focus.background')};
 }
 
 .p-tieredmenu-item-active > .p-tieredmenu-item-content .p-tieredmenu-item-icon,