diff --git a/components/lib/orderlist/style/OrderListStyle.js b/components/lib/orderlist/style/OrderListStyle.js
index 07d6808c0..5ec8d134d 100644
--- a/components/lib/orderlist/style/OrderListStyle.js
+++ b/components/lib/orderlist/style/OrderListStyle.js
@@ -3,9 +3,9 @@ import BaseStyle from 'primevue/base/style';
 const classes = {
     root: 'p-orderlist p-component',
     controls: 'p-orderlist-controls',
-    container: 'p-orderlist-list-container',
-    list: 'p-orderlist-list',
-    item: 'p-orderlist-item'
+    container: 'p-orderlist-list-container', //TODO: Remove
+    list: 'p-orderlist-list', //TODO: Remove
+    item: 'p-orderlist-item' //TODO: Remove
 };
 
 export default BaseStyle.extend({
diff --git a/components/lib/picklist/PickList.vue b/components/lib/picklist/PickList.vue
index 880c4c12a..9b7a71d0e 100755
--- a/components/lib/picklist/PickList.vue
+++ b/components/lib/picklist/PickList.vue
@@ -570,7 +570,7 @@ export default {
         flex-direction: column;
     }
 
-    .p-picklist[${this.attributeSelector}] .p-picklist-buttons {
+    .p-picklist[${this.attributeSelector}] .p-picklist-controls {
         flex-direction: row;
     }
 }
diff --git a/components/lib/picklist/style/PickListStyle.js b/components/lib/picklist/style/PickListStyle.js
index d10c4b941..a9cd3ba55 100644
--- a/components/lib/picklist/style/PickListStyle.js
+++ b/components/lib/picklist/style/PickListStyle.js
@@ -2,14 +2,14 @@ import BaseStyle from 'primevue/base/style';
 
 const classes = {
     root: 'p-picklist p-component',
-    sourceControls: 'p-picklist-buttons p-picklist-source-controls',
-    sourceWrapper: 'p-picklist-list-wrapper p-picklist-source-wrapper',
-    sourceList: 'p-picklist-list p-picklist-source-list',
-    buttons: 'p-picklist-buttons p-picklist-transfer-buttons',
-    targetWrapper: 'p-picklist-list-wrapper p-picklist-target-wrapper',
-    targetList: 'p-picklist-list p-picklist-target',
-    item: 'p-picklist-item',
-    targetControls: 'p-picklist-buttons p-picklist-target-controls'
+    sourceControls: 'p-picklist-controls p-picklist-source-controls',
+    sourceWrapper: 'p-picklist-list-container p-picklist-source-list-container',
+    sourceList: 'p-picklist-list p-picklist-source-list', //TODO: Remove
+    buttons: 'p-picklist-controls p-picklist-transfer-controls',
+    targetWrapper: 'p-picklist-list-container p-picklist-target-list-container',
+    targetList: 'p-picklist-list p-picklist-target',  //TODO: Remove
+    item: 'p-picklist-item',  //TODO: Remove
+    targetControls: 'p-picklist-controls p-picklist-target-controls'
 };
 
 export default BaseStyle.extend({
diff --git a/components/lib/themes/primeone/base/picklist/index.js b/components/lib/themes/primeone/base/picklist/index.js
index 1d61eb2f2..720d5ed0a 100644
--- a/components/lib/themes/primeone/base/picklist/index.js
+++ b/components/lib/themes/primeone/base/picklist/index.js
@@ -5,14 +5,14 @@ export default {
     gap: 1.125rem;
 }
 
-.p-picklist-buttons {
+.p-picklist-controls {
     display: flex;
     flex-direction: column;
     justify-content: center;
     gap: 0.5rem;
 }
 
-.p-picklist-list-wrapper {
+.p-picklist-list-container {
     flex: 1 1 50%;
 }