diff --git a/packages/astro/client.d.ts b/packages/astro/client.d.ts
index 613823129d62..9eefdf370aa6 100644
--- a/packages/astro/client.d.ts
+++ b/packages/astro/client.d.ts
@@ -54,7 +54,7 @@ declare module 'astro:assets' {
 		inferRemoteSize: typeof import('./dist/assets/utils/index.js').inferRemoteSize;
 		Image: typeof import('./components/Image.astro').default;
 		Picture: typeof import('./components/Picture.astro').default;
-		Fonts: typeof import('./components/Fonts.astro').default;
+		Font: typeof import('./components/Font.astro').default;
 	};
 
 	type ImgAttributes = import('./dist/type-utils.js').WithRequired<
diff --git a/packages/astro/components/Fonts.astro b/packages/astro/components/Font.astro
similarity index 100%
rename from packages/astro/components/Fonts.astro
rename to packages/astro/components/Font.astro
diff --git a/packages/astro/src/assets/fonts/README.md b/packages/astro/src/assets/fonts/README.md
index edf22efe7ca3..bed7e5ef116c 100644
--- a/packages/astro/src/assets/fonts/README.md
+++ b/packages/astro/src/assets/fonts/README.md
@@ -8,4 +8,4 @@ The vite plugin orchestrates the fonts logic:
 - In dev, serves a middleware that dynamically loads and caches fonts data
 - In build, download fonts data (from cache if possible)
 
-The `<Fonts />` component is the only aspect not managed in the vite plugin, since it's exported from `astro:assets`.
\ No newline at end of file
+The `<Font />` component is the only aspect not managed in the vite plugin, since it's exported from `astro:assets`.
\ No newline at end of file
diff --git a/packages/astro/src/assets/fonts/vite-plugin-fonts.ts b/packages/astro/src/assets/fonts/vite-plugin-fonts.ts
index 2750fea5d582..a70e40f85f1e 100644
--- a/packages/astro/src/assets/fonts/vite-plugin-fonts.ts
+++ b/packages/astro/src/assets/fonts/vite-plugin-fonts.ts
@@ -23,8 +23,6 @@ import { AstroError, AstroErrorData } from '../../core/errors/index.js';
 import type { ModuleLoader } from '../../core/module-loader/loader.js';
 import { createViteLoader } from '../../core/module-loader/vite.js';
 
-// TODO: maybe rename Fonts component to Font
-
 interface Options {
 	settings: AstroSettings;
 	sync: boolean;
@@ -32,7 +30,7 @@ interface Options {
 }
 
 /**
- * Preload data is used for links generation inside the <Fonts /> component
+ * Preload data is used for links generation inside the <Font /> component
  */
 type PreloadData = Array<{
 	/**
diff --git a/packages/astro/src/assets/vite-plugin-assets.ts b/packages/astro/src/assets/vite-plugin-assets.ts
index f0dfce05ebd6..b35faff0c814 100644
--- a/packages/astro/src/assets/vite-plugin-assets.ts
+++ b/packages/astro/src/assets/vite-plugin-assets.ts
@@ -130,7 +130,7 @@ export default function assets({ settings, sync, logger }: Options): vite.Plugin
 					import { getImage as getImageInternal } from "astro/assets";
 					export { default as Image } from "astro/components/${imageComponentPrefix}Image.astro";
 					export { default as Picture } from "astro/components/${imageComponentPrefix}Picture.astro";
-					export { default as Fonts } from "astro/components/Fonts.astro";
+					export { default as Font } from "astro/components/Font.astro";
 					export { inferRemoteSize } from "astro/assets/utils/inferRemoteSize.js";
 
 					export const imageConfig = ${JSON.stringify({ ...settings.config.image, experimentalResponsiveImages: settings.config.experimental.responsiveImages })};
diff --git a/packages/astro/test/fixtures/fonts/src/pages/index.astro b/packages/astro/test/fixtures/fonts/src/pages/index.astro
index 386253db1d28..c0c339c7ca8a 100644
--- a/packages/astro/test/fixtures/fonts/src/pages/index.astro
+++ b/packages/astro/test/fixtures/fonts/src/pages/index.astro
@@ -1,5 +1,5 @@
 ---
-import { Fonts } from 'astro:assets'
+import { Font } from 'astro:assets'
 ---
 
-<Fonts family='Roboto' />
\ No newline at end of file
+<Font family='Roboto' />
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/fonts/src/pages/preload.astro b/packages/astro/test/fixtures/fonts/src/pages/preload.astro
index dab372339dce..7997722db086 100644
--- a/packages/astro/test/fixtures/fonts/src/pages/preload.astro
+++ b/packages/astro/test/fixtures/fonts/src/pages/preload.astro
@@ -1,5 +1,5 @@
 ---
-import { Fonts } from 'astro:assets'
+import { Font } from 'astro:assets'
 ---
 
-<Fonts family='Roboto' preload />
\ No newline at end of file
+<Font family='Roboto' preload />
\ No newline at end of file
diff --git a/packages/astro/test/fonts.test.js b/packages/astro/test/fonts.test.js
index fb7194634178..6c5dd463ba9a 100644
--- a/packages/astro/test/fonts.test.js
+++ b/packages/astro/test/fonts.test.js
@@ -9,7 +9,7 @@ describe('astro:fonts', () => {
 	/** @type {import('./test-utils.js').DevServer} */
 	let devServer;
 
-	describe('<Fonts /> component', () => {
+	describe('<Font /> component', () => {
 		// TODO: remove once fonts are stabilized
 		describe('Fonts are not enabled', () => {
 			before(async () => {