diff --git a/src/plugins/gridRowGap.js b/src/plugins/columnGap.js
similarity index 51%
rename from src/plugins/gridRowGap.js
rename to src/plugins/columnGap.js
index eb642f79f..6fff2b6d4 100644
--- a/src/plugins/gridRowGap.js
+++ b/src/plugins/columnGap.js
@@ -1,5 +1,5 @@
 import createUtilityPlugin from '../util/createUtilityPlugin'
 
 export default function() {
-  return createUtilityPlugin('gridRowGap', [['row-gap', ['gridRowGap']]])
+  return createUtilityPlugin('columnGap', [['col-gap', ['gridColumnGap', 'columnGap']]])
 }
diff --git a/src/plugins/gridGap.js b/src/plugins/gap.js
similarity index 58%
rename from src/plugins/gridGap.js
rename to src/plugins/gap.js
index ec8d0e535..c2c2090a4 100644
--- a/src/plugins/gridGap.js
+++ b/src/plugins/gap.js
@@ -1,5 +1,5 @@
 import createUtilityPlugin from '../util/createUtilityPlugin'
 
 export default function() {
-  return createUtilityPlugin('gridGap', [['gap', ['gridGap']]])
+  return createUtilityPlugin('gap', [['gap', ['gridGap', 'gap']]])
 }
diff --git a/src/plugins/gridColumnGap.js b/src/plugins/rowGap.js
similarity index 53%
rename from src/plugins/gridColumnGap.js
rename to src/plugins/rowGap.js
index 0a309687a..4d63ff044 100644
--- a/src/plugins/gridColumnGap.js
+++ b/src/plugins/rowGap.js
@@ -1,5 +1,5 @@
 import createUtilityPlugin from '../util/createUtilityPlugin'
 
 export default function() {
-  return createUtilityPlugin('gridColumnGap', [['col-gap', ['gridColumnGap']]])
+  return createUtilityPlugin('rowGap', [['row-gap', ['gridRowGap', 'rowGap']]])
 }
diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js
index eb343494f..24fe9b23f 100644
--- a/stubs/defaultConfig.stub.js
+++ b/stubs/defaultConfig.stub.js
@@ -405,7 +405,9 @@ module.exports = {
       '40': '40',
       '50': '50',
     },
-    gridGap: theme => theme('spacing'),
+    gap: theme => theme('spacing'),
+    rowGap: {},
+    columnGap: {},
     gridTemplateColumns: {
       '1': 'repeat(1, minmax(0, 1fr))',
       '2': 'repeat(2, minmax(0, 1fr))',
@@ -420,7 +422,6 @@ module.exports = {
       '11': 'repeat(11, minmax(0, 1fr))',
       '12': 'repeat(12, minmax(0, 1fr))',
     },
-    gridColumnGap: {},
     gridColumn: {
       'span-1': 'span 1 / span 1',
       'span-2': 'span 2 / span 2',
@@ -466,7 +467,6 @@ module.exports = {
       '13': '13',
     },
     gridTemplateRows: {},
-    gridRowGap: {},
     gridRow: {},
     gridRowStart: {},
     gridRowEnd: {},
@@ -578,14 +578,14 @@ module.exports = {
     width: ['responsive'],
     wordBreak: ['responsive'],
     zIndex: ['responsive'],
-    gridGap: ['responsive'],
+    gap: ['responsive'],
+    columnGap: ['responsive'],
+    rowGap: ['responsive'],
     gridTemplateColumns: ['responsive'],
-    gridColumnGap: ['responsive'],
     gridColumn: ['responsive'],
     gridColumnStart: ['responsive'],
     gridColumnEnd: ['responsive'],
     gridTemplateRows: ['responsive'],
-    gridRowGap: ['responsive'],
     gridRow: ['responsive'],
     gridRowStart: ['responsive'],
     gridRowEnd: ['responsive'],