diff --git a/less/carousel.less b/less/carousel.less
index c468d435cd..de5e4c9369 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -183,7 +183,7 @@
 
 
 // Scale up controls for tablets and up
-@media screen and (min-width: @screen-tablet) {
+@media screen and (min-width: @screen-sm) {
 
   // Scale up the controls a smidge
   .carousel-control .icon-prev,
diff --git a/less/forms.less b/less/forms.less
index f87b602764..a02df1e3d2 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -289,7 +289,7 @@ input[type="checkbox"],
 .form-inline {
 
   // Kick in the inline
-  @media (min-width: @screen-tablet) {
+  @media (min-width: @screen-sm) {
     // Inline-block all the things for "inline"
     .form-group  {
       display: inline-block;
@@ -345,7 +345,7 @@ input[type="checkbox"],
   }
 
   // Only right align form labels here when the columns stop stacking
-  @media (min-width: @screen-tablet) {
+  @media (min-width: @screen-sm) {
     .control-label {
       text-align: right;
     }
diff --git a/less/grid.less b/less/grid.less
index 44e38994ef..d3a3cf6bca 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -114,7 +114,7 @@
 // Note that `.col-sm-12` doesn't get floated on purpose—there's no need since
 // it's full-width.
 
-@media (min-width: @screen-tablet) {
+@media (min-width: @screen-sm) {
   .container {
     max-width: @container-tablet;
   }
@@ -192,7 +192,7 @@
 // Note that `.col-md-12` doesn't get floated on purpose—there's no need since
 // it's full-width.
 
-@media (min-width: @screen-desktop) {
+@media (min-width: @screen-md) {
   .container {
     max-width: @container-desktop;
   }
diff --git a/less/jumbotron.less b/less/jumbotron.less
index 8f482af527..53289fb2c9 100644
--- a/less/jumbotron.less
+++ b/less/jumbotron.less
@@ -24,7 +24,7 @@
     border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
   }
 
-  @media screen and (min-width: @screen-tablet) {
+  @media screen and (min-width: @screen-sm) {
     padding-top:    (@jumbotron-padding * 1.6);
     padding-bottom: (@jumbotron-padding * 1.6);
 
diff --git a/less/modals.less b/less/modals.less
index 7bc6c314fe..f886fb25ce 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -125,7 +125,7 @@
 }
 
 // Scale up the modal
-@media screen and (min-width: @screen-tablet) {
+@media screen and (min-width: @screen-sm) {
 
   .modal-dialog {
     left: 50%;
diff --git a/less/variables.less b/less/variables.less
index fa623e283e..b2547493aa 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -201,19 +201,19 @@
 
 // Extra small screen / phone
 @screen-xs:                  480px;
-@screen-phone:               @screen-xs;
+@screen-phone:               @screen-xs;// NOTE: Deprecated in favor of @screen-xs
 
 // Small screen / tablet
 @screen-sm:                  768px;
-@screen-tablet:              @screen-sm;
+@screen-tablet:              @screen-sm;// NOTE: Deprecated in favor of @screen-sm
 
 // Medium screen / desktop
 @screen-md:                  992px;
-@screen-desktop:             @screen-md;
+@screen-desktop:             @screen-md;// NOTE: Deprecated in favor of @screen-md
 
 // Large screen / wide desktop
 @screen-lg:                  1200px;
-@screen-lg-desktop:          @screen-lg;
+@screen-lg-desktop:          @screen-lg;// NOTE: Deprecated in favor of @screen-lg
 
 // So media queries don't overlap when required, provide a maximum
 @screen-xs-max:              (@screen-sm - 1);
@@ -229,7 +229,7 @@
 // Padding, to be divided by two and applied to the left and right of all columns
 @grid-gutter-width:         30px;
 // Point at which the navbar stops collapsing
-@grid-float-breakpoint:     @screen-tablet;
+@grid-float-breakpoint:     @screen-sm;
 
 
 // Navbar