diff --git a/apps/storybook-react-native/.storybook/FontLoader.js b/apps/storybook-react-native/.storybook/FontLoader.js
index 23a7e83e0..8bddd7c17 100644
--- a/apps/storybook-react-native/.storybook/FontLoader.js
+++ b/apps/storybook-react-native/.storybook/FontLoader.js
@@ -8,16 +8,16 @@ const FontLoader = ({ children }) => {
   useEffect(() => {
     (async () => {
       await Font.loadAsync({
-        'Geist Regular': require('../fonts/Geist/Geist Regular.otf'),
-        'Geist Regular Italic': require('../fonts/Geist/Geist Regular Italic.otf'),
-        'Geist Medium': require('../fonts/Geist/Geist Medium.otf'),
-        'Geist Medium Italic': require('../fonts/Geist/Geist Medium Italic.otf'),
-        'Geist Bold': require('../fonts/Geist/Geist Bold.otf'),
-        'Geist Bold Italic': require('../fonts/Geist/Geist Bold Italic.otf'),
-        'MM Poly Regular': require('../fonts/MMPoly/MM Poly Regular.otf'),
-        'MM Sans Regular': require('../fonts/MMSans/MM Sans Regular.otf'),
-        'MM Sans Medium': require('../fonts/MMSans/MM Sans Medium.otf'),
-        'MM Sans Bold': require('../fonts/MMSans/MM Sans Bold.otf'),
+        'Geist-Regular': require('../fonts/Geist/Geist-Regular.otf'),
+        'Geist-RegularItalic': require('../fonts/Geist/Geist-RegularItalic.otf'),
+        'Geist-Medium': require('../fonts/Geist/Geist-Medium.otf'),
+        'Geist-MediumItalic': require('../fonts/Geist/Geist-MediumItalic.otf'),
+        'Geist-Bold': require('../fonts/Geist/Geist-Bold.otf'),
+        'Geist-BoldItalic': require('../fonts/Geist/Geist-BoldItalic.otf'),
+        'MMPoly-Regular': require('../fonts/MMPoly/MMPoly-Regular.otf'),
+        'MMSans-Regular': require('../fonts/MMSans/MMSans-Regular.otf'),
+        'MMSans-Medium': require('../fonts/MMSans/MMSans-Medium.otf'),
+        'MMSans-Bold': require('../fonts/MMSans/MMSans-Bold.otf'),
       });
       setFontsLoaded(true);
     })();
diff --git a/apps/storybook-react-native/fonts/Geist/Geist Bold.otf b/apps/storybook-react-native/fonts/Geist/Geist-Bold.otf
similarity index 100%
rename from apps/storybook-react-native/fonts/Geist/Geist Bold.otf
rename to apps/storybook-react-native/fonts/Geist/Geist-Bold.otf
diff --git a/apps/storybook-react-native/fonts/Geist/Geist Bold Italic.otf b/apps/storybook-react-native/fonts/Geist/Geist-BoldItalic.otf
similarity index 100%
rename from apps/storybook-react-native/fonts/Geist/Geist Bold Italic.otf
rename to apps/storybook-react-native/fonts/Geist/Geist-BoldItalic.otf
diff --git a/apps/storybook-react-native/fonts/Geist/Geist Medium.otf b/apps/storybook-react-native/fonts/Geist/Geist-Medium.otf
similarity index 100%
rename from apps/storybook-react-native/fonts/Geist/Geist Medium.otf
rename to apps/storybook-react-native/fonts/Geist/Geist-Medium.otf
diff --git a/apps/storybook-react-native/fonts/Geist/Geist Medium Italic.otf b/apps/storybook-react-native/fonts/Geist/Geist-MediumItalic.otf
similarity index 100%
rename from apps/storybook-react-native/fonts/Geist/Geist Medium Italic.otf
rename to apps/storybook-react-native/fonts/Geist/Geist-MediumItalic.otf
diff --git a/apps/storybook-react-native/fonts/Geist/Geist Regular.otf b/apps/storybook-react-native/fonts/Geist/Geist-Regular.otf
similarity index 100%
rename from apps/storybook-react-native/fonts/Geist/Geist Regular.otf
rename to apps/storybook-react-native/fonts/Geist/Geist-Regular.otf
diff --git a/apps/storybook-react-native/fonts/Geist/Geist Regular Italic.otf b/apps/storybook-react-native/fonts/Geist/Geist-RegularItalic.otf
similarity index 100%
rename from apps/storybook-react-native/fonts/Geist/Geist Regular Italic.otf
rename to apps/storybook-react-native/fonts/Geist/Geist-RegularItalic.otf
diff --git a/apps/storybook-react-native/fonts/MMPoly/MM Poly Regular.otf b/apps/storybook-react-native/fonts/MMPoly/MMPoly-Regular.otf
similarity index 100%
rename from apps/storybook-react-native/fonts/MMPoly/MM Poly Regular.otf
rename to apps/storybook-react-native/fonts/MMPoly/MMPoly-Regular.otf
diff --git a/apps/storybook-react-native/fonts/MMSans/MM Sans Bold.otf b/apps/storybook-react-native/fonts/MMSans/MMSans-Bold.otf
similarity index 100%
rename from apps/storybook-react-native/fonts/MMSans/MM Sans Bold.otf
rename to apps/storybook-react-native/fonts/MMSans/MMSans-Bold.otf
diff --git a/apps/storybook-react-native/fonts/MMSans/MM Sans Medium.otf b/apps/storybook-react-native/fonts/MMSans/MMSans-Medium.otf
similarity index 100%
rename from apps/storybook-react-native/fonts/MMSans/MM Sans Medium.otf
rename to apps/storybook-react-native/fonts/MMSans/MMSans-Medium.otf
diff --git a/apps/storybook-react-native/fonts/MMSans/MM Sans Regular.otf b/apps/storybook-react-native/fonts/MMSans/MMSans-Regular.otf
similarity index 100%
rename from apps/storybook-react-native/fonts/MMSans/MM Sans Regular.otf
rename to apps/storybook-react-native/fonts/MMSans/MMSans-Regular.otf
diff --git a/apps/storybook-react/fonts/Geist/Geist Bold.woff2 b/apps/storybook-react/fonts/Geist/Geist-Bold.woff2
similarity index 100%
rename from apps/storybook-react/fonts/Geist/Geist Bold.woff2
rename to apps/storybook-react/fonts/Geist/Geist-Bold.woff2
diff --git a/apps/storybook-react/fonts/Geist/Geist Bold Italic.woff2 b/apps/storybook-react/fonts/Geist/Geist-BoldItalic.woff2
similarity index 100%
rename from apps/storybook-react/fonts/Geist/Geist Bold Italic.woff2
rename to apps/storybook-react/fonts/Geist/Geist-BoldItalic.woff2
diff --git a/apps/storybook-react/fonts/Geist/Geist Medium.woff2 b/apps/storybook-react/fonts/Geist/Geist-Medium.woff2
similarity index 100%
rename from apps/storybook-react/fonts/Geist/Geist Medium.woff2
rename to apps/storybook-react/fonts/Geist/Geist-Medium.woff2
diff --git a/apps/storybook-react/fonts/Geist/Geist Medium Italic.woff2 b/apps/storybook-react/fonts/Geist/Geist-MediumItalic.woff2
similarity index 100%
rename from apps/storybook-react/fonts/Geist/Geist Medium Italic.woff2
rename to apps/storybook-react/fonts/Geist/Geist-MediumItalic.woff2
diff --git a/apps/storybook-react/fonts/Geist/Geist Regular.woff2 b/apps/storybook-react/fonts/Geist/Geist-Regular.woff2
similarity index 100%
rename from apps/storybook-react/fonts/Geist/Geist Regular.woff2
rename to apps/storybook-react/fonts/Geist/Geist-Regular.woff2
diff --git a/apps/storybook-react/fonts/Geist/Geist Regular Italic.woff2 b/apps/storybook-react/fonts/Geist/Geist-RegularItalic.woff2
similarity index 100%
rename from apps/storybook-react/fonts/Geist/Geist Regular Italic.woff2
rename to apps/storybook-react/fonts/Geist/Geist-RegularItalic.woff2
diff --git a/apps/storybook-react/fonts/MMPoly/MM Poly Regular.woff2 b/apps/storybook-react/fonts/MMPoly/MMPoly-Regular.woff2
similarity index 100%
rename from apps/storybook-react/fonts/MMPoly/MM Poly Regular.woff2
rename to apps/storybook-react/fonts/MMPoly/MMPoly-Regular.woff2
diff --git a/apps/storybook-react/fonts/MMSans/MM Sans Bold.woff2 b/apps/storybook-react/fonts/MMSans/MMSans-Bold.woff2
similarity index 100%
rename from apps/storybook-react/fonts/MMSans/MM Sans Bold.woff2
rename to apps/storybook-react/fonts/MMSans/MMSans-Bold.woff2
diff --git a/apps/storybook-react/fonts/MMSans/MM Sans Medium.woff2 b/apps/storybook-react/fonts/MMSans/MMSans-Medium.woff2
similarity index 100%
rename from apps/storybook-react/fonts/MMSans/MM Sans Medium.woff2
rename to apps/storybook-react/fonts/MMSans/MMSans-Medium.woff2
diff --git a/apps/storybook-react/fonts/MMSans/MM Sans Regular.woff2 b/apps/storybook-react/fonts/MMSans/MMSans-Regular.woff2
similarity index 100%
rename from apps/storybook-react/fonts/MMSans/MM Sans Regular.woff2
rename to apps/storybook-react/fonts/MMSans/MMSans-Regular.woff2
diff --git a/apps/storybook-react/tailwind.css b/apps/storybook-react/tailwind.css
index 0b08f01e8..88d03dae8 100644
--- a/apps/storybook-react/tailwind.css
+++ b/apps/storybook-react/tailwind.css
@@ -7,42 +7,42 @@
   font-family: 'Geist';
   font-style: normal;
   font-weight: 400;
-  src: url('fonts/Geist/Geist Regular.woff2') format('woff2');
+  src: url('fonts/Geist/Geist-Regular.woff2') format('woff2');
 }
 
 @font-face {
   font-family: 'Geist';
   font-style: italic;
   font-weight: 400;
-  src: url('fonts/Geist/Geist Regular Italic.woff2') format('woff2');
+  src: url('fonts/Geist/Geist-RegularItalic.woff2') format('woff2');
 }
 
 @font-face {
   font-family: 'Geist';
   font-style: normal;
   font-weight: 500;
-  src: url('fonts/Geist/Geist Medium.woff2') format('woff2');
+  src: url('fonts/Geist/Geist-Medium.woff2') format('woff2');
 }
 
 @font-face {
   font-family: 'Geist';
   font-style: italic;
   font-weight: 500;
-  src: url('fonts/Geist/Geist Medium Italic.woff2') format('woff2');
+  src: url('fonts/Geist/Geist-MediumItalic.woff2') format('woff2');
 }
 
 @font-face {
   font-family: 'Geist';
   font-style: normal;
   font-weight: 700;
-  src: url('fonts/Geist/Geist Bold.woff2') format('woff2');
+  src: url('fonts/Geist/Geist-Bold.woff2') format('woff2');
 }
 
 @font-face {
   font-family: 'Geist';
   font-style: italic;
   font-weight: 700;
-  src: url('fonts/Geist/Geist Bold Italic.woff2') format('woff2');
+  src: url('fonts/Geist/Geist-BoldItalic.woff2') format('woff2');
 }
 
 /* MM Sans */
@@ -50,21 +50,21 @@
   font-family: 'MMSans';
   font-style: normal;
   font-weight: 400;
-  src: url('fonts/MMSans/MM Sans Regular.woff2') format('woff2');
+  src: url('fonts/MMSans/MMSans-Regular.woff2') format('woff2');
 }
 
 @font-face {
   font-family: 'MMSans';
   font-style: normal;
   font-weight: 500;
-  src: url('fonts/MMSans/MM Sans Medium.woff2') format('woff2');
+  src: url('fonts/MMSans/MMSans-Medium.woff2') format('woff2');
 }
 
 @font-face {
   font-family: 'MMSans';
   font-style: normal;
   font-weight: 700;
-  src: url('fonts/MMSans/MM Sans Bold.woff2') format('woff2');
+  src: url('fonts/MMSans/MMSans-Bold.woff2') format('woff2');
 }
 
 /* MM Poly */
@@ -72,19 +72,19 @@
   font-family: 'MMPoly';
   font-style: normal;
   font-weight: 400;
-  src: url('fonts/MMPoly/MM Poly Regular.woff2') format('woff2');
+  src: url('fonts/MMPoly/MMPoly-Regular.woff2') format('woff2');
 }
 
 @font-face {
   font-family: 'MMPoly';
   font-style: normal;
   font-weight: 500;
-  src: url('fonts/MMPoly/MM Poly Regular.woff2') format('woff2');
+  src: url('fonts/MMPoly/MMPoly-Regular.woff2') format('woff2');
 }
 
 @font-face {
   font-family: 'MMPoly';
   font-style: normal;
   font-weight: 700;
-  src: url('fonts/MMPoly/MM Poly Regular.woff2') format('woff2');
+  src: url('fonts/MMPoly/MMPoly-Regular.woff2') format('woff2');
 }
diff --git a/packages/design-system-twrnc-preset/src/typography.ts b/packages/design-system-twrnc-preset/src/typography.ts
index cff2d8fc8..ddd393cf7 100644
--- a/packages/design-system-twrnc-preset/src/typography.ts
+++ b/packages/design-system-twrnc-preset/src/typography.ts
@@ -118,16 +118,16 @@ export const typographyTailwindConfig: TypographyTailwindConfigProps = {
     ],
   },
   fontFamily: {
-    'default-regular': 'Geist Regular',
-    'default-regular-italic': 'Geist Regular Italic',
-    'default-medium': 'Geist Medium',
-    'default-medium-italic': 'Geist Medium Italic',
-    'default-bold': 'Geist Bold',
-    'default-bold-italic': 'Geist Bold Italic',
-    'accent-regular': 'MM Sans Regular',
-    'accent-medium': 'MM Sans Medium',
-    'accent-bold': 'MM Sans Bold',
-    'hero-regular': 'MM Poly Regular',
+    'default-regular': 'Geist-Regular',
+    'default-regular-italic': 'Geist-RegularItalic',
+    'default-medium': 'Geist-Medium',
+    'default-medium-italic': 'Geist-MediumItalic',
+    'default-bold': 'Geist-Bold',
+    'default-bold-italic': 'Geist-BoldItalic',
+    'accent-regular': 'MMSans-Regular',
+    'accent-medium': 'MMSans-Medium',
+    'accent-bold': 'MMSans-Bold',
+    'hero-regular': 'MMPoly-Regular',
   },
   letterSpacing: {
     'display-lg': `${typography.sDisplayLG.letterSpacing as number}`,
diff --git a/packages/design-system-twrnc-preset/src/typography.types.ts b/packages/design-system-twrnc-preset/src/typography.types.ts
index dc01e31e0..a4c559dde 100644
--- a/packages/design-system-twrnc-preset/src/typography.types.ts
+++ b/packages/design-system-twrnc-preset/src/typography.types.ts
@@ -42,7 +42,7 @@ export type FontStyle = 'normal' | 'italic';
  * {
  *   fontSize: {
  *     'display-md': {
- *       fontFamily: 'Geist Bold',
+ *       fontFamily: 'Geist-Bold',
  *       fontSize: '32',
  *       fontWeight: '700',
  *       letterSpacing: '0',