diff --git a/proprietary/tokens/src/components/ams/blockquote.tokens.json b/proprietary/tokens/src/components/ams/blockquote.tokens.json
index e139132b9e..f642677d9d 100644
--- a/proprietary/tokens/src/components/ams/blockquote.tokens.json
+++ b/proprietary/tokens/src/components/ams/blockquote.tokens.json
@@ -2,10 +2,10 @@
   "ams": {
     "blockquote": {
       "color": { "value": "{ams.brand.color.neutral.100}" },
-      "font-family": { "value": "{ams.text.font-family}" },
-      "font-size": { "value": "{ams.text.level.3.font-size}" },
-      "font-weight": { "value": "{ams.text.font-weight.bold}" },
-      "line-height": { "value": "{ams.text.level.3.line-height}" },
+      "font-family": { "value": "{ams.common.typography.body-text.font-family.default}" },
+      "font-size": { "value": "{ams.common.typography.body-text.font-size.xl}" },
+      "font-weight": { "value": "{ams.common.typography.body-text.font-weight.default}" },
+      "line-height": { "value": "{ams.common.typography.body-text.line-height.xl}" },
       "inverse-color": { "value": "{ams.brand.color.neutral.0}" }
     }
   }
diff --git a/proprietary/tokens/src/components/ams/heading.tokens.json b/proprietary/tokens/src/components/ams/heading.tokens.json
index 9425a8ab2c..1f6650c05f 100644
--- a/proprietary/tokens/src/components/ams/heading.tokens.json
+++ b/proprietary/tokens/src/components/ams/heading.tokens.json
@@ -2,33 +2,33 @@
   "ams": {
     "heading": {
       "color": { "value": "{ams.brand.color.neutral.100}" },
-      "font-family": { "value": "{ams.text.font-family}" },
-      "font-weight": { "value": "{ams.text.font-weight.bold}" },
+      "font-family": { "value": "{ams.common.typography.headings.font-family.default}" },
+      "font-weight": { "value": "{ams.common.typography.headings.font-weight.default}" },
       "inverse-color": { "value": "{ams.brand.color.neutral.0}" },
       "level": {
         "1": {
-          "font-size": { "value": "{ams.text.level.1.font-size}" },
-          "line-height": { "value": "{ams.text.level.1.line-height}" }
+          "font-size": { "value": "{ams.common.typography.headings.font-size.level-1}" },
+          "line-height": { "value": "{ams.common.typography.headings.line-height.level-1}" }
         },
         "2": {
-          "font-size": { "value": "{ams.text.level.2.font-size}" },
-          "line-height": { "value": "{ams.text.level.2.line-height}" }
+          "font-size": { "value": "{ams.common.typography.headings.font-size.level-2}" },
+          "line-height": { "value": "{ams.common.typography.headings.line-height.level-2}" }
         },
         "3": {
-          "font-size": { "value": "{ams.text.level.3.font-size}" },
-          "line-height": { "value": "{ams.text.level.3.line-height}" }
+          "font-size": { "value": "{ams.common.typography.headings.font-size.level-3}" },
+          "line-height": { "value": "{ams.common.typography.headings.line-height.level-3}" }
         },
         "4": {
-          "font-size": { "value": "{ams.text.level.4.font-size}" },
-          "line-height": { "value": "{ams.text.level.4.line-height}" }
+          "font-size": { "value": "{ams.common.typography.headings.font-size.level-4}" },
+          "line-height": { "value": "{ams.common.typography.headings.line-height.level-4}" }
         },
         "5": {
-          "font-size": { "value": "{ams.text.level.5.font-size}" },
-          "line-height": { "value": "{ams.text.level.5.line-height}" }
+          "font-size": { "value": "{ams.common.typography.headings.font-size.level-5}" },
+          "line-height": { "value": "{ams.common.typography.headings.line-height.level-5}" }
         },
         "6": {
-          "font-size": { "value": "{ams.text.level.6.font-size}" },
-          "line-height": { "value": "{ams.text.level.6.line-height}" }
+          "font-size": { "value": "{ams.common.typography.headings.font-size.level-6}" },
+          "line-height": { "value": "{ams.common.typography.headings.line-height.level-6}" }
         }
       }
     }
diff --git a/proprietary/tokens/src/components/ams/paragraph.tokens.json b/proprietary/tokens/src/components/ams/paragraph.tokens.json
index cb65d44a30..86c4ed5ce3 100644
--- a/proprietary/tokens/src/components/ams/paragraph.tokens.json
+++ b/proprietary/tokens/src/components/ams/paragraph.tokens.json
@@ -2,18 +2,18 @@
   "ams": {
     "paragraph": {
       "color": { "value": "{ams.brand.color.neutral.100}" },
-      "font-family": { "value": "{ams.text.font-family}" },
-      "font-size": { "value": "{ams.text.level.5.font-size}" },
-      "font-weight": { "value": "{ams.text.font-weight.normal}" },
-      "line-height": { "value": "{ams.text.level.5.line-height}" },
+      "font-family": { "value": "{ams.common.typography.body-text.font-family.default}" },
+      "font-size": { "value": "{ams.common.typography.body-text.font-size.md}" },
+      "font-weight": { "value": "{ams.common.typography.body-text.font-weight.default}" },
+      "line-height": { "value": "{ams.common.typography.body-text.line-height.md}" },
       "inverse-color": { "value": "{ams.brand.color.neutral.0}" },
       "small": {
-        "font-size": { "value": "{ams.text.level.6.font-size}" },
-        "line-height": { "value": "{ams.text.level.6.line-height}" }
+        "font-size": { "value": "{ams.common.typography.body-text.font-size.sm}" },
+        "line-height": { "value": "{ams.common.typography.body-text.line-height.sm}" }
       },
       "large": {
-        "font-size": { "value": "{ams.text.level.4.font-size}" },
-        "line-height": { "value": "{ams.text.level.4.line-height}" }
+        "font-size": { "value": "{ams.common.typography.body-text.font-size.lg}" },
+        "line-height": { "value": "{ams.common.typography.body-text.line-height.lg}" }
       }
     }
   }