diff --git a/src/styles/base/dark.js b/src/styles/base/dark.js
index 006bdf07c..0a835c273 100644
--- a/src/styles/base/dark.js
+++ b/src/styles/base/dark.js
@@ -139,11 +139,11 @@ export default create({
       disabledCloseColor: neutral(base.alpha4),
       disabledCloseHoverColor: overlay(base.alpha4),
 
-      scrollbarOverlayBackgroundColor: overlay(base.alphaScrollbar),
-      scrollbarHoverOverlayBackgroundColor: overlay(base.alphaScrollbarHover),
+      scrollbarBackgroundOverlayColor: overlay(base.alphaScrollbar),
+      scrollbarHoverBackgroundOverlayColor: overlay(base.alphaScrollbarHover),
 
       railBackgroundColor: neutral(base.alphaRail),
-      railOverlayBackgroundColor: overlay(base.alphaRail),
+      railBackgroundOverlayColor: overlay(base.alphaRail),
 
       popoverBackgroundColor: base.neutralPopover,
       tableBodyBackgroundColor: base.neutralCard,
@@ -152,16 +152,16 @@ export default create({
       bodyBackgroundColor: base.neutralBody,
       tagBackgroundColor: neutral(base.alphaTag),
 
-      inputOverlayBackgroundColor: overlay(base.alphaInput),
-      codeOverlayBackgroundColor: overlay(base.alphaCode),
-      tabOverlayBackgroundColor: overlay(base.alphaTab),
-      avatarOverlayBackgroundColor: overlay(base.alphaAvatar),
-      actionOverlayBackgroundColor: overlay(base.alphaAction),
-      tableHeaderOverlayBackgroundColor: overlay(base.alphaAction),
+      inputBackgroundOverlayColor: overlay(base.alphaInput),
+      codeBackgroundOverlayColor: overlay(base.alphaCode),
+      tabBackgroundOverlayColor: overlay(base.alphaTab),
+      avatarBackgroundOverlayColor: overlay(base.alphaAvatar),
+      actionBackgroundOverlayColor: overlay(base.alphaAction),
+      tableHeaderBackgroundOverlayColor: overlay(base.alphaAction),
 
-      pendingOverlayBackgroundColor: overlay(base.alphaPending),
-      tablePendingOverlayBackgroundColor: overlay(base.alphaTablePending),
-      activeOverlayBackgroundColor: overlay(base.alphaActive),
+      pendingBackgroundOverlayColor: overlay(base.alphaPending),
+      tablePendingBackgroundOverlayColor: overlay(base.alphaTablePending),
+      activeBackgroundOverlayColor: overlay(base.alphaActive),
 
       disabledOpacity: base.alphaDisabled,
       disabledFillBackgroundColor: neutral(base.alphaDisabledFill),
diff --git a/src/styles/base/light.js b/src/styles/base/light.js
index 14c5e6c83..205d3a17c 100644
--- a/src/styles/base/light.js
+++ b/src/styles/base/light.js
@@ -139,11 +139,11 @@ export default create({
       disabledCloseColor: neutral(base.alpha4),
       disabledCloseHoverColor: overlay(base.alpha4),
 
-      scrollbarOverlayBackgroundColor: overlay(base.alphaScrollbar),
-      scrollbarHoverOverlayBackgroundColor: overlay(base.alphaScrollbarHover),
+      scrollbarBackgroundOverlayColor: overlay(base.alphaScrollbar),
+      scrollbarHoverBackgroundOverlayColor: overlay(base.alphaScrollbarHover),
 
       railBackgroundColor: neutral(base.alphaRail),
-      railOverlayBackgroundColor: overlay(base.alphaRail),
+      railBackgroundOverlayColor: overlay(base.alphaRail),
 
       popoverBackgroundColor: base.neutralPopover,
       tableBodyBackgroundColor: base.neutralCard,
@@ -152,16 +152,16 @@ export default create({
       bodyBackgroundColor: base.neutralBody,
       tagBackgroundColor: neutral(base.alphaTag),
 
-      inputOverlayBackgroundColor: overlay(base.alphaInput),
-      codeOverlayBackgroundColor: overlay(base.alphaCode),
-      tabOverlayBackgroundColor: overlay(base.alphaTab),
-      avatarOverlayBackgroundColor: overlay(base.alphaAvatar),
-      actionOverlayBackgroundColor: overlay(base.alphaAction),
-      tableHeaderOverlayBackgroundColor: overlay(base.alphaAction),
+      inputBackgroundOverlayColor: overlay(base.alphaInput),
+      codeBackgroundOverlayColor: overlay(base.alphaCode),
+      tabBackgroundOverlayColor: overlay(base.alphaTab),
+      avatarBackgroundOverlayColor: overlay(base.alphaAvatar),
+      actionBackgroundOverlayColor: overlay(base.alphaAction),
+      tableHeaderBackgroundOverlayColor: overlay(base.alphaAction),
 
-      pendingOverlayBackgroundColor: overlay(base.alphaPending),
-      tablePendingOverlayBackgroundColor: overlay(base.alphaTablePending),
-      activeOverlayBackgroundColor: overlay(base.alphaActive),
+      pendingBackgroundOverlayColor: overlay(base.alphaPending),
+      tablePendingBackgroundOverlayColor: overlay(base.alphaTablePending),
+      activeBackgroundOverlayColor: overlay(base.alphaActive),
 
       disabledOpacity: base.alphaDisabled,
       disabledFillBackgroundColor: neutral(base.alphaDisabledFill),
diff --git a/src/styles/progress/dark.js b/src/styles/progress/dark.js
index b127da922..4d4154808 100644
--- a/src/styles/progress/dark.js
+++ b/src/styles/progress/dark.js
@@ -3,7 +3,7 @@ import create from '../_utils/create-component-base'
 export default create({
   getDerivedVariables ({ derived }) {
     return {
-      railColor: derived.railOverlayBackgroundColor,
+      railColor: derived.railBackgroundOverlayColor,
       default: {
         fillColor: derived.infoColor
       },
diff --git a/src/styles/progress/light.js b/src/styles/progress/light.js
index c559616f0..0e1907857 100644
--- a/src/styles/progress/light.js
+++ b/src/styles/progress/light.js
@@ -3,7 +3,7 @@ import create from '../_utils/create-component-base'
 export default create({
   getDerivedVariables ({ derived }) {
     return {
-      railColor: derived.railOverlayBackgroundColor,
+      railColor: derived.railBackgroundOverlayColor,
       default: {
         fillColor: derived.infoColor
       },