diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css
index c23f8657f..6690d5d2d 100644
--- a/__tests__/fixtures/tailwind-output-important.css
+++ b/__tests__/fixtures/tailwind-output-important.css
@@ -569,9 +569,8 @@ samp {
   }
 }
 
-.list-reset {
-  list-style: none !important;
-  padding: 0 !important;
+.list-none {
+  list-style-type: none !important;
 }
 
 .appearance-none {
@@ -6602,9 +6601,8 @@ samp {
 }
 
 @media (min-width: 640px) {
-  .sm\:list-reset {
-    list-style: none !important;
-    padding: 0 !important;
+  .sm\:list-none {
+    list-style-type: none !important;
   }
 
   .sm\:appearance-none {
@@ -12612,9 +12610,8 @@ samp {
 }
 
 @media (min-width: 768px) {
-  .md\:list-reset {
-    list-style: none !important;
-    padding: 0 !important;
+  .md\:list-none {
+    list-style-type: none !important;
   }
 
   .md\:appearance-none {
@@ -18622,9 +18619,8 @@ samp {
 }
 
 @media (min-width: 1024px) {
-  .lg\:list-reset {
-    list-style: none !important;
-    padding: 0 !important;
+  .lg\:list-none {
+    list-style-type: none !important;
   }
 
   .lg\:appearance-none {
@@ -24632,9 +24628,8 @@ samp {
 }
 
 @media (min-width: 1280px) {
-  .xl\:list-reset {
-    list-style: none !important;
-    padding: 0 !important;
+  .xl\:list-none {
+    list-style-type: none !important;
   }
 
   .xl\:appearance-none {
diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css
index d8b5cdfc0..d1fc51dd4 100644
--- a/__tests__/fixtures/tailwind-output.css
+++ b/__tests__/fixtures/tailwind-output.css
@@ -569,9 +569,8 @@ samp {
   }
 }
 
-.list-reset {
-  list-style: none;
-  padding: 0;
+.list-none {
+  list-style-type: none;
 }
 
 .appearance-none {
@@ -6602,9 +6601,8 @@ samp {
 }
 
 @media (min-width: 640px) {
-  .sm\:list-reset {
-    list-style: none;
-    padding: 0;
+  .sm\:list-none {
+    list-style-type: none;
   }
 
   .sm\:appearance-none {
@@ -12612,9 +12610,8 @@ samp {
 }
 
 @media (min-width: 768px) {
-  .md\:list-reset {
-    list-style: none;
-    padding: 0;
+  .md\:list-none {
+    list-style-type: none;
   }
 
   .md\:appearance-none {
@@ -18622,9 +18619,8 @@ samp {
 }
 
 @media (min-width: 1024px) {
-  .lg\:list-reset {
-    list-style: none;
-    padding: 0;
+  .lg\:list-none {
+    list-style-type: none;
   }
 
   .lg\:appearance-none {
@@ -24632,9 +24628,8 @@ samp {
 }
 
 @media (min-width: 1280px) {
-  .xl\:list-reset {
-    list-style: none;
-    padding: 0;
+  .xl\:list-none {
+    list-style-type: none;
   }
 
   .xl\:appearance-none {
diff --git a/defaultConfig.stub.js b/defaultConfig.stub.js
index 48104ae6c..52e5e1d73 100644
--- a/defaultConfig.stub.js
+++ b/defaultConfig.stub.js
@@ -33,7 +33,7 @@ module.exports = {
     fontWeight: ['responsive', 'hover', 'focus'],
     height: ['responsive'],
     lineHeight: ['responsive'],
-    listStyle: ['responsive'],
+    listStyleType: ['responsive'],
     margin: ['responsive'],
     maxHeight: ['responsive'],
     maxWidth: ['responsive'],
diff --git a/src/corePlugins.js b/src/corePlugins.js
index 7711076af..570829303 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -1,5 +1,5 @@
 import preflight from './plugins/preflight'
-import listStyle from './plugins/listStyle'
+import listStyleType from './plugins/listStyleType'
 import appearance from './plugins/appearance'
 import backgroundAttachment from './plugins/backgroundAttachment'
 import backgroundColor from './plugins/backgroundColor'
@@ -66,7 +66,7 @@ import configurePlugins from './util/configurePlugins'
 export default function({ corePlugins: corePluginConfig }) {
   return configurePlugins(corePluginConfig, {
     preflight,
-    listStyle,
+    listStyleType,
     appearance,
     backgroundAttachment,
     backgroundColor,
diff --git a/src/plugins/listStyle.js b/src/plugins/listStyleType.js
similarity index 53%
rename from src/plugins/listStyle.js
rename to src/plugins/listStyleType.js
index 13a3f5cd2..ed609fe14 100644
--- a/src/plugins/listStyle.js
+++ b/src/plugins/listStyleType.js
@@ -2,12 +2,11 @@ export default function() {
   return function({ addUtilities, config }) {
     addUtilities(
       {
-        '.list-reset': {
-          'list-style': 'none',
-          padding: '0',
+        '.list-none': {
+          'list-style-type': 'none',
         },
       },
-      config('variants.listStyle')
+      config('variants.listStyleType')
     )
   }
 }