diff --git a/src/app/components/ExportProvider/SingleFileExport.test.tsx b/src/app/components/ExportProvider/SingleFileExport.test.tsx
index 8f1b35c63..e15148e21 100644
--- a/src/app/components/ExportProvider/SingleFileExport.test.tsx
+++ b/src/app/components/ExportProvider/SingleFileExport.test.tsx
@@ -171,11 +171,11 @@ describe('SingleFileExport', () => {
           headline: {
             fontFamily: {
               value: 'Inter',
-              type: 'fontFamily',
+              type: 'fontFamilies',
             },
             fontWeight: {
               value: 'Bold',
-              type: 'fontWeight',
+              type: 'fontWeights',
             },
           },
           alias: {
diff --git a/src/utils/convertToDefaultProperty.ts b/src/utils/convertToDefaultProperty.ts
index 1b721cb4b..00760d951 100644
--- a/src/utils/convertToDefaultProperty.ts
+++ b/src/utils/convertToDefaultProperty.ts
@@ -31,6 +31,18 @@ export function convertToDefaultProperty(property: string): string {
     case Properties.borderWidthBottom:
       type = Properties.borderWidth;
       break;
+    case 'fontFamily':
+      type = Properties.fontFamilies;
+      break;
+    case 'fontSize':
+      type = Properties.fontSizes;
+      break;
+    case 'fontWeight':
+      type = Properties.fontWeights;
+      break;
+    case 'lineHeights':
+      type = Properties.lineHeights;
+      break;
     default:
       type = property;
       break;
diff --git a/src/utils/formatTokens.test.ts b/src/utils/formatTokens.test.ts
index 59024b08c..bc5726ba0 100644
--- a/src/utils/formatTokens.test.ts
+++ b/src/utils/formatTokens.test.ts
@@ -116,43 +116,43 @@ describe('formatTokens', () => {
                 h1: {
                   fontFamily: {
                     value: 'Inter',
-                    type: 'fontFamily',
+                    type: 'fontFamilies',
                   },
                   fontWeight: {
                     value: 'Bold',
-                    type: 'fontWeight',
+                    type: 'fontWeights',
                   },
                   fontSize: {
                     value: 36,
-                    type: 'fontSize',
+                    type: 'fontSizes',
                   },
                 },
                 h2: {
                   fontFamily: {
                     value: 'Inter',
-                    type: 'fontFamily',
+                    type: 'fontFamilies',
                   },
                   fontWeight: {
                     value: 'Regular',
-                    type: 'fontWeight',
+                    type: 'fontWeights',
                   },
                   fontSize: {
                     value: 24,
-                    type: 'fontSize',
+                    type: 'fontSizes',
                   },
                 },
                 alias: {
                   fontFamily: {
                     value: 'Inter',
-                    type: 'fontFamily',
+                    type: 'fontFamilies',
                   },
                   fontWeight: {
                     value: 'Bold',
-                    type: 'fontWeight',
+                    type: 'fontWeights',
                   },
                   fontSize: {
                     value: 36,
-                    type: 'fontSize',
+                    type: 'fontSizes',
                   },
                 },
                 non_resolved: {
diff --git a/token-transformer/output/composition.json b/token-transformer/output/composition.json
index c68764202..57a00ae56 100644
--- a/token-transformer/output/composition.json
+++ b/token-transformer/output/composition.json
@@ -21,15 +21,15 @@
     "header": {
       "fontFamily": {
         "value": "Roboto",
-        "type": "fontFamily"
+        "type": "fontFamilies"
       },
       "fontSize": {
         "value": 96,
-        "type": "fontSize"
+        "type": "fontSizes"
       },
       "fontWeight": {
         "value": "Bold",
-        "type": "fontWeight"
+        "type": "fontWeights"
       }
     },
     "body": {