diff --git a/src/components/Button/PButton.vue b/src/components/Button/PButton.vue
index 9033ebcd4..cd3513b3b 100644
--- a/src/components/Button/PButton.vue
+++ b/src/components/Button/PButton.vue
@@ -276,9 +276,9 @@
 .p-button--selected,
 .p-button--selected:not(:disabled):hover,
 .p-button--selected:not(:disabled):active {
-  background-color: var(--p-color-button-activated-bg);
-  border-color: var(--p-color-button-activated-border);
-  color: var(--p-color-button-activated-text);
+  background-color: var(--p-color-button-selected-bg);
+  border-color: var(--p-color-button-selected-border);
+  color: var(--p-color-button-selected-text);
   cursor: default;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/DatePicker/ScrollingPicker.vue b/src/components/DatePicker/ScrollingPicker.vue
index 9042465e3..324f21d1c 100644
--- a/src/components/DatePicker/ScrollingPicker.vue
+++ b/src/components/DatePicker/ScrollingPicker.vue
@@ -102,9 +102,9 @@
 .scrolling-picker__option--selected:not(:disabled):hover,
 .scrolling-picker__option--selected:not(:disabled):active { @apply
   cursor-default;
-  background-color: var(--p-color-button-activated-bg);
-  border-color: var(--p-color-button-activated-border);
-  color: var(--p-color-button-activated-text);
+  background-color: var(--p-color-button-selected-bg);
+  border-color: var(--p-color-button-selected-border);
+  color: var(--p-color-button-selected-text);
 }
 
 .scrolling-picker__option--disabled { @apply
diff --git a/src/components/DateRangeInput/PDateRangeInput.vue b/src/components/DateRangeInput/PDateRangeInput.vue
index d38fdbf54..18cd01b75 100644
--- a/src/components/DateRangeInput/PDateRangeInput.vue
+++ b/src/components/DateRangeInput/PDateRangeInput.vue
@@ -190,7 +190,7 @@
 
 .p-date-range-input__date--in-range:not(.p-date-range-input__date--selected),
 .p-date-range-input__date--in-range:not(.p-date-range-input__date--selected):hover { @apply
-  bg-to-active-hover
+  bg-selectable-hover
 }
 
 .p-date-range-input__date--out-of-month:not(:disabled) { @apply
diff --git a/src/styles/index.css b/src/styles/index.css
index ca3edec9b..cc69c0e14 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -257,9 +257,9 @@
     --p-color-button-flat-danger-border-active: var(--p-color-button-flat-danger-border-hover);
     --p-color-button-flat-danger-text-active: var(--p-color-button-flat-danger-text-hover);
 
-    --p-color-button-activated-bg: var(--p-color-selected);
-    --p-color-button-activated-border: transparent;
-    --p-color-button-activated-text: var(--p-color-text-default);
+    --p-color-button-selected-bg: var(--p-color-selected);
+    --p-color-button-selected-border: transparent;
+    --p-color-button-selected-text: var(--p-color-text-default);
 
     /* Legacy Tokens – To be removed before releasing version 2.0 */
     --foreground: var(--200);
@@ -447,9 +447,9 @@
     --p-color-button-flat-danger-border-active: var(--p-color-button-flat-danger-border-hover);
     --p-color-button-flat-danger-text-active: var(--p-color-button-flat-danger-text-hover);
 
-    --p-color-button-activated-bg: var(--p-color-selected);
-    --p-color-button-activated-border: transparent;
-    --p-color-button-activated-text: var(--p-color-text-default);
+    --p-color-button-selected-bg: var(--p-color-selected);
+    --p-color-button-selected-border: transparent;
+    --p-color-button-selected-text: var(--p-color-text-default);
 
     /* Legacy Tokens – To be removed before releasing version 2.0 */
     --foreground: var(--800);