diff --git a/.changeset/friendly-days-march.md b/.changeset/friendly-days-march.md
index d3170cee4e..a190c50a43 100644
--- a/.changeset/friendly-days-march.md
+++ b/.changeset/friendly-days-march.md
@@ -4,4 +4,4 @@
 
 Added `createFrontendModule` as a replacement for `createExtensionOverrides`, which is now deprecated.
 
-Deprecated the `BackstagePlugin` type in favor of `FrontendPlugin`.
+Deprecated the `BackstagePlugin` and `FrontendFeature` type in favor of `FrontendPlugin` and `FrontendFeature` from `@backstage/frontend-app-api` respectively.
diff --git a/packages/core-compat-api/api-report.md b/packages/core-compat-api/api-report.md
index 9e72d6178c..e61ee451d9 100644
--- a/packages/core-compat-api/api-report.md
+++ b/packages/core-compat-api/api-report.md
@@ -12,9 +12,10 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { BackstagePlugin as BackstagePlugin_2 } from '@backstage/frontend-plugin-api';
 import { ComponentType } from 'react';
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
+import { ExtensionOverrides } from '@backstage/frontend-plugin-api';
 import { ExternalRouteRef } from '@backstage/core-plugin-api';
 import { ExternalRouteRef as ExternalRouteRef_2 } from '@backstage/frontend-plugin-api';
-import { FrontendFeature } from '@backstage/frontend-plugin-api';
+import { FrontendPlugin } from '@backstage/frontend-plugin-api';
 import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
@@ -28,7 +29,7 @@ export function compatWrapper(element: ReactNode): React_2.JSX.Element;
 // @public (undocumented)
 export function convertLegacyApp(
   rootElement: React_2.JSX.Element,
-): FrontendFeature[];
+): (FrontendPlugin | ExtensionOverrides)[];
 
 // @public (undocumented)
 export function convertLegacyPageExtension(
diff --git a/packages/core-compat-api/src/collectLegacyRoutes.tsx b/packages/core-compat-api/src/collectLegacyRoutes.tsx
index 4c0e7efceb..197c245278 100644
--- a/packages/core-compat-api/src/collectLegacyRoutes.tsx
+++ b/packages/core-compat-api/src/collectLegacyRoutes.tsx
@@ -268,7 +268,10 @@ export function collectLegacyRoutes(
       extensions: [
         ...extensions,
         ...Array.from(plugin.getApis()).map(factory =>
-          ApiBlueprint.make({ namespace: factory.api.id, params: { factory } }),
+          ApiBlueprint.make({
+            namespace: factory.api.id,
+            params: { factory },
+          }),
         ),
       ],
       routes: convertLegacyRouteRefs(plugin.routes ?? {}),
diff --git a/packages/core-compat-api/src/convertLegacyApp.ts b/packages/core-compat-api/src/convertLegacyApp.ts
index ffeab3bdc6..2729664941 100644
--- a/packages/core-compat-api/src/convertLegacyApp.ts
+++ b/packages/core-compat-api/src/convertLegacyApp.ts
@@ -22,7 +22,8 @@ import React, {
   isValidElement,
 } from 'react';
 import {
-  FrontendFeature,
+  ExtensionOverrides,
+  FrontendPlugin,
   coreExtensionData,
   createExtension,
   createExtensionInput,
@@ -60,7 +61,7 @@ function selectChildren(
 /** @public */
 export function convertLegacyApp(
   rootElement: React.JSX.Element,
-): FrontendFeature[] {
+): (FrontendPlugin | ExtensionOverrides)[] {
   if (getComponentData(rootElement, 'core.type') === 'FlatRoutes') {
     return collectLegacyRoutes(rootElement);
   }
diff --git a/packages/frontend-app-api/api-report.md b/packages/frontend-app-api/api-report.md
index c837ff09b7..e8fa7572b7 100644
--- a/packages/frontend-app-api/api-report.md
+++ b/packages/frontend-app-api/api-report.md
@@ -5,7 +5,8 @@
 ```ts
 import { ConfigApi } from '@backstage/core-plugin-api';
 import { ExternalRouteRef } from '@backstage/frontend-plugin-api';
-import { FrontendFeature } from '@backstage/frontend-plugin-api';
+import { FrontendModule } from '@backstage/frontend-plugin-api';
+import { FrontendPlugin } from '@backstage/frontend-plugin-api';
 import { JSX as JSX_2 } from 'react';
 import { ReactNode } from 'react';
 import { RouteRef } from '@backstage/frontend-plugin-api';
@@ -52,4 +53,15 @@ export function createSpecializedApp(options?: {
 }): {
   createRoot(): JSX_2.Element;
 };
+
+// @public (undocumented)
+export type FrontendFeature =
+  | FrontendPlugin
+  | FrontendModule
+  | {
+      $$type: '@backstage/ExtensionOverrides';
+    }
+  | {
+      $$type: '@backstage/BackstagePlugin';
+    };
 ```
diff --git a/packages/frontend-app-api/src/routing/collectRouteIds.ts b/packages/frontend-app-api/src/routing/collectRouteIds.ts
index 6e9e1a6ebb..d89834c02e 100644
--- a/packages/frontend-app-api/src/routing/collectRouteIds.ts
+++ b/packages/frontend-app-api/src/routing/collectRouteIds.ts
@@ -18,7 +18,6 @@ import {
   RouteRef,
   SubRouteRef,
   ExternalRouteRef,
-  FrontendFeature,
 } from '@backstage/frontend-plugin-api';
 // eslint-disable-next-line @backstage/no-relative-monorepo-imports
 import {
@@ -31,6 +30,7 @@ import { toInternalExternalRouteRef } from '../../../frontend-plugin-api/src/rou
 import { toInternalSubRouteRef } from '../../../frontend-plugin-api/src/routing/SubRouteRef';
 // eslint-disable-next-line @backstage/no-relative-monorepo-imports
 import { isInternalFrontendPlugin } from '../../../frontend-plugin-api/src/wiring/createFrontendPlugin';
+import { FrontendFeature } from '../wiring';
 
 /** @internal */
 export interface RouteRefsById {
diff --git a/packages/frontend-app-api/src/tree/resolveAppNodeSpecs.ts b/packages/frontend-app-api/src/tree/resolveAppNodeSpecs.ts
index f210bd1186..1ccc7bae7f 100644
--- a/packages/frontend-app-api/src/tree/resolveAppNodeSpecs.ts
+++ b/packages/frontend-app-api/src/tree/resolveAppNodeSpecs.ts
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  Extension,
-  ExtensionOverrides,
-  FrontendFeature,
-} from '@backstage/frontend-plugin-api';
+import { Extension, ExtensionOverrides } from '@backstage/frontend-plugin-api';
 // eslint-disable-next-line @backstage/no-relative-monorepo-imports
 import { toInternalExtensionOverrides } from '../../../frontend-plugin-api/src/wiring/createExtensionOverrides';
 import { ExtensionParameters } from './readAppExtensionsConfig';
@@ -30,6 +26,7 @@ import {
 } from '../../../frontend-plugin-api/src/wiring/createFrontendPlugin';
 // eslint-disable-next-line @backstage/no-relative-monorepo-imports
 import { toInternalExtension } from '../../../frontend-plugin-api/src/wiring/resolveExtensionDefinition';
+import { FrontendFeature } from '../wiring';
 
 /** @internal */
 export function resolveAppNodeSpecs(options: {
diff --git a/packages/frontend-app-api/src/wiring/createApp.tsx b/packages/frontend-app-api/src/wiring/createApp.tsx
index 40535ae09c..591dee9a00 100644
--- a/packages/frontend-app-api/src/wiring/createApp.tsx
+++ b/packages/frontend-app-api/src/wiring/createApp.tsx
@@ -22,7 +22,6 @@ import {
   AppTreeApi,
   appTreeApiRef,
   coreExtensionData,
-  FrontendFeature,
   RouteRef,
   ExternalRouteRef,
   SubRouteRef,
@@ -85,6 +84,7 @@ import { ApiRegistry } from '../../../core-app-api/src/apis/system/ApiRegistry';
 import { AppIdentityProxy } from '../../../core-app-api/src/apis/implementations/IdentityApi/AppIdentityProxy';
 import { BackstageRouteObject } from '../routing/types';
 import appPlugin from '@backstage/plugin-app';
+import { FrontendFeature } from './types';
 
 function deduplicateFeatures(
   allFeatures: FrontendFeature[],
diff --git a/packages/frontend-app-api/src/wiring/discovery.ts b/packages/frontend-app-api/src/wiring/discovery.ts
index f80bf47aa8..6f9d2e2d16 100644
--- a/packages/frontend-app-api/src/wiring/discovery.ts
+++ b/packages/frontend-app-api/src/wiring/discovery.ts
@@ -15,7 +15,7 @@
  */
 
 import { Config, ConfigReader } from '@backstage/config';
-import { FrontendFeature } from '@backstage/frontend-plugin-api';
+import { FrontendFeature } from '@backstage/frontend-app-api';
 
 interface DiscoveryGlobal {
   modules: Array<{ name: string; export?: string; default: unknown }>;
diff --git a/packages/frontend-app-api/src/wiring/index.ts b/packages/frontend-app-api/src/wiring/index.ts
index d1498514c8..bcf623d740 100644
--- a/packages/frontend-app-api/src/wiring/index.ts
+++ b/packages/frontend-app-api/src/wiring/index.ts
@@ -19,3 +19,4 @@ export {
   createSpecializedApp,
   type CreateAppFeatureLoader,
 } from './createApp';
+export * from './types';
diff --git a/packages/frontend-app-api/src/wiring/types.ts b/packages/frontend-app-api/src/wiring/types.ts
new file mode 100644
index 0000000000..fb887534e3
--- /dev/null
+++ b/packages/frontend-app-api/src/wiring/types.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { FrontendModule, FrontendPlugin } from '@backstage/frontend-plugin-api';
+
+/** @public  */
+export type FrontendFeature =
+  | FrontendPlugin
+  | FrontendModule
+  // TODO(blam): This is just forwards backwards compatibility, remove after v1.31.0
+  | { $$type: '@backstage/ExtensionOverrides' }
+  | { $$type: '@backstage/BackstagePlugin' };
diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 6eb5a87109..b42efddffa 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -749,7 +749,20 @@ export function createExternalRouteRef<
 export function createFrontendModule<
   TId extends string,
   TExtensions extends readonly ExtensionDefinition[] = [],
->(options: FrontendModuleOptions<TId, TExtensions>): FrontendModule;
+>(options: CreateFrontendModuleOptions<TId, TExtensions>): FrontendModule;
+
+// @public (undocumented)
+export interface CreateFrontendModuleOptions<
+  TPluginId extends string,
+  TExtensions extends readonly ExtensionDefinition[],
+> {
+  // (undocumented)
+  extensions?: TExtensions;
+  // (undocumented)
+  featureFlags?: FeatureFlagConfig[];
+  // (undocumented)
+  pluginId: TPluginId;
+}
 
 // @public (undocumented)
 export function createFrontendPlugin<
@@ -1232,11 +1245,8 @@ export { FetchApi };
 
 export { fetchApiRef };
 
-// @public (undocumented)
-export type FrontendFeature =
-  | FrontendPlugin
-  | FrontendModule
-  | ExtensionOverrides;
+// @public @deprecated (undocumented)
+export type FrontendFeature = FrontendPlugin | ExtensionOverrides;
 
 // @public (undocumented)
 export interface FrontendModule {
@@ -1246,19 +1256,6 @@ export interface FrontendModule {
   readonly pluginId: string;
 }
 
-// @public (undocumented)
-export interface FrontendModuleOptions<
-  TPluginId extends string,
-  TExtensions extends readonly ExtensionDefinition[],
-> {
-  // (undocumented)
-  extensions?: TExtensions;
-  // (undocumented)
-  featureFlags?: FeatureFlagConfig[];
-  // (undocumented)
-  pluginId: TPluginId;
-}
-
 // @public (undocumented)
 export interface FrontendPlugin<
   TRoutes extends AnyRoutes = AnyRoutes,
diff --git a/packages/frontend-plugin-api/src/wiring/createFrontendModule.ts b/packages/frontend-plugin-api/src/wiring/createFrontendModule.ts
index 15e195f56d..aacc34ccf0 100644
--- a/packages/frontend-plugin-api/src/wiring/createFrontendModule.ts
+++ b/packages/frontend-plugin-api/src/wiring/createFrontendModule.ts
@@ -26,7 +26,7 @@ import {
 import { FeatureFlagConfig } from './types';
 
 /** @public */
-export interface FrontendModuleOptions<
+export interface CreateFrontendModuleOptions<
   TPluginId extends string,
   TExtensions extends readonly ExtensionDefinition[],
 > {
@@ -52,7 +52,7 @@ export interface InternalFrontendModule extends FrontendModule {
 export function createFrontendModule<
   TId extends string,
   TExtensions extends readonly ExtensionDefinition[] = [],
->(options: FrontendModuleOptions<TId, TExtensions>): FrontendModule {
+>(options: CreateFrontendModuleOptions<TId, TExtensions>): FrontendModule {
   const { pluginId } = options;
 
   const extensions = new Array<Extension<any>>();
diff --git a/packages/frontend-plugin-api/src/wiring/createFrontendPlugin.ts b/packages/frontend-plugin-api/src/wiring/createFrontendPlugin.ts
index 185eabb985..03c843543d 100644
--- a/packages/frontend-plugin-api/src/wiring/createFrontendPlugin.ts
+++ b/packages/frontend-plugin-api/src/wiring/createFrontendPlugin.ts
@@ -51,7 +51,6 @@ export type BackstagePlugin<
   TExternalRoutes extends AnyExternalRoutes = AnyExternalRoutes,
   TExtensionMap extends { [id in string]: ExtensionDefinition } = {},
 > = FrontendPlugin<TRoutes, TExternalRoutes, TExtensionMap>;
-
 /** @public */
 export interface PluginOptions<
   TId extends string,
diff --git a/packages/frontend-plugin-api/src/wiring/index.ts b/packages/frontend-plugin-api/src/wiring/index.ts
index 5cbeeb3c24..f8ad362bac 100644
--- a/packages/frontend-plugin-api/src/wiring/index.ts
+++ b/packages/frontend-plugin-api/src/wiring/index.ts
@@ -46,7 +46,7 @@ export {
 export {
   createFrontendModule,
   type FrontendModule,
-  type FrontendModuleOptions,
+  type CreateFrontendModuleOptions,
 } from './createFrontendModule';
 export {
   createExtensionOverrides,
diff --git a/packages/frontend-plugin-api/src/wiring/types.ts b/packages/frontend-plugin-api/src/wiring/types.ts
index 04400e4211..b52bbf446c 100644
--- a/packages/frontend-plugin-api/src/wiring/types.ts
+++ b/packages/frontend-plugin-api/src/wiring/types.ts
@@ -16,7 +16,6 @@
 
 import { ExternalRouteRef, RouteRef, SubRouteRef } from '../routing';
 import { ExtensionDefinition } from './createExtension';
-import { FrontendModule } from './createFrontendModule';
 import { FrontendPlugin } from './createFrontendPlugin';
 
 /**
@@ -47,8 +46,8 @@ export interface ExtensionOverrides {
   readonly $$type: '@backstage/ExtensionOverrides';
 }
 
-/** @public */
-export type FrontendFeature =
-  | FrontendPlugin
-  | FrontendModule
-  | ExtensionOverrides;
+/**
+ * @public
+ * @deprecated import from {@link @backstage/frontend-app-api#FrontendFeature} instead
+ */
+export type FrontendFeature = FrontendPlugin | ExtensionOverrides;
diff --git a/packages/frontend-test-utils/api-report.md b/packages/frontend-test-utils/api-report.md
index ba4b8aae2b..10b84b0981 100644
--- a/packages/frontend-test-utils/api-report.md
+++ b/packages/frontend-test-utils/api-report.md
@@ -14,7 +14,7 @@ import { ErrorWithContext } from '@backstage/test-utils';
 import { ExtensionDataRef } from '@backstage/frontend-plugin-api';
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { ExtensionDefinitionParameters } from '@backstage/frontend-plugin-api';
-import { FrontendFeature } from '@backstage/frontend-plugin-api';
+import { FrontendFeature } from '@backstage/frontend-app-api';
 import { JsonObject } from '@backstage/types';
 import { MockConfigApi } from '@backstage/test-utils';
 import { MockErrorApi } from '@backstage/test-utils';
diff --git a/packages/frontend-test-utils/src/app/renderInTestApp.tsx b/packages/frontend-test-utils/src/app/renderInTestApp.tsx
index 7923050050..fae67a260c 100644
--- a/packages/frontend-test-utils/src/app/renderInTestApp.tsx
+++ b/packages/frontend-test-utils/src/app/renderInTestApp.tsx
@@ -16,7 +16,10 @@
 
 import React from 'react';
 import { Link, MemoryRouter } from 'react-router-dom';
-import { createSpecializedApp } from '@backstage/frontend-app-api';
+import {
+  createSpecializedApp,
+  FrontendFeature,
+} from '@backstage/frontend-app-api';
 import { RenderResult, render } from '@testing-library/react';
 import { ConfigReader } from '@backstage/config';
 import { JsonObject } from '@backstage/types';
@@ -30,7 +33,6 @@ import {
   IconComponent,
   RouterBlueprint,
   NavItemBlueprint,
-  FrontendFeature,
 } from '@backstage/frontend-plugin-api';
 import appPlugin from '@backstage/plugin-app';