diff --git a/.changeset/add-ai-resource-entity-model.md b/.changeset/add-ai-resource-entity-model.md
index 97e6cb9d52..8c3356734b 100644
--- a/.changeset/add-ai-resource-entity-model.md
+++ b/.changeset/add-ai-resource-entity-model.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/plugin-catalog-backend-module-ai-resource-entity-model': minor
+'@backstage/plugin-catalog-backend-module-ai-model': minor
 ---
 
 Introduced the `AiResource` catalog entity kind as an opt-in backend module. Install this module to register support for `AiResource` entities in your catalog, used to represent contextual information consumed by AI coding tools such as skills and rules.
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 1ebdb39406..90e4463c37 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -40,7 +40,7 @@
     "@backstage/plugin-auth-backend-module-openshift-provider": "workspace:^",
     "@backstage/plugin-auth-node": "workspace:^",
     "@backstage/plugin-catalog-backend": "workspace:^",
-    "@backstage/plugin-catalog-backend-module-ai-resource-entity-model": "workspace:^",
+    "@backstage/plugin-catalog-backend-module-ai-model": "workspace:^",
     "@backstage/plugin-catalog-backend-module-backstage-openapi": "workspace:^",
     "@backstage/plugin-catalog-backend-module-logs": "workspace:^",
     "@backstage/plugin-catalog-backend-module-openapi": "workspace:^",
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index 9a74cf9f51..4152121a45 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -46,9 +46,7 @@ backend.add(import('@backstage/plugin-auth-backend-module-guest-provider'));
 backend.add(import('@backstage/plugin-auth-backend-module-openshift-provider'));
 backend.add(import('@backstage/plugin-app-backend'));
 backend.add(import('@backstage/plugin-catalog-backend-module-unprocessed'));
-backend.add(
-  import('@backstage/plugin-catalog-backend-module-ai-resource-entity-model'),
-);
+backend.add(import('@backstage/plugin-catalog-backend-module-ai-model'));
 backend.add(
   import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
 );
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/.eslintrc.js b/plugins/catalog-backend-module-ai-model/.eslintrc.js
similarity index 100%
rename from plugins/catalog-backend-module-ai-resource-entity-model/.eslintrc.js
rename to plugins/catalog-backend-module-ai-model/.eslintrc.js
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/README.md b/plugins/catalog-backend-module-ai-model/README.md
similarity index 86%
rename from plugins/catalog-backend-module-ai-resource-entity-model/README.md
rename to plugins/catalog-backend-module-ai-model/README.md
index 7d229dd00a..907c074c83 100644
--- a/plugins/catalog-backend-module-ai-resource-entity-model/README.md
+++ b/plugins/catalog-backend-module-ai-model/README.md
@@ -1,4 +1,4 @@
-# @backstage/plugin-catalog-backend-module-ai-resource-entity-model
+# @backstage/plugin-catalog-backend-module-ai-model
 
 Adds support for the `AiResource` entity kind to the catalog backend plugin. AI resources represent contextual information consumed by AI coding tools, such as skills and rules.
 
@@ -7,9 +7,7 @@ Adds support for the `AiResource` entity kind to the catalog backend plugin. AI
 Add the module to your backend:
 
 ```ts
-backend.add(
-  import('@backstage/plugin-catalog-backend-module-ai-resource-entity-model'),
-);
+backend.add(import('@backstage/plugin-catalog-backend-module-ai-model'));
 ```
 
 ## Entity shape
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/catalog-info.yaml b/plugins/catalog-backend-module-ai-model/catalog-info.yaml
similarity index 61%
rename from plugins/catalog-backend-module-ai-resource-entity-model/catalog-info.yaml
rename to plugins/catalog-backend-module-ai-model/catalog-info.yaml
index d6a29b6e18..a99fca43c9 100644
--- a/plugins/catalog-backend-module-ai-resource-entity-model/catalog-info.yaml
+++ b/plugins/catalog-backend-module-ai-model/catalog-info.yaml
@@ -1,8 +1,8 @@
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
-  name: backstage-plugin-catalog-backend-module-ai-resource-entity-model
-  title: '@backstage/plugin-catalog-backend-module-ai-resource-entity-model'
+  name: backstage-plugin-catalog-backend-module-ai-model
+  title: "@backstage/plugin-catalog-backend-module-ai-model"
   description: Adds support for the AIResource entity kind to the catalog backend plugin.
 spec:
   lifecycle: experimental
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/package.json b/plugins/catalog-backend-module-ai-model/package.json
similarity index 90%
rename from plugins/catalog-backend-module-ai-resource-entity-model/package.json
rename to plugins/catalog-backend-module-ai-model/package.json
index 2ebd5b4bd6..c1cc2dbee5 100644
--- a/plugins/catalog-backend-module-ai-resource-entity-model/package.json
+++ b/plugins/catalog-backend-module-ai-model/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@backstage/plugin-catalog-backend-module-ai-resource-entity-model",
+  "name": "@backstage/plugin-catalog-backend-module-ai-model",
   "version": "0.1.0",
   "description": "Adds support for the AIResource entity kind to the catalog backend plugin.",
   "backstage": {
@@ -13,7 +13,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/backstage/backstage",
-    "directory": "plugins/catalog-backend-module-ai-resource-entity-model"
+    "directory": "plugins/catalog-backend-module-ai-model"
   },
   "license": "Apache-2.0",
   "exports": {
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/report-alpha.api.md b/plugins/catalog-backend-module-ai-model/report-alpha.api.md
similarity index 93%
rename from plugins/catalog-backend-module-ai-resource-entity-model/report-alpha.api.md
rename to plugins/catalog-backend-module-ai-model/report-alpha.api.md
index 3012dbbfbb..0da8b27915 100644
--- a/plugins/catalog-backend-module-ai-resource-entity-model/report-alpha.api.md
+++ b/plugins/catalog-backend-module-ai-model/report-alpha.api.md
@@ -1,4 +1,4 @@
-## API Report File for "@backstage/plugin-catalog-backend-module-ai-resource-entity-model"
+## API Report File for "@backstage/plugin-catalog-backend-module-ai-model"
 
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/report.api.md b/plugins/catalog-backend-module-ai-model/report.api.md
similarity index 98%
rename from plugins/catalog-backend-module-ai-resource-entity-model/report.api.md
rename to plugins/catalog-backend-module-ai-model/report.api.md
index ad21f4982f..1e5315d601 100644
--- a/plugins/catalog-backend-module-ai-resource-entity-model/report.api.md
+++ b/plugins/catalog-backend-module-ai-model/report.api.md
@@ -1,4 +1,4 @@
-## API Report File for "@backstage/plugin-catalog-backend-module-ai-resource-entity-model"
+## API Report File for "@backstage/plugin-catalog-backend-module-ai-model"
 
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/src/AiResourceEntityV1alpha1.test.ts b/plugins/catalog-backend-module-ai-model/src/AiResourceEntityV1alpha1.test.ts
similarity index 100%
rename from plugins/catalog-backend-module-ai-resource-entity-model/src/AiResourceEntityV1alpha1.test.ts
rename to plugins/catalog-backend-module-ai-model/src/AiResourceEntityV1alpha1.test.ts
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/src/AiResourceEntityV1alpha1.ts b/plugins/catalog-backend-module-ai-model/src/AiResourceEntityV1alpha1.ts
similarity index 100%
rename from plugins/catalog-backend-module-ai-resource-entity-model/src/AiResourceEntityV1alpha1.ts
rename to plugins/catalog-backend-module-ai-model/src/AiResourceEntityV1alpha1.ts
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/src/alpha.ts b/plugins/catalog-backend-module-ai-model/src/alpha.ts
similarity index 100%
rename from plugins/catalog-backend-module-ai-resource-entity-model/src/alpha.ts
rename to plugins/catalog-backend-module-ai-model/src/alpha.ts
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/src/index.ts b/plugins/catalog-backend-module-ai-model/src/index.ts
similarity index 100%
rename from plugins/catalog-backend-module-ai-resource-entity-model/src/index.ts
rename to plugins/catalog-backend-module-ai-model/src/index.ts
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/src/module.test.ts b/plugins/catalog-backend-module-ai-model/src/module.test.ts
similarity index 100%
rename from plugins/catalog-backend-module-ai-resource-entity-model/src/module.test.ts
rename to plugins/catalog-backend-module-ai-model/src/module.test.ts
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/src/module.ts b/plugins/catalog-backend-module-ai-model/src/module.ts
similarity index 97%
rename from plugins/catalog-backend-module-ai-resource-entity-model/src/module.ts
rename to plugins/catalog-backend-module-ai-model/src/module.ts
index 2796a84377..fc293889b4 100644
--- a/plugins/catalog-backend-module-ai-resource-entity-model/src/module.ts
+++ b/plugins/catalog-backend-module-ai-model/src/module.ts
@@ -26,7 +26,7 @@ import { aiResourceEntityModel } from './AiResourceEntityV1alpha1';
  */
 export const catalogModuleAiResourceEntityModel = createBackendModule({
   pluginId: 'catalog',
-  moduleId: 'ai-resource-entity-model',
+  moduleId: 'ai-model',
   register(reg) {
     reg.registerInit({
       deps: {
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/src/schema/AiResource.v1alpha1.schema.json b/plugins/catalog-backend-module-ai-model/src/schema/AiResource.v1alpha1.schema.json
similarity index 100%
rename from plugins/catalog-backend-module-ai-resource-entity-model/src/schema/AiResource.v1alpha1.schema.json
rename to plugins/catalog-backend-module-ai-model/src/schema/AiResource.v1alpha1.schema.json
diff --git a/plugins/catalog-backend-module-ai-resource-entity-model/src/schema/AiResource.v1alpha1.skill.schema.json b/plugins/catalog-backend-module-ai-model/src/schema/AiResource.v1alpha1.skill.schema.json
similarity index 100%
rename from plugins/catalog-backend-module-ai-resource-entity-model/src/schema/AiResource.v1alpha1.skill.schema.json
rename to plugins/catalog-backend-module-ai-model/src/schema/AiResource.v1alpha1.skill.schema.json
diff --git a/yarn.lock b/yarn.lock
index 401c4072d8..3ed08d279b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4759,9 +4759,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-catalog-backend-module-ai-resource-entity-model@workspace:^, @backstage/plugin-catalog-backend-module-ai-resource-entity-model@workspace:plugins/catalog-backend-module-ai-resource-entity-model":
+"@backstage/plugin-catalog-backend-module-ai-model@workspace:^, @backstage/plugin-catalog-backend-module-ai-model@workspace:plugins/catalog-backend-module-ai-model":
   version: 0.0.0-use.local
-  resolution: "@backstage/plugin-catalog-backend-module-ai-resource-entity-model@workspace:plugins/catalog-backend-module-ai-resource-entity-model"
+  resolution: "@backstage/plugin-catalog-backend-module-ai-model@workspace:plugins/catalog-backend-module-ai-model"
   dependencies:
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
@@ -29306,7 +29306,7 @@ __metadata:
     "@backstage/plugin-auth-backend-module-openshift-provider": "workspace:^"
     "@backstage/plugin-auth-node": "workspace:^"
     "@backstage/plugin-catalog-backend": "workspace:^"
-    "@backstage/plugin-catalog-backend-module-ai-resource-entity-model": "workspace:^"
+    "@backstage/plugin-catalog-backend-module-ai-model": "workspace:^"
     "@backstage/plugin-catalog-backend-module-backstage-openapi": "workspace:^"
     "@backstage/plugin-catalog-backend-module-logs": "workspace:^"
     "@backstage/plugin-catalog-backend-module-openapi": "workspace:^"