diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css
index 6230a647942f..fe03a35b012f 100644
--- a/__tests__/fixtures/tailwind-output-important.css
+++ b/__tests__/fixtures/tailwind-output-important.css
@@ -7161,16 +7161,13 @@ samp {
   white-space: pre-wrap !important;
 }
 
-.wrap-break {
-  overflow-wrap: break-word !important;
-}
-
-.wrap-normal {
+.break-normal {
   overflow-wrap: normal !important;
+  word-break: normal !important;
 }
 
-.break-normal {
-  word-break: normal !important;
+.break-words {
+  overflow-wrap: break-word !important;
 }
 
 .break-all {
@@ -13905,16 +13902,13 @@ samp {
     white-space: pre-wrap !important;
   }
 
-  .sm\:wrap-break {
-    overflow-wrap: break-word !important;
-  }
-
-  .sm\:wrap-normal {
+  .sm\:break-normal {
     overflow-wrap: normal !important;
+    word-break: normal !important;
   }
 
-  .sm\:break-normal {
-    word-break: normal !important;
+  .sm\:break-words {
+    overflow-wrap: break-word !important;
   }
 
   .sm\:break-all {
@@ -20650,16 +20644,13 @@ samp {
     white-space: pre-wrap !important;
   }
 
-  .md\:wrap-break {
-    overflow-wrap: break-word !important;
-  }
-
-  .md\:wrap-normal {
+  .md\:break-normal {
     overflow-wrap: normal !important;
+    word-break: normal !important;
   }
 
-  .md\:break-normal {
-    word-break: normal !important;
+  .md\:break-words {
+    overflow-wrap: break-word !important;
   }
 
   .md\:break-all {
@@ -27395,16 +27386,13 @@ samp {
     white-space: pre-wrap !important;
   }
 
-  .lg\:wrap-break {
-    overflow-wrap: break-word !important;
-  }
-
-  .lg\:wrap-normal {
+  .lg\:break-normal {
     overflow-wrap: normal !important;
+    word-break: normal !important;
   }
 
-  .lg\:break-normal {
-    word-break: normal !important;
+  .lg\:break-words {
+    overflow-wrap: break-word !important;
   }
 
   .lg\:break-all {
@@ -34140,16 +34128,13 @@ samp {
     white-space: pre-wrap !important;
   }
 
-  .xl\:wrap-break {
-    overflow-wrap: break-word !important;
-  }
-
-  .xl\:wrap-normal {
+  .xl\:break-normal {
     overflow-wrap: normal !important;
+    word-break: normal !important;
   }
 
-  .xl\:break-normal {
-    word-break: normal !important;
+  .xl\:break-words {
+    overflow-wrap: break-word !important;
   }
 
   .xl\:break-all {
diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css
index 89326dfc644e..b4c3f1828e4f 100644
--- a/__tests__/fixtures/tailwind-output.css
+++ b/__tests__/fixtures/tailwind-output.css
@@ -7161,16 +7161,13 @@ samp {
   white-space: pre-wrap;
 }
 
-.wrap-break {
-  overflow-wrap: break-word;
-}
-
-.wrap-normal {
+.break-normal {
   overflow-wrap: normal;
+  word-break: normal;
 }
 
-.break-normal {
-  word-break: normal;
+.break-words {
+  overflow-wrap: break-word;
 }
 
 .break-all {
@@ -13905,16 +13902,13 @@ samp {
     white-space: pre-wrap;
   }
 
-  .sm\:wrap-break {
-    overflow-wrap: break-word;
-  }
-
-  .sm\:wrap-normal {
+  .sm\:break-normal {
     overflow-wrap: normal;
+    word-break: normal;
   }
 
-  .sm\:break-normal {
-    word-break: normal;
+  .sm\:break-words {
+    overflow-wrap: break-word;
   }
 
   .sm\:break-all {
@@ -20650,16 +20644,13 @@ samp {
     white-space: pre-wrap;
   }
 
-  .md\:wrap-break {
-    overflow-wrap: break-word;
-  }
-
-  .md\:wrap-normal {
+  .md\:break-normal {
     overflow-wrap: normal;
+    word-break: normal;
   }
 
-  .md\:break-normal {
-    word-break: normal;
+  .md\:break-words {
+    overflow-wrap: break-word;
   }
 
   .md\:break-all {
@@ -27395,16 +27386,13 @@ samp {
     white-space: pre-wrap;
   }
 
-  .lg\:wrap-break {
-    overflow-wrap: break-word;
-  }
-
-  .lg\:wrap-normal {
+  .lg\:break-normal {
     overflow-wrap: normal;
+    word-break: normal;
   }
 
-  .lg\:break-normal {
-    word-break: normal;
+  .lg\:break-words {
+    overflow-wrap: break-word;
   }
 
   .lg\:break-all {
@@ -34140,16 +34128,13 @@ samp {
     white-space: pre-wrap;
   }
 
-  .xl\:wrap-break {
-    overflow-wrap: break-word;
-  }
-
-  .xl\:wrap-normal {
+  .xl\:break-normal {
     overflow-wrap: normal;
+    word-break: normal;
   }
 
-  .xl\:break-normal {
-    word-break: normal;
+  .xl\:break-words {
+    overflow-wrap: break-word;
   }
 
   .xl\:break-all {
diff --git a/src/plugins/whitespace.js b/src/plugins/whitespace.js
index 61bf32d326f8..d646137819c5 100644
--- a/src/plugins/whitespace.js
+++ b/src/plugins/whitespace.js
@@ -8,10 +8,11 @@ export default function() {
         '.whitespace-pre-line': { 'white-space': 'pre-line' },
         '.whitespace-pre-wrap': { 'white-space': 'pre-wrap' },
 
-        '.wrap-break': { 'overflow-wrap': 'break-word' },
-        '.wrap-normal': { 'overflow-wrap': 'normal' },
-
-        '.break-normal': { 'word-break': 'normal' },
+        '.break-normal': {
+          'overflow-wrap': 'normal',
+          'word-break': 'normal',
+        },
+        '.break-words': { 'overflow-wrap': 'break-word' },
         '.break-all': { 'word-break': 'break-all' },
 
         '.truncate': {