diff --git a/roles/controller_ad_hoc_command/README.md b/roles/controller_ad_hoc_command/README.md
index a3045b41d..644442df0 100644
--- a/roles/controller_ad_hoc_command/README.md
+++ b/roles/controller_ad_hoc_command/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.ad_hoc_command
+# infra.aap_configuration.controller_ad_hoc_command
 
 ## Description
 
@@ -94,7 +94,7 @@ controller_ad_hoc_commands:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.ad_hoc_command, when: controller_ad_hoc_commands is defined}
+    - {role: infra.aap_configuration.controller_ad_hoc_command, when: controller_ad_hoc_commands is defined}
 
 ```
 
diff --git a/roles/controller_ad_hoc_command_cancel/README.md b/roles/controller_ad_hoc_command_cancel/README.md
index 56151e4b4..f3c5d795b 100644
--- a/roles/controller_ad_hoc_command_cancel/README.md
+++ b/roles/controller_ad_hoc_command_cancel/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.ad_hoc_command_cancel
+# infra.aap_configuration.controller_ad_hoc_command_cancel
 
 ## Description
 
@@ -86,7 +86,7 @@ controller_ad_hoc_commands_cancel:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.ad_hoc_command_cancel, when: controller_ad_hoc_commands is defined}
+    - {role: infra.aap_configuration.controller_ad_hoc_command_cancel, when: controller_ad_hoc_commands is defined}
 ```
 
 ## License
diff --git a/roles/controller_applications/README.md b/roles/controller_applications/README.md
index bef16e781..7bd8014f9 100644
--- a/roles/controller_applications/README.md
+++ b/roles/controller_applications/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.applications
+# infra.aap_configuration.controller_applications
 
 ## Description
 
@@ -137,7 +137,7 @@ aap_applications:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.applications, when: aap_applications is defined}
+    - {role: infra.aap_configuration.controller_applications, when: aap_applications is defined}
 ```
 
 ## License
diff --git a/roles/controller_bulk_host_create/README.md b/roles/controller_bulk_host_create/README.md
index 08f9f6ce8..ccd7bf682 100644
--- a/roles/controller_bulk_host_create/README.md
+++ b/roles/controller_bulk_host_create/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.bulk_host_create
+# infra.aap_configuration.controller_bulk_host_create
 
 ## Description
 
@@ -132,7 +132,7 @@ controller_bulk_hosts:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.bulk_host_create, when: controller_bulk_hosts is defined}
+    - {role: infra.aap_configuration.controller_bulk_host_create, when: controller_bulk_hosts is defined}
 ```
 
 ## License
diff --git a/roles/controller_bulk_job_launch/README.md b/roles/controller_bulk_job_launch/README.md
index 0d79b5046..5b731a16b 100644
--- a/roles/controller_bulk_job_launch/README.md
+++ b/roles/controller_bulk_job_launch/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.bulk_job_launch
+# infra.aap_configuration.controller_bulk_job_launch
 
 ## Description
 
@@ -130,7 +130,7 @@ This also speeds up the overall role.
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.license, when: controller_license is defined}
+    - {role: infra.aap_configuration.controller_license, when: controller_license is defined}
 ```
 
 ## License
diff --git a/roles/controller_credential_input_sources/README.md b/roles/controller_credential_input_sources/README.md
index 72beae241..285bc6d11 100644
--- a/roles/controller_credential_input_sources/README.md
+++ b/roles/controller_credential_input_sources/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.credential_input_sources
+# infra.aap_configuration.controller_credential_input_sources
 
 ## Description
 
@@ -163,7 +163,7 @@ controller_credential_input_sources:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.credential_input_sources, when: controller_credential_input_sources is defined}
+    - {role: infra.aap_configuration.controller_credential_input_sources, when: controller_credential_input_sources is defined}
 ```
 
 ## License
diff --git a/roles/controller_credential_types/README.md b/roles/controller_credential_types/README.md
index dda58601e..0252beda7 100644
--- a/roles/controller_credential_types/README.md
+++ b/roles/controller_credential_types/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.credential_types
+# infra.aap_configuration.controller_credential_types
 
 ## Description
 
@@ -238,7 +238,7 @@ controller_credential_types:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.credential_types, when: controller_credential_types is defined}
+    - {role: infra.aap_configuration.controller_credential_types, when: controller_credential_types is defined}
 ```
 
 ## License
diff --git a/roles/controller_credentials/README.md b/roles/controller_credentials/README.md
index 6ce091073..c46ba4d18 100644
--- a/roles/controller_credentials/README.md
+++ b/roles/controller_credentials/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.credentials
+# infra.aap_configuration.controller_credentials
 
 ## Description
 
@@ -164,7 +164,7 @@ controller_credentials:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.credentials, when: controller_credentials is defined}
+    - {role: infra.aap_configuration.controller_credentials, when: controller_credentials is defined}
 ```
 
 ## License
diff --git a/roles/controller_execution_environments/README.md b/roles/controller_execution_environments/README.md
index fadfd9efc..fbf91ef3b 100644
--- a/roles/controller_execution_environments/README.md
+++ b/roles/controller_execution_environments/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.execution_environments
+# infra.aap_configuration.controller_execution_environments
 
 ## Description
 
@@ -127,7 +127,7 @@ controller_execution_environments:
   tasks:
     - name: Add Execution Environments
       include_role:
-        name: infra.aap_configuration.execution_environments
+        name: infra.aap_configuration.controller_execution_environments
 ```
 
 ## License
diff --git a/roles/controller_host_groups/README.md b/roles/controller_host_groups/README.md
index 4dc3801cf..0626f4590 100644
--- a/roles/controller_host_groups/README.md
+++ b/roles/controller_host_groups/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.groups
+# infra.aap_configuration.controller_host_groups
 
 ## Description
 
@@ -166,7 +166,7 @@ controller_groups:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.groups, when: controller_groups is defined}
+    - {role: infra.aap_configuration.controller_host_groups, when: controller_groups is defined}
 ```
 
 ## License
diff --git a/roles/controller_hosts/README.md b/roles/controller_hosts/README.md
index f9e0c8360..498bfe544 100644
--- a/roles/controller_hosts/README.md
+++ b/roles/controller_hosts/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.hosts
+# infra.aap_configuration.controller_hosts
 
 ## Description
 
@@ -154,7 +154,7 @@ controller_hosts:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.hosts, when: controller_hosts is defined}
+    - {role: infra.aap_configuration.controller_hosts, when: controller_hosts is defined}
 ```
 
 ## License
diff --git a/roles/controller_instance_groups/README.md b/roles/controller_instance_groups/README.md
index 3b2af95f3..375eb6acf 100644
--- a/roles/controller_instance_groups/README.md
+++ b/roles/controller_instance_groups/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.instance_groups
+# infra.aap_configuration.controller_instance_groups
 
 ## Description
 
@@ -119,7 +119,7 @@ controller_instance_groups:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.instance_groups, when: controller_instance_groups is defined}
+    - {role: infra.aap_configuration.controller_instance_groups, when: controller_instance_groups is defined}
 ```
 
 ## License
diff --git a/roles/controller_instances/README.md b/roles/controller_instances/README.md
index f1a7332b5..fc95b8dca 100644
--- a/roles/controller_instances/README.md
+++ b/roles/controller_instances/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.instances
+# infra.aap_configuration.controller_instances
 
 ## Description
 
@@ -118,7 +118,7 @@ controller_instances:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.instances, when: controller_instances is defined}
+    - {role: infra.aap_configuration.controller_instances, when: controller_instances is defined}
 ```
 
 ## License
diff --git a/roles/controller_inventories/README.md b/roles/controller_inventories/README.md
index dbeb19ef2..443888a1d 100644
--- a/roles/controller_inventories/README.md
+++ b/roles/controller_inventories/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.inventories
+# infra.aap_configuration.controller_inventories
 
 ## Description
 
@@ -169,7 +169,7 @@ controller_inventories:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.inventories, when: controller_inventories is defined}
+    - {role: infra.aap_configuration.controller_inventories, when: controller_inventories is defined}
 ```
 
 ## License
diff --git a/roles/controller_inventory_source_update/README.md b/roles/controller_inventory_source_update/README.md
index 8de805097..97ea3f31f 100644
--- a/roles/controller_inventory_source_update/README.md
+++ b/roles/controller_inventory_source_update/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.inventory_source_update
+# infra.aap_configuration.controller_inventory_source_update
 
 ## Description
 
@@ -108,7 +108,7 @@ controller_inventory_sources:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.inventory_source_update, when: controller_inventory_sources is defined}
+    - {role: infra.aap_configuration.controller_inventory_source_update, when: controller_inventory_sources is defined}
 
 ```
 
diff --git a/roles/controller_inventory_sources/README.md b/roles/controller_inventory_sources/README.md
index 3186cd1b9..05c5623a5 100644
--- a/roles/controller_inventory_sources/README.md
+++ b/roles/controller_inventory_sources/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.inventory_sources
+# infra.aap_configuration.controller_inventory_sources
 
 ## Description
 
@@ -182,7 +182,7 @@ controller_inventory_sources:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.inventory_sources, when: controller_inventory_sources is defined}
+    - {role: infra.aap_configuration.controller_inventory_sources, when: controller_inventory_sources is defined}
 ```
 
 ## License
diff --git a/roles/controller_job_launch/README.md b/roles/controller_job_launch/README.md
index efdcd1a5b..4cd2e9e6a 100644
--- a/roles/controller_job_launch/README.md
+++ b/roles/controller_job_launch/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.job_launch
+# infra.aap_configuration.controller_job_launch
 
 ## Description
 
@@ -97,7 +97,7 @@ controller_launch_jobs:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.job_launch, when: controller_launch_jobs is defined}
+    - {role: infra.aap_configuration.controller_job_launch, when: controller_launch_jobs is defined}
 ```
 
 ## License
diff --git a/roles/controller_job_templates/README.md b/roles/controller_job_templates/README.md
index 26993d25f..f68d8c2ac 100644
--- a/roles/controller_job_templates/README.md
+++ b/roles/controller_job_templates/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.job_templates
+# infra.aap_configuration.controller_job_templates
 
 ## Description
 
@@ -295,7 +295,7 @@ controller_templates:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.job_templates, when: controller_templates is defined}
+    - {role: infra.aap_configuration.controller_job_templates, when: controller_templates is defined}
 ```
 
 ## License
diff --git a/roles/controller_jobs_cancel/README.md b/roles/controller_jobs_cancel/README.md
index 0c490c337..6a962d90e 100644
--- a/roles/controller_jobs_cancel/README.md
+++ b/roles/controller_jobs_cancel/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.jobs_cancel
+# infra.aap_configuration.controller_jobs_cancel
 
 ## Description
 
@@ -77,7 +77,7 @@ controller_cancel_jobs:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.jobs_cancel, when: controller_cancel_jobs is defined}
+    - {role: infra.aap_configuration.controller_jobs_cancel, when: controller_cancel_jobs is defined}
 ```
 
 ## License
diff --git a/roles/controller_labels/README.md b/roles/controller_labels/README.md
index 425481849..acbf1afd1 100644
--- a/roles/controller_labels/README.md
+++ b/roles/controller_labels/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.labels
+# infra.aap_configuration.controller_labels
 
 An Ansible role to create/update/remove labels for templates on Ansible Controller.
 
@@ -115,7 +115,7 @@ controller_labels:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.labels, when: controller_labels is defined}
+    - {role: infra.aap_configuration.controller_labels, when: controller_labels is defined}
 ```
 
 ## License
diff --git a/roles/controller_license/README.md b/roles/controller_license/README.md
index 15a4c5e7a..2eb2dca63 100644
--- a/roles/controller_license/README.md
+++ b/roles/controller_license/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.license
+# infra.aap_configuration.controller_license
 
 ## Description
 
@@ -118,7 +118,7 @@ controller_license:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.license, when: controller_license is defined}
+    - {role: infra.aap_configuration.controller_license, when: controller_license is defined}
 ```
 
 ### Standard Subscription lookup Role Usage
@@ -141,7 +141,7 @@ controller_license:
         product_name: "Red Hat Ansible Automation Platform"
         support_level: "Self-Support"
   roles:
-    - {role: infra.aap_configuration.license}
+    - {role: infra.aap_configuration.controller_license}
 ```
 
 ## License
diff --git a/roles/controller_notification_templates/README.md b/roles/controller_notification_templates/README.md
index 165d0e49f..2181b70d6 100644
--- a/roles/controller_notification_templates/README.md
+++ b/roles/controller_notification_templates/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.notification_templates
+# infra.aap_configuration.controller_notification_templates
 
 ## Description
 
@@ -191,7 +191,7 @@ controller_notifications:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.notification_templates, when: controller_notifications is defined}
+    - {role: infra.aap_configuration.controller_notification_templates, when: controller_notifications is defined}
 ```
 
 ## License
diff --git a/roles/controller_organizations/README.md b/roles/controller_organizations/README.md
index 775048a8c..bff991962 100644
--- a/roles/controller_organizations/README.md
+++ b/roles/controller_organizations/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.organizations
+# infra.aap_configuration.controller_organizations
 
 ## Description
 
@@ -184,7 +184,7 @@ aap_organizations:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.organizations, when: aap_organizations is defined}
+    - {role: infra.aap_configuration.controller_organizations, when: aap_organizations is defined}
 ```
 
 ## License
diff --git a/roles/controller_project_update/README.md b/roles/controller_project_update/README.md
index 9293f25da..548ac2329 100644
--- a/roles/controller_project_update/README.md
+++ b/roles/controller_project_update/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.project_update
+# infra.aap_configuration.controller_project_update
 
 ## Description
 
@@ -117,7 +117,7 @@ controller_projects:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.project_update, when: controller_projects is defined}
+    - {role: infra.aap_configuration.controller_project_update, when: controller_projects is defined}
 
 ```
 
diff --git a/roles/controller_projects/README.md b/roles/controller_projects/README.md
index c1e88e160..c892dd5a8 100644
--- a/roles/controller_projects/README.md
+++ b/roles/controller_projects/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.projects
+# infra.aap_configuration.controller_projects
 
 ## Description
 
@@ -168,7 +168,7 @@ controller_projects:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.projects, when: controller_projects is defined}
+    - {role: infra.aap_configuration.controller_projects, when: controller_projects is defined}
 ```
 
 ## License
diff --git a/roles/controller_roles/README.md b/roles/controller_roles/README.md
index e1b39e2c7..9a5bb1c2d 100644
--- a/roles/controller_roles/README.md
+++ b/roles/controller_roles/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.roles
+# infra.aap_configuration.controller_roles
 
 ## Description
 
@@ -185,7 +185,7 @@ controller_roles:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.roles, when: controller_roles is defined}
+    - {role: infra.aap_configuration.controller_roles, when: controller_roles is defined}
 ```
 
 ## License
diff --git a/roles/controller_schedules/README.md b/roles/controller_schedules/README.md
index 9a1988419..682090158 100644
--- a/roles/controller_schedules/README.md
+++ b/roles/controller_schedules/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.schedules
+# infra.aap_configuration.controller_schedules
 
 ## Description
 
@@ -160,7 +160,7 @@ controller_schedules:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.schedules, when: controller_schedules is defined}
+    - {role: infra.aap_configuration.controller_schedules, when: controller_schedules is defined}
 ```
 
 ## License
diff --git a/roles/controller_settings/README.md b/roles/controller_settings/README.md
index f72614db7..202f3bbfe 100644
--- a/roles/controller_settings/README.md
+++ b/roles/controller_settings/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.settings
+# infra.aap_configuration.controller_settings
 
 An Ansible role to alter Settings on Ansible Controller.
 
@@ -142,7 +142,7 @@ controller_settings:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.settings, when: controller_settings is defined}
+    - {role: infra.aap_configuration.controller_settings, when: controller_settings is defined}
 ```
 
 ## License
diff --git a/roles/controller_teams/README.md b/roles/controller_teams/README.md
index 3cd060133..e93c7643a 100644
--- a/roles/controller_teams/README.md
+++ b/roles/controller_teams/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.teams
+# infra.aap_configuration.controller_teams
 
 ## Description
 
@@ -100,7 +100,7 @@ This also speeds up the overall role.
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.teams, when: aap_teams is defined}
+    - {role: infra.aap_configuration.controller_teams, when: aap_teams is defined}
 ```
 
 ## License
diff --git a/roles/controller_users/README.md b/roles/controller_users/README.md
index c50fa6105..26eb1fbc2 100644
--- a/roles/controller_users/README.md
+++ b/roles/controller_users/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.users
+# infra.aap_configuration.controller_users
 
 ## Description
 
@@ -136,7 +136,7 @@ aap_user_accounts:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.users, when: aap_user_accounts is defined}
+    - {role: infra.aap_configuration.controller_users, when: aap_user_accounts is defined}
 ```
 
 ## License
diff --git a/roles/controller_workflow_job_templates/README.md b/roles/controller_workflow_job_templates/README.md
index 3eb257b78..04debb1d6 100644
--- a/roles/controller_workflow_job_templates/README.md
+++ b/roles/controller_workflow_job_templates/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.workflow_job_templates
+# infra.aap_configuration.controller_workflow_job_templates
 
 ## Description
 
@@ -421,7 +421,7 @@ controller_workflows:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.workflow_job_templates, when: controller_workflows is defined}
+    - {role: infra.aap_configuration.controller_workflow_job_templates, when: controller_workflows is defined}
 
 ```
 
diff --git a/roles/controller_workflow_launch/README.md b/roles/controller_workflow_launch/README.md
index d44237d2b..d2ce7756c 100644
--- a/roles/controller_workflow_launch/README.md
+++ b/roles/controller_workflow_launch/README.md
@@ -1,4 +1,4 @@
-# infra.aap_configuration.workflow_launch
+# infra.aap_configuration.controller_workflow_launch
 
 ## Description
 
@@ -84,7 +84,7 @@ controller_workflow_launch_jobs:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: infra.aap_configuration.workflow_launch, when: controller_workflow_launch_jobs is defined}
+    - {role: infra.aap_configuration.controller_workflow_launch, when: controller_workflow_launch_jobs is defined}
 
 ```