diff --git a/packages/core-app-api/report.api.md b/packages/core-app-api/report.api.md
index 0cecc22f4a..e039394946 100644
--- a/packages/core-app-api/report.api.md
+++ b/packages/core-app-api/report.api.md
@@ -20,6 +20,7 @@ import { AuthProviderInfo } from '@backstage/core-plugin-api';
 import { AuthRequestOptions } from '@backstage/core-plugin-api';
 import { BackstageIdentityApi } from '@backstage/core-plugin-api';
 import { BackstageIdentityResponse } from '@backstage/core-plugin-api';
+import { BackstageIdentityResponse as BackstageIdentityResponse_2 } from '@backstage/frontend-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { bitbucketAuthApiRef } from '@backstage/core-plugin-api';
 import { bitbucketServerAuthApiRef } from '@backstage/core-plugin-api';
@@ -55,6 +56,7 @@ import { OpenIdConnectApi } from '@backstage/core-plugin-api';
 import { openshiftAuthApiRef } from '@backstage/core-plugin-api';
 import { PendingOAuthRequest } from '@backstage/core-plugin-api';
 import { ProfileInfo } from '@backstage/core-plugin-api';
+import { ProfileInfo as ProfileInfo_2 } from '@backstage/frontend-plugin-api';
 import { ProfileInfoApi } from '@backstage/core-plugin-api';
 import { PropsWithChildren } from 'react';
 import PropTypes from 'prop-types';
@@ -62,6 +64,7 @@ import { ReactNode } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { SessionApi } from '@backstage/core-plugin-api';
 import { SessionState } from '@backstage/core-plugin-api';
+import { SessionState as SessionState_2 } from '@backstage/frontend-plugin-api';
 import { StorageApi } from '@backstage/core-plugin-api';
 import { StorageValueSnapshot } from '@backstage/core-plugin-api';
 import { SubRouteRef } from '@backstage/core-plugin-api';
@@ -511,13 +514,13 @@ export class MicrosoftAuth {
   // (undocumented)
   getBackstageIdentity(
     options?: AuthRequestOptions,
-  ): Promise<BackstageIdentityResponse | undefined>;
+  ): Promise<BackstageIdentityResponse_2 | undefined>;
   // (undocumented)
   getIdToken(options?: AuthRequestOptions): Promise<string>;
   // (undocumented)
-  getProfile(options?: AuthRequestOptions): Promise<ProfileInfo | undefined>;
+  getProfile(options?: AuthRequestOptions): Promise<ProfileInfo_2 | undefined>;
   // (undocumented)
-  sessionState$(): Observable<SessionState>;
+  sessionState$(): Observable<SessionState_2>;
   // (undocumented)
   signIn(): Promise<void>;
   // (undocumented)
diff --git a/packages/core-components/report-alpha.api.md b/packages/core-components/report-alpha.api.md
index 7608699487..785b97ce28 100644
--- a/packages/core-components/report-alpha.api.md
+++ b/packages/core-components/report-alpha.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { TranslationRef } from '@backstage/frontend-plugin-api';
 
 // @alpha (undocumented)
 export const coreComponentsTranslationRef: TranslationRef<
diff --git a/packages/frontend-plugin-api/report.api.md b/packages/frontend-plugin-api/report.api.md
index d95634988c..025efabb85 100644
--- a/packages/frontend-plugin-api/report.api.md
+++ b/packages/frontend-plugin-api/report.api.md
@@ -4,12 +4,14 @@
 
 ```ts
 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 { 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 { IconComponent as IconComponent_2 } from '@backstage/frontend-plugin-api';
 import { JsonObject } from '@backstage/types';
@@ -20,6 +22,7 @@ import { Observable } from '@backstage/types';
 import { PropsWithChildren } from 'react';
 import { ReactNode } from 'react';
 import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api';
+import { SwappableComponentRef as SwappableComponentRef_2 } from '@backstage/frontend-plugin-api';
 import { z } from 'zod';
 
 // @public
@@ -80,12 +83,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',
     {}
@@ -94,7 +97,7 @@ export const AnalyticsImplementationBlueprint: ExtensionBlueprint<{
   config: {};
   configInput: {};
   dataRefs: {
-    factory: ConfigurableExtensionDataRef<
+    factory: ConfigurableExtensionDataRef_2<
       AnalyticsImplementationFactory<{}>,
       'core.analytics.factory',
       {}
@@ -147,7 +150,7 @@ export type AnyRouteRefParams =
   | undefined;
 
 // @public
-export const ApiBlueprint: ExtensionBlueprint<{
+export const ApiBlueprint: ExtensionBlueprint_2<{
   kind: 'api';
   params: <
     TApi,
@@ -155,13 +158,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',
       {}
@@ -256,12 +259,12 @@ export interface AppNodeSpec {
 }
 
 // @public
-export const AppRootElementBlueprint: ExtensionBlueprint<{
+export const AppRootElementBlueprint: ExtensionBlueprint_2<{
   kind: 'app-root-element';
   params: {
     element: JSX.Element;
   };
-  output: ExtensionDataRef<JSX_3, 'core.reactElement', {}>;
+  output: ExtensionDataRef_2<JSX_3, 'core.reactElement', {}>;
   inputs: {};
   config: {};
   configInput: {};
@@ -269,13 +272,13 @@ export const AppRootElementBlueprint: ExtensionBlueprint<{
 }>;
 
 // @public
-export const AppRootWrapperBlueprint: ExtensionBlueprint<{
+export const AppRootWrapperBlueprint: ExtensionBlueprint_2<{
   kind: 'app-root-wrapper';
   params: {
     Component?: [error: 'Use the `component` parameter instead'];
     component: (props: { children: ReactNode }) => JSX.Element | null;
   };
-  output: ExtensionDataRef<
+  output: ExtensionDataRef_2<
     (props: { children: ReactNode }) => JSX.Element | null,
     'app.root.wrapper',
     {}
@@ -284,7 +287,7 @@ export const AppRootWrapperBlueprint: ExtensionBlueprint<{
   config: {};
   configInput: {};
   dataRefs: {
-    component: ConfigurableExtensionDataRef<
+    component: ConfigurableExtensionDataRef_2<
       (props: { children: ReactNode }) => JSX.Element | null,
       'app.root.wrapper',
       {}
@@ -330,7 +333,7 @@ export interface AppTreeApi {
 }
 
 // @public
-export const appTreeApiRef: ApiRef<AppTreeApi>;
+export const appTreeApiRef: ApiRef_2<AppTreeApi>;
 
 // @public
 export const atlassianAuthApiRef: ApiRef<
@@ -410,14 +413,14 @@ export interface ConfigurableExtensionDataRef<
 
 // @public (undocumented)
 export const coreExtensionData: {
-  title: ConfigurableExtensionDataRef<string, 'core.title', {}>;
-  reactElement: ConfigurableExtensionDataRef<
+  title: ConfigurableExtensionDataRef_2<string, 'core.title', {}>;
+  reactElement: ConfigurableExtensionDataRef_2<
     JSX_3.Element,
     'core.reactElement',
     {}
   >;
-  routePath: ConfigurableExtensionDataRef<string, 'core.routing.path', {}>;
-  routeRef: ConfigurableExtensionDataRef<
+  routePath: ConfigurableExtensionDataRef_2<string, 'core.routing.path', {}>;
+  routeRef: ConfigurableExtensionDataRef_2<
     RouteRef<AnyRouteRefParams_2>,
     'core.routing.ref',
     {}
@@ -891,7 +894,7 @@ export interface DialogApiDialog<TResult = void> {
 }
 
 // @public
-export const dialogApiRef: ApiRef<DialogApi>;
+export const dialogApiRef: ApiRef_2<DialogApi>;
 
 // @public
 export type DiscoveryApi = {
@@ -928,7 +931,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)
@@ -975,7 +978,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;
@@ -1030,7 +1033,7 @@ export interface ExtensionBlueprint<
     };
     factory(
       originalFactory: <
-        TParamsInput extends AnyParamsInput<NonNullable<T['params']>>,
+        TParamsInput extends AnyParamsInput_2<NonNullable<T['params']>>,
       >(
         params: TParamsInput extends ExtensionBlueprintDefineParams
           ? TParamsInput
@@ -1449,12 +1452,12 @@ export const googleAuthApiRef: ApiRef<
 >;
 
 // @public (undocumented)
-export const IconBundleBlueprint: ExtensionBlueprint<{
+export const IconBundleBlueprint: ExtensionBlueprint_2<{
   kind: 'icon-bundle';
   params: {
     icons: { [key in string]: IconComponent };
   };
-  output: ExtensionDataRef<
+  output: ExtensionDataRef_2<
     {
       [x: string]: IconComponent;
     },
@@ -1465,7 +1468,7 @@ export const IconBundleBlueprint: ExtensionBlueprint<{
   config: {};
   configInput: {};
   dataRefs: {
-    icons: ConfigurableExtensionDataRef<
+    icons: ConfigurableExtensionDataRef_2<
       {
         [x: string]: IconComponent;
       },
@@ -1489,7 +1492,7 @@ export interface IconsApi {
 }
 
 // @public
-export const iconsApiRef: ApiRef<IconsApi>;
+export const iconsApiRef: ApiRef_2<IconsApi>;
 
 // @public
 export type IdentityApi = {
@@ -1553,14 +1556,14 @@ export interface NavContentComponentProps {
 }
 
 // @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;
@@ -1573,7 +1576,7 @@ export const NavItemBlueprint: ExtensionBlueprint<{
   config: {};
   configInput: {};
   dataRefs: {
-    target: ConfigurableExtensionDataRef<
+    target: ConfigurableExtensionDataRef_2<
       {
         title: string;
         icon: IconComponent;
@@ -1588,7 +1591,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)
@@ -1676,7 +1679,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<
@@ -1702,7 +1705,7 @@ export interface OverridableExtensionDefinition<
         };
         factory?(
           originalFactory: <
-            TFactoryParamsReturn extends AnyParamsInput_2<
+            TFactoryParamsReturn extends AnyParamsInput<
               NonNullable<T['params']>
             >,
           >(
@@ -1799,7 +1802,7 @@ export interface OverridableFrontendPlugin<
 }
 
 // @public
-export const PageBlueprint: ExtensionBlueprint<{
+export const PageBlueprint: ExtensionBlueprint_2<{
   kind: 'page';
   params: {
     defaultPath?: [Error: `Use the 'path' param instead`];
@@ -1808,10 +1811,10 @@ export const PageBlueprint: ExtensionBlueprint<{
     routeRef?: RouteRef;
   };
   output:
-    | ExtensionDataRef<string, 'core.routing.path', {}>
-    | ExtensionDataRef<JSX_3, 'core.reactElement', {}>
-    | ExtensionDataRef<
-        RouteRef<AnyRouteRefParams>,
+    | ExtensionDataRef_2<string, 'core.routing.path', {}>
+    | ExtensionDataRef_2<JSX_3, 'core.reactElement', {}>
+    | ExtensionDataRef_2<
+        RouteRef<AnyRouteRefParams_2>,
         'core.routing.ref',
         {
           optional: true;
@@ -1880,7 +1883,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)
@@ -1915,13 +1918,13 @@ export type RouteFunc<TParams extends AnyRouteRefParams> = (
 ) => string;
 
 // @public (undocumented)
-export const RouterBlueprint: ExtensionBlueprint<{
+export const RouterBlueprint: ExtensionBlueprint_2<{
   kind: 'app-router-component';
   params: {
     Component?: [error: 'Use the `component` parameter instead'];
     component: (props: { children: ReactNode }) => JSX.Element | null;
   };
-  output: ExtensionDataRef<
+  output: ExtensionDataRef_2<
     (props: { children: ReactNode }) => JSX.Element | null,
     'app.router.wrapper',
     {}
@@ -1930,7 +1933,7 @@ export const RouterBlueprint: ExtensionBlueprint<{
   config: {};
   configInput: {};
   dataRefs: {
-    component: ConfigurableExtensionDataRef<
+    component: ConfigurableExtensionDataRef_2<
       (props: { children: ReactNode }) => JSX.Element | null,
       'app.router.wrapper',
       {}
@@ -1963,7 +1966,7 @@ export interface RouteResolutionApi {
 }
 
 // @public
-export const routeResolutionApiRef: ApiRef<RouteResolutionApi>;
+export const routeResolutionApiRef: ApiRef_2<RouteResolutionApi>;
 
 // @public
 export type SessionApi = {
@@ -1990,12 +1993,12 @@ export namespace SessionState {
 }
 
 // @public
-export const SignInPageBlueprint: ExtensionBlueprint<{
+export const SignInPageBlueprint: ExtensionBlueprint_2<{
   kind: 'sign-in-page';
   params: {
     loader: () => Promise<ComponentType<SignInPageProps>>;
   };
-  output: ExtensionDataRef<
+  output: ExtensionDataRef_2<
     ComponentType<SignInPageProps>,
     'core.sign-in-page.component',
     {}
@@ -2004,7 +2007,7 @@ export const SignInPageBlueprint: ExtensionBlueprint<{
   config: {};
   configInput: {};
   dataRefs: {
-    component: ConfigurableExtensionDataRef<
+    component: ConfigurableExtensionDataRef_2<
       ComponentType<SignInPageProps>,
       'core.sign-in-page.component',
       {}
@@ -2058,7 +2061,7 @@ export interface SubRouteRef<
 }
 
 // @public
-export const SwappableComponentBlueprint: ExtensionBlueprint<{
+export const SwappableComponentBlueprint: ExtensionBlueprint_2<{
   kind: 'component';
   params: <Ref extends SwappableComponentRef<any>>(params: {
     component: Ref extends SwappableComponentRef<
@@ -2074,7 +2077,7 @@ export const SwappableComponentBlueprint: ExtensionBlueprint<{
           | (() => (props: IInnerComponentProps) => JSX.Element | null)
           | (() => Promise<(props: IInnerComponentProps) => JSX.Element | null>)
       : never;
-  }) => ExtensionBlueprintParams<{
+  }) => ExtensionBlueprintParams_2<{
     component: Ref extends SwappableComponentRef<
       any,
       infer IExternalComponentProps
@@ -2089,7 +2092,7 @@ export const SwappableComponentBlueprint: ExtensionBlueprint<{
           | (() => Promise<(props: IInnerComponentProps) => JSX.Element | null>)
       : never;
   }>;
-  output: ExtensionDataRef<
+  output: ExtensionDataRef_2<
     {
       ref: SwappableComponentRef;
       loader:
@@ -2103,7 +2106,7 @@ export const SwappableComponentBlueprint: ExtensionBlueprint<{
   config: {};
   configInput: {};
   dataRefs: {
-    component: ConfigurableExtensionDataRef<
+    component: ConfigurableExtensionDataRef_2<
       {
         ref: SwappableComponentRef;
         loader:
@@ -2139,20 +2142,20 @@ export interface SwappableComponentsApi {
 }
 
 // @public
-export const swappableComponentsApiRef: ApiRef<SwappableComponentsApi>;
+export const swappableComponentsApiRef: ApiRef_2<SwappableComponentsApi>;
 
 // @public
-export const ThemeBlueprint: ExtensionBlueprint<{
+export const ThemeBlueprint: ExtensionBlueprint_2<{
   kind: 'theme';
   params: {
     theme: AppTheme;
   };
-  output: ExtensionDataRef<AppTheme, 'core.theme.theme', {}>;
+  output: ExtensionDataRef_2<AppTheme, 'core.theme.theme', {}>;
   inputs: {};
   config: {};
   configInput: {};
   dataRefs: {
-    theme: ConfigurableExtensionDataRef<AppTheme, 'core.theme.theme', {}>;
+    theme: ConfigurableExtensionDataRef_2<AppTheme, 'core.theme.theme', {}>;
   };
 }>;
 
@@ -2178,12 +2181,12 @@ export type TranslationApi = {
 export const translationApiRef: ApiRef<TranslationApi>;
 
 // @public
-export const TranslationBlueprint: ExtensionBlueprint<{
+export const TranslationBlueprint: ExtensionBlueprint_2<{
   kind: 'translation';
   params: {
     resource: TranslationResource | TranslationMessages;
   };
-  output: ExtensionDataRef<
+  output: ExtensionDataRef_2<
     | TranslationResource<string>
     | TranslationMessages<
         string,
@@ -2199,7 +2202,7 @@ export const TranslationBlueprint: ExtensionBlueprint<{
   config: {};
   configInput: {};
   dataRefs: {
-    translation: ConfigurableExtensionDataRef<
+    translation: ConfigurableExtensionDataRef_2<
       | TranslationResource<string>
       | TranslationMessages<
           string,
diff --git a/packages/integration-react/report.api.md b/packages/integration-react/report.api.md
index 78da2eb5fa..0974c4821a 100644
--- a/packages/integration-react/report.api.md
+++ b/packages/integration-react/report.api.md
@@ -3,17 +3,17 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiFactory } from '@backstage/core-plugin-api';
+import { ApiFactory } from '@backstage/frontend-plugin-api';
 import { ApiRef } from '@backstage/core-plugin-api';
 import { AuthRequestOptions } from '@backstage/core-plugin-api';
-import { BackstageIdentityApi } from '@backstage/core-plugin-api';
+import { BackstageIdentityApi } from '@backstage/frontend-plugin-api';
 import { Config } from '@backstage/config';
 import { JSX as JSX_2 } from 'react/jsx-runtime';
 import { OAuthApi } from '@backstage/core-plugin-api';
-import { OpenIdConnectApi } from '@backstage/core-plugin-api';
-import { ProfileInfoApi } from '@backstage/core-plugin-api';
+import { OpenIdConnectApi } from '@backstage/frontend-plugin-api';
+import { ProfileInfoApi } from '@backstage/frontend-plugin-api';
 import { ScmIntegrationRegistry } from '@backstage/integration';
-import { SessionApi } from '@backstage/core-plugin-api';
+import { SessionApi } from '@backstage/frontend-plugin-api';
 
 // @public
 export class ScmAuth implements ScmAuthApi {
diff --git a/plugins/api-docs/report.api.md b/plugins/api-docs/report.api.md
index fb37b2b33b..5c84544319 100644
--- a/plugins/api-docs/report.api.md
+++ b/plugins/api-docs/report.api.md
@@ -4,7 +4,7 @@
 
 ```ts
 import { ApiEntity } from '@backstage/catalog-model';
-import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CatalogTableRow } from '@backstage/plugin-catalog';
 import { ComponentEntity } from '@backstage/catalog-model';
diff --git a/plugins/catalog-graph/report.api.md b/plugins/catalog-graph/report.api.md
index d9342dbf36..8d3b8f2cc8 100644
--- a/plugins/catalog-graph/report.api.md
+++ b/plugins/catalog-graph/report.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CompoundEntityRef } from '@backstage/catalog-model';
 import { DependencyGraphTypes } from '@backstage/core-components';
diff --git a/plugins/catalog-import/report-alpha.api.md b/plugins/catalog-import/report-alpha.api.md
index a718145b24..935c3711ab 100644
--- a/plugins/catalog-import/report-alpha.api.md
+++ b/plugins/catalog-import/report-alpha.api.md
@@ -3,9 +3,9 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { AnyApiFactory } from '@backstage/core-plugin-api';
+import { AnyApiFactory } from '@backstage/frontend-plugin-api';
 import { AnyRouteRefParams } from '@backstage/frontend-plugin-api';
-import { ApiFactory } from '@backstage/core-plugin-api';
+import { ApiFactory } from '@backstage/frontend-plugin-api';
 import { ExtensionBlueprintParams } from '@backstage/frontend-plugin-api';
 import { ExtensionDataRef } from '@backstage/frontend-plugin-api';
 import { JSX as JSX_2 } from 'react';
@@ -13,7 +13,7 @@ import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api';
-import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { TranslationRef } from '@backstage/frontend-plugin-api';
 
 // @alpha (undocumented)
 export const catalogImportTranslationRef: TranslationRef<
diff --git a/plugins/catalog-import/report.api.md b/plugins/catalog-import/report.api.md
index ed7d2f3347..238231e498 100644
--- a/plugins/catalog-import/report.api.md
+++ b/plugins/catalog-import/report.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
 import { catalogImportTranslationRef } from '@backstage/plugin-catalog-import/alpha';
diff --git a/plugins/catalog-react/report-alpha.api.md b/plugins/catalog-react/report-alpha.api.md
index 166aa7aaaa..3f2ed575b4 100644
--- a/plugins/catalog-react/report-alpha.api.md
+++ b/plugins/catalog-react/report-alpha.api.md
@@ -16,7 +16,7 @@ import { JSX as JSX_2 } from 'react';
 import { ReactNode } from 'react';
 import { ResourcePermission } from '@backstage/plugin-permission-common';
 import { RouteRef } from '@backstage/frontend-plugin-api';
-import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { TranslationRef } from '@backstage/frontend-plugin-api';
 
 // @alpha
 export const CatalogFilterBlueprint: ExtensionBlueprint<{
diff --git a/plugins/catalog-react/report.api.md b/plugins/catalog-react/report.api.md
index d013199a00..8916fc98f9 100644
--- a/plugins/catalog-react/report.api.md
+++ b/plugins/catalog-react/report.api.md
@@ -3,7 +3,8 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
+import { ApiRef as ApiRef_2 } from '@backstage/core-plugin-api';
 import { AutocompleteProps } from '@material-ui/lab/Autocomplete';
 import { CATALOG_FILTER_EXISTS } from '@backstage/catalog-client';
 import { CatalogApi } from '@backstage/catalog-client';
@@ -475,7 +476,7 @@ export interface EntityPresentationApi {
 }
 
 // @public
-export const entityPresentationApiRef: ApiRef<EntityPresentationApi>;
+export const entityPresentationApiRef: ApiRef_2<EntityPresentationApi>;
 
 // @public (undocumented)
 export const EntityProcessingStatusPicker: () => JSX_2.Element;
@@ -774,7 +775,7 @@ export interface StarredEntitiesApi {
 }
 
 // @public
-export const starredEntitiesApiRef: ApiRef<StarredEntitiesApi>;
+export const starredEntitiesApiRef: ApiRef_2<StarredEntitiesApi>;
 
 // @public (undocumented)
 export const UnregisterEntityDialog: (
diff --git a/plugins/catalog-unprocessed-entities/report.api.md b/plugins/catalog-unprocessed-entities/report.api.md
index 28b55b9a6d..deeafb8a7c 100644
--- a/plugins/catalog-unprocessed-entities/report.api.md
+++ b/plugins/catalog-unprocessed-entities/report.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CatalogUnprocessedEntitiesApi as CatalogUnprocessedEntitiesApi_2 } from '@backstage/plugin-catalog-unprocessed-entities-common';
 import { CatalogUnprocessedEntitiesApiResponse as CatalogUnprocessedEntitiesApiResponse_2 } from '@backstage/plugin-catalog-unprocessed-entities-common';
diff --git a/plugins/catalog/report-alpha.api.md b/plugins/catalog/report-alpha.api.md
index e40444bd07..dff2128ef6 100644
--- a/plugins/catalog/report-alpha.api.md
+++ b/plugins/catalog/report-alpha.api.md
@@ -27,7 +27,7 @@ import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api';
 import { SearchResultItemExtensionComponent } from '@backstage/plugin-search-react/alpha';
 import { SearchResultItemExtensionPredicate } from '@backstage/plugin-search-react/alpha';
 import { SearchResultListItemBlueprintParams } from '@backstage/plugin-search-react/alpha';
-import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { TranslationRef } from '@backstage/frontend-plugin-api';
 
 // @alpha (undocumented)
 export const catalogTranslationRef: TranslationRef<
diff --git a/plugins/config-schema/report.api.md b/plugins/config-schema/report.api.md
index c78e56aa0e..66c856f4d8 100644
--- a/plugins/config-schema/report.api.md
+++ b/plugins/config-schema/report.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { JSX as JSX_2 } from 'react/jsx-runtime';
 import { Observable } from '@backstage/types';
diff --git a/plugins/home/report.api.md b/plugins/home/report.api.md
index 7036e9d6d2..7b15ecd8a7 100644
--- a/plugins/home/report.api.md
+++ b/plugins/home/report.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CardConfig as CardConfig_2 } from '@backstage/plugin-home-react';
 import { CardExtensionProps as CardExtensionProps_2 } from '@backstage/plugin-home-react';
diff --git a/plugins/kubernetes-cluster/report-alpha.api.md b/plugins/kubernetes-cluster/report-alpha.api.md
index 13314d6c83..2ce9c33c47 100644
--- a/plugins/kubernetes-cluster/report-alpha.api.md
+++ b/plugins/kubernetes-cluster/report-alpha.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { TranslationRef } from '@backstage/frontend-plugin-api';
 
 // @alpha (undocumented)
 export const kubernetesClusterTranslationRef: TranslationRef<
diff --git a/plugins/kubernetes-react/report-alpha.api.md b/plugins/kubernetes-react/report-alpha.api.md
index 453a7a9b1b..1c8746eb8f 100644
--- a/plugins/kubernetes-react/report-alpha.api.md
+++ b/plugins/kubernetes-react/report-alpha.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { TranslationRef } from '@backstage/frontend-plugin-api';
 
 // @alpha (undocumented)
 export const kubernetesReactTranslationRef: TranslationRef<
diff --git a/plugins/kubernetes-react/report.api.md b/plugins/kubernetes-react/report.api.md
index 4bf48ecd92..497c8673c2 100644
--- a/plugins/kubernetes-react/report.api.md
+++ b/plugins/kubernetes-react/report.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { AsyncState } from 'react-use/esm/useAsyncFn';
 import { ClientContainerStatus } from '@backstage/plugin-kubernetes-common';
 import { ClientPodStatus } from '@backstage/plugin-kubernetes-common';
diff --git a/plugins/kubernetes/report-alpha.api.md b/plugins/kubernetes/report-alpha.api.md
index 16604bc769..9b847b862a 100644
--- a/plugins/kubernetes/report-alpha.api.md
+++ b/plugins/kubernetes/report-alpha.api.md
@@ -16,7 +16,7 @@ import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api';
-import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { TranslationRef } from '@backstage/frontend-plugin-api';
 
 // @public (undocumented)
 const _default: OverridableFrontendPlugin<
diff --git a/plugins/notifications/report.api.md b/plugins/notifications/report.api.md
index a9aeb64cda..f42814f983 100644
--- a/plugins/notifications/report.api.md
+++ b/plugins/notifications/report.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { FetchApi } from '@backstage/core-plugin-api';
diff --git a/plugins/scaffolder-react/report-alpha.api.md b/plugins/scaffolder-react/report-alpha.api.md
index 7497902e5b..2839851521 100644
--- a/plugins/scaffolder-react/report-alpha.api.md
+++ b/plugins/scaffolder-react/report-alpha.api.md
@@ -42,7 +42,7 @@ import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
 import { TemplateGroupFilter } from '@backstage/plugin-scaffolder-react';
 import { TemplateParameterSchema } from '@backstage/plugin-scaffolder-react';
 import { TemplatePresentationV1beta3 } from '@backstage/plugin-scaffolder-common';
-import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { TranslationRef } from '@backstage/frontend-plugin-api';
 import { UiSchema } from '@rjsf/utils';
 import { WidgetProps } from '@rjsf/utils';
 import { z } from 'zod';
diff --git a/plugins/scaffolder/report-alpha.api.md b/plugins/scaffolder/report-alpha.api.md
index df46f9feb6..7c0247cae9 100644
--- a/plugins/scaffolder/report-alpha.api.md
+++ b/plugins/scaffolder/report-alpha.api.md
@@ -35,7 +35,7 @@ import { ScaffolderFormFieldsApi } from '@backstage/plugin-scaffolder-react/alph
 import { SubRouteRef } from '@backstage/core-plugin-api';
 import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
 import { TemplateGroupFilter } from '@backstage/plugin-scaffolder-react';
-import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { TranslationRef } from '@backstage/frontend-plugin-api';
 
 // @alpha (undocumented)
 const _default: OverridableFrontendPlugin<
diff --git a/plugins/search-backend-module-elasticsearch/report.api.md b/plugins/search-backend-module-elasticsearch/report.api.md
index c2fb23efd6..a4b4c7e356 100644
--- a/plugins/search-backend-module-elasticsearch/report.api.md
+++ b/plugins/search-backend-module-elasticsearch/report.api.md
@@ -18,7 +18,7 @@ import { LoggerService } from '@backstage/backend-plugin-api';
 import { Readable } from 'stream';
 import { SearchEngine } from '@backstage/plugin-search-backend-node';
 import { SearchQuery } from '@backstage/plugin-search-common';
-import { TransportRequestPromise } from '@opensearch-project/opensearch/lib/Transport';
+import { TransportRequestPromise } from '@opensearch-project/opensearch/lib/Transport.js';
 import { TransportRequestPromise as TransportRequestPromise_2 } from '@elastic/elasticsearch/lib/Transport';
 
 // @public
diff --git a/plugins/search-react/report-alpha.api.md b/plugins/search-react/report-alpha.api.md
index 3ddcde9076..2f7b32ab16 100644
--- a/plugins/search-react/report-alpha.api.md
+++ b/plugins/search-react/report-alpha.api.md
@@ -10,7 +10,7 @@ import { JSX as JSX_2 } from 'react';
 import { ListItemProps } from '@material-ui/core/ListItem';
 import { SearchDocument } from '@backstage/plugin-search-common';
 import { SearchResult } from '@backstage/plugin-search-common';
-import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { TranslationRef } from '@backstage/frontend-plugin-api';
 
 // @alpha (undocumented)
 export type BaseSearchResultListItemProps<T = {}> = T & {
diff --git a/plugins/search-react/report.api.md b/plugins/search-react/report.api.md
index 96b45776bc..d4b7592682 100644
--- a/plugins/search-react/report.api.md
+++ b/plugins/search-react/report.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { AsyncState } from 'react-use/esm/useAsync';
 import { AutocompleteProps } from '@material-ui/lab/Autocomplete';
 import { Dispatch } from 'react';
diff --git a/plugins/search/report-alpha.api.md b/plugins/search/report-alpha.api.md
index 742bf1bf3b..4f6fa8be78 100644
--- a/plugins/search/report-alpha.api.md
+++ b/plugins/search/report-alpha.api.md
@@ -3,14 +3,14 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { AnyApiFactory } from '@backstage/core-plugin-api';
+import { AnyApiFactory } from '@backstage/frontend-plugin-api';
 import { AnyRouteRefParams } from '@backstage/frontend-plugin-api';
-import { ApiFactory } from '@backstage/core-plugin-api';
+import { ApiFactory } from '@backstage/frontend-plugin-api';
 import { ConfigurableExtensionDataRef } from '@backstage/frontend-plugin-api';
 import { ExtensionBlueprintParams } from '@backstage/frontend-plugin-api';
 import { ExtensionDataRef } from '@backstage/frontend-plugin-api';
 import { ExtensionInput } from '@backstage/frontend-plugin-api';
-import { IconComponent } from '@backstage/core-plugin-api';
+import { IconComponent } from '@backstage/frontend-plugin-api';
 import { JSX as JSX_2 } from 'react';
 import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api';
@@ -19,7 +19,7 @@ import { RouteRef as RouteRef_2 } from '@backstage/core-plugin-api';
 import { SearchFilterExtensionComponent } from '@backstage/plugin-search-react/alpha';
 import { SearchResultItemExtensionComponent } from '@backstage/plugin-search-react/alpha';
 import { SearchResultItemExtensionPredicate } from '@backstage/plugin-search-react/alpha';
-import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { TranslationRef } from '@backstage/frontend-plugin-api';
 
 // @alpha (undocumented)
 const _default: OverridableFrontendPlugin<
diff --git a/plugins/signals-react/report.api.md b/plugins/signals-react/report.api.md
index 87d856288b..23a81af4fc 100644
--- a/plugins/signals-react/report.api.md
+++ b/plugins/signals-react/report.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { JsonObject } from '@backstage/types';
 
 // @public (undocumented)
diff --git a/plugins/techdocs-react/report.api.md b/plugins/techdocs-react/report.api.md
index 62ac6375fa..eb6d0dccb3 100644
--- a/plugins/techdocs-react/report.api.md
+++ b/plugins/techdocs-react/report.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { AsyncState } from 'react-use/esm/useAsync';
 import { ComponentType } from 'react';
 import { CompoundEntityRef } from '@backstage/catalog-model';
diff --git a/plugins/techdocs/report.api.md b/plugins/techdocs/report.api.md
index 2369466674..e7e9e4b916 100644
--- a/plugins/techdocs/report.api.md
+++ b/plugins/techdocs/report.api.md
@@ -3,7 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/frontend-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { CompoundEntityRef } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
diff --git a/plugins/user-settings/report-alpha.api.md b/plugins/user-settings/report-alpha.api.md
index 5d28bb85aa..73ef5cfa3d 100644
--- a/plugins/user-settings/report-alpha.api.md
+++ b/plugins/user-settings/report-alpha.api.md
@@ -13,7 +13,7 @@ import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/frontend-plugin-api';
 import { RouteRef as RouteRef_2 } from '@backstage/core-plugin-api';
-import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { TranslationRef } from '@backstage/frontend-plugin-api';
 
 // @alpha (undocumented)
 const _default: OverridableFrontendPlugin<
diff --git a/plugins/user-settings/report.api.md b/plugins/user-settings/report.api.md
index c99765bc67..77670bb357 100644
--- a/plugins/user-settings/report.api.md
+++ b/plugins/user-settings/report.api.md
@@ -5,7 +5,7 @@
 ```ts
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
-import { BackstageUserIdentity } from '@backstage/core-plugin-api';
+import { BackstageUserIdentity } from '@backstage/frontend-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { ElementType } from 'react';
 import { ErrorApi } from '@backstage/core-plugin-api';