diff --git a/UNRELEASED-v8.md b/UNRELEASED-v8.md
index 9c8aacaa6ef..cd8eb01713a 100644
--- a/UNRELEASED-v8.md
+++ b/UNRELEASED-v8.md
@@ -35,7 +35,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t
 - Removed the border-radius() function and replaced any instances with tokens ([#4793](https://github.com/Shopify/polaris-react/pull/4793))
 - Removed the shadow() function (replaced any instances with tokens) and renamed shadow legacy tokens ([#4823](https://github.com/Shopify/polaris-react/pull/4823))
 - Removed the ms-high-contrast-color() function and replaced any instances with values ([#4938](https://github.com/Shopify/polaris-react/pull/4938))
-- Removed the font-family() function and replaced any instances with values ([#4940](https://github.com/Shopify/polaris-react/pull/4940))
+- Removed the font-family() function and replaced any instances with tokens ([#4940](https://github.com/Shopify/polaris-react/pull/4940))
 
 ### New components
 
diff --git a/src/components/AppProvider/AppProvider.scss b/src/components/AppProvider/AppProvider.scss
index 52e56025a54..eb3bfa2b976 100644
--- a/src/components/AppProvider/AppProvider.scss
+++ b/src/components/AppProvider/AppProvider.scss
@@ -17,7 +17,7 @@ body {
 html,
 body,
 button {
-  font-family: var(--p-font-family-base);
+  font-family: var(--p-font-family-sans);
 }
 
 html {
diff --git a/src/components/KeyboardKey/KeyboardKey.scss b/src/components/KeyboardKey/KeyboardKey.scss
index 596dae912c4..16c990e53b0 100644
--- a/src/components/KeyboardKey/KeyboardKey.scss
+++ b/src/components/KeyboardKey/KeyboardKey.scss
@@ -12,7 +12,7 @@ $key-base-height: 24px;
     0 var(--p-space-05) 0 0 var(--p-surface),
     0 var(--p-space-05) 0 1px var(--p-border-subdued);
   border-radius: var(--p-border-radius-1);
-  font-family: var(--p-font-family-base);
+  font-family: var(--p-font-family-sans);
   font-size: 12px;
   font-weight: var(--p-font-weight-medium);
   line-height: $key-base-height;
diff --git a/src/components/TextField/TextField.scss b/src/components/TextField/TextField.scss
index 8cc24b61b82..9346ab7fad7 100644
--- a/src/components/TextField/TextField.scss
+++ b/src/components/TextField/TextField.scss
@@ -97,7 +97,7 @@ $prefix-horizontal-spacing: var(--p-space-2);
   padding: control-vertical-padding() $backdrop-horizontal-spacing;
   background: none;
   border: border(transparent);
-  font-family: var(--p-font-family-base);
+  font-family: var(--p-font-family-sans);
   appearance: none;
   caret-color: var(--p-text);
   color: var(--p-text);
diff --git a/src/tokens/token-groups/typography.json b/src/tokens/token-groups/typography.json
index 2bdb95dae35..861dd03e719 100644
--- a/src/tokens/token-groups/typography.json
+++ b/src/tokens/token-groups/typography.json
@@ -1,5 +1,5 @@
 {
-  "font-family-base": "-apple-system, BlinkMacSystemFont, 'San Francisco', 'Segoe UI', Roboto, 'Helvetica Neue', sans-serif",
+  "font-family-sans": "-apple-system, BlinkMacSystemFont, 'San Francisco', 'Segoe UI', Roboto, 'Helvetica Neue', sans-serif",
   "font-family-mono": "ui-monospace, SFMono-Regular, 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace",
 
   "font-size-1": "12px",