diff --git a/.changeset/brave-lemons-hope.md b/.changeset/brave-lemons-hope.md
index 491322c827..c1e2e3f3bd 100644
--- a/.changeset/brave-lemons-hope.md
+++ b/.changeset/brave-lemons-hope.md
@@ -15,16 +15,16 @@ To this:
 
 ```tsx
 import {
-  ScaffolderCustomFields,
+  ScaffolderFieldExtensions,
   RepoUrlPickerFieldExtension,
   OwnerPickerFieldExtension,
 } from '@backstage/plugin-scaffolder';
 
 <Route path="/create" element={<ScaffolderPage />}>
-  <ScaffolderCustomFields>
+  <ScaffolderFieldExtensions>
     <RepoUrlPickerFieldExtension />
     <OwnerPickerFieldExtension />
-  </ScaffolderCustomFields>
+  </ScaffolderFieldExtensions>
 </Route>;
 ```
 
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index 354c047f91..90d5463c59 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -47,7 +47,7 @@ import {
   scaffolderPlugin,
   OwnerPickerFieldExtension,
   RepoUrlPickerFieldExtension,
-  ScaffolderCustomFields,
+  ScaffolderFieldExtensions,
 } from '@backstage/plugin-scaffolder';
 import { SearchPage, SearchPageNext } from '@backstage/plugin-search';
 import { TechRadarPage } from '@backstage/plugin-tech-radar';
@@ -114,10 +114,10 @@ const routes = (
     <Route path="/catalog-import" element={<CatalogImportPage />} />
     <Route path="/docs" element={<TechdocsPage />} />
     <Route path="/create" element={<ScaffolderPage />}>
-      <ScaffolderCustomFields>
+      <ScaffolderFieldExtensions>
         <RepoUrlPickerFieldExtension />
         <OwnerPickerFieldExtension />
-      </ScaffolderCustomFields>
+      </ScaffolderFieldExtensions>
     </Route>
     <Route path="/explore" element={<ExplorePage />} />
     <Route
diff --git a/packages/create-app/templates/default-app/packages/app/src/App.tsx b/packages/create-app/templates/default-app/packages/app/src/App.tsx
index ebd420f832..0ad09121e8 100644
--- a/packages/create-app/templates/default-app/packages/app/src/App.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/App.tsx
@@ -16,7 +16,7 @@ import {CatalogImportPage, catalogImportPlugin} from '@backstage/plugin-catalog-
 import { 
   OwnerPickerFieldExtension, 
   RepoUrlPickerFieldExtension, 
-  ScaffolderCustomFields, 
+  ScaffolderFieldExtensions, 
   ScaffolderPage, 
   scaffolderPlugin 
 } from '@backstage/plugin-scaffolder';
@@ -58,10 +58,10 @@ const routes = (
     </Route>
     <Route path="/docs" element={<TechdocsPage />} />
     <Route path="/create" element={<ScaffolderPage />}>
-      <ScaffolderCustomFields>
+      <ScaffolderFieldExtensions>
         <RepoUrlPickerFieldExtension />
         <OwnerPickerFieldExtension />
-      </ScaffolderCustomFields>
+      </ScaffolderFieldExtensions>
     </Route>
     <Route path="/api-docs" element={<ApiExplorerPage />} />
     <Route
diff --git a/plugins/scaffolder/src/extensions/index.tsx b/plugins/scaffolder/src/extensions/index.tsx
index d794ac71e4..874c6c3a18 100644
--- a/plugins/scaffolder/src/extensions/index.tsx
+++ b/plugins/scaffolder/src/extensions/index.tsx
@@ -45,5 +45,9 @@ export function createScaffolderFieldExtension<T = any>(
   };
 }
 
-export const ScaffolderCustomFields: React.ComponentType = () => null;
-attachComponentData(ScaffolderCustomFields, FIELD_EXTENSION_WRAPPER_KEY, true);
+export const ScaffolderFieldExtensions: React.ComponentType = () => null;
+attachComponentData(
+  ScaffolderFieldExtensions,
+  FIELD_EXTENSION_WRAPPER_KEY,
+  true,
+);
diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts
index b92fd9d4bc..c22597f373 100644
--- a/plugins/scaffolder/src/index.ts
+++ b/plugins/scaffolder/src/index.ts
@@ -21,6 +21,6 @@ export {
   OwnerPickerFieldExtension,
   RepoUrlPickerFieldExtension,
 } from './plugin';
-export { ScaffolderCustomFields } from './extensions';
+export { ScaffolderFieldExtensions } from './extensions';
 export type { ScaffolderApi } from './api';
 export { ScaffolderClient, scaffolderApiRef } from './api';