diff --git a/packages/cli/templates/default-backend-module.yaml b/packages/cli/templates/default-backend-module.yaml
index 1d6a86e8e2..bc2d1561dd 100644
--- a/packages/cli/templates/default-backend-module.yaml
+++ b/packages/cli/templates/default-backend-module.yaml
@@ -2,7 +2,8 @@
 description: A new backend module that extends an existing backend plugin with additional features
 template: ./default-backend-module
 targetPath: plugins
+backendModulePrefix: true
 prompts:
-  - id: test
-    prompt: Test prompt
-    default: test-default
+  - id
+  - moduleId
+  - owner
diff --git a/packages/cli/templates/default-backend-module/README.md.hbs b/packages/cli/templates/default-backend-module/README.md.hbs
index ad7669beda..3fb632e1af 100644
--- a/packages/cli/templates/default-backend-module/README.md.hbs
+++ b/packages/cli/templates/default-backend-module/README.md.hbs
@@ -1,5 +1,5 @@
 # {{name}}
 
-The {{moduleId}} backend module for the {{pluginId}} plugin.
+The {{moduleId}} backend module for the {{id}} plugin.
 
 _This plugin was created through the Backstage CLI_
diff --git a/packages/cli/templates/default-backend-module/package.json.hbs b/packages/cli/templates/default-backend-module/package.json.hbs
index 7e82e047ce..741148a052 100644
--- a/packages/cli/templates/default-backend-module/package.json.hbs
+++ b/packages/cli/templates/default-backend-module/package.json.hbs
@@ -1,6 +1,6 @@
 {
   "name": "{{name}}",
-  "description": "The {{moduleId}} backend module for the {{pluginId}} plugin.",
+  "description": "The {{moduleId}} backend module for the {{id}} plugin.",
   "version": "{{packageVersion}}",
   "main": "src/index.ts",
   "types": "src/index.ts",
diff --git a/packages/cli/templates/default-backend-module/src/index.ts.hbs b/packages/cli/templates/default-backend-module/src/index.ts.hbs
index 7075598e13..9f70884d59 100644
--- a/packages/cli/templates/default-backend-module/src/index.ts.hbs
+++ b/packages/cli/templates/default-backend-module/src/index.ts.hbs
@@ -1,6 +1,6 @@
 /***/
 /**
- * The {{moduleId}} backend module for the {{pluginId}} plugin.
+ * The {{moduleId}} backend module for the {{id}} plugin.
  *
  * @packageDocumentation
  */
diff --git a/packages/cli/templates/default-backend-module/src/module.ts.hbs b/packages/cli/templates/default-backend-module/src/module.ts.hbs
index 64445871b2..b0fb48b4ef 100644
--- a/packages/cli/templates/default-backend-module/src/module.ts.hbs
+++ b/packages/cli/templates/default-backend-module/src/module.ts.hbs
@@ -4,7 +4,7 @@ import {
 } from '@backstage/backend-plugin-api';
 
 export const {{moduleVar}} = createBackendModule({
-  pluginId: '{{pluginId}}',
+  pluginId: '{{id}}',
   moduleId: '{{moduleId}}',
   register(reg) {
     reg.registerInit({
diff --git a/packages/cli/templates/scaffolder-module.yaml b/packages/cli/templates/scaffolder-module.yaml
index 0588079442..6d00ddc4a3 100644
--- a/packages/cli/templates/scaffolder-module.yaml
+++ b/packages/cli/templates/scaffolder-module.yaml
@@ -2,7 +2,11 @@
 description: A module exporting custom actions for @backstage/plugin-scaffolder-backend
 template: ./scaffolder-module
 targetPath: plugins
+backendModulePrefix: true
 prompts:
-  - id: test
-    prompt: Test prompt
-    default: test-default
+  - id: id
+    prompt: Enter the ID of the plugin [required]
+    default: scaffolder
+    validate: backstage-id
+  - moduleId
+  - owner
diff --git a/packages/cli/templates/scaffolder-module/README.md.hbs b/packages/cli/templates/scaffolder-module/README.md.hbs
index 8ee653a4ac..96396f0e4c 100644
--- a/packages/cli/templates/scaffolder-module/README.md.hbs
+++ b/packages/cli/templates/scaffolder-module/README.md.hbs
@@ -1,5 +1,5 @@
 # {{name}}
 
-The {{id}} module for [@backstage/plugin-scaffolder-backend](https://www.npmjs.com/package/@backstage/plugin-scaffolder-backend).
+The {{moduleId}} module for [@backstage/plugin-scaffolder-backend](https://www.npmjs.com/package/@backstage/plugin-scaffolder-backend).
 
 _This plugin was created through the Backstage CLI_
diff --git a/packages/cli/templates/scaffolder-module/package.json.hbs b/packages/cli/templates/scaffolder-module/package.json.hbs
index 25cd8616f2..7f613baebe 100644
--- a/packages/cli/templates/scaffolder-module/package.json.hbs
+++ b/packages/cli/templates/scaffolder-module/package.json.hbs
@@ -1,6 +1,6 @@
 {
   "name": "{{name}}",
-  "description": "The {{id}} module for @backstage/plugin-scaffolder-backend",
+  "description": "The {{moduleId}} module for @backstage/plugin-scaffolder-backend",
   "version": "{{pluginVersion}}",
   "main": "src/index.ts",
   "types": "src/index.ts",
diff --git a/packages/cli/templates/scaffolder-module/src/index.ts.hbs b/packages/cli/templates/scaffolder-module/src/index.ts.hbs
index 58d5da4a57..e278e6f4b2 100644
--- a/packages/cli/templates/scaffolder-module/src/index.ts.hbs
+++ b/packages/cli/templates/scaffolder-module/src/index.ts.hbs
@@ -1,6 +1,6 @@
 /***/
 /**
- * The {{id}} module for @backstage/plugin-scaffolder-backend.
+ * The {{moduleId}} module for @backstage/plugin-scaffolder-backend.
  *
  * @packageDocumentation
  */