diff --git a/lib/src/components/accordion/AccordionTrigger.tsx b/lib/src/components/accordion/AccordionTrigger.tsx
index 4049925bd..0269d8308 100644
--- a/lib/src/components/accordion/AccordionTrigger.tsx
+++ b/lib/src/components/accordion/AccordionTrigger.tsx
@@ -29,11 +29,11 @@ const StyledTrigger = styled(Trigger, {
   cursor: 'pointer',
   bg: '$interactive2',
   color: '$interactiveForeground',
-  '&[data-disabled]': {
+  '&[disabled]': {
     opacity: 0.3,
     cursor: 'not-allowed'
   },
-  '&:not([data-disabled])': {
+  '&:not([disabled])': {
     '&:active, &:hover, &:focus-visible': {
       bg: '$interactive3'
     },
diff --git a/lib/src/components/accordion/__snapshots__/Accordion.test.tsx.snap b/lib/src/components/accordion/__snapshots__/Accordion.test.tsx.snap
index 2a38d594d..0a0d91930 100644
--- a/lib/src/components/accordion/__snapshots__/Accordion.test.tsx.snap
+++ b/lib/src/components/accordion/__snapshots__/Accordion.test.tsx.snap
@@ -302,7 +302,7 @@ exports[`Accordion component renders an accordion 1`] = `
     transform: rotate(0deg);
   }
 
-  .c-cHXTzy {
+  .c-cdQaC {
     border: 0;
     padding-top: var(--space-3);
     padding-bottom: var(--space-3);
@@ -317,29 +317,29 @@ exports[`Accordion component renders an accordion 1`] = `
     color: var(--colors-interactiveForeground);
   }
 
-  .c-cHXTzy[data-disabled] {
+  .c-cdQaC[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
 
-  .c-cHXTzy:not([data-disabled]):active,
-  .c-cHXTzy:not([data-disabled]):hover,
-  .c-cHXTzy:not([data-disabled]):focus-visible {
+  .c-cdQaC:not([disabled]):active,
+  .c-cdQaC:not([disabled]):hover,
+  .c-cdQaC:not([disabled]):focus-visible {
     background: var(--colors-interactive3);
   }
 
-  .c-cHXTzy:not([data-disabled]):focus-visible {
+  .c-cdQaC:not([disabled]):focus-visible {
     outline: none;
     position: relative;
     z-index: 1;
     box-shadow: white 0px 0px 0px 2px, var(--colors-primary800) 0px 0px 0px 4px;
   }
 
-  .c-cHXTzy[data-state="open"] {
+  .c-cdQaC[data-state="open"] {
     border-radius: var(--radii-0) var(--radii-0) 0 0;
   }
 
-  .c-cHXTzy[data-state="closed"] {
+  .c-cdQaC[data-state="closed"] {
     border-radius: var(--radii-0);
   }
 
@@ -399,7 +399,7 @@ exports[`Accordion component renders an accordion 1`] = `
         aria-controls="radix-0"
         aria-disabled="true"
         aria-expanded="true"
-        class="c-cHXTzy t-dVJiaJ t-hwCMvs"
+        class="c-cdQaC t-dVJiaJ t-hwCMvs"
         data-radix-collection-item=""
         data-state="open"
         id="radix-1"
@@ -435,7 +435,7 @@ exports[`Accordion component renders an accordion 1`] = `
       <button
         aria-controls="radix-2"
         aria-expanded="false"
-        class="c-cHXTzy t-dVJiaJ t-hwCMvs"
+        class="c-cdQaC t-dVJiaJ t-hwCMvs"
         data-radix-collection-item=""
         data-state="closed"
         id="radix-3"
diff --git a/lib/src/components/chip-dismissible-group/__snapshots__/ChipDismissibleGroup.test.tsx.snap b/lib/src/components/chip-dismissible-group/__snapshots__/ChipDismissibleGroup.test.tsx.snap
index 23e6cb0d0..5e1798a5f 100644
--- a/lib/src/components/chip-dismissible-group/__snapshots__/ChipDismissibleGroup.test.tsx.snap
+++ b/lib/src/components/chip-dismissible-group/__snapshots__/ChipDismissibleGroup.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`ChipDismissibleGroup component renders 1`] = `
     display: flex;
   }
 
-  .c-cDmpis {
+  .c-iCmdOp {
     padding-left: var(--space-2);
     padding-right: var(--space-2);
     border: 1px solid;
@@ -19,7 +19,7 @@ exports[`ChipDismissibleGroup component renders 1`] = `
     background: var(--colors-primary100);
   }
 
-  .c-cDmpis[data-disabled] {
+  .c-iCmdOp[disabled] {
     opacity: 0.3;
     pointer-events: none;
   }
@@ -137,19 +137,19 @@ exports[`ChipDismissibleGroup component renders 1`] = `
     gap: var(--space-2);
   }
 
-  .c-cDmpis-kIEsaE-size-md {
+  .c-iCmdOp-kIEsaE-size-md {
     height: var(--sizes-3);
     font-size: var(--fontSizes-sm);
     line-height: 1.53;
   }
 
-  .c-cDmpis-kIEsaE-size-md::before {
+  .c-iCmdOp-kIEsaE-size-md::before {
     content: '';
     margin-bottom: -0.4056em;
     display: table;
   }
 
-  .c-cDmpis-kIEsaE-size-md::after {
+  .c-iCmdOp-kIEsaE-size-md::after {
     content: '';
     margin-top: -0.4056em;
     display: table;
@@ -204,7 +204,7 @@ exports[`ChipDismissibleGroup component renders 1`] = `
     class="c-dhzjXW c-dhzjXW-ejCoEP-direction-row c-dhzjXW-XefLA-wrap-wrap c-dhzjXW-kaVYFn-gap-2"
   >
     <div
-      class="c-dhzjXW c-cDmpis c-cDmpis-kIEsaE-size-md c-efCiES"
+      class="c-dhzjXW c-iCmdOp c-iCmdOp-kIEsaE-size-md c-efCiES"
     >
       <span
         class="c-eOdeXL"
@@ -230,7 +230,7 @@ exports[`ChipDismissibleGroup component renders 1`] = `
       </button>
     </div>
     <div
-      class="c-dhzjXW c-cDmpis c-cDmpis-kIEsaE-size-md c-efCiES"
+      class="c-dhzjXW c-iCmdOp c-iCmdOp-kIEsaE-size-md c-efCiES"
       data-disabled=""
     >
       <span
diff --git a/lib/src/components/chip-toggle-group/__snapshots__/ChipToggleGroup.test.tsx.snap b/lib/src/components/chip-toggle-group/__snapshots__/ChipToggleGroup.test.tsx.snap
index f73c2054f..c8f7fb424 100644
--- a/lib/src/components/chip-toggle-group/__snapshots__/ChipToggleGroup.test.tsx.snap
+++ b/lib/src/components/chip-toggle-group/__snapshots__/ChipToggleGroup.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`ChipToggleGroup component renders 1`] = `
     display: flex;
   }
 
-  .c-cDmpis {
+  .c-iCmdOp {
     padding-left: var(--space-2);
     padding-right: var(--space-2);
     border: 1px solid;
@@ -19,7 +19,7 @@ exports[`ChipToggleGroup component renders 1`] = `
     background: var(--colors-primary100);
   }
 
-  .c-cDmpis[data-disabled] {
+  .c-iCmdOp[disabled] {
     opacity: 0.3;
     pointer-events: none;
   }
@@ -99,19 +99,19 @@ exports[`ChipToggleGroup component renders 1`] = `
     gap: var(--space-2);
   }
 
-  .c-cDmpis-kIEsaE-size-md {
+  .c-iCmdOp-kIEsaE-size-md {
     height: var(--sizes-3);
     font-size: var(--fontSizes-sm);
     line-height: 1.53;
   }
 
-  .c-cDmpis-kIEsaE-size-md::before {
+  .c-iCmdOp-kIEsaE-size-md::before {
     content: '';
     margin-bottom: -0.4056em;
     display: table;
   }
 
-  .c-cDmpis-kIEsaE-size-md::after {
+  .c-iCmdOp-kIEsaE-size-md::after {
     content: '';
     margin-top: -0.4056em;
     display: table;
@@ -135,7 +135,7 @@ exports[`ChipToggleGroup component renders 1`] = `
   >
     <button
       aria-pressed="true"
-      class="c-dhzjXW c-cDmpis c-cDmpis-kIEsaE-size-md c-bxUhlk"
+      class="c-dhzjXW c-iCmdOp c-iCmdOp-kIEsaE-size-md c-bxUhlk"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="on"
@@ -160,7 +160,7 @@ exports[`ChipToggleGroup component renders 1`] = `
     </button>
     <button
       aria-pressed="true"
-      class="c-dhzjXW c-cDmpis c-cDmpis-kIEsaE-size-md c-bxUhlk"
+      class="c-dhzjXW c-iCmdOp c-iCmdOp-kIEsaE-size-md c-bxUhlk"
       data-disabled=""
       data-orientation="horizontal"
       data-radix-collection-item=""
@@ -187,7 +187,7 @@ exports[`ChipToggleGroup component renders 1`] = `
     </button>
     <button
       aria-pressed="false"
-      class="c-dhzjXW c-cDmpis c-cDmpis-kIEsaE-size-md c-bxUhlk"
+      class="c-dhzjXW c-iCmdOp c-iCmdOp-kIEsaE-size-md c-bxUhlk"
       data-orientation="horizontal"
       data-radix-collection-item=""
       data-state="off"
@@ -212,7 +212,7 @@ exports[`ChipToggleGroup component renders 1`] = `
     </button>
     <button
       aria-pressed="false"
-      class="c-dhzjXW c-cDmpis c-cDmpis-kIEsaE-size-md c-bxUhlk"
+      class="c-dhzjXW c-iCmdOp c-iCmdOp-kIEsaE-size-md c-bxUhlk"
       data-disabled=""
       data-orientation="horizontal"
       data-radix-collection-item=""
diff --git a/lib/src/components/chip/Chip.tsx b/lib/src/components/chip/Chip.tsx
index d75c9c1eb..c9ceb7b39 100644
--- a/lib/src/components/chip/Chip.tsx
+++ b/lib/src/components/chip/Chip.tsx
@@ -68,7 +68,7 @@ export const StyledRoot = styled(Flex, {
   borderColor: '$primary800',
   color: '$primary900',
   bg: '$primary100',
-  '&[data-disabled]': {
+  '&[disabled]': {
     opacity: '0.3',
     pointerEvents: 'none'
   },
diff --git a/lib/src/components/chip/__snapshots__/Chip.test.tsx.snap b/lib/src/components/chip/__snapshots__/Chip.test.tsx.snap
index 3247a6f31..68025c6a8 100644
--- a/lib/src/components/chip/__snapshots__/Chip.test.tsx.snap
+++ b/lib/src/components/chip/__snapshots__/Chip.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`Chip component renders 1`] = `
     display: flex;
   }
 
-  .c-cDmpis {
+  .c-iCmdOp {
     padding-left: var(--space-2);
     padding-right: var(--space-2);
     border: 1px solid;
@@ -19,7 +19,7 @@ exports[`Chip component renders 1`] = `
     background: var(--colors-primary100);
   }
 
-  .c-cDmpis[data-disabled] {
+  .c-iCmdOp[disabled] {
     opacity: 0.3;
     pointer-events: none;
   }
@@ -51,19 +51,19 @@ exports[`Chip component renders 1`] = `
 }
 
 @media  {
-  .c-cDmpis-kIEsaE-size-md {
+  .c-iCmdOp-kIEsaE-size-md {
     height: var(--sizes-3);
     font-size: var(--fontSizes-sm);
     line-height: 1.53;
   }
 
-  .c-cDmpis-kIEsaE-size-md::before {
+  .c-iCmdOp-kIEsaE-size-md::before {
     content: '';
     margin-bottom: -0.4056em;
     display: table;
   }
 
-  .c-cDmpis-kIEsaE-size-md::after {
+  .c-iCmdOp-kIEsaE-size-md::after {
     content: '';
     margin-top: -0.4056em;
     display: table;
@@ -86,7 +86,7 @@ exports[`Chip component renders 1`] = `
 
 <div>
   <div
-    class="c-dhzjXW c-cDmpis c-cDmpis-kIEsaE-size-md"
+    class="c-dhzjXW c-iCmdOp c-iCmdOp-kIEsaE-size-md"
   >
     <span
       class="c-eOdeXL"
diff --git a/lib/src/components/navigation-menu-vertical/NavigationMenuVertical.styles.ts b/lib/src/components/navigation-menu-vertical/NavigationMenuVertical.styles.ts
index 614e4e6c3..c05307f19 100644
--- a/lib/src/components/navigation-menu-vertical/NavigationMenuVertical.styles.ts
+++ b/lib/src/components/navigation-menu-vertical/NavigationMenuVertical.styles.ts
@@ -22,11 +22,11 @@ export const navigationMenuVerticalItemStyles = {
   '&[data-state=open]': {
     '--navigation-menu-vertical-item-font-weight': 600
   },
-  '&[data-disabled]': {
+  '&[disabled]': {
     opacity: 0.3,
     cursor: 'not-allowed'
   },
-  '&:not([data-disabled])': {
+  '&:not([disabled])': {
     '&:hover': {
       bg: '$backgroundHover'
     },
diff --git a/lib/src/components/navigation-menu-vertical/__snapshots__/NavigationMenuVertical.test.tsx.snap b/lib/src/components/navigation-menu-vertical/__snapshots__/NavigationMenuVertical.test.tsx.snap
index 00aa43aa9..25a94414d 100644
--- a/lib/src/components/navigation-menu-vertical/__snapshots__/NavigationMenuVertical.test.tsx.snap
+++ b/lib/src/components/navigation-menu-vertical/__snapshots__/NavigationMenuVertical.test.tsx.snap
@@ -288,7 +288,7 @@ exports[`NavigationMenuVertical renders 1`] = `
     line-height: 1.2;
   }
 
-  .c-rTOZb {
+  .c-fcJjQf {
     padding: var(--space-2);
     border: none;
     outline: none;
@@ -306,30 +306,30 @@ exports[`NavigationMenuVertical renders 1`] = `
     --navigation-menu-vertical-item-font-weight: 400;
   }
 
-  .c-rTOZb[data-active] {
+  .c-fcJjQf[data-active] {
     background: var(--colors-backgroundSelected);
     color: var(--colors-textSelected);
     --navigation-menu-vertical-item-font-weight: 600;
   }
 
-  .c-rTOZb[data-state=open] {
+  .c-fcJjQf[data-state=open] {
     --navigation-menu-vertical-item-font-weight: 600;
   }
 
-  .c-rTOZb[data-disabled] {
+  .c-fcJjQf[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
 
-  .c-rTOZb:not([data-disabled]):hover {
+  .c-fcJjQf:not([disabled]):hover {
     background: var(--colors-backgroundHover);
   }
 
-  .c-rTOZb:not([data-disabled]):active {
+  .c-fcJjQf:not([disabled]):active {
     background: var(--colors-backgroundActive);
   }
 
-  .c-rTOZb:not([data-disabled]):focus-visible {
+  .c-fcJjQf:not([disabled]):focus-visible {
     outline: none;
     position: relative;
     z-index: 1;
@@ -390,7 +390,7 @@ exports[`NavigationMenuVertical renders 1`] = `
     display: table;
   }
 
-  .c-rTOZb-jLELKD-size-lg {
+  .c-fcJjQf-jLELKD-size-lg {
     min-height: var(--sizes-5);
   }
 }
@@ -414,7 +414,7 @@ exports[`NavigationMenuVertical renders 1`] = `
       >
         <button
           aria-current="page"
-          class="c-rTOZb c-rTOZb-jLELKD-size-lg"
+          class="c-fcJjQf c-fcJjQf-jLELKD-size-lg"
           data-active=""
           data-radix-collection-item=""
           type="button"
@@ -434,7 +434,7 @@ exports[`NavigationMenuVertical renders 1`] = `
         class="c-PJLV"
       >
         <a
-          class="c-rTOZb c-rTOZb-jLELKD-size-lg"
+          class="c-fcJjQf c-fcJjQf-jLELKD-size-lg"
           data-radix-collection-item=""
           href="/somewhere"
         >
@@ -453,7 +453,7 @@ exports[`NavigationMenuVertical renders 1`] = `
         class="c-PJLV"
       >
         <a
-          class="c-rTOZb c-rTOZb-jLELKD-size-lg"
+          class="c-fcJjQf c-fcJjQf-jLELKD-size-lg"
           data-radix-collection-item=""
           href="http://google.com"
           rel="noopener noreferrer"
@@ -763,7 +763,7 @@ exports[`NavigationMenuVertical renders accordion and interacts correctly 1`] =
     line-height: 1.2;
   }
 
-  .c-rTOZb {
+  .c-fcJjQf {
     padding: var(--space-2);
     border: none;
     outline: none;
@@ -781,30 +781,30 @@ exports[`NavigationMenuVertical renders accordion and interacts correctly 1`] =
     --navigation-menu-vertical-item-font-weight: 400;
   }
 
-  .c-rTOZb[data-active] {
+  .c-fcJjQf[data-active] {
     background: var(--colors-backgroundSelected);
     color: var(--colors-textSelected);
     --navigation-menu-vertical-item-font-weight: 600;
   }
 
-  .c-rTOZb[data-state=open] {
+  .c-fcJjQf[data-state=open] {
     --navigation-menu-vertical-item-font-weight: 600;
   }
 
-  .c-rTOZb[data-disabled] {
+  .c-fcJjQf[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
 
-  .c-rTOZb:not([data-disabled]):hover {
+  .c-fcJjQf:not([disabled]):hover {
     background: var(--colors-backgroundHover);
   }
 
-  .c-rTOZb:not([data-disabled]):active {
+  .c-fcJjQf:not([disabled]):active {
     background: var(--colors-backgroundActive);
   }
 
-  .c-rTOZb:not([data-disabled]):focus-visible {
+  .c-fcJjQf:not([disabled]):focus-visible {
     outline: none;
     position: relative;
     z-index: 1;
@@ -883,7 +883,7 @@ exports[`NavigationMenuVertical renders accordion and interacts correctly 1`] =
     display: table;
   }
 
-  .c-rTOZb-jLELKD-size-lg {
+  .c-fcJjQf-jLELKD-size-lg {
     min-height: var(--sizes-5);
   }
 
@@ -922,7 +922,7 @@ exports[`NavigationMenuVertical renders accordion and interacts correctly 1`] =
         >
           <button
             aria-current="page"
-            class="c-rTOZb c-rTOZb-jLELKD-size-lg"
+            class="c-fcJjQf c-fcJjQf-jLELKD-size-lg"
             data-active=""
             data-radix-collection-item=""
             type="button"
@@ -942,7 +942,7 @@ exports[`NavigationMenuVertical renders accordion and interacts correctly 1`] =
           class="c-PJLV"
         >
           <a
-            class="c-rTOZb c-rTOZb-jLELKD-size-lg"
+            class="c-fcJjQf c-fcJjQf-jLELKD-size-lg"
             data-radix-collection-item=""
             href="/somewhere"
           >
@@ -961,7 +961,7 @@ exports[`NavigationMenuVertical renders accordion and interacts correctly 1`] =
           class="c-PJLV"
         >
           <a
-            class="c-rTOZb c-rTOZb-jLELKD-size-lg"
+            class="c-fcJjQf c-fcJjQf-jLELKD-size-lg"
             data-radix-collection-item=""
             href="http://google.com"
             rel="noopener noreferrer"
@@ -985,7 +985,7 @@ exports[`NavigationMenuVertical renders accordion and interacts correctly 1`] =
           <button
             aria-controls="radix-0"
             aria-expanded="true"
-            class="c-dhzjXW c-dhzjXW-knmidH-justify-space-between c-dhzjXW-jroWjL-align-center c-dhzjXW-dvnNgW-gap-3 c-rTOZb c-rTOZb-jLELKD-size-lg"
+            class="c-dhzjXW c-dhzjXW-knmidH-justify-space-between c-dhzjXW-jroWjL-align-center c-dhzjXW-dvnNgW-gap-3 c-fcJjQf c-fcJjQf-jLELKD-size-lg"
             data-radix-collection-item=""
             data-state="open"
             data-testid="accordion-trigger"
diff --git a/lib/src/components/slider-field/__snapshots__/SliderField.test.tsx.snap b/lib/src/components/slider-field/__snapshots__/SliderField.test.tsx.snap
index 4577984b4..0716330e8 100644
--- a/lib/src/components/slider-field/__snapshots__/SliderField.test.tsx.snap
+++ b/lib/src/components/slider-field/__snapshots__/SliderField.test.tsx.snap
@@ -12,14 +12,14 @@ exports[`SliderField component renders 1`] = `
     margin: 0;
   }
 
-  .c-hNIRsQ {
+  .c-cYBvhd {
     background: var(--colors-primary800);
     border-radius: var(--radii-round);
     height: 100%;
     position: absolute;
   }
 
-  .c-hNIRsQ[data-disabled] {
+  .c-cYBvhd[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
@@ -38,7 +38,7 @@ exports[`SliderField component renders 1`] = `
     width: var(--space-1);
   }
 
-  .c-ccaAMC {
+  .c-bOlXUH {
     background: var(--colors-primary900);
     border-radius: var(--radii-round);
     display: block;
@@ -46,21 +46,21 @@ exports[`SliderField component renders 1`] = `
     width: var(--sizes-1);
   }
 
-  .c-ccaAMC:hover {
+  .c-bOlXUH:hover {
     background: var(--colors-primary1000);
   }
 
-  .c-ccaAMC:focus {
+  .c-bOlXUH:focus {
     outline: 2px solid var(--colors-primary900);
     outline-offset: 2px;
   }
 
-  .c-ccaAMC[data-disabled] {
+  .c-bOlXUH[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
 
-  .c-bwqjWK {
+  .c-kydCSz {
     align-items: center;
     display: flex;
     position: relative;
@@ -70,16 +70,16 @@ exports[`SliderField component renders 1`] = `
     cursor: pointer;
   }
 
-  .c-bwqjWK[data-orientation="horizontal"] {
+  .c-kydCSz[data-orientation="horizontal"] {
     height: var(--sizes-1);
   }
 
-  .c-bwqjWK[data-orientation="vertical"] {
+  .c-kydCSz[data-orientation="vertical"] {
     flex-direction: column;
     width: var(--sizes-1);
   }
 
-  .c-bwqjWK[data-disabled] {
+  .c-kydCSz[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
@@ -119,7 +119,7 @@ exports[`SliderField component renders 1`] = `
     font-weight: 600;
   }
 
-  .c-bwqjWK-dOexvR-theme-tonal .c-nJgcq {
+  .c-kydCSz-dOexvR-theme-tonal .c-nJgcq {
     background: var(--colors-tonal200);
   }
 
@@ -175,7 +175,7 @@ exports[`SliderField component renders 1`] = `
       </div>
       <span
         aria-disabled="false"
-        class="c-bwqjWK c-bwqjWK-dOexvR-theme-tonal"
+        class="c-kydCSz c-kydCSz-dOexvR-theme-tonal"
         data-orientation="horizontal"
         dir="ltr"
         style="--radix-slider-thumb-transform: translateX(-50%);"
@@ -185,7 +185,7 @@ exports[`SliderField component renders 1`] = `
           data-orientation="horizontal"
         >
           <span
-            class="c-hNIRsQ"
+            class="c-cYBvhd"
             data-orientation="horizontal"
             style="left: 0%; right: 50%;"
           />
@@ -198,7 +198,7 @@ exports[`SliderField component renders 1`] = `
             aria-valuemax="100"
             aria-valuemin="0"
             aria-valuenow="50"
-            class="c-ccaAMC"
+            class="c-bOlXUH"
             data-orientation="horizontal"
             data-radix-collection-item=""
             role="slider"
diff --git a/lib/src/components/slider/Slider.tsx b/lib/src/components/slider/Slider.tsx
index 5efd8f2a4..577abecfb 100644
--- a/lib/src/components/slider/Slider.tsx
+++ b/lib/src/components/slider/Slider.tsx
@@ -29,7 +29,7 @@ const StyledSlider = styled(Root, {
     flexDirection: 'column',
     width: '$1'
   },
-  '&[data-disabled]': disabledStyle,
+  '&[disabled]': disabledStyle,
   variants: {
     theme: {
       light: {
@@ -47,7 +47,7 @@ const StyledRange = styled(Range, {
   borderRadius: '$round',
   height: '100%',
   position: 'absolute',
-  '&[data-disabled]': disabledStyle
+  '&[disabled]': disabledStyle
 })
 
 const StyledThumb = styled(Thumb, {
@@ -62,7 +62,7 @@ const StyledThumb = styled(Thumb, {
     outline: '2px solid $primary900',
     outlineOffset: '2px'
   },
-  '&[data-disabled]': disabledStyle
+  '&[disabled]': disabledStyle
 })
 
 export type SliderProps = React.ComponentProps<typeof StyledSlider>
diff --git a/lib/src/components/slider/__snapshots__/Slider.test.tsx.snap b/lib/src/components/slider/__snapshots__/Slider.test.tsx.snap
index f279b8622..28bc1a89c 100644
--- a/lib/src/components/slider/__snapshots__/Slider.test.tsx.snap
+++ b/lib/src/components/slider/__snapshots__/Slider.test.tsx.snap
@@ -2,14 +2,14 @@
 
 exports[`Slider component renders 1`] = `
 @media  {
-  .c-hNIRsQ {
+  .c-cYBvhd {
     background: var(--colors-primary800);
     border-radius: var(--radii-round);
     height: 100%;
     position: absolute;
   }
 
-  .c-hNIRsQ[data-disabled] {
+  .c-cYBvhd[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
@@ -28,7 +28,7 @@ exports[`Slider component renders 1`] = `
     width: var(--space-1);
   }
 
-  .c-ccaAMC {
+  .c-bOlXUH {
     background: var(--colors-primary900);
     border-radius: var(--radii-round);
     display: block;
@@ -36,21 +36,21 @@ exports[`Slider component renders 1`] = `
     width: var(--sizes-1);
   }
 
-  .c-ccaAMC:hover {
+  .c-bOlXUH:hover {
     background: var(--colors-primary1000);
   }
 
-  .c-ccaAMC:focus {
+  .c-bOlXUH:focus {
     outline: 2px solid var(--colors-primary900);
     outline-offset: 2px;
   }
 
-  .c-ccaAMC[data-disabled] {
+  .c-bOlXUH[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
 
-  .c-bwqjWK {
+  .c-kydCSz {
     align-items: center;
     display: flex;
     position: relative;
@@ -60,23 +60,23 @@ exports[`Slider component renders 1`] = `
     cursor: pointer;
   }
 
-  .c-bwqjWK[data-orientation="horizontal"] {
+  .c-kydCSz[data-orientation="horizontal"] {
     height: var(--sizes-1);
   }
 
-  .c-bwqjWK[data-orientation="vertical"] {
+  .c-kydCSz[data-orientation="vertical"] {
     flex-direction: column;
     width: var(--sizes-1);
   }
 
-  .c-bwqjWK[data-disabled] {
+  .c-kydCSz[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
 }
 
 @media  {
-  .c-bwqjWK-dOexvR-theme-tonal .c-nJgcq {
+  .c-kydCSz-dOexvR-theme-tonal .c-nJgcq {
     background: var(--colors-tonal200);
   }
 }
@@ -84,7 +84,7 @@ exports[`Slider component renders 1`] = `
 <div>
   <span
     aria-disabled="false"
-    class="c-bwqjWK c-bwqjWK-dOexvR-theme-tonal"
+    class="c-kydCSz c-kydCSz-dOexvR-theme-tonal"
     data-orientation="horizontal"
     dir="ltr"
     style="--radix-slider-thumb-transform: translateX(-50%);"
@@ -94,7 +94,7 @@ exports[`Slider component renders 1`] = `
       data-orientation="horizontal"
     >
       <span
-        class="c-hNIRsQ"
+        class="c-cYBvhd"
         data-orientation="horizontal"
         style="left: 0%; right: 50%;"
       />
@@ -107,7 +107,7 @@ exports[`Slider component renders 1`] = `
         aria-valuemax="100"
         aria-valuemin="0"
         aria-valuenow="50"
-        class="c-ccaAMC"
+        class="c-bOlXUH"
         data-orientation="horizontal"
         data-radix-collection-item=""
         role="slider"
@@ -121,14 +121,14 @@ exports[`Slider component renders 1`] = `
 
 exports[`Slider component renders with a steps list 1`] = `
 @media  {
-  .c-hNIRsQ {
+  .c-cYBvhd {
     background: var(--colors-primary800);
     border-radius: var(--radii-round);
     height: 100%;
     position: absolute;
   }
 
-  .c-hNIRsQ[data-disabled] {
+  .c-cYBvhd[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
@@ -147,7 +147,7 @@ exports[`Slider component renders with a steps list 1`] = `
     width: var(--space-1);
   }
 
-  .c-ccaAMC {
+  .c-bOlXUH {
     background: var(--colors-primary900);
     border-radius: var(--radii-round);
     display: block;
@@ -155,21 +155,21 @@ exports[`Slider component renders with a steps list 1`] = `
     width: var(--sizes-1);
   }
 
-  .c-ccaAMC:hover {
+  .c-bOlXUH:hover {
     background: var(--colors-primary1000);
   }
 
-  .c-ccaAMC:focus {
+  .c-bOlXUH:focus {
     outline: 2px solid var(--colors-primary900);
     outline-offset: 2px;
   }
 
-  .c-ccaAMC[data-disabled] {
+  .c-bOlXUH[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
 
-  .c-bwqjWK {
+  .c-kydCSz {
     align-items: center;
     display: flex;
     position: relative;
@@ -179,23 +179,23 @@ exports[`Slider component renders with a steps list 1`] = `
     cursor: pointer;
   }
 
-  .c-bwqjWK[data-orientation="horizontal"] {
+  .c-kydCSz[data-orientation="horizontal"] {
     height: var(--sizes-1);
   }
 
-  .c-bwqjWK[data-orientation="vertical"] {
+  .c-kydCSz[data-orientation="vertical"] {
     flex-direction: column;
     width: var(--sizes-1);
   }
 
-  .c-bwqjWK[data-disabled] {
+  .c-kydCSz[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
 }
 
 @media  {
-  .c-bwqjWK-dOexvR-theme-tonal .c-nJgcq {
+  .c-kydCSz-dOexvR-theme-tonal .c-nJgcq {
     background: var(--colors-tonal200);
   }
 }
@@ -203,7 +203,7 @@ exports[`Slider component renders with a steps list 1`] = `
 <div>
   <span
     aria-disabled="false"
-    class="c-bwqjWK c-bwqjWK-dOexvR-theme-tonal"
+    class="c-kydCSz c-kydCSz-dOexvR-theme-tonal"
     data-orientation="horizontal"
     dir="ltr"
     steps="[object Object],[object Object],[object Object]"
@@ -214,7 +214,7 @@ exports[`Slider component renders with a steps list 1`] = `
       data-orientation="horizontal"
     >
       <span
-        class="c-hNIRsQ"
+        class="c-cYBvhd"
         data-orientation="horizontal"
         style="left: 0%; right: 50%;"
       />
@@ -227,7 +227,7 @@ exports[`Slider component renders with a steps list 1`] = `
         aria-valuemax="100"
         aria-valuemin="0"
         aria-valuenow="50"
-        class="c-ccaAMC"
+        class="c-bOlXUH"
         data-orientation="horizontal"
         data-radix-collection-item=""
         role="slider"
@@ -241,14 +241,14 @@ exports[`Slider component renders with a steps list 1`] = `
 
 exports[`Slider.Value component renders 1`] = `
 @media  {
-  .c-hNIRsQ {
+  .c-cYBvhd {
     background: var(--colors-primary800);
     border-radius: var(--radii-round);
     height: 100%;
     position: absolute;
   }
 
-  .c-hNIRsQ[data-disabled] {
+  .c-cYBvhd[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
@@ -267,7 +267,7 @@ exports[`Slider.Value component renders 1`] = `
     width: var(--space-1);
   }
 
-  .c-ccaAMC {
+  .c-bOlXUH {
     background: var(--colors-primary900);
     border-radius: var(--radii-round);
     display: block;
@@ -275,21 +275,21 @@ exports[`Slider.Value component renders 1`] = `
     width: var(--sizes-1);
   }
 
-  .c-ccaAMC:hover {
+  .c-bOlXUH:hover {
     background: var(--colors-primary1000);
   }
 
-  .c-ccaAMC:focus {
+  .c-bOlXUH:focus {
     outline: 2px solid var(--colors-primary900);
     outline-offset: 2px;
   }
 
-  .c-ccaAMC[data-disabled] {
+  .c-bOlXUH[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
 
-  .c-bwqjWK {
+  .c-kydCSz {
     align-items: center;
     display: flex;
     position: relative;
@@ -299,16 +299,16 @@ exports[`Slider.Value component renders 1`] = `
     cursor: pointer;
   }
 
-  .c-bwqjWK[data-orientation="horizontal"] {
+  .c-kydCSz[data-orientation="horizontal"] {
     height: var(--sizes-1);
   }
 
-  .c-bwqjWK[data-orientation="vertical"] {
+  .c-kydCSz[data-orientation="vertical"] {
     flex-direction: column;
     width: var(--sizes-1);
   }
 
-  .c-bwqjWK[data-disabled] {
+  .c-kydCSz[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
@@ -326,7 +326,7 @@ exports[`Slider.Value component renders 1`] = `
 }
 
 @media  {
-  .c-bwqjWK-dOexvR-theme-tonal .c-nJgcq {
+  .c-kydCSz-dOexvR-theme-tonal .c-nJgcq {
     background: var(--colors-tonal200);
   }
 
diff --git a/lib/src/components/tabs/TabsTrigger.tsx b/lib/src/components/tabs/TabsTrigger.tsx
index 18bdea266..0d7dce616 100644
--- a/lib/src/components/tabs/TabsTrigger.tsx
+++ b/lib/src/components/tabs/TabsTrigger.tsx
@@ -29,8 +29,8 @@ const StyledTabsTrigger = styled(Trigger, {
     letterSpacing: '-0.005em',
     borderColor: 'currentColor'
   },
-  '&[data-disabled]': disabledStyle,
-  '&:not([data-disabled])': {
+  '&[disabled]': disabledStyle,
+  '&:not([disabled])': {
     '&:hover, &:focus-visible': {
       color: '$interactive2',
       [`& ${StyledTabsTriggerHoverBackground}`]: {
diff --git a/lib/src/components/tabs/__snapshots__/Tabs.test.tsx.snap b/lib/src/components/tabs/__snapshots__/Tabs.test.tsx.snap
index 238533c30..e7cd02a82 100644
--- a/lib/src/components/tabs/__snapshots__/Tabs.test.tsx.snap
+++ b/lib/src/components/tabs/__snapshots__/Tabs.test.tsx.snap
@@ -315,7 +315,7 @@ exports[`Tabs component renders 1`] = `
     background: var(--colors-interactive1);
   }
 
-  .c-cDgrSH {
+  .c-efqMNv {
     background: none;
     border: none;
     cursor: pointer;
@@ -327,33 +327,33 @@ exports[`Tabs component renders 1`] = `
     position: relative;
   }
 
-  .c-cDgrSH[data-state="active"] {
+  .c-efqMNv[data-state="active"] {
     color: var(--colors-interactive1);
     font-weight: 600;
     letter-spacing: -0.005em;
     border-color: currentColor;
   }
 
-  .c-cDgrSH[data-disabled] {
+  .c-efqMNv[disabled] {
     opacity: 0.3;
     cursor: not-allowed;
   }
 
-  .c-cDgrSH:not([data-disabled]):hover,
-  .c-cDgrSH:not([data-disabled]):focus-visible {
+  .c-efqMNv:not([disabled]):hover,
+  .c-efqMNv:not([disabled]):focus-visible {
     color: var(--colors-interactive2);
   }
 
-  .c-cDgrSH:not([data-disabled]):hover .c-iPskiL,
-  .c-cDgrSH:not([data-disabled]):focus-visible .c-iPskiL {
+  .c-efqMNv:not([disabled]):hover .c-iPskiL,
+  .c-efqMNv:not([disabled]):focus-visible .c-iPskiL {
     opacity: 0.07;
   }
 
-  .c-cDgrSH:not([data-disabled]):active {
+  .c-efqMNv:not([disabled]):active {
     color: var(--colors-interactive3);
   }
 
-  .c-cDgrSH:not([data-disabled]):focus-visible {
+  .c-efqMNv:not([disabled]):focus-visible {
     outline: none;
     position: relative;
     z-index: 1;
@@ -430,7 +430,7 @@ exports[`Tabs component renders 1`] = `
         <button
           aria-controls="radix-3-content-tab1"
           aria-selected="true"
-          class="c-cDgrSH"
+          class="c-efqMNv"
           data-orientation="horizontal"
           data-radix-collection-item=""
           data-state="active"
@@ -451,7 +451,7 @@ exports[`Tabs component renders 1`] = `
         <button
           aria-controls="radix-3-content-tab2"
           aria-selected="false"
-          class="c-cDgrSH"
+          class="c-efqMNv"
           data-orientation="horizontal"
           data-radix-collection-item=""
           data-state="inactive"
@@ -472,7 +472,7 @@ exports[`Tabs component renders 1`] = `
         <button
           aria-controls="radix-3-content-tab3"
           aria-selected="false"
-          class="c-cDgrSH"
+          class="c-efqMNv"
           data-disabled=""
           data-orientation="horizontal"
           data-radix-collection-item=""