diff --git a/less/buttons.less b/less/buttons.less
index d6e334f0e2..a412bd5ff5 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -117,19 +117,19 @@ input[type="button"] {
 }
 // Warning appears as orange
 .btn-warning {
-  .btn-pseudo-states(@btn-bg-warning, @btn-warning-border);
+  .btn-pseudo-states(@btn-warning-bg, @btn-warning-border);
 }
 // Danger and error appear as red
 .btn-danger {
-  .btn-pseudo-states(@btn-bg-danger, @btn-danger-border);
+  .btn-pseudo-states(@btn-danger-bg, @btn-danger-border);
 }
 // Success appears as green
 .btn-success {
-  .btn-pseudo-states(@btn-bg-success, @btn-success-border);
+  .btn-pseudo-states(@btn-success-bg, @btn-success-border);
 }
 // Info appears as blue-green
 .btn-info {
-  .btn-pseudo-states(@btn-bg-info, @btn-info-border);
+  .btn-pseudo-states(@btn-info-bg, @btn-info-border);
 }
 
 
diff --git a/less/navbar.less b/less/navbar.less
index ac950ca9b8..01d747ef52 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -193,8 +193,8 @@
     color: @navbar-inverse-brand-color;
     &:hover,
     &:focus {
-      color: @navbar-inverse-brand-color-hover;
-      background-color: @navbar-inverse-brand-bg-hover;
+      color: @navbar-inverse-brand-hover-color;
+      background-color: @navbar-inverse-brand-hover-bg;
     }
   }
 
diff --git a/less/variables.less b/less/variables.less
index 57a08f3b23..30ac7a59d7 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -91,17 +91,17 @@
 @btn-primary-bg:                 @brand-primary;
 @btn-primary-border:             @btn-primary-bg;
 
-@btn-bg-success:                 @brand-success;
-@btn-success-border:             @btn-bg-success;
+@btn-success-bg:                 @brand-success;
+@btn-success-border:             @btn-success-bg;
 
-@btn-bg-warning:                 @brand-warning;
-@btn-warning-border:             @btn-bg-warning;
+@btn-warning-bg:                 @brand-warning;
+@btn-warning-border:             @btn-warning-bg;
 
-@btn-bg-danger:                  @brand-danger;
-@btn-danger-border:              @btn-bg-danger;
+@btn-danger-bg:                  @brand-danger;
+@btn-danger-border:              @btn-danger-bg;
 
-@btn-bg-info:                    @brand-info;
-@btn-info-border:                @btn-bg-info;
+@btn-info-bg:                    @brand-info;
+@btn-info-border:                @btn-info-bg;
 
 
 
@@ -190,8 +190,8 @@
 
 // Inverted navbar brand label
 @navbar-inverse-brand-color:                @navbar-inverse-link-color;
-@navbar-inverse-brand-color-hover:          #fff;
-@navbar-inverse-brand-bg-hover:             transparent;
+@navbar-inverse-brand-hover-color:          #fff;
+@navbar-inverse-brand-hover-bg:             transparent;
 
 // Inverted navbar links
 @navbar-inverse-link-color:                 @grayLight;