diff --git a/.changeset/add-cli-plugin-role.md b/.changeset/add-cli-plugin-role.md
index b31c631762..1f09a08ade 100644
--- a/.changeset/add-cli-plugin-role.md
+++ b/.changeset/add-cli-plugin-role.md
@@ -2,4 +2,4 @@
 '@backstage/cli-node': patch
 ---
 
-Added a new `cli-plugin` package role for packages that provide CLI plugin extensions.
+Added a new `cli-module` package role for packages that provide CLI plugin extensions.
diff --git a/.changeset/cli-node-add-cli-plugin.md b/.changeset/cli-node-add-cli-plugin.md
index b5a26979a9..2a6a5f20bc 100644
--- a/.changeset/cli-node-add-cli-plugin.md
+++ b/.changeset/cli-node-add-cli-plugin.md
@@ -2,4 +2,4 @@
 '@backstage/cli-node': minor
 ---
 
-Added `createCliPlugin` API and related types for building Backstage CLI plugins.
+Added `createCliModule` API and related types for building Backstage CLI plugins.
diff --git a/.changeset/cli-support-cli-plugin-role.md b/.changeset/cli-support-cli-plugin-role.md
index d56c30db78..b336f7f551 100644
--- a/.changeset/cli-support-cli-plugin-role.md
+++ b/.changeset/cli-support-cli-plugin-role.md
@@ -2,4 +2,4 @@
 '@backstage/cli': patch
 ---
 
-Added support for the new `cli-plugin` package role in the build system, ESLint configuration, Jest configuration, and maintenance commands.
+Added support for the new `cli-module` package role in the build system, ESLint configuration, Jest configuration, and maintenance commands.
diff --git a/.changeset/cli-use-cli-plugin-api.md b/.changeset/cli-use-cli-plugin-api.md
index cf7f7f12b5..c155483c10 100644
--- a/.changeset/cli-use-cli-plugin-api.md
+++ b/.changeset/cli-use-cli-plugin-api.md
@@ -2,4 +2,4 @@
 '@backstage/cli': patch
 ---
 
-Migrated CLI plugin modules to use `createCliPlugin` from `@backstage/cli-node`.
+Migrated CLI plugin modules to use `createCliModule` from `@backstage/cli-node`.
diff --git a/packages/cli-internal/src/InternalCliPlugin.ts b/packages/cli-internal/src/InternalCliModule.ts
similarity index 83%
rename from packages/cli-internal/src/InternalCliPlugin.ts
rename to packages/cli-internal/src/InternalCliModule.ts
index 4491e5d7c1..213e309371 100644
--- a/packages/cli-internal/src/InternalCliPlugin.ts
+++ b/packages/cli-internal/src/InternalCliModule.ts
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-import { CliCommand, CliPlugin } from '@backstage/cli-node';
+import { CliCommand, CliModule } from '@backstage/cli-node';
 import { OpaqueType } from '@internal/opaque';
 
-export const OpaqueCliPlugin = OpaqueType.create<{
-  public: CliPlugin;
+export const OpaqueCliModule = OpaqueType.create<{
+  public: CliModule;
   versions: {
     readonly version: 'v1';
     readonly packageName: string;
     readonly commands: Promise<ReadonlyArray<CliCommand>>;
   };
 }>({
-  type: '@backstage/CliPlugin',
+  type: '@backstage/CliModule',
   versions: ['v1'],
 });
diff --git a/packages/cli-internal/src/index.ts b/packages/cli-internal/src/index.ts
index 578333ee96..68b5affe64 100644
--- a/packages/cli-internal/src/index.ts
+++ b/packages/cli-internal/src/index.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export { OpaqueCliPlugin } from './InternalCliPlugin';
+export { OpaqueCliModule } from './InternalCliModule';
 export type {
   CommandNode,
   CommandTreeNode,
diff --git a/packages/cli-node/report.api.md b/packages/cli-node/report.api.md
index d2d4db856d..b979fff0b0 100644
--- a/packages/cli-node/report.api.md
+++ b/packages/cli-node/report.api.md
@@ -111,9 +111,9 @@ export interface CliCommandContext {
 }
 
 // @public
-export interface CliPlugin {
+export interface CliModule {
   // (undocumented)
-  readonly $$type: '@backstage/CliPlugin';
+  readonly $$type: '@backstage/CliModule';
 }
 
 // @public
@@ -124,14 +124,14 @@ export type ConcurrentTasksOptions<TItem> = {
 };
 
 // @public
-export function createCliPlugin(options: {
+export function createCliModule(options: {
   packageJson: {
     name: string;
   };
   init: (registry: {
     addCommand: (command: CliCommand) => void;
   }) => Promise<void>;
-}): CliPlugin;
+}): CliModule;
 
 // @public
 export class GitUtils {
@@ -227,7 +227,7 @@ export type PackageRole =
   | 'frontend'
   | 'backend'
   | 'cli'
-  | 'cli-plugin'
+  | 'cli-module'
   | 'web-library'
   | 'node-library'
   | 'common-library'
diff --git a/packages/cli-node/src/cli-plugin/createCliPlugin.ts b/packages/cli-node/src/cli-module/createCliModule.ts
similarity index 86%
rename from packages/cli-node/src/cli-plugin/createCliPlugin.ts
rename to packages/cli-node/src/cli-module/createCliModule.ts
index dcb79e0b3f..89ed21876f 100644
--- a/packages/cli-node/src/cli-plugin/createCliPlugin.ts
+++ b/packages/cli-node/src/cli-module/createCliModule.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { OpaqueCliPlugin } from '@internal/cli';
-import { CliCommand, CliPlugin } from './types';
+import { OpaqueCliModule } from '@internal/cli';
+import { CliCommand, CliModule } from './types';
 
 /**
  * Creates a new CLI plugin that provides commands to the Backstage CLI.
@@ -26,10 +26,10 @@ import { CliCommand, CliPlugin } from './types';
  *
  * @example
  * ```
- * import { createCliPlugin } from '@backstage/cli-node';
+ * import { createCliModule } from '@backstage/cli-node';
  * import packageJson from '../package.json';
  *
- * export default createCliPlugin({
+ * export default createCliModule({
  *   packageJson,
  *   init: async reg => {
  *     reg.addCommand({
@@ -43,7 +43,7 @@ import { CliCommand, CliPlugin } from './types';
  *
  * @public
  */
-export function createCliPlugin(options: {
+export function createCliModule(options: {
   /** The `package.json` contents of the plugin package, used to identify the plugin. */
   packageJson: { name: string };
   /**
@@ -54,13 +54,13 @@ export function createCliPlugin(options: {
     /** Registers a new command with the CLI. */
     addCommand: (command: CliCommand) => void;
   }) => Promise<void>;
-}): CliPlugin {
+}): CliModule {
   const commands: CliCommand[] = [];
   const commandsPromise = options
     .init({ addCommand: command => commands.push(command) })
     .then(() => commands);
 
-  return OpaqueCliPlugin.createInstance('v1', {
+  return OpaqueCliModule.createInstance('v1', {
     packageName: options.packageJson.name,
     commands: commandsPromise,
   });
diff --git a/packages/cli-node/src/cli-plugin/index.ts b/packages/cli-node/src/cli-module/index.ts
similarity index 84%
rename from packages/cli-node/src/cli-plugin/index.ts
rename to packages/cli-node/src/cli-module/index.ts
index df8b340c50..646073a815 100644
--- a/packages/cli-node/src/cli-plugin/index.ts
+++ b/packages/cli-node/src/cli-module/index.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-export { createCliPlugin } from './createCliPlugin';
-export type { CliCommand, CliCommandContext, CliPlugin } from './types';
+export { createCliModule } from './createCliModule';
+export type { CliCommand, CliCommandContext, CliModule } from './types';
diff --git a/packages/cli-node/src/cli-plugin/types.ts b/packages/cli-node/src/cli-module/types.ts
similarity index 96%
rename from packages/cli-node/src/cli-plugin/types.ts
rename to packages/cli-node/src/cli-module/types.ts
index 21dac09eb9..3db290f89f 100644
--- a/packages/cli-node/src/cli-plugin/types.ts
+++ b/packages/cli-node/src/cli-module/types.ts
@@ -109,10 +109,10 @@ export interface CliCommand {
 
 /**
  * An opaque representation of a Backstage CLI plugin, created
- * using {@link createCliPlugin}.
+ * using {@link createCliModule}.
  *
  * @public
  */
-export interface CliPlugin {
-  readonly $$type: '@backstage/CliPlugin';
+export interface CliModule {
+  readonly $$type: '@backstage/CliModule';
 }
diff --git a/packages/cli-node/src/index.ts b/packages/cli-node/src/index.ts
index 7c18070bbe..8831753a82 100644
--- a/packages/cli-node/src/index.ts
+++ b/packages/cli-node/src/index.ts
@@ -21,7 +21,7 @@
  */
 
 export * from './cache';
-export * from './cli-plugin';
+export * from './cli-module';
 export * from './concurrency';
 export * from './git';
 export * from './monorepo';
diff --git a/packages/cli-node/src/roles/PackageRoles.ts b/packages/cli-node/src/roles/PackageRoles.ts
index b0ee82af84..7761b0d4cc 100644
--- a/packages/cli-node/src/roles/PackageRoles.ts
+++ b/packages/cli-node/src/roles/PackageRoles.ts
@@ -34,7 +34,7 @@ const packageRoleInfos: PackageRoleInfo[] = [
     output: ['cjs'],
   },
   {
-    role: 'cli-plugin',
+    role: 'cli-module',
     platform: 'node',
     output: ['types', 'cjs'],
   },
diff --git a/packages/cli-node/src/roles/types.ts b/packages/cli-node/src/roles/types.ts
index 29e5fbb5d6..d0eaedbd02 100644
--- a/packages/cli-node/src/roles/types.ts
+++ b/packages/cli-node/src/roles/types.ts
@@ -23,7 +23,7 @@ export type PackageRole =
   | 'frontend'
   | 'backend'
   | 'cli'
-  | 'cli-plugin'
+  | 'cli-module'
   | 'web-library'
   | 'node-library'
   | 'common-library'
diff --git a/packages/cli/config/eslint-factory.js b/packages/cli/config/eslint-factory.js
index db547f9b15..4e51803802 100644
--- a/packages/cli/config/eslint-factory.js
+++ b/packages/cli/config/eslint-factory.js
@@ -269,7 +269,7 @@ function createConfigForRole(dir, role, extraConfig = {}) {
       });
 
     case 'cli':
-    case 'cli-plugin':
+    case 'cli-module':
     case 'node-library':
     case 'backend':
     case 'backend-plugin':
diff --git a/packages/cli/config/jest.js b/packages/cli/config/jest.js
index 07f92002ae..8a88483d42 100644
--- a/packages/cli/config/jest.js
+++ b/packages/cli/config/jest.js
@@ -38,7 +38,7 @@ const FRONTEND_ROLES = [
 const NODE_ROLES = [
   'backend',
   'cli',
-  'cli-plugin',
+  'cli-module',
   'node-library',
   'backend-plugin',
   'backend-plugin-module',
diff --git a/packages/cli/src/modules/auth/index.ts b/packages/cli/src/modules/auth/index.ts
index 6ce849a9b9..25876bbece 100644
--- a/packages/cli/src/modules/auth/index.ts
+++ b/packages/cli/src/modules/auth/index.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { createCliPlugin } from '../../wiring/factory';
+import { createCliModule } from '../../wiring/factory';
 import packageJson from '../../../package.json';
 
-export default createCliPlugin({
+export default createCliModule({
   packageJson,
   init: async reg => {
     reg.addCommand({
diff --git a/packages/cli/src/modules/build/index.ts b/packages/cli/src/modules/build/index.ts
index e3c04e6325..ac389c6a68 100644
--- a/packages/cli/src/modules/build/index.ts
+++ b/packages/cli/src/modules/build/index.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { createCliPlugin } from '@backstage/cli-node';
+import { createCliModule } from '@backstage/cli-node';
 import packageJson from '../../../package.json';
 
-export const buildPlugin = createCliPlugin({
+export const buildPlugin = createCliModule({
   packageJson,
   init: async reg => {
     reg.addCommand({
diff --git a/packages/cli/src/modules/build/lib/typeDistProject.test.ts b/packages/cli/src/modules/build/lib/typeDistProject.test.ts
index c773c505be..9d14bccc15 100644
--- a/packages/cli/src/modules/build/lib/typeDistProject.test.ts
+++ b/packages/cli/src/modules/build/lib/typeDistProject.test.ts
@@ -33,7 +33,7 @@ describe('typeDistProject', () => {
       frontend: false,
       backend: false,
       cli: false,
-      'cli-plugin': false,
+      'cli-module': false,
       'common-library': false,
     };
 
diff --git a/packages/cli/src/modules/config/index.ts b/packages/cli/src/modules/config/index.ts
index e2ddec3678..89a7d90111 100644
--- a/packages/cli/src/modules/config/index.ts
+++ b/packages/cli/src/modules/config/index.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createCliPlugin } from '@backstage/cli-node';
+import { createCliModule } from '@backstage/cli-node';
 import packageJson from '../../../package.json';
 
 export const configOption = [
@@ -23,7 +23,7 @@ export const configOption = [
   Array<string>(),
 ] as const;
 
-export default createCliPlugin({
+export default createCliModule({
   packageJson,
   init: async reg => {
     reg.addCommand({
diff --git a/packages/cli/src/modules/create-github-app/index.ts b/packages/cli/src/modules/create-github-app/index.ts
index 2171f2ca2e..04786cbbdb 100644
--- a/packages/cli/src/modules/create-github-app/index.ts
+++ b/packages/cli/src/modules/create-github-app/index.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createCliPlugin } from '@backstage/cli-node';
+import { createCliModule } from '@backstage/cli-node';
 import packageJson from '../../../package.json';
 
-export default createCliPlugin({
+export default createCliModule({
   packageJson,
   init: async reg => {
     reg.addCommand({
diff --git a/packages/cli/src/modules/info/index.ts b/packages/cli/src/modules/info/index.ts
index b1fa885f03..c4a839ff12 100644
--- a/packages/cli/src/modules/info/index.ts
+++ b/packages/cli/src/modules/info/index.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createCliPlugin } from '@backstage/cli-node';
+import { createCliModule } from '@backstage/cli-node';
 import packageJson from '../../../package.json';
 
-export default createCliPlugin({
+export default createCliModule({
   packageJson,
   init: async reg => {
     reg.addCommand({
diff --git a/packages/cli/src/modules/lint/index.ts b/packages/cli/src/modules/lint/index.ts
index 7da72679d4..71961a147f 100644
--- a/packages/cli/src/modules/lint/index.ts
+++ b/packages/cli/src/modules/lint/index.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createCliPlugin } from '@backstage/cli-node';
+import { createCliModule } from '@backstage/cli-node';
 import packageJson from '../../../package.json';
 
-export default createCliPlugin({
+export default createCliModule({
   packageJson,
   init: async reg => {
     reg.addCommand({
diff --git a/packages/cli/src/modules/maintenance/commands/repo/fix.ts b/packages/cli/src/modules/maintenance/commands/repo/fix.ts
index d3e0759afc..147779443d 100644
--- a/packages/cli/src/modules/maintenance/commands/repo/fix.ts
+++ b/packages/cli/src/modules/maintenance/commands/repo/fix.ts
@@ -298,7 +298,7 @@ export function fixPluginId(pkg: FixablePackage) {
     role === 'backend' ||
     role === 'frontend' ||
     role === 'cli' ||
-    role === 'cli-plugin'
+    role === 'cli-module'
   ) {
     return;
   }
@@ -385,7 +385,7 @@ export function fixPluginPackages(
     role === 'backend' ||
     role === 'frontend' ||
     role === 'cli' ||
-    role === 'cli-plugin'
+    role === 'cli-module'
   ) {
     return;
   }
diff --git a/packages/cli/src/modules/maintenance/index.ts b/packages/cli/src/modules/maintenance/index.ts
index cf6cf00b2c..315d222448 100644
--- a/packages/cli/src/modules/maintenance/index.ts
+++ b/packages/cli/src/modules/maintenance/index.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createCliPlugin } from '@backstage/cli-node';
+import { createCliModule } from '@backstage/cli-node';
 import packageJson from '../../../package.json';
 
-export default createCliPlugin({
+export default createCliModule({
   packageJson,
   init: async reg => {
     reg.addCommand({
diff --git a/packages/cli/src/modules/migrate/commands/packageScripts.ts b/packages/cli/src/modules/migrate/commands/packageScripts.ts
index 80810f31fc..b9bc9d6656 100644
--- a/packages/cli/src/modules/migrate/commands/packageScripts.ts
+++ b/packages/cli/src/modules/migrate/commands/packageScripts.ts
@@ -22,7 +22,7 @@ import type { CliCommandContext } from '../../../wiring/types';
 
 const configArgPattern = /--config[=\s][^\s$]+/;
 
-const noStartRoles: PackageRole[] = ['cli', 'cli-plugin', 'common-library'];
+const noStartRoles: PackageRole[] = ['cli', 'cli-module', 'common-library'];
 
 export default async ({ args, info }: CliCommandContext) => {
   cli({ help: info, booleanFlagNegation: true }, undefined, args);
diff --git a/packages/cli/src/modules/migrate/index.ts b/packages/cli/src/modules/migrate/index.ts
index 16cf45d244..ca77f678a4 100644
--- a/packages/cli/src/modules/migrate/index.ts
+++ b/packages/cli/src/modules/migrate/index.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createCliPlugin } from '@backstage/cli-node';
+import { createCliModule } from '@backstage/cli-node';
 import packageJson from '../../../package.json';
 
-export default createCliPlugin({
+export default createCliModule({
   packageJson,
   init: async reg => {
     reg.addCommand({
diff --git a/packages/cli/src/modules/new/index.ts b/packages/cli/src/modules/new/index.ts
index 9ceb50e272..2a08a71e97 100644
--- a/packages/cli/src/modules/new/index.ts
+++ b/packages/cli/src/modules/new/index.ts
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createCliPlugin } from '@backstage/cli-node';
+import { createCliModule } from '@backstage/cli-node';
 import { NotImplementedError } from '@backstage/errors';
 import packageJson from '../../../package.json';
 
-export default createCliPlugin({
+export default createCliModule({
   packageJson,
   init: async reg => {
     reg.addCommand({
diff --git a/packages/cli/src/modules/test/index.ts b/packages/cli/src/modules/test/index.ts
index 07eabbf3f7..f10e13828f 100644
--- a/packages/cli/src/modules/test/index.ts
+++ b/packages/cli/src/modules/test/index.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createCliPlugin } from '@backstage/cli-node';
+import { createCliModule } from '@backstage/cli-node';
 import packageJson from '../../../package.json';
 
-export default createCliPlugin({
+export default createCliModule({
   packageJson,
   init: async reg => {
     reg.addCommand({
diff --git a/packages/cli/src/modules/translations/index.ts b/packages/cli/src/modules/translations/index.ts
index 1903d87684..7654c2e0b6 100644
--- a/packages/cli/src/modules/translations/index.ts
+++ b/packages/cli/src/modules/translations/index.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createCliPlugin } from '@backstage/cli-node';
+import { createCliModule } from '@backstage/cli-node';
 import packageJson from '../../../package.json';
 
-export default createCliPlugin({
+export default createCliModule({
   packageJson,
   init: async reg => {
     reg.addCommand({
diff --git a/packages/cli/src/wiring/CliInitializer.test.ts b/packages/cli/src/wiring/CliInitializer.test.ts
index c5d304db91..b5ac9cfaaa 100644
--- a/packages/cli/src/wiring/CliInitializer.test.ts
+++ b/packages/cli/src/wiring/CliInitializer.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { CliInitializer } from './CliInitializer';
-import { createCliPlugin } from './factory';
+import { createCliModule } from './factory';
 
 process.exit = jest.fn() as any;
 
@@ -28,7 +28,7 @@ describe('CliInitializer', () => {
     process.argv = ['node', 'cli', 'test'];
     const initializer = new CliInitializer();
     initializer.add(
-      createCliPlugin({
+      createCliModule({
         packageJson: { name: '@backstage/test' },
         init: async reg =>
           reg.addCommand({
@@ -50,7 +50,7 @@ describe('CliInitializer', () => {
     process.argv = ['node', 'cli', 'test', '[positional]', '<arg>'];
     const initializer = new CliInitializer();
     initializer.add(
-      createCliPlugin({
+      createCliModule({
         packageJson: { name: '@backstage/test' },
         init: async reg =>
           reg.addCommand({
@@ -72,7 +72,7 @@ describe('CliInitializer', () => {
     process.argv = ['node', 'cli', 'test', '--verbose'];
     const initializer = new CliInitializer();
     initializer.add(
-      createCliPlugin({
+      createCliModule({
         packageJson: { name: '@backstage/test' },
         init: async reg =>
           reg.addCommand({
@@ -97,7 +97,7 @@ describe('CliInitializer', () => {
     process.argv = ['node', 'cli', 'secret'];
     const initializer = new CliInitializer();
     initializer.add(
-      createCliPlugin({
+      createCliModule({
         packageJson: { name: '@backstage/test' },
         init: async reg => {
           reg.addCommand({
@@ -124,7 +124,7 @@ describe('CliInitializer', () => {
     const writeSpy = jest.spyOn(process.stdout, 'write');
     const initializer2 = new CliInitializer();
     initializer2.add(
-      createCliPlugin({
+      createCliModule({
         packageJson: { name: '@backstage/test' },
         init: async reg => {
           reg.addCommand({
@@ -152,7 +152,7 @@ describe('CliInitializer', () => {
     const writeSpy = jest.spyOn(process.stdout, 'write');
     const initializer = new CliInitializer();
     initializer.add(
-      createCliPlugin({
+      createCliModule({
         packageJson: { name: '@backstage/test' },
         init: async reg => {
           reg.addCommand({
@@ -187,7 +187,7 @@ describe('CliInitializer', () => {
     const writeSpy = jest.spyOn(process.stdout, 'write');
     const initializer = new CliInitializer();
     initializer.add(
-      createCliPlugin({
+      createCliModule({
         packageJson: { name: '@backstage/test' },
         init: async reg => {
           reg.addCommand({
@@ -223,7 +223,7 @@ describe('CliInitializer', () => {
     ];
     const initializer = new CliInitializer();
     initializer.add(
-      createCliPlugin({
+      createCliModule({
         packageJson: { name: '@backstage/test' },
         init: async reg =>
           reg.addCommand({
diff --git a/packages/cli/src/wiring/CliInitializer.ts b/packages/cli/src/wiring/CliInitializer.ts
index 37156641ee..a09adbbc89 100644
--- a/packages/cli/src/wiring/CliInitializer.ts
+++ b/packages/cli/src/wiring/CliInitializer.ts
@@ -16,12 +16,12 @@
 
 import { CommandGraph } from './CommandGraph';
 import {
-  OpaqueCliPlugin,
+  OpaqueCliModule,
   OpaqueCommandTreeNode,
   OpaqueCommandLeafNode,
 } from '@internal/cli';
 import type { CommandNode } from '@internal/cli';
-import type { CliPlugin } from '@backstage/cli-node';
+import type { CliModule } from '@backstage/cli-node';
 import { CommandRegistry } from './CommandRegistry';
 import { Command } from 'commander';
 import { version } from './version';
@@ -39,12 +39,12 @@ function isNodeHidden(node: CommandNode): boolean {
   return children.every(child => isNodeHidden(child));
 }
 
-type UninitializedFeature = CliPlugin | Promise<{ default: CliPlugin }>;
+type UninitializedFeature = CliModule | Promise<{ default: CliModule }>;
 
 export class CliInitializer {
   private graph = new CommandGraph();
   private commandRegistry = new CommandRegistry(this.graph);
-  #uninitiazedFeatures: Promise<CliPlugin>[] = [];
+  #uninitiazedFeatures: Promise<CliModule>[] = [];
 
   add(feature: UninitializedFeature) {
     if (isPromise(feature)) {
@@ -56,9 +56,9 @@ export class CliInitializer {
     }
   }
 
-  async #register(feature: CliPlugin) {
-    if (OpaqueCliPlugin.isType(feature)) {
-      const internal = OpaqueCliPlugin.toInternal(feature);
+  async #register(feature: CliModule) {
+    if (OpaqueCliModule.isType(feature)) {
+      const internal = OpaqueCliModule.toInternal(feature);
       for (const command of await internal.commands) {
         this.commandRegistry.addCommand(command);
       }
@@ -186,8 +186,8 @@ export class CliInitializer {
 
 /** @internal */
 export function unwrapFeature(
-  feature: CliPlugin | { default: CliPlugin },
-): CliPlugin {
+  feature: CliModule | { default: CliModule },
+): CliModule {
   if ('$$type' in feature) {
     return feature;
   }
diff --git a/packages/cli/src/wiring/factory.ts b/packages/cli/src/wiring/factory.ts
index e840e694c6..f8f04715c3 100644
--- a/packages/cli/src/wiring/factory.ts
+++ b/packages/cli/src/wiring/factory.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { createCliPlugin } from '@backstage/cli-node';
+export { createCliModule } from '@backstage/cli-node';
diff --git a/packages/cli/src/wiring/types.ts b/packages/cli/src/wiring/types.ts
index f927645340..7a8a009a60 100644
--- a/packages/cli/src/wiring/types.ts
+++ b/packages/cli/src/wiring/types.ts
@@ -17,5 +17,5 @@
 export type {
   CliCommandContext,
   CliCommand,
-  CliPlugin,
+  CliModule,
 } from '@backstage/cli-node';