diff --git a/components/lib/theme/aura/index.js b/components/lib/theme/aura/index.js
index 1272d63a2..d22f99057 100644
--- a/components/lib/theme/aura/index.js
+++ b/components/lib/theme/aura/index.js
@@ -129,7 +129,7 @@ export default {
                     hoverColor: '{primary.600}',
                     activeColor: '{primary.700}'
                 },
-                listItemHighlight: {
+                highlight: {
                     background: '{primary.50}',
                     backgroundFocus: '{primary.100}',
                     textColor: '{primary.700}',
@@ -158,7 +158,7 @@ export default {
                     hoverColor: '{primary.300}',
                     activeColor: '{primary.200}'
                 },
-                listItemHighlight: {
+                highlight: {
                     background: 'color-mix(in srgb, {primary.400}, transparent 84%)',
                     backgroundFocus: 'color-mix(in srgb, {primary.400}, transparent 76%)',
                     textColor: 'rgba(255,255,255,.87)',
diff --git a/components/lib/theme/aura/orderlist/index.js b/components/lib/theme/aura/orderlist/index.js
index f6868f034..20bf32e6a 100644
--- a/components/lib/theme/aura/orderlist/index.js
+++ b/components/lib/theme/aura/orderlist/index.js
@@ -130,13 +130,13 @@ export default {
 }
 
 .p-orderlist-item.p-highlight {
-    background: var(--p-list-item-highlight-background);
-    color: var(--p-list-item-highlight-text-color);
+    background: var(--p-highlight-background);
+    color: var(--p-highlight-text-color);
 }
 
 .p-orderlist-item.p-highlight.p-focus {
-    background: var(--p-list-item-highlight-background-focus);
-    color: var(--p-list-item-highlight-text-color-focus);
+    background: var(--p-highlight-background-focus);
+    color: var(--p-highlight-text-color-focus);
 }
 
 .p-orderlist-controls .p-button {
diff --git a/components/lib/theme/aura/organizationchart/index.js b/components/lib/theme/aura/organizationchart/index.js
index 59cc2ea58..6068c86c9 100644
--- a/components/lib/theme/aura/organizationchart/index.js
+++ b/components/lib/theme/aura/organizationchart/index.js
@@ -55,8 +55,8 @@ export default {
 }
 
 .p-organizationchart-node-content.p-highlight {
-    background: var(--p-list-item-highlight-background);
-    color: var(--p-list-item-highlight-text-color);
+    background: var(--p-highlight-background);
+    color: var(--p-highlight-text-color);
 }
 
 .p-organizationchart-node-content .p-node-toggler {
diff --git a/components/lib/theme/aura/paginator/index.js b/components/lib/theme/aura/paginator/index.js
index 75a9c4800..d9ff07491 100644
--- a/components/lib/theme/aura/paginator/index.js
+++ b/components/lib/theme/aura/paginator/index.js
@@ -95,8 +95,8 @@ export default {
 }
 
 .p-paginator-page.p-highlight {
-    background: var(--p-list-item-highlight-background);
-    color: var(--p-list-item-highlight-text-color);
+    background: var(--p-highlight-background);
+    color: var(--p-highlight-text-color);
 }
 
 .p-paginator-page-input .p-inputtext {
diff --git a/components/lib/theme/aura/picklist/index.js b/components/lib/theme/aura/picklist/index.js
index 1f0fe512a..3aa9f4375 100644
--- a/components/lib/theme/aura/picklist/index.js
+++ b/components/lib/theme/aura/picklist/index.js
@@ -130,13 +130,13 @@ export default {
 }
 
 .p-picklist-item.p-highlight {
-    background: var(--p-list-item-highlight-background);
-    color: var(--p-list-item-highlight-text-color);
+    background: var(--p-highlight-background);
+    color: var(--p-highlight-text-color);
 }
 
 .p-picklist-item.p-highlight.p-focus {
-    background: var(--p-list-item-highlight-background-focus);
-    color: var(--p-list-item-highlight-text-color-focus);
+    background: var(--p-highlight-background-focus);
+    color: var(--p-highlight-text-color-focus);
 }
 
 .p-picklist-buttons .p-button {