diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 71f800dff8..7973ae6111 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -14,9 +14,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/packages/backend-test-utils/package.json b/packages/backend-test-utils/package.json
index 7e14963aab..7bcb680dfe 100644
--- a/packages/backend-test-utils/package.json
+++ b/packages/backend-test-utils/package.json
@@ -13,9 +13,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "package.json": [
         "package.json"
       ]
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 2d569053b1..b391ad79e4 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/packages/cli/src/commands/migrate/packageExports.ts b/packages/cli/src/commands/migrate/packageExports.ts
index 51dc5c38bd..ff01f939f9 100644
--- a/packages/cli/src/commands/migrate/packageExports.ts
+++ b/packages/cli/src/commands/migrate/packageExports.ts
@@ -59,7 +59,11 @@ export async function command() {
 
       const typeEntries: Record<string, [string]> = {};
       for (const [path, value] of Object.entries(exp)) {
-        const newPath = path === '.' ? '*' : trimRelative(path);
+        // Main entry point does not need to be listed
+        if (path === '.') {
+          continue;
+        }
+        const newPath = trimRelative(path);
 
         if (typeof value === 'string') {
           typeEntries[newPath] = [trimRelative(value)];
diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json
index 781ebe37e1..d34d13dbe1 100644
--- a/packages/core-plugin-api/package.json
+++ b/packages/core-plugin-api/package.json
@@ -12,9 +12,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index b278b00c14..192d58fd14 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -12,9 +12,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
index 78070cbf14..ae2c61311c 100644
--- a/plugins/app-backend/package.json
+++ b/plugins/app-backend/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/catalog-backend-module-aws/package.json b/plugins/catalog-backend-module-aws/package.json
index 0273326e36..61cf55d546 100644
--- a/plugins/catalog-backend-module-aws/package.json
+++ b/plugins/catalog-backend-module-aws/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/catalog-backend-module-azure/package.json b/plugins/catalog-backend-module-azure/package.json
index dd89aec185..ecaf9fb9cc 100644
--- a/plugins/catalog-backend-module-azure/package.json
+++ b/plugins/catalog-backend-module-azure/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/package.json b/plugins/catalog-backend-module-bitbucket-cloud/package.json
index 8fbff7d79b..5d6c80a0cb 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/package.json
+++ b/plugins/catalog-backend-module-bitbucket-cloud/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/catalog-backend-module-bitbucket-server/package.json b/plugins/catalog-backend-module-bitbucket-server/package.json
index 1a82807288..811dfe9f10 100644
--- a/plugins/catalog-backend-module-bitbucket-server/package.json
+++ b/plugins/catalog-backend-module-bitbucket-server/package.json
@@ -14,9 +14,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/catalog-backend-module-gerrit/package.json b/plugins/catalog-backend-module-gerrit/package.json
index 33fcc4abcb..95978c2502 100644
--- a/plugins/catalog-backend-module-gerrit/package.json
+++ b/plugins/catalog-backend-module-gerrit/package.json
@@ -14,9 +14,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/catalog-backend-module-github/api-report.md b/plugins/catalog-backend-module-github/api-report.md
index 0ad377952a..e2b73d267b 100644
--- a/plugins/catalog-backend-module-github/api-report.md
+++ b/plugins/catalog-backend-module-github/api-report.md
@@ -7,7 +7,7 @@ import { AnalyzeOptions } from '@backstage/plugin-catalog-backend';
 import { CatalogProcessor } from '@backstage/plugin-catalog-backend';
 import { CatalogProcessorEmit } from '@backstage/plugin-catalog-backend';
 import { Config } from '@backstage/config';
-import { Entity } from '@backstage/catalog-model/*';
+import { Entity } from '@backstage/catalog-model';
 import { EntityProvider } from '@backstage/plugin-catalog-backend';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-backend';
 import { EventParams } from '@backstage/plugin-events-node';
diff --git a/plugins/catalog-backend-module-github/package.json b/plugins/catalog-backend-module-github/package.json
index a5899ced33..ccf1be3b2a 100644
--- a/plugins/catalog-backend-module-github/package.json
+++ b/plugins/catalog-backend-module-github/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/catalog-backend-module-gitlab/package.json b/plugins/catalog-backend-module-gitlab/package.json
index 8d1ec70123..cbd07944d9 100644
--- a/plugins/catalog-backend-module-gitlab/package.json
+++ b/plugins/catalog-backend-module-gitlab/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/catalog-backend-module-incremental-ingestion/package.json b/plugins/catalog-backend-module-incremental-ingestion/package.json
index 9479fd88e0..5f49cb8905 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/package.json
+++ b/plugins/catalog-backend-module-incremental-ingestion/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/catalog-backend-module-msgraph/package.json b/plugins/catalog-backend-module-msgraph/package.json
index 99e5b0da35..1cc3855d77 100644
--- a/plugins/catalog-backend-module-msgraph/package.json
+++ b/plugins/catalog-backend-module-msgraph/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/catalog-backend/alpha-api-report.md b/plugins/catalog-backend/alpha-api-report.md
index 46be9a27df..df2fa3d2e9 100644
--- a/plugins/catalog-backend/alpha-api-report.md
+++ b/plugins/catalog-backend/alpha-api-report.md
@@ -6,8 +6,7 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 import { ConditionalPolicyDecision } from '@backstage/plugin-permission-common';
 import { Conditions } from '@backstage/plugin-permission-node';
-import { Entity } from '@backstage/catalog-model/*';
-import { Entity as Entity_2 } from '@backstage/catalog-model';
+import { Entity } from '@backstage/catalog-model';
 import { PermissionCondition } from '@backstage/plugin-permission-common';
 import { PermissionCriteria } from '@backstage/plugin-permission-common';
 import { PermissionRule } from '@backstage/plugin-permission-node';
@@ -72,7 +71,7 @@ export const catalogConditions: Conditions<{
 // @alpha
 export type CatalogPermissionRule<
   TParams extends PermissionRuleParams = PermissionRuleParams,
-> = PermissionRule<Entity_2, EntitiesSearchFilter, 'catalog-entity', TParams>;
+> = PermissionRule<Entity, EntitiesSearchFilter, 'catalog-entity', TParams>;
 
 // @alpha
 export const catalogPlugin: () => BackendFeature;
@@ -89,13 +88,8 @@ export const createCatalogConditionalDecision: (
 export const createCatalogPermissionRule: <
   TParams extends PermissionRuleParams = undefined,
 >(
-  rule: PermissionRule<
-    Entity_2,
-    EntitiesSearchFilter,
-    'catalog-entity',
-    TParams
-  >,
-) => PermissionRule<Entity_2, EntitiesSearchFilter, 'catalog-entity', TParams>;
+  rule: PermissionRule<Entity, EntitiesSearchFilter, 'catalog-entity', TParams>,
+) => PermissionRule<Entity, EntitiesSearchFilter, 'catalog-entity', TParams>;
 
 // @public
 export type EntitiesSearchFilter = {
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 47e678c012..17e9c9aa7c 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/catalog-common/package.json b/plugins/catalog-common/package.json
index 2c74307f1c..27b31d15ea 100644
--- a/plugins/catalog-common/package.json
+++ b/plugins/catalog-common/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/catalog-node/package.json b/plugins/catalog-node/package.json
index 7d186ad52c..6c888f342e 100644
--- a/plugins/catalog-node/package.json
+++ b/plugins/catalog-node/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index 955e63b425..e8f796a725 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/events-backend-module-aws-sqs/package.json b/plugins/events-backend-module-aws-sqs/package.json
index d68c77bb41..2e45015bce 100644
--- a/plugins/events-backend-module-aws-sqs/package.json
+++ b/plugins/events-backend-module-aws-sqs/package.json
@@ -14,9 +14,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/events-backend-module-azure/package.json b/plugins/events-backend-module-azure/package.json
index a1314b2db7..a3acd37263 100644
--- a/plugins/events-backend-module-azure/package.json
+++ b/plugins/events-backend-module-azure/package.json
@@ -14,9 +14,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/events-backend-module-bitbucket-cloud/package.json b/plugins/events-backend-module-bitbucket-cloud/package.json
index db85c32fad..ae006b1bce 100644
--- a/plugins/events-backend-module-bitbucket-cloud/package.json
+++ b/plugins/events-backend-module-bitbucket-cloud/package.json
@@ -14,9 +14,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/events-backend-module-gerrit/package.json b/plugins/events-backend-module-gerrit/package.json
index 35a82b4fc5..a7aadf06dc 100644
--- a/plugins/events-backend-module-gerrit/package.json
+++ b/plugins/events-backend-module-gerrit/package.json
@@ -14,9 +14,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/events-backend-module-github/package.json b/plugins/events-backend-module-github/package.json
index 7a7df507b7..966b7b3592 100644
--- a/plugins/events-backend-module-github/package.json
+++ b/plugins/events-backend-module-github/package.json
@@ -14,9 +14,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/events-backend-module-gitlab/package.json b/plugins/events-backend-module-gitlab/package.json
index f95995473c..4e5e53771d 100644
--- a/plugins/events-backend-module-gitlab/package.json
+++ b/plugins/events-backend-module-gitlab/package.json
@@ -14,9 +14,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/events-backend/package.json b/plugins/events-backend/package.json
index a0d4f9bf12..d779869e14 100644
--- a/plugins/events-backend/package.json
+++ b/plugins/events-backend/package.json
@@ -14,9 +14,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/events-node/package.json b/plugins/events-node/package.json
index ef0cce170e..368e567930 100644
--- a/plugins/events-node/package.json
+++ b/plugins/events-node/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 9ee87669ff..121a5c8ed0 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json
index 6907f8080e..14d25136e0 100644
--- a/plugins/scaffolder-react/package.json
+++ b/plugins/scaffolder-react/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index df1670e718..43cc657a03 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -6,7 +6,7 @@
 /// <reference types="react" />
 
 import { ApiHolder } from '@backstage/core-plugin-api';
-import { ApiRef } from '@backstage/core-plugin-api/*';
+import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { ComponentType } from 'react';
 import { createScaffolderFieldExtension as createScaffolderFieldExtension_2 } from '@backstage/plugin-scaffolder-react';
@@ -32,7 +32,6 @@ import { PathParams } from '@backstage/core-plugin-api';
 import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
-import { RouteRef as RouteRef_2 } from '@backstage/core-plugin-api/*';
 import { ScaffolderApi as ScaffolderApi_2 } from '@backstage/plugin-scaffolder-react';
 import { ScaffolderDryRunOptions as ScaffolderDryRunOptions_2 } from '@backstage/plugin-scaffolder-react';
 import { ScaffolderDryRunResponse as ScaffolderDryRunResponse_2 } from '@backstage/plugin-scaffolder-react';
@@ -316,7 +315,7 @@ export type ReviewStepProps = {
 };
 
 // @public @deprecated (undocumented)
-export const rootRouteRef: RouteRef_2<undefined>;
+export const rootRouteRef: RouteRef<undefined>;
 
 // @public
 export type RouterProps = {
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 46e8f436fd..15893b7ccb 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -15,9 +15,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "alpha": [
         "src/alpha.ts"
       ],
diff --git a/plugins/sonarqube-react/package.json b/plugins/sonarqube-react/package.json
index 2f31d37007..80177d9e24 100644
--- a/plugins/sonarqube-react/package.json
+++ b/plugins/sonarqube-react/package.json
@@ -13,9 +13,6 @@
   },
   "typesVersions": {
     "*": {
-      "*": [
-        "src/index.ts"
-      ],
       "package.json": [
         "package.json"
       ]
diff --git a/plugins/sonarqube/api-report.md b/plugins/sonarqube/api-report.md
index cdbe839543..baf796b34c 100644
--- a/plugins/sonarqube/api-report.md
+++ b/plugins/sonarqube/api-report.md
@@ -7,7 +7,7 @@
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
-import { Entity } from '@backstage/catalog-model/*';
+import { Entity } from '@backstage/catalog-model';
 import { FindingSummary } from '@backstage/plugin-sonarqube-react/alpha';
 import { IdentityApi } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';