diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js
index 8715bf9ea..b8faf69c5 100644
--- a/defaultConfig.stub.js
+++ b/defaultConfig.stub.js
@@ -24,7 +24,7 @@ module.exports = {
     fontFamily: ['responsive'],
     fontWeight: ['responsive', 'hover', 'focus'],
     height: ['responsive'],
-    leading: ['responsive'],
+    lineHeight: ['responsive'],
     listStyle: ['responsive'],
     margin: ['responsive'],
     maxHeight: ['responsive'],
@@ -52,7 +52,7 @@ module.exports = {
     textTransform: ['responsive', 'hover', 'focus'],
     textDecoration: ['responsive', 'hover', 'focus'],
     fontSmoothing: ['responsive', 'hover', 'focus'],
-    tracking: ['responsive'],
+    letterSpacing: ['responsive'],
     userSelect: ['responsive'],
     verticalAlign: ['responsive'],
     visibility: ['responsive'],
diff --git a/defaultTheme.js b/defaultTheme.js
index 4137a4209..9c0462bdf 100644
--- a/defaultTheme.js
+++ b/defaultTheme.js
@@ -159,13 +159,13 @@ module.exports = function() {
       extrabold: 800,
       black: 900,
     },
-    leading: {
+    lineHeight: {
       none: 1,
       tight: 1.25,
       normal: 1.5,
       loose: 2,
     },
-    tracking: {
+    letterSpacing: {
       tight: '-0.05em',
       normal: '0',
       wide: '0.05em',
diff --git a/plugins/leading.js b/plugins/leading.js
deleted file mode 100644
index 231aeb9ed..000000000
--- a/plugins/leading.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('../lib/plugins/leading').default
diff --git a/plugins/letterSpacing.js b/plugins/letterSpacing.js
new file mode 100644
index 000000000..20be9ee84
--- /dev/null
+++ b/plugins/letterSpacing.js
@@ -0,0 +1 @@
+module.exports = require('../lib/plugins/letterSpacing').default
diff --git a/plugins/lineHeight.js b/plugins/lineHeight.js
new file mode 100644
index 000000000..31977ffaa
--- /dev/null
+++ b/plugins/lineHeight.js
@@ -0,0 +1 @@
+module.exports = require('../lib/plugins/lineHeight').default
diff --git a/plugins/tracking.js b/plugins/tracking.js
deleted file mode 100644
index 1e44f581c..000000000
--- a/plugins/tracking.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('../lib/plugins/tracking').default
diff --git a/src/corePlugins.js b/src/corePlugins.js
index ba2443042..c0d7f8ebf 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -18,7 +18,7 @@ import float from './plugins/float'
 import fontFamily from './plugins/fontFamily'
 import fontWeight from './plugins/fontWeight'
 import height from './plugins/height'
-import leading from './plugins/leading'
+import lineHeight from './plugins/lineHeight'
 import margin from './plugins/margin'
 import maxHeight from './plugins/maxHeight'
 import maxWidth from './plugins/maxWidth'
@@ -45,7 +45,7 @@ import fontStyle from './plugins/fontStyle'
 import textTransform from './plugins/textTransform'
 import textDecoration from './plugins/textDecoration'
 import fontSmoothing from './plugins/fontSmoothing'
-import tracking from './plugins/tracking'
+import letterSpacing from './plugins/letterSpacing'
 import userSelect from './plugins/userSelect'
 import verticalAlign from './plugins/verticalAlign'
 import visibility from './plugins/visibility'
@@ -92,7 +92,7 @@ export default function(config) {
     fontFamily,
     fontWeight,
     height,
-    leading,
+    lineHeight,
     margin,
     maxHeight,
     maxWidth,
@@ -119,7 +119,7 @@ export default function(config) {
     textTransform,
     textDecoration,
     fontSmoothing,
-    tracking,
+    letterSpacing,
     userSelect,
     verticalAlign,
     visibility,
diff --git a/src/plugins/tracking.js b/src/plugins/letterSpacing.js
similarity index 100%
rename from src/plugins/tracking.js
rename to src/plugins/letterSpacing.js
diff --git a/src/plugins/leading.js b/src/plugins/lineHeight.js
similarity index 100%
rename from src/plugins/leading.js
rename to src/plugins/lineHeight.js