diff --git a/less/alerts.less b/less/alerts.less
index 20e0a8b5d0..48e4bab422 100644
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -10,7 +10,7 @@
   padding: 8px 35px 8px 14px;
   margin-bottom: @line-height-base;
   color: @state-warning-text;
-  background-color: @state-warning-background;
+  background-color: @state-warning-bg;
   border: 1px solid @state-warning-border;
   border-radius: @border-radius-base;
 
@@ -45,7 +45,7 @@
 // -------------------------
 
 .alert-success {
-  background-color: @state-success-background;
+  background-color: @state-success-bg;
   border-color: @state-success-border;
   color: @state-success-text;
   hr {
@@ -58,7 +58,7 @@
 }
 .alert-danger,
 .alert-error {
-  background-color: @state-danger-background;
+  background-color: @state-danger-bg;
   border-color: @state-danger-border;
   color: @state-danger-text;
   hr {
@@ -70,7 +70,7 @@
   }
 }
 .alert-info {
-  background-color: @state-info-background;
+  background-color: @state-info-bg;
   border-color: @state-info-border;
   color: @state-info-text;
   hr {
diff --git a/less/forms.less b/less/forms.less
index 583d1e30f9..0c440265d8 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -307,15 +307,15 @@ input[type="checkbox"] {
 
 // Warning
 .has-warning {
-  .formFieldState(@state-warning-text, @state-warning-text, @state-warning-background);
+  .formFieldState(@state-warning-text, @state-warning-text, @state-warning-bg);
 }
 // Error
 .has-error {
-  .formFieldState(@state-danger-text, @state-danger-text, @state-danger-background);
+  .formFieldState(@state-danger-text, @state-danger-text, @state-danger-bg);
 }
 // Success
 .has-success {
-  .formFieldState(@state-success-text, @state-success-text, @state-success-background);
+  .formFieldState(@state-success-text, @state-success-text, @state-success-bg);
 }
 
 // HTML5 invalid states
diff --git a/less/tables.less b/less/tables.less
index 196eff709f..29ae81ee42 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -197,19 +197,19 @@ table th[class*="col-span-"] {
   > td.success,
   > th.success,
   &.success > td {
-    background-color: @state-success-background;
+    background-color: @state-success-bg;
     border-color: @state-success-border;
   }
   > td.danger,
   > th.danger,
   &.danger > td {
-    background-color: @state-danger-background;
+    background-color: @state-danger-bg;
     border-color: @state-danger-border;
   }
   > td.warning,
   > th.warning,
   &.warning > td {
-    background-color: @state-warning-background;
+    background-color: @state-warning-bg;
     border-color: @state-warning-border;
   }
 }
@@ -219,19 +219,19 @@ table th[class*="col-span-"] {
   > td.success:hover,
   > th.success:hover,
   &.success:hover > td {
-    background-color: darken(@state-success-background, 5%);
+    background-color: darken(@state-success-bg, 5%);
     border-color: darken(@state-success-border, 5%);
   }
   > td.danger:hover,
   > th.danger:hover,
   &.danger:hover > td {
-    background-color: darken(@state-danger-background, 5%);
+    background-color: darken(@state-danger-bg, 5%);
     border-color: darken(@state-danger-border, 5%);
   }
   > td.warning:hover,
   > th.warning:hover,
   &.warning:hover > td {
-    background-color: darken(@state-warning-background, 5%);
+    background-color: darken(@state-warning-bg, 5%);
     border-color: darken(@state-warning-border, 5%);
   }
 }
diff --git a/less/variables.less b/less/variables.less
index a6cdce5cc1..81b53f8d50 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -239,20 +239,20 @@
 // -------------------------
 
 @state-warning-text:             #c09853;
-@state-warning-background:       #fcf8e3;
-@state-warning-border:           darken(spin(@state-warning-background, -10), 3%);
+@state-warning-bg:               #fcf8e3;
+@state-warning-border:           darken(spin(@state-warning-bg, -10), 3%);
 
 @state-danger-text:              #b94a48;
-@state-danger-background:        #f2dede;
-@state-danger-border:            darken(spin(@state-danger-background, -10), 3%);
+@state-danger-bg:                #f2dede;
+@state-danger-border:            darken(spin(@state-danger-bg, -10), 3%);
 
 @state-success-text:             #468847;
-@state-success-background:       #dff0d8;
-@state-success-border:           darken(spin(@state-success-background, -10), 5%);
+@state-success-bg:               #dff0d8;
+@state-success-border:           darken(spin(@state-success-bg, -10), 5%);
 
 @state-info-text:                #3a87ad;
-@state-info-background:          #d9edf7;
-@state-info-border:              darken(spin(@state-info-background, -10), 7%);
+@state-info-bg:                  #d9edf7;
+@state-info-border:              darken(spin(@state-info-bg, -10), 7%);
 
 
 // Tooltips and popovers
@@ -315,19 +315,19 @@
 
 @panel-success-text:          @state-success-text;
 @panel-success-border:        @state-success-border;
-@panel-success-heading-bg:    @state-success-background;
+@panel-success-heading-bg:    @state-success-bg;
 
 @panel-warning-text:          @state-warning-text;
 @panel-warning-border:        @state-warning-border;
-@panel-warning-heading-bg:    @state-warning-background;
+@panel-warning-heading-bg:    @state-warning-bg;
 
 @panel-danger-text:           @state-danger-text;
 @panel-danger-border:         @state-danger-border;
-@panel-danger-heading-bg:     @state-danger-background;
+@panel-danger-heading-bg:     @state-danger-bg;
 
 @panel-info-text:             @state-info-text;
 @panel-info-border:           @state-info-border;
-@panel-info-heading-bg:       @state-info-background;
+@panel-info-heading-bg:       @state-info-bg;
 
 
 // Wells