diff --git a/less/icons.less b/less/icons.less
index 9033ae8ac..c3df48b10 100644
--- a/less/icons.less
+++ b/less/icons.less
@@ -1,11 +1,11 @@
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
    readers do not read off random characters that represent icons */
 
-.createIconClasses(@iterator: 1) when(@iterator <= length(@fa-icon-glyphs)) {
-  @fa-glyph-name: extract(extract(@fa-icon-glyphs, @iterator), 1);
+.createIconClasses(@iterator: 1) when(@iterator <= length(@fa-var-glyphs)) {
+  @fa-glyph-name: extract(extract(@fa-var-glyphs, @iterator), 1);
   @fa-glyph-name-unquoted: ~"@{fa-glyph-name}";
   .@{fa-css-prefix}-@{fa-glyph-name-unquoted}:before {
-    content: extract(extract(@fa-icon-glyphs, @iterator), 2);
+    content: extract(extract(@fa-var-glyphs, @iterator), 2);
   }
   .createIconClasses((@iterator + 1));
 }
diff --git a/less/rotated-flipped.less b/less/rotated-flipped.less
index 004bc98a8..d9ea757af 100644
--- a/less/rotated-flipped.less
+++ b/less/rotated-flipped.less
@@ -9,7 +9,7 @@
 // calculate classes and values for rotation
 .calculateRotations(@i) when (@i >= 0) {
   @rotation-selector: ~"@{fa-css-prefix}-rotate-@{i}";
-  .@{rotation-selector} when (mod(@i, @fa-rotate-by) = 0) {
+  .@{rotation-selector} when (mod(@i, @fa-rotation-increment) = 0) {
     .fa-icon-rotate(@i);
   }
   .calculateRotations((@i - 1));
diff --git a/less/variables.less b/less/variables.less
index 264a74307..dc50f8417 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -610,14 +610,14 @@
 // icon sizes - these scale font size and line height
 @fa-var-scales:
   "default" 1.000,
-  "lg":  1.333,
-  "sm":  0.666,
-  "xlg": 1.666,
-  "xsm": 0.333;
+  "lg"      1.333,
+  "sm"      0.666,
+  "xlg"     1.666,
+  "xsm"     0.333;
 
 // icon size multipliers - these scale font size
 @fa-var-multipliers:
-  "2x": 2,
-  "3x": 3,
-  "4x": 4,
-  "5x": 5;
+  "2x" 2,
+  "3x" 3,
+  "4x" 4,
+  "5x" 5;