diff --git a/.changeset/techdocs-quick-owls-smile.md b/.changeset/techdocs-quick-owls-smile.md
index 7513e836ce..db4202fb5b 100644
--- a/.changeset/techdocs-quick-owls-smile.md
+++ b/.changeset/techdocs-quick-owls-smile.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/plugin-techdocs-addons-contrib': minor
+'@backstage/plugin-techdocs-module-addons-contrib': minor
 ---
 
 A package for contributed TechDocs addons.
diff --git a/packages/app/package.json b/packages/app/package.json
index 708e7f247f..efe8935cd5 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -56,7 +56,7 @@
     "@backstage/plugin-tech-radar": "^0.5.11",
     "@backstage/plugin-techdocs": "^1.1.0",
     "@backstage/plugin-techdocs-react": "^0.1.0",
-    "@backstage/plugin-techdocs-addons-contrib": "^0.0.0",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^0.0.0",
     "@backstage/plugin-todo": "^0.2.6",
     "@backstage/plugin-user-settings": "^0.4.3",
     "@backstage/plugin-tech-insights": "^0.2.0",
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index 9f2f190e60..4cf2c02e55 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -70,7 +70,7 @@ import {
   techdocsPlugin,
 } from '@backstage/plugin-techdocs';
 import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
-import { ReportIssue } from '@backstage/plugin-techdocs-addons-contrib';
+import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';
 import {
   UserSettingsPage,
   UserSettingsTab,
diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json
index b9fced8583..3824af4e7b 100644
--- a/packages/techdocs-cli-embedded-app/package.json
+++ b/packages/techdocs-cli-embedded-app/package.json
@@ -18,7 +18,7 @@
     "@backstage/plugin-catalog": "^1.1.0",
     "@backstage/plugin-techdocs": "^1.1.0",
     "@backstage/plugin-techdocs-react": "^0.1.0",
-    "@backstage/plugin-techdocs-addons-contrib": "^0.0.0",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^0.0.0",
     "@backstage/test-utils": "^1.0.1",
     "@backstage/theme": "^0.2.15",
     "@material-ui/core": "^4.11.0",
diff --git a/plugins/techdocs-addons-contrib/.eslintrc.js b/plugins/techdocs-module-addons-contrib/.eslintrc.js
similarity index 100%
rename from plugins/techdocs-addons-contrib/.eslintrc.js
rename to plugins/techdocs-module-addons-contrib/.eslintrc.js
diff --git a/plugins/techdocs-addons-contrib/api-report.md b/plugins/techdocs-module-addons-contrib/api-report.md
similarity index 100%
rename from plugins/techdocs-addons-contrib/api-report.md
rename to plugins/techdocs-module-addons-contrib/api-report.md
diff --git a/plugins/techdocs-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json
similarity index 91%
rename from plugins/techdocs-addons-contrib/package.json
rename to plugins/techdocs-module-addons-contrib/package.json
index a2f25f9607..cff78620b0 100644
--- a/plugins/techdocs-addons-contrib/package.json
+++ b/plugins/techdocs-module-addons-contrib/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@backstage/plugin-techdocs-addons-contrib",
-  "description": "Plugin for contributed TechDocs Addons",
+  "name": "@backstage/plugin-techdocs-module-addons-contrib",
+  "description": "Plugin module for contributed TechDocs Addons",
   "version": "0.0.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -12,7 +12,7 @@
     "types": "dist/index.d.ts"
   },
   "backstage": {
-    "role": "frontend-plugin"
+    "role": "frontend-plugin-module"
   },
   "homepage": "https://backstage.io",
   "repository": {
diff --git a/plugins/techdocs-addons-contrib/src/ReportIssue/IssueLink.test.tsx b/plugins/techdocs-module-addons-contrib/src/ReportIssue/IssueLink.test.tsx
similarity index 100%
rename from plugins/techdocs-addons-contrib/src/ReportIssue/IssueLink.test.tsx
rename to plugins/techdocs-module-addons-contrib/src/ReportIssue/IssueLink.test.tsx
diff --git a/plugins/techdocs-addons-contrib/src/ReportIssue/IssueLink.tsx b/plugins/techdocs-module-addons-contrib/src/ReportIssue/IssueLink.tsx
similarity index 100%
rename from plugins/techdocs-addons-contrib/src/ReportIssue/IssueLink.tsx
rename to plugins/techdocs-module-addons-contrib/src/ReportIssue/IssueLink.tsx
diff --git a/plugins/techdocs-addons-contrib/src/ReportIssue/ReportIssue.tsx b/plugins/techdocs-module-addons-contrib/src/ReportIssue/ReportIssue.tsx
similarity index 100%
rename from plugins/techdocs-addons-contrib/src/ReportIssue/ReportIssue.tsx
rename to plugins/techdocs-module-addons-contrib/src/ReportIssue/ReportIssue.tsx
diff --git a/plugins/techdocs-addons-contrib/src/ReportIssue/constants.ts b/plugins/techdocs-module-addons-contrib/src/ReportIssue/constants.ts
similarity index 100%
rename from plugins/techdocs-addons-contrib/src/ReportIssue/constants.ts
rename to plugins/techdocs-module-addons-contrib/src/ReportIssue/constants.ts
diff --git a/plugins/techdocs-addons-contrib/src/ReportIssue/hooks.ts b/plugins/techdocs-module-addons-contrib/src/ReportIssue/hooks.ts
similarity index 100%
rename from plugins/techdocs-addons-contrib/src/ReportIssue/hooks.ts
rename to plugins/techdocs-module-addons-contrib/src/ReportIssue/hooks.ts
diff --git a/plugins/techdocs-addons-contrib/src/ReportIssue/index.ts b/plugins/techdocs-module-addons-contrib/src/ReportIssue/index.ts
similarity index 100%
rename from plugins/techdocs-addons-contrib/src/ReportIssue/index.ts
rename to plugins/techdocs-module-addons-contrib/src/ReportIssue/index.ts
diff --git a/plugins/techdocs-addons-contrib/src/ReportIssue/types.ts b/plugins/techdocs-module-addons-contrib/src/ReportIssue/types.ts
similarity index 100%
rename from plugins/techdocs-addons-contrib/src/ReportIssue/types.ts
rename to plugins/techdocs-module-addons-contrib/src/ReportIssue/types.ts
diff --git a/plugins/techdocs-addons-contrib/src/index.ts b/plugins/techdocs-module-addons-contrib/src/index.ts
similarity index 91%
rename from plugins/techdocs-addons-contrib/src/index.ts
rename to plugins/techdocs-module-addons-contrib/src/index.ts
index ed89ba976b..09fe1f8671 100644
--- a/plugins/techdocs-addons-contrib/src/index.ts
+++ b/plugins/techdocs-module-addons-contrib/src/index.ts
@@ -20,7 +20,7 @@
  * @packageDocumentation
  */
 
-export { techdocsAddonsContribPlugin, ReportIssue } from './plugin';
+export { techdocsModuleAddonsContribPlugin, ReportIssue } from './plugin';
 export type {
   ReportIssueProps,
   ReportIssueTemplate,
diff --git a/plugins/techdocs-addons-contrib/src/plugin.test.ts b/plugins/techdocs-module-addons-contrib/src/plugin.test.ts
similarity index 85%
rename from plugins/techdocs-addons-contrib/src/plugin.test.ts
rename to plugins/techdocs-module-addons-contrib/src/plugin.test.ts
index 071623fc4f..249cea6624 100644
--- a/plugins/techdocs-addons-contrib/src/plugin.test.ts
+++ b/plugins/techdocs-module-addons-contrib/src/plugin.test.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { techdocsAddonsContribPlugin } from './plugin';
+import { techdocsModuleAddonsContribPlugin } from './plugin';
 
 describe('techdocs-addons-contrib', () => {
   it('should export plugin', () => {
-    expect(techdocsAddonsContribPlugin).toBeDefined();
+    expect(techdocsModuleAddonsContribPlugin).toBeDefined();
   });
 });
diff --git a/plugins/techdocs-addons-contrib/src/plugin.ts b/plugins/techdocs-module-addons-contrib/src/plugin.ts
similarity index 87%
rename from plugins/techdocs-addons-contrib/src/plugin.ts
rename to plugins/techdocs-module-addons-contrib/src/plugin.ts
index f29d6ed5dd..e71ec2a5c7 100644
--- a/plugins/techdocs-addons-contrib/src/plugin.ts
+++ b/plugins/techdocs-module-addons-contrib/src/plugin.ts
@@ -27,8 +27,8 @@ import { ReportIssueAddon, ReportIssueProps } from './ReportIssue';
  * @public
  */
 
-export const techdocsAddonsContribPlugin = createPlugin({
-  id: 'techdocsAddonsContrib',
+export const techdocsModuleAddonsContribPlugin = createPlugin({
+  id: 'techdocsModuleAddonsContrib',
 });
 
 /**
@@ -37,7 +37,7 @@ export const techdocsAddonsContribPlugin = createPlugin({
  * @public
  */
 
-export const ReportIssue = techdocsAddonsContribPlugin.provide(
+export const ReportIssue = techdocsModuleAddonsContribPlugin.provide(
   createTechDocsAddonExtension<ReportIssueProps>({
     name: 'ReportIssue',
     location: TechDocsAddonLocations.Content,
diff --git a/plugins/techdocs-addons-contrib/src/setupTests.ts b/plugins/techdocs-module-addons-contrib/src/setupTests.ts
similarity index 100%
rename from plugins/techdocs-addons-contrib/src/setupTests.ts
rename to plugins/techdocs-module-addons-contrib/src/setupTests.ts