diff --git a/packages/frontend-plugin-api/report-alpha.api.md b/packages/frontend-plugin-api/report-alpha.api.md
index 4665d56b49..77a377bb8e 100644
--- a/packages/frontend-plugin-api/report-alpha.api.md
+++ b/packages/frontend-plugin-api/report-alpha.api.md
@@ -3,13 +3,13 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef as ApiRef_2 } from '@backstage/frontend-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { ComponentType } from 'react';
-import { Expand } from '@backstage/types';
-import { JsonObject } from '@backstage/types';
-import { JSX as JSX_2 } from 'react';
+import { ConfigurableExtensionDataRef } from '@backstage/frontend-plugin-api';
+import { ExtensionBlueprint } from '@backstage/frontend-plugin-api';
+import { ExtensionBlueprintParams } from '@backstage/frontend-plugin-api';
+import { ExtensionDataRef } from '@backstage/frontend-plugin-api';
 import { ReactNode } from 'react';
-import type { z } from 'zod';
 
 // @alpha
 export type PluginWrapperApi = {
@@ -21,10 +21,8 @@ export type PluginWrapperApi = {
 };
 
 // @alpha
-export const pluginWrapperApiRef: ApiRef_2<PluginWrapperApi>;
+export const pluginWrapperApiRef: ApiRef<PluginWrapperApi>;
 
-// Warning: (ae-forgotten-export) The symbol "ExtensionBlueprint" needs to be exported by the entry point alpha.d.ts
-//
 // @alpha
 export const PluginWrapperBlueprint: ExtensionBlueprint<{
   kind: 'plugin-wrapper';
@@ -66,11 +64,5 @@ export const PluginWrapperBlueprint: ExtensionBlueprint<{
   };
 }>;
 
-// Warnings were encountered during analysis:
-//
-// src/blueprints/PluginWrapperBlueprint.d.ts:9:5 - (ae-forgotten-export) The symbol "ExtensionBlueprintParams" needs to be exported by the entry point alpha.d.ts
-// src/blueprints/PluginWrapperBlueprint.d.ts:22:5 - (ae-forgotten-export) The symbol "ExtensionDataRef" needs to be exported by the entry point alpha.d.ts
-// src/blueprints/PluginWrapperBlueprint.d.ts:31:9 - (ae-forgotten-export) The symbol "ConfigurableExtensionDataRef" needs to be exported by the entry point alpha.d.ts
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/frontend-plugin-api/report.api.md b/packages/frontend-plugin-api/report.api.md
index 053fd645b7..5b01362d02 100644
--- a/packages/frontend-plugin-api/report.api.md
+++ b/packages/frontend-plugin-api/report.api.md
@@ -3,13 +3,17 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef as ApiRef_2 } from '@backstage/core-plugin-api';
+import { AnyRouteRefParams as AnyRouteRefParams_2 } from '@backstage/frontend-plugin-api';
+import { ApiRef as ApiRef_2 } from '@backstage/frontend-plugin-api';
 import { ComponentType } from 'react';
 import type { Config } from '@backstage/config';
+import { ConfigurableExtensionDataRef as ConfigurableExtensionDataRef_2 } from '@backstage/frontend-plugin-api';
 import { Expand } from '@backstage/types';
 import { ExpandRecursive } from '@backstage/types';
 import { ExtensionBlueprint as ExtensionBlueprint_2 } from '@backstage/frontend-plugin-api';
+import { ExtensionBlueprintParams as ExtensionBlueprintParams_2 } from '@backstage/frontend-plugin-api';
 import { ExtensionDataRef as ExtensionDataRef_2 } from '@backstage/frontend-plugin-api';
+import { ExtensionInput as ExtensionInput_2 } from '@backstage/frontend-plugin-api';
 import { JsonObject } from '@backstage/types';
 import { JsonValue } from '@backstage/types';
 import { JSX as JSX_2 } from 'react';
@@ -17,6 +21,7 @@ import { JSX as JSX_3 } from 'react/jsx-runtime';
 import { Observable } from '@backstage/types';
 import { PropsWithChildren } from 'react';
 import { ReactNode } from 'react';
+import { SwappableComponentRef as SwappableComponentRef_2 } from '@backstage/frontend-plugin-api';
 import type { z } from 'zod';
 
 // @public
@@ -77,12 +82,12 @@ export type AnalyticsImplementation = {
 };
 
 // @public
-export const AnalyticsImplementationBlueprint: ExtensionBlueprint<{
+export const AnalyticsImplementationBlueprint: ExtensionBlueprint_2<{
   kind: 'analytics';
   params: <TDeps extends { [name in string]: unknown }>(
     params: AnalyticsImplementationFactory<TDeps>,
-  ) => ExtensionBlueprintParams<AnalyticsImplementationFactory<{}>>;
-  output: ExtensionDataRef<
+  ) => ExtensionBlueprintParams_2<AnalyticsImplementationFactory<{}>>;
+  output: ExtensionDataRef_2<
     AnalyticsImplementationFactory<{}>,
     'core.analytics.factory',
     {}
@@ -91,7 +96,7 @@ export const AnalyticsImplementationBlueprint: ExtensionBlueprint<{
   config: {};
   configInput: {};
   dataRefs: {
-    factory: ConfigurableExtensionDataRef<
+    factory: ConfigurableExtensionDataRef_2<
       AnalyticsImplementationFactory<{}>,
       'core.analytics.factory',
       {}
@@ -141,7 +146,7 @@ export type AnyRouteRefParams =
   | undefined;
 
 // @public
-export const ApiBlueprint: ExtensionBlueprint<{
+export const ApiBlueprint: ExtensionBlueprint_2<{
   kind: 'api';
   params: <
     TApi,
@@ -149,13 +154,13 @@ export const ApiBlueprint: ExtensionBlueprint<{
     TDeps extends { [name in string]: unknown },
   >(
     params: ApiFactory<TApi, TImpl, TDeps>,
-  ) => ExtensionBlueprintParams<AnyApiFactory>;
-  output: ExtensionDataRef<AnyApiFactory, 'core.api.factory', {}>;
+  ) => ExtensionBlueprintParams_2<AnyApiFactory>;
+  output: ExtensionDataRef_2<AnyApiFactory, 'core.api.factory', {}>;
   inputs: {};
   config: {};
   configInput: {};
   dataRefs: {
-    factory: ConfigurableExtensionDataRef<
+    factory: ConfigurableExtensionDataRef_2<
       AnyApiFactory,
       'core.api.factory',
       {}
@@ -380,16 +385,16 @@ export interface ConfigurableExtensionDataRef<
 
 // @public (undocumented)
 export const coreExtensionData: {
-  title: ConfigurableExtensionDataRef<string, 'core.title', {}>;
-  icon: ConfigurableExtensionDataRef<IconElement, 'core.icon', {}>;
-  reactElement: ConfigurableExtensionDataRef<
+  title: ConfigurableExtensionDataRef_2<string, 'core.title', {}>;
+  icon: ConfigurableExtensionDataRef_2<IconElement, 'core.icon', {}>;
+  reactElement: ConfigurableExtensionDataRef_2<
     JSX_2.Element,
     'core.reactElement',
     {}
   >;
-  routePath: ConfigurableExtensionDataRef<string, 'core.routing.path', {}>;
-  routeRef: ConfigurableExtensionDataRef<
-    RouteRef<AnyRouteRefParams>,
+  routePath: ConfigurableExtensionDataRef_2<string, 'core.routing.path', {}>;
+  routeRef: ConfigurableExtensionDataRef_2<
+    RouteRef<AnyRouteRefParams_2>,
     'core.routing.ref',
     {}
   >;
@@ -901,7 +906,7 @@ export const errorApiRef: ApiRef<ErrorApi>;
 // @public (undocumented)
 export const ErrorDisplay: {
   (props: ErrorDisplayProps): JSX.Element | null;
-  ref: SwappableComponentRef<ErrorDisplayProps, ErrorDisplayProps>;
+  ref: SwappableComponentRef_2<ErrorDisplayProps, ErrorDisplayProps>;
 };
 
 // @public (undocumented)
@@ -948,7 +953,7 @@ export interface ExtensionBlueprint<
   // (undocumented)
   make<
     TName extends string | undefined,
-    TParamsInput extends AnyParamsInput<NonNullable<T['params']>>,
+    TParamsInput extends AnyParamsInput_2<NonNullable<T['params']>>,
     UParentInputs extends ExtensionDataRef,
   >(args: {
     name?: TName;
@@ -1003,7 +1008,7 @@ export interface ExtensionBlueprint<
     };
     factory(
       originalFactory: <
-        TParamsInput extends AnyParamsInput<NonNullable<T['params']>>,
+        TParamsInput extends AnyParamsInput_2<NonNullable<T['params']>>,
       >(
         params: TParamsInput extends ExtensionBlueprintDefineParams
           ? TParamsInput
@@ -1463,14 +1468,14 @@ export const microsoftAuthApiRef: ApiRef<
 >;
 
 // @public
-export const NavItemBlueprint: ExtensionBlueprint<{
+export const NavItemBlueprint: ExtensionBlueprint_2<{
   kind: 'nav-item';
   params: {
     title: string;
     icon: IconComponent;
     routeRef: RouteRef<undefined>;
   };
-  output: ExtensionDataRef<
+  output: ExtensionDataRef_2<
     {
       title: string;
       icon: IconComponent;
@@ -1483,7 +1488,7 @@ export const NavItemBlueprint: ExtensionBlueprint<{
   config: {};
   configInput: {};
   dataRefs: {
-    target: ConfigurableExtensionDataRef<
+    target: ConfigurableExtensionDataRef_2<
       {
         title: string;
         icon: IconComponent;
@@ -1498,7 +1503,7 @@ export const NavItemBlueprint: ExtensionBlueprint<{
 // @public (undocumented)
 export const NotFoundErrorPage: {
   (props: NotFoundErrorPageProps): JSX.Element | null;
-  ref: SwappableComponentRef<NotFoundErrorPageProps, NotFoundErrorPageProps>;
+  ref: SwappableComponentRef_2<NotFoundErrorPageProps, NotFoundErrorPageProps>;
 };
 
 // @public (undocumented)
@@ -1586,7 +1591,7 @@ export interface OverridableExtensionDefinition<
     TExtraInputs extends {
       [inputName in string]: ExtensionInput;
     },
-    TParamsInput extends AnyParamsInput_2<NonNullable<T['params']>>,
+    TParamsInput extends AnyParamsInput<NonNullable<T['params']>>,
     UParentInputs extends ExtensionDataRef,
   >(
     args: Expand<
@@ -1612,7 +1617,7 @@ export interface OverridableExtensionDefinition<
         };
         factory?(
           originalFactory: <
-            TFactoryParamsReturn extends AnyParamsInput_2<
+            TFactoryParamsReturn extends AnyParamsInput<
               NonNullable<T['params']>
             >,
           >(
@@ -1711,7 +1716,7 @@ export interface OverridableFrontendPlugin<
 }
 
 // @public
-export const PageBlueprint: ExtensionBlueprint<{
+export const PageBlueprint: ExtensionBlueprint_2<{
   kind: 'page';
   params: {
     defaultPath?: [Error: `Use the 'path' param instead`];
@@ -1723,23 +1728,23 @@ export const PageBlueprint: ExtensionBlueprint<{
     noHeader?: boolean;
   };
   output:
-    | ExtensionDataRef<string, 'core.routing.path', {}>
-    | ExtensionDataRef<
-        RouteRef<AnyRouteRefParams>,
+    | ExtensionDataRef_2<string, 'core.routing.path', {}>
+    | ExtensionDataRef_2<
+        RouteRef<AnyRouteRefParams_2>,
         'core.routing.ref',
         {
           optional: true;
         }
       >
-    | ExtensionDataRef<JSX_2.Element, 'core.reactElement', {}>
-    | ExtensionDataRef<
+    | ExtensionDataRef_2<JSX_2.Element, 'core.reactElement', {}>
+    | ExtensionDataRef_2<
         string,
         'core.title',
         {
           optional: true;
         }
       >
-    | ExtensionDataRef<
+    | ExtensionDataRef_2<
         IconElement,
         'core.icon',
         {
@@ -1747,24 +1752,24 @@ export const PageBlueprint: ExtensionBlueprint<{
         }
       >;
   inputs: {
-    pages: ExtensionInput<
-      | ConfigurableExtensionDataRef<JSX_2.Element, 'core.reactElement', {}>
-      | ConfigurableExtensionDataRef<string, 'core.routing.path', {}>
-      | ConfigurableExtensionDataRef<
-          RouteRef<AnyRouteRefParams>,
+    pages: ExtensionInput_2<
+      | ConfigurableExtensionDataRef_2<JSX_2.Element, 'core.reactElement', {}>
+      | ConfigurableExtensionDataRef_2<string, 'core.routing.path', {}>
+      | ConfigurableExtensionDataRef_2<
+          RouteRef<AnyRouteRefParams_2>,
           'core.routing.ref',
           {
             optional: true;
           }
         >
-      | ConfigurableExtensionDataRef<
+      | ConfigurableExtensionDataRef_2<
           string,
           'core.title',
           {
             optional: true;
           }
         >
-      | ConfigurableExtensionDataRef<
+      | ConfigurableExtensionDataRef_2<
           IconElement,
           'core.icon',
           {
@@ -1792,7 +1797,7 @@ export const PageBlueprint: ExtensionBlueprint<{
 // @public
 export const PageLayout: {
   (props: PageLayoutProps): JSX.Element | null;
-  ref: SwappableComponentRef<PageLayoutProps, PageLayoutProps>;
+  ref: SwappableComponentRef_2<PageLayoutProps, PageLayoutProps>;
 };
 
 // @public
@@ -1831,14 +1836,14 @@ export type PendingOAuthRequest = {
 };
 
 // @public
-export const PluginHeaderActionBlueprint: ExtensionBlueprint<{
+export const PluginHeaderActionBlueprint: ExtensionBlueprint_2<{
   kind: 'plugin-header-action';
   params: (params: {
     loader: () => Promise<JSX.Element>;
-  }) => ExtensionBlueprintParams<{
+  }) => ExtensionBlueprintParams_2<{
     loader: () => Promise<JSX.Element>;
   }>;
-  output: ExtensionDataRef<JSX_2, 'core.reactElement', {}>;
+  output: ExtensionDataRef_2<JSX_2, 'core.reactElement', {}>;
   inputs: {};
   config: {};
   configInput: {};
@@ -1901,7 +1906,7 @@ export type ProfileInfoApi = {
 // @public (undocumented)
 export const Progress: {
   (props: ProgressProps): JSX.Element | null;
-  ref: SwappableComponentRef<ProgressProps, ProgressProps>;
+  ref: SwappableComponentRef_2<ProgressProps, ProgressProps>;
 };
 
 // @public (undocumented)
@@ -2012,7 +2017,7 @@ export type StorageValueSnapshot<TValue extends JsonValue> =
     };
 
 // @public
-export const SubPageBlueprint: ExtensionBlueprint<{
+export const SubPageBlueprint: ExtensionBlueprint_2<{
   kind: 'sub-page';
   params: {
     path: string;
@@ -2022,17 +2027,17 @@ export const SubPageBlueprint: ExtensionBlueprint<{
     routeRef?: RouteRef;
   };
   output:
-    | ExtensionDataRef<string, 'core.routing.path', {}>
-    | ExtensionDataRef<
-        RouteRef<AnyRouteRefParams>,
+    | ExtensionDataRef_2<string, 'core.routing.path', {}>
+    | ExtensionDataRef_2<
+        RouteRef<AnyRouteRefParams_2>,
         'core.routing.ref',
         {
           optional: true;
         }
       >
-    | ExtensionDataRef<JSX_2, 'core.reactElement', {}>
-    | ExtensionDataRef<string, 'core.title', {}>
-    | ExtensionDataRef<
+    | ExtensionDataRef_2<JSX_2, 'core.reactElement', {}>
+    | ExtensionDataRef_2<string, 'core.title', {}>
+    | ExtensionDataRef_2<
         IconElement,
         'core.icon',
         {