diff --git a/src/corePlugins/animation.js b/src/corePlugins/animation.js
index 7bda6a8..055efd6 100644
--- a/src/corePlugins/animation.js
+++ b/src/corePlugins/animation.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 const parseAnimationValue = require('tailwindcss/lib/util/parseAnimationValue').default
 
diff --git a/src/corePlugins/backgroundColor.js b/src/corePlugins/backgroundColor.js
index 72acf44..78dd52f 100644
--- a/src/corePlugins/backgroundColor.js
+++ b/src/corePlugins/backgroundColor.js
@@ -1,9 +1,8 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default
 const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default
 const toColorValue = require('tailwindcss/lib/util/toColorValue').default
-const { asColor } = require('../pluginUtils')
+const { asColor, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   let colorPalette = flattenColorPalette(theme.backgroundColor)
diff --git a/src/corePlugins/backgroundImage.js b/src/corePlugins/backgroundImage.js
index 9279e7a..3de3a40 100644
--- a/src/corePlugins/backgroundImage.js
+++ b/src/corePlugins/backgroundImage.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/backgroundOpacity.js b/src/corePlugins/backgroundOpacity.js
index 5103766..aa0eae3 100644
--- a/src/corePlugins/backgroundOpacity.js
+++ b/src/corePlugins/backgroundOpacity.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asValue } = require('../pluginUtils')
+const { asValue, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme, addVariant, e } }) {
   matchUtilities({
diff --git a/src/corePlugins/backgroundPosition.js b/src/corePlugins/backgroundPosition.js
index c5f6035..1fbeabe 100644
--- a/src/corePlugins/backgroundPosition.js
+++ b/src/corePlugins/backgroundPosition.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/backgroundSize.js b/src/corePlugins/backgroundSize.js
index 9211eb3..4dbf5a8 100644
--- a/src/corePlugins/backgroundSize.js
+++ b/src/corePlugins/backgroundSize.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/borderColor.js b/src/corePlugins/borderColor.js
index 587e312..ce50a56 100644
--- a/src/corePlugins/borderColor.js
+++ b/src/corePlugins/borderColor.js
@@ -1,8 +1,7 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default
 const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default
 const toColorValue = require('tailwindcss/lib/util/toColorValue').default
-const { asColor } = require('../pluginUtils')
+const { asColor, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   let colorPalette = flattenColorPalette(theme.borderColor)
diff --git a/src/corePlugins/borderOpacity.js b/src/corePlugins/borderOpacity.js
index cbd6c03..69b3ae2 100644
--- a/src/corePlugins/borderOpacity.js
+++ b/src/corePlugins/borderOpacity.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asValue } = require('../pluginUtils')
+const { asValue, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/borderRadius.js b/src/corePlugins/borderRadius.js
index 9109db0..afbb421 100644
--- a/src/corePlugins/borderRadius.js
+++ b/src/corePlugins/borderRadius.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/borderWidth.js b/src/corePlugins/borderWidth.js
index 7d8b43c..5dc2724 100644
--- a/src/corePlugins/borderWidth.js
+++ b/src/corePlugins/borderWidth.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/boxShadow.js b/src/corePlugins/boxShadow.js
index ece9362..c282dd2 100644
--- a/src/corePlugins/boxShadow.js
+++ b/src/corePlugins/boxShadow.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 
 let transformValue = transformThemeValue('boxShadow')
diff --git a/src/corePlugins/cursor.js b/src/corePlugins/cursor.js
index 0ce450a..1c04086 100644
--- a/src/corePlugins/cursor.js
+++ b/src/corePlugins/cursor.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asValue } = require('../pluginUtils')
+const { asValue, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/divideColor.js b/src/corePlugins/divideColor.js
index bc3621d..15f605a 100644
--- a/src/corePlugins/divideColor.js
+++ b/src/corePlugins/divideColor.js
@@ -1,8 +1,7 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default
 const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default
 const toColorValue = require('tailwindcss/lib/util/toColorValue').default
-const { asColor } = require('../pluginUtils')
+const { asColor, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   let colorPalette = flattenColorPalette(theme.divideColor)
diff --git a/src/corePlugins/divideOpacity.js b/src/corePlugins/divideOpacity.js
index ec17813..5d60514 100644
--- a/src/corePlugins/divideOpacity.js
+++ b/src/corePlugins/divideOpacity.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asValue } = require('../pluginUtils')
+const { asValue, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/divideWidth.js b/src/corePlugins/divideWidth.js
index b084a45..06dbe94 100644
--- a/src/corePlugins/divideWidth.js
+++ b/src/corePlugins/divideWidth.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ addUtilities, matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/fill.js b/src/corePlugins/fill.js
index f8666b0..5a8a011 100644
--- a/src/corePlugins/fill.js
+++ b/src/corePlugins/fill.js
@@ -1,8 +1,7 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default
 const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default
 const toColorValue = require('tailwindcss/lib/util/toColorValue').default
-const { asColor } = require('../pluginUtils')
+const { asColor, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   let colorPalette = flattenColorPalette(theme.fill)
diff --git a/src/corePlugins/flex.js b/src/corePlugins/flex.js
index 5bc4006..82edabb 100644
--- a/src/corePlugins/flex.js
+++ b/src/corePlugins/flex.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
diff --git a/src/corePlugins/flexGrow.js b/src/corePlugins/flexGrow.js
index b568770..5ef14cc 100644
--- a/src/corePlugins/flexGrow.js
+++ b/src/corePlugins/flexGrow.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asValue } = require('../pluginUtils')
+const { asValue, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/flexShrink.js b/src/corePlugins/flexShrink.js
index a523b76..e01dee0 100644
--- a/src/corePlugins/flexShrink.js
+++ b/src/corePlugins/flexShrink.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asValue } = require('../pluginUtils')
+const { asValue, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/fontFamily.js b/src/corePlugins/fontFamily.js
index e2a3531..415733e 100644
--- a/src/corePlugins/fontFamily.js
+++ b/src/corePlugins/fontFamily.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
diff --git a/src/corePlugins/fontSize.js b/src/corePlugins/fontSize.js
index c07444b..1c73c1b 100644
--- a/src/corePlugins/fontSize.js
+++ b/src/corePlugins/fontSize.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 const { isPlainObject } = require('../lib/utils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
diff --git a/src/corePlugins/fontWeight.js b/src/corePlugins/fontWeight.js
index 958188a..f3ccd30 100644
--- a/src/corePlugins/fontWeight.js
+++ b/src/corePlugins/fontWeight.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
diff --git a/src/corePlugins/gap.js b/src/corePlugins/gap.js
index eacc3f3..f176e18 100644
--- a/src/corePlugins/gap.js
+++ b/src/corePlugins/gap.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/gradientColorStops.js b/src/corePlugins/gradientColorStops.js
index 3a0fbc7..c9ca6b3 100644
--- a/src/corePlugins/gradientColorStops.js
+++ b/src/corePlugins/gradientColorStops.js
@@ -1,9 +1,8 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default
 const toColorValue = require('tailwindcss/lib/util/toColorValue').default
 const toRgba = require('tailwindcss/lib/util/withAlphaVariable').toRgba
-const { asColor } = require('../pluginUtils')
+const { asColor, nameClass } = require('../pluginUtils')
 
 function transparentTo(value) {
   if (typeof value === 'function') {
diff --git a/src/corePlugins/gridAutoColumns.js b/src/corePlugins/gridAutoColumns.js
index 01c3738..9838a46 100644
--- a/src/corePlugins/gridAutoColumns.js
+++ b/src/corePlugins/gridAutoColumns.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asList } = require('../pluginUtils')
+const { asList, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/gridAutoRows.js b/src/corePlugins/gridAutoRows.js
index c89a65e..4dc38a1 100644
--- a/src/corePlugins/gridAutoRows.js
+++ b/src/corePlugins/gridAutoRows.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asList } = require('../pluginUtils')
+const { asList, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/gridColumn.js b/src/corePlugins/gridColumn.js
index 5d4de3d..ba4394f 100644
--- a/src/corePlugins/gridColumn.js
+++ b/src/corePlugins/gridColumn.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
diff --git a/src/corePlugins/gridColumnEnd.js b/src/corePlugins/gridColumnEnd.js
index a168e99..8620271 100644
--- a/src/corePlugins/gridColumnEnd.js
+++ b/src/corePlugins/gridColumnEnd.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
diff --git a/src/corePlugins/gridColumnStart.js b/src/corePlugins/gridColumnStart.js
index d72fc84..6699ade 100644
--- a/src/corePlugins/gridColumnStart.js
+++ b/src/corePlugins/gridColumnStart.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
diff --git a/src/corePlugins/gridRow.js b/src/corePlugins/gridRow.js
index a808311..df43345 100644
--- a/src/corePlugins/gridRow.js
+++ b/src/corePlugins/gridRow.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
diff --git a/src/corePlugins/gridRowEnd.js b/src/corePlugins/gridRowEnd.js
index 5d72438..56df03b 100644
--- a/src/corePlugins/gridRowEnd.js
+++ b/src/corePlugins/gridRowEnd.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/gridRowStart.js b/src/corePlugins/gridRowStart.js
index aff3da3..270ee48 100644
--- a/src/corePlugins/gridRowStart.js
+++ b/src/corePlugins/gridRowStart.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/gridTemplateColumns.js b/src/corePlugins/gridTemplateColumns.js
index 2c22f01..9fdf1ce 100644
--- a/src/corePlugins/gridTemplateColumns.js
+++ b/src/corePlugins/gridTemplateColumns.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asList } = require('../pluginUtils')
+const { asList, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/gridTemplateRows.js b/src/corePlugins/gridTemplateRows.js
index 4654d68..c79cc91 100644
--- a/src/corePlugins/gridTemplateRows.js
+++ b/src/corePlugins/gridTemplateRows.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asList } = require('../pluginUtils')
+const { asList, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/height.js b/src/corePlugins/height.js
index 5f99e37..b0f68ac 100644
--- a/src/corePlugins/height.js
+++ b/src/corePlugins/height.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/inset.js b/src/corePlugins/inset.js
index 5f3f0e1..4596515 100644
--- a/src/corePlugins/inset.js
+++ b/src/corePlugins/inset.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/letterSpacing.js b/src/corePlugins/letterSpacing.js
index f80d6eb..3767f99 100644
--- a/src/corePlugins/letterSpacing.js
+++ b/src/corePlugins/letterSpacing.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/lineHeight.js b/src/corePlugins/lineHeight.js
index 1a9f8e7..b7c8144 100644
--- a/src/corePlugins/lineHeight.js
+++ b/src/corePlugins/lineHeight.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/listStyleType.js b/src/corePlugins/listStyleType.js
index 90dccdf..c8ba142 100644
--- a/src/corePlugins/listStyleType.js
+++ b/src/corePlugins/listStyleType.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
diff --git a/src/corePlugins/margin.js b/src/corePlugins/margin.js
index c98e940..6c8a64a 100644
--- a/src/corePlugins/margin.js
+++ b/src/corePlugins/margin.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/maxHeight.js b/src/corePlugins/maxHeight.js
index c0b8c46..8e0cc1c 100644
--- a/src/corePlugins/maxHeight.js
+++ b/src/corePlugins/maxHeight.js
@@ -1,6 +1,5 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/maxWidth.js b/src/corePlugins/maxWidth.js
index 2faee71..e934858 100644
--- a/src/corePlugins/maxWidth.js
+++ b/src/corePlugins/maxWidth.js
@@ -1,6 +1,5 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/minHeight.js b/src/corePlugins/minHeight.js
index 27c5b7c..5b758c1 100644
--- a/src/corePlugins/minHeight.js
+++ b/src/corePlugins/minHeight.js
@@ -1,6 +1,5 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/minWidth.js b/src/corePlugins/minWidth.js
index 24df890..a45d266 100644
--- a/src/corePlugins/minWidth.js
+++ b/src/corePlugins/minWidth.js
@@ -1,6 +1,5 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/objectPosition.js b/src/corePlugins/objectPosition.js
index 246776c..c20e1d9 100644
--- a/src/corePlugins/objectPosition.js
+++ b/src/corePlugins/objectPosition.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
diff --git a/src/corePlugins/opacity.js b/src/corePlugins/opacity.js
index f9f1e5f..061f547 100644
--- a/src/corePlugins/opacity.js
+++ b/src/corePlugins/opacity.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asValue } = require('../pluginUtils')
+const { asValue, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/order.js b/src/corePlugins/order.js
index 9f37038..f7bf2f2 100644
--- a/src/corePlugins/order.js
+++ b/src/corePlugins/order.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asValue } = require('../pluginUtils')
+const { asValue, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/outline.js b/src/corePlugins/outline.js
index f71adbd..ac6f5ec 100644
--- a/src/corePlugins/outline.js
+++ b/src/corePlugins/outline.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/padding.js b/src/corePlugins/padding.js
index 3748d73..a7005ad 100644
--- a/src/corePlugins/padding.js
+++ b/src/corePlugins/padding.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/placeholderColor.js b/src/corePlugins/placeholderColor.js
index 9f9da78..17d4038 100644
--- a/src/corePlugins/placeholderColor.js
+++ b/src/corePlugins/placeholderColor.js
@@ -1,8 +1,7 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default
 const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default
 const toColorValue = require('tailwindcss/lib/util/toColorValue').default
-const { asColor } = require('../pluginUtils')
+const { asColor, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   let colorPalette = flattenColorPalette(theme.placeholderColor)
diff --git a/src/corePlugins/placeholderOpacity.js b/src/corePlugins/placeholderOpacity.js
index 675dc72..118776b 100644
--- a/src/corePlugins/placeholderOpacity.js
+++ b/src/corePlugins/placeholderOpacity.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asValue } = require('../pluginUtils')
+const { asValue, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/ringColor.js b/src/corePlugins/ringColor.js
index 6befa0b..b2fdd57 100644
--- a/src/corePlugins/ringColor.js
+++ b/src/corePlugins/ringColor.js
@@ -1,8 +1,7 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default
 const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default
 const toColorValue = require('tailwindcss/lib/util/toColorValue').default
-const { asColor } = require('../pluginUtils')
+const { asColor, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   let colorPalette = flattenColorPalette(theme.ringColor)
diff --git a/src/corePlugins/ringOffsetColor.js b/src/corePlugins/ringOffsetColor.js
index 2f05af5..109aac9 100644
--- a/src/corePlugins/ringOffsetColor.js
+++ b/src/corePlugins/ringOffsetColor.js
@@ -1,8 +1,7 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default
 const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default
 const toColorValue = require('tailwindcss/lib/util/toColorValue').default
-const { asColor } = require('../pluginUtils')
+const { asColor, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   let colorPalette = flattenColorPalette(theme.ringOffsetColor)
diff --git a/src/corePlugins/ringOffsetWidth.js b/src/corePlugins/ringOffsetWidth.js
index ca17a42..d821841 100644
--- a/src/corePlugins/ringOffsetWidth.js
+++ b/src/corePlugins/ringOffsetWidth.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/ringOpacity.js b/src/corePlugins/ringOpacity.js
index 4aa9fcd..e680238 100644
--- a/src/corePlugins/ringOpacity.js
+++ b/src/corePlugins/ringOpacity.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asValue } = require('../pluginUtils')
+const { asValue, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/ringWidth.js b/src/corePlugins/ringWidth.js
index d29d677..16626ff 100644
--- a/src/corePlugins/ringWidth.js
+++ b/src/corePlugins/ringWidth.js
@@ -1,7 +1,6 @@
 const dlv = require('dlv')
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const toRgba = require('tailwindcss/lib/util/withAlphaVariable').toRgba
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 function safeCall(callback, defaultValue) {
   try {
diff --git a/src/corePlugins/rotate.js b/src/corePlugins/rotate.js
index 99cd7b2..b033e89 100644
--- a/src/corePlugins/rotate.js
+++ b/src/corePlugins/rotate.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asAngle } = require('../pluginUtils')
+const { asAngle, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/scale.js b/src/corePlugins/scale.js
index 86d6b1f..c5b049e 100644
--- a/src/corePlugins/scale.js
+++ b/src/corePlugins/scale.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asValue } = require('../pluginUtils')
+const { asValue, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/skew.js b/src/corePlugins/skew.js
index 330a16e..ed5cd7b 100644
--- a/src/corePlugins/skew.js
+++ b/src/corePlugins/skew.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asAngle } = require('../pluginUtils')
+const { asAngle, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/space.js b/src/corePlugins/space.js
index 3f7af1c..46eea6a 100644
--- a/src/corePlugins/space.js
+++ b/src/corePlugins/space.js
@@ -1,6 +1,5 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, addUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/stroke.js b/src/corePlugins/stroke.js
index 8d2bbaa..0b47471 100644
--- a/src/corePlugins/stroke.js
+++ b/src/corePlugins/stroke.js
@@ -1,8 +1,7 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default
 const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default
 const toColorValue = require('tailwindcss/lib/util/toColorValue').default
-const { asColor } = require('../pluginUtils')
+const { asColor, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   let colorPalette = flattenColorPalette(theme.stroke)
diff --git a/src/corePlugins/strokeWidth.js b/src/corePlugins/strokeWidth.js
index 215831f..c9ff9a6 100644
--- a/src/corePlugins/strokeWidth.js
+++ b/src/corePlugins/strokeWidth.js
@@ -1,6 +1,5 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/textColor.js b/src/corePlugins/textColor.js
index 33a9be9..8cbe8cd 100644
--- a/src/corePlugins/textColor.js
+++ b/src/corePlugins/textColor.js
@@ -1,8 +1,7 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
 const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette').default
 const withAlphaVariable = require('tailwindcss/lib/util/withAlphaVariable').default
 const toColorValue = require('tailwindcss/lib/util/toColorValue').default
-const { asColor } = require('../pluginUtils')
+const { asColor, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   let colorPalette = flattenColorPalette(theme.textColor)
diff --git a/src/corePlugins/textOpacity.js b/src/corePlugins/textOpacity.js
index 98080e7..90e980f 100644
--- a/src/corePlugins/textOpacity.js
+++ b/src/corePlugins/textOpacity.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asValue } = require('../pluginUtils')
+const { asValue, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/transformOrigin.js b/src/corePlugins/transformOrigin.js
index f99acc5..5860822 100644
--- a/src/corePlugins/transformOrigin.js
+++ b/src/corePlugins/transformOrigin.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/transitionDelay.js b/src/corePlugins/transitionDelay.js
index 4b31704..dc9ed2e 100644
--- a/src/corePlugins/transitionDelay.js
+++ b/src/corePlugins/transitionDelay.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/transitionDuration.js b/src/corePlugins/transitionDuration.js
index ad7f1c5..50dc15b 100644
--- a/src/corePlugins/transitionDuration.js
+++ b/src/corePlugins/transitionDuration.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/transitionProperty.js b/src/corePlugins/transitionProperty.js
index 13c36a8..be0343c 100644
--- a/src/corePlugins/transitionProperty.js
+++ b/src/corePlugins/transitionProperty.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   let defaultTimingFunction = theme.transitionTimingFunction.DEFAULT
diff --git a/src/corePlugins/transitionTimingFunction.js b/src/corePlugins/transitionTimingFunction.js
index 56c6518..fb436fc 100644
--- a/src/corePlugins/transitionTimingFunction.js
+++ b/src/corePlugins/transitionTimingFunction.js
@@ -1,4 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
+const { nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/translate.js b/src/corePlugins/translate.js
index b1fc620..d51e1c2 100644
--- a/src/corePlugins/translate.js
+++ b/src/corePlugins/translate.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/width.js b/src/corePlugins/width.js
index dcdd987..9617c2f 100644
--- a/src/corePlugins/width.js
+++ b/src/corePlugins/width.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asLength } = require('../pluginUtils')
+const { asLength, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/corePlugins/zIndex.js b/src/corePlugins/zIndex.js
index bf785ff..9e3fa1f 100644
--- a/src/corePlugins/zIndex.js
+++ b/src/corePlugins/zIndex.js
@@ -1,5 +1,4 @@
-const nameClass = require('tailwindcss/lib/util/nameClass').default
-const { asValue } = require('../pluginUtils')
+const { asValue, nameClass } = require('../pluginUtils')
 
 module.exports = function ({ matchUtilities, jit: { theme } }) {
   matchUtilities({
diff --git a/src/lib/expandApplyAtRules.js b/src/lib/expandApplyAtRules.js
index acf65de..c3bad3e 100644
--- a/src/lib/expandApplyAtRules.js
+++ b/src/lib/expandApplyAtRules.js
@@ -1,7 +1,6 @@
 const postcss = require('postcss')
 const { resolveMatches } = require('./generateRules')
-const { bigSign } = require('./utils')
-const escape = require('tailwindcss/lib/util/escapeClassName').default
+const { bigSign, escapeClassName } = require('./utils')
 
 function buildApplyCache(applyCandidates, context) {
   for (let candidate of applyCandidates) {
@@ -85,7 +84,7 @@ function expandApplyAtRules(context) {
           .map((s) => {
             let replaced = []
             for (let utilitySelector of utilitySelectors.split(/\s*,\s*/g)) {
-              let replacedSelector = utilitySelector.replace(`.${escape(candidate)}`, s)
+              let replacedSelector = utilitySelector.replace(`.${escapeClassName(candidate)}`, s)
               if (replacedSelector === utilitySelector) {
                 continue
               }
diff --git a/src/lib/setupContext.js b/src/lib/setupContext.js
index bb44ad4..89d8b10 100644
--- a/src/lib/setupContext.js
+++ b/src/lib/setupContext.js
@@ -13,14 +13,13 @@ const LRU = require('quick-lru')
 const transformThemeValue = require('tailwindcss/lib/util/transformThemeValue').default
 const parseObjectStyles = require('tailwindcss/lib/util/parseObjectStyles').default
 const getModuleDependencies = require('tailwindcss/lib/lib/getModuleDependencies').default
-const escapeClassName = require('tailwindcss/lib/util/escapeClassName').default
 const prefixSelector = require('tailwindcss/lib/util/prefixSelector').default
 
 const resolveConfig = require('tailwindcss/resolveConfig')
 
 const sharedState = require('./sharedState')
 const corePlugins = require('../corePlugins')
-const { isPlainObject } = require('./utils')
+const { isPlainObject, escapeClassName } = require('./utils')
 const { isBuffer } = require('util')
 
 let contextMap = sharedState.contextMap
diff --git a/src/lib/utils.js b/src/lib/utils.js
index dbc07b2..10dfe93 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -1,4 +1,8 @@
 const postcss = require('postcss')
+const tailwindUtils = {
+  escapeClassName: require('tailwindcss/lib/util/escapeClassName').default,
+  nameClass: require('tailwindcss/lib/util/nameClass').default,
+}
 
 // Takes our lightweight rule structure and turns it into a PostCSS node.
 // This is likely a hot path and should be as optimized as possible. We
@@ -66,8 +70,24 @@ function isPlainObject(value) {
   return prototype === null || prototype === Object.prototype
 }
 
+// workaround for minifier bug which splits selectors by commas,
+// even when they are escaped (e.g. \,)
+function escapeCommas(className) {
+  return className.replace(/\\,/g, '\\2c ')
+}
+
+function escapeClassName(...args) {
+  return escapeCommas(tailwindUtils.escapeClassName(...args))
+}
+
+function nameClass(...args) {
+  return escapeCommas(tailwindUtils.nameClass(...args))
+}
+
 module.exports = {
   toPostCssNode,
   bigSign,
   isPlainObject,
+  escapeClassName,
+  nameClass,
 }
diff --git a/src/pluginUtils.js b/src/pluginUtils.js
index 3f15a0f..417e9d6 100644
--- a/src/pluginUtils.js
+++ b/src/pluginUtils.js
@@ -1,6 +1,7 @@
 const selectorParser = require('postcss-selector-parser')
 const postcss = require('postcss')
 const { toRgba } = require('tailwindcss/lib/util/withAlphaVariable')
+const { nameClass } = require('./lib/utils')
 
 function updateAllClasses(selectors, updateClass) {
   let parser = selectorParser((selectors) => {
@@ -124,6 +125,7 @@ function asUnit(modifier, units, lookup = {}) {
 }
 
 module.exports = {
+  nameClass,
   updateAllClasses,
   updateLastClasses,
   transformAllSelectors,
diff --git a/tests/00-kitchen-sink.test.css b/tests/00-kitchen-sink.test.css
index 52e978b..cd056ad 100644
--- a/tests/00-kitchen-sink.test.css
+++ b/tests/00-kitchen-sink.test.css
@@ -274,7 +274,7 @@ div {
   --tw-scale-x: 0.5;
   --tw-scale-y: 0.5;
 }
-.grid-cols-\[200px\,repeat\(auto-fill\,minmax\(15\%\,100px\)\)\,300px\] {
+.grid-cols-\[200px\2c repeat\(auto-fill\2c minmax\(15\%\2c 100px\)\)\2c 300px\] {
   grid-template-columns: 200px repeat(auto-fill, minmax(15%, 100px)) 300px;
 }
 .bg-black {
diff --git a/tests/08-arbitrary-values.test.css b/tests/08-arbitrary-values.test.css
index 4db4aff..1458d5a 100644
--- a/tests/08-arbitrary-values.test.css
+++ b/tests/08-arbitrary-values.test.css
@@ -25,7 +25,7 @@
 .rotate-\[1\.5turn\] {
   --tw-rotate: 1.5turn;
 }
-.grid-cols-\[200px\,repeat\(auto-fill\,minmax\(15\%\,100px\)\)\,300px\] {
+.grid-cols-\[200px\2c repeat\(auto-fill\2c minmax\(15\%\2c 100px\)\)\2c 300px\] {
   grid-template-columns: 200px repeat(auto-fill, minmax(15%, 100px)) 300px;
 }
 .space-x-\[20cm\] > :not([hidden]) ~ :not([hidden]) {
@@ -56,18 +56,18 @@
 .bg-\[\#0000ffcc\] {
   background-color: #0000ffcc;
 }
-.bg-\[rgb\(123\,123\,123\)\] {
+.bg-\[rgb\(123\2c 123\2c 123\)\] {
   --tw-bg-opacity: 1;
   background-color: rgba(123, 123, 123, var(--tw-bg-opacity));
 }
-.bg-\[rgba\(123\,123\,123\,0\.5\)\] {
+.bg-\[rgba\(123\2c 123\2c 123\2c 0\.5\)\] {
   background-color: rgba(123, 123, 123, 0.5);
 }
-.bg-\[hsl\(0\,100\%\,50\%\)\] {
+.bg-\[hsl\(0\2c 100\%\2c 50\%\)\] {
   --tw-bg-opacity: 1;
   background-color: rgba(255, 0, 0, var(--tw-bg-opacity));
 }
-.bg-\[hsla\(0\,100\%\,50\%\,0\.3\)\] {
+.bg-\[hsla\(0\2c 100\%\2c 50\%\2c 0\.3\)\] {
   background-color: hsla(0, 100%, 50%, 0.3);
 }
 .bg-opacity-\[0\.11\] {