diff --git a/roles/ansible_config/README.md b/roles/ansible_config/README.md
index dac79d917..bf54523d5 100644
--- a/roles/ansible_config/README.md
+++ b/roles/ansible_config/README.md
@@ -1,4 +1,4 @@
-# galaxy.galaxy.ansible_config
+# infra.aap_configuration.ansible_config
 
 ## Description
 
@@ -104,7 +104,7 @@ automation_hub_list:
       tags:
         - always
   roles:
-    - ../../ansible_config
+    - infra.aap_configuration.ansible_config
 ```
 
 ## License
diff --git a/roles/ansible_config/tests/test.yml b/roles/ansible_config/tests/test.yml
index 7481c4731..1cec19569 100644
--- a/roles/ansible_config/tests/test.yml
+++ b/roles/ansible_config/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../ansible_config
+    - infra.aap_configuration.ansible_config
 ...
diff --git a/roles/controller_ad_hoc_command/README.md b/roles/controller_ad_hoc_command/README.md
index ff299aa49..a3045b41d 100644
--- a/roles/controller_ad_hoc_command/README.md
+++ b/roles/controller_ad_hoc_command/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.ad_hoc_command
+# infra.aap_configuration.ad_hoc_command
 
 ## Description
 
diff --git a/roles/controller_ad_hoc_command_cancel/README.md b/roles/controller_ad_hoc_command_cancel/README.md
index 6611105f8..56151e4b4 100644
--- a/roles/controller_ad_hoc_command_cancel/README.md
+++ b/roles/controller_ad_hoc_command_cancel/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.ad_hoc_command_cancel
+# infra.aap_configuration.ad_hoc_command_cancel
 
 ## Description
 
diff --git a/roles/controller_applications/README.md b/roles/controller_applications/README.md
index 3d996d061..bef16e781 100644
--- a/roles/controller_applications/README.md
+++ b/roles/controller_applications/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.applications
+# infra.aap_configuration.applications
 
 ## Description
 
diff --git a/roles/controller_bulk_host_create/README.md b/roles/controller_bulk_host_create/README.md
index 53bfda932..08f9f6ce8 100644
--- a/roles/controller_bulk_host_create/README.md
+++ b/roles/controller_bulk_host_create/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.bulk_host_create
+# infra.aap_configuration.bulk_host_create
 
 ## Description
 
@@ -132,7 +132,7 @@ controller_bulk_hosts:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: redhat_cop.controller_configuration.bulk_host_create, when: controller_bulk_hosts is defined}
+    - {role: infra.aap_configuration.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 181347ac5..0d79b5046 100644
--- a/roles/controller_bulk_job_launch/README.md
+++ b/roles/controller_bulk_job_launch/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.bulk_job_launch
+# infra.aap_configuration.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: redhat_cop.controller_configuration.license, when: controller_license is defined}
+    - {role: infra.aap_configuration.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 e0d19dc92..72beae241 100644
--- a/roles/controller_credential_input_sources/README.md
+++ b/roles/controller_credential_input_sources/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.credential_input_sources
+# infra.aap_configuration.credential_input_sources
 
 ## Description
 
diff --git a/roles/controller_credential_types/README.md b/roles/controller_credential_types/README.md
index bb3463ba4..dda58601e 100644
--- a/roles/controller_credential_types/README.md
+++ b/roles/controller_credential_types/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.credential_types
+# infra.aap_configuration.credential_types
 
 ## Description
 
diff --git a/roles/controller_credentials/README.md b/roles/controller_credentials/README.md
index 0e347cc33..6ce091073 100644
--- a/roles/controller_credentials/README.md
+++ b/roles/controller_credentials/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.credentials
+# infra.aap_configuration.credentials
 
 ## Description
 
diff --git a/roles/controller_execution_environments/README.md b/roles/controller_execution_environments/README.md
index b621c7095..fadfd9efc 100644
--- a/roles/controller_execution_environments/README.md
+++ b/roles/controller_execution_environments/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.execution_environments
+# infra.aap_configuration.execution_environments
 
 ## Description
 
diff --git a/roles/controller_host_groups/README.md b/roles/controller_host_groups/README.md
index 90d531b57..4dc3801cf 100644
--- a/roles/controller_host_groups/README.md
+++ b/roles/controller_host_groups/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.groups
+# infra.aap_configuration.groups
 
 ## Description
 
diff --git a/roles/controller_hosts/README.md b/roles/controller_hosts/README.md
index e79e7a8bc..f9e0c8360 100644
--- a/roles/controller_hosts/README.md
+++ b/roles/controller_hosts/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.hosts
+# infra.aap_configuration.hosts
 
 ## Description
 
diff --git a/roles/controller_instance_groups/README.md b/roles/controller_instance_groups/README.md
index eb0768f56..3b2af95f3 100644
--- a/roles/controller_instance_groups/README.md
+++ b/roles/controller_instance_groups/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.instance_groups
+# infra.aap_configuration.instance_groups
 
 ## Description
 
diff --git a/roles/controller_instances/README.md b/roles/controller_instances/README.md
index 6a4e65900..f1a7332b5 100644
--- a/roles/controller_instances/README.md
+++ b/roles/controller_instances/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.instances
+# infra.aap_configuration.instances
 
 ## Description
 
diff --git a/roles/controller_inventories/README.md b/roles/controller_inventories/README.md
index 9331c9568..dbeb19ef2 100644
--- a/roles/controller_inventories/README.md
+++ b/roles/controller_inventories/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.inventories
+# infra.aap_configuration.inventories
 
 ## Description
 
diff --git a/roles/controller_inventory_source_update/README.md b/roles/controller_inventory_source_update/README.md
index 7a022c735..8de805097 100644
--- a/roles/controller_inventory_source_update/README.md
+++ b/roles/controller_inventory_source_update/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.inventory_source_update
+# infra.aap_configuration.inventory_source_update
 
 ## Description
 
diff --git a/roles/controller_inventory_sources/README.md b/roles/controller_inventory_sources/README.md
index 4bf2fdf5a..3186cd1b9 100644
--- a/roles/controller_inventory_sources/README.md
+++ b/roles/controller_inventory_sources/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.inventory_sources
+# infra.aap_configuration.inventory_sources
 
 ## Description
 
diff --git a/roles/controller_job_launch/README.md b/roles/controller_job_launch/README.md
index 4f3946099..efdcd1a5b 100644
--- a/roles/controller_job_launch/README.md
+++ b/roles/controller_job_launch/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.job_launch
+# infra.aap_configuration.job_launch
 
 ## Description
 
diff --git a/roles/controller_job_templates/README.md b/roles/controller_job_templates/README.md
index 7f8d49d73..26993d25f 100644
--- a/roles/controller_job_templates/README.md
+++ b/roles/controller_job_templates/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.job_templates
+# infra.aap_configuration.job_templates
 
 ## Description
 
diff --git a/roles/controller_jobs_cancel/README.md b/roles/controller_jobs_cancel/README.md
index 619c9186b..0c490c337 100644
--- a/roles/controller_jobs_cancel/README.md
+++ b/roles/controller_jobs_cancel/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.jobs_cancel
+# infra.aap_configuration.jobs_cancel
 
 ## Description
 
diff --git a/roles/controller_labels/README.md b/roles/controller_labels/README.md
index 5d2f14938..425481849 100644
--- a/roles/controller_labels/README.md
+++ b/roles/controller_labels/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.labels
+# infra.aap_configuration.labels
 
 An Ansible role to create/update/remove labels for templates on Ansible Controller.
 
diff --git a/roles/controller_license/README.md b/roles/controller_license/README.md
index 36f78b831..15a4c5e7a 100644
--- a/roles/controller_license/README.md
+++ b/roles/controller_license/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.license
+# infra.aap_configuration.license
 
 ## Description
 
diff --git a/roles/controller_notification_templates/README.md b/roles/controller_notification_templates/README.md
index 15620e494..165d0e49f 100644
--- a/roles/controller_notification_templates/README.md
+++ b/roles/controller_notification_templates/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.notification_templates
+# infra.aap_configuration.notification_templates
 
 ## Description
 
diff --git a/roles/controller_organizations/README.md b/roles/controller_organizations/README.md
index 8034ce9c5..775048a8c 100644
--- a/roles/controller_organizations/README.md
+++ b/roles/controller_organizations/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.organizations
+# infra.aap_configuration.organizations
 
 ## Description
 
diff --git a/roles/controller_project_update/README.md b/roles/controller_project_update/README.md
index aaa8a36cf..9293f25da 100644
--- a/roles/controller_project_update/README.md
+++ b/roles/controller_project_update/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.project_update
+# infra.aap_configuration.project_update
 
 ## Description
 
diff --git a/roles/controller_projects/README.md b/roles/controller_projects/README.md
index 3165eecfa..c1e88e160 100644
--- a/roles/controller_projects/README.md
+++ b/roles/controller_projects/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.projects
+# infra.aap_configuration.projects
 
 ## Description
 
diff --git a/roles/controller_roles/README.md b/roles/controller_roles/README.md
index b503b45f7..e1b39e2c7 100644
--- a/roles/controller_roles/README.md
+++ b/roles/controller_roles/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.roles
+# infra.aap_configuration.roles
 
 ## Description
 
diff --git a/roles/controller_schedules/README.md b/roles/controller_schedules/README.md
index 77e4d14e0..9a1988419 100644
--- a/roles/controller_schedules/README.md
+++ b/roles/controller_schedules/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.schedules
+# infra.aap_configuration.schedules
 
 ## Description
 
diff --git a/roles/controller_settings/README.md b/roles/controller_settings/README.md
index ed0ac5da6..f72614db7 100644
--- a/roles/controller_settings/README.md
+++ b/roles/controller_settings/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.settings
+# infra.aap_configuration.settings
 
 An Ansible role to alter Settings on Ansible Controller.
 
diff --git a/roles/controller_teams/README.md b/roles/controller_teams/README.md
index 3d2613f1c..3cd060133 100644
--- a/roles/controller_teams/README.md
+++ b/roles/controller_teams/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.teams
+# infra.aap_configuration.teams
 
 ## Description
 
diff --git a/roles/controller_users/README.md b/roles/controller_users/README.md
index 067fa0946..c50fa6105 100644
--- a/roles/controller_users/README.md
+++ b/roles/controller_users/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.users
+# infra.aap_configuration.users
 
 ## Description
 
diff --git a/roles/controller_workflow_job_templates/README.md b/roles/controller_workflow_job_templates/README.md
index 6f40a3111..3eb257b78 100644
--- a/roles/controller_workflow_job_templates/README.md
+++ b/roles/controller_workflow_job_templates/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.workflow_job_templates
+# infra.aap_configuration.workflow_job_templates
 
 ## Description
 
diff --git a/roles/controller_workflow_launch/README.md b/roles/controller_workflow_launch/README.md
index 1300f058a..d44237d2b 100644
--- a/roles/controller_workflow_launch/README.md
+++ b/roles/controller_workflow_launch/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.workflow_launch
+# infra.aap_configuration.workflow_launch
 
 ## Description
 
diff --git a/roles/dispatch/tests/test.yml b/roles/dispatch/tests/test.yml
index 8006efc68..dc1a01746 100644
--- a/roles/dispatch/tests/test.yml
+++ b/roles/dispatch/tests/test.yml
@@ -20,5 +20,5 @@
       tags: always
 
   roles:
-    - ../../dispatch
+    - infra.aap_configuration.dispatch
 ...
diff --git a/roles/eda_controller_tokens/README.md b/roles/eda_controller_tokens/README.md
index df5e8b098..f674f055a 100644
--- a/roles/eda_controller_tokens/README.md
+++ b/roles/eda_controller_tokens/README.md
@@ -1,4 +1,4 @@
-# infra.eda_configuration.eda_controller_tokens
+# infra.aap_configuration.eda_controller_tokens
 
 ## Description
 
@@ -92,7 +92,7 @@ eda_controller_tokens:
       tags:
         - always
   roles:
-    - infra.eda_configuration.controller_tokens
+    - infra.aap_configuration.eda_controller_tokens
 ```
 
 ## License
diff --git a/roles/eda_controller_tokens/tests/test.yml b/roles/eda_controller_tokens/tests/test.yml
index 925d41add..87480d484 100644
--- a/roles/eda_controller_tokens/tests/test.yml
+++ b/roles/eda_controller_tokens/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../eda_controller_tokens
+    - infra.aap_configuration.eda_controller_tokens
 ...
diff --git a/roles/eda_credential_types/tests/test.yml b/roles/eda_credential_types/tests/test.yml
index fddff8a82..a04fb44e6 100644
--- a/roles/eda_credential_types/tests/test.yml
+++ b/roles/eda_credential_types/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../eda_credential_types
+    - infra.aap_configuration.eda_credential_types
 ...
diff --git a/roles/eda_credentials/README.md b/roles/eda_credentials/README.md
index 0eaf37428..ecec4f2a1 100644
--- a/roles/eda_credentials/README.md
+++ b/roles/eda_credentials/README.md
@@ -1,4 +1,4 @@
-# infra.eda_configuration.eda_credentials
+# infra.aap_configuration.eda_credentials
 
 ## Description
 
@@ -97,7 +97,7 @@ eda_credentials:
       tags:
         - always
   roles:
-    - infra.eda_configuration.credentials
+    - infra.aap_configuration.eda_credentials
 ```
 
 ## License
diff --git a/roles/eda_credentials/tests/test.yml b/roles/eda_credentials/tests/test.yml
index 7cb40a80d..534ec51a4 100644
--- a/roles/eda_credentials/tests/test.yml
+++ b/roles/eda_credentials/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../eda_credentials
+    - infra.aap_configuration.eda_credentials
 ...
diff --git a/roles/eda_decision_environments/README.md b/roles/eda_decision_environments/README.md
index b351aaa9c..fdf7863ec 100644
--- a/roles/eda_decision_environments/README.md
+++ b/roles/eda_decision_environments/README.md
@@ -1,4 +1,4 @@
-# infra.eda_configuration.eda_decision_environments
+# infra.aap_configuration.eda_decision_environments
 
 ## Description
 
@@ -96,7 +96,7 @@ eda_decision_environments:
       tags:
         - always
   roles:
-    - infra.eda_configuration.decision_environments
+    - infra.aap_configuration.decision_environments
 ```
 
 ## License
diff --git a/roles/eda_decision_environments/tests/test.yml b/roles/eda_decision_environments/tests/test.yml
index ab61ed064..7b423c703 100644
--- a/roles/eda_decision_environments/tests/test.yml
+++ b/roles/eda_decision_environments/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../eda_decision_environments
+    - infra.aap_configuration.eda_decision_environments
 ...
diff --git a/roles/eda_event_streams/README.md b/roles/eda_event_streams/README.md
index c9e776647..9021efb9f 100644
--- a/roles/eda_event_streams/README.md
+++ b/roles/eda_event_streams/README.md
@@ -1,4 +1,4 @@
-# infra.eda_configuration.eda_event_streams
+# infra.aap_configuration.eda_event_streams
 
 ## Description
 
@@ -95,7 +95,7 @@ eda_event_streams:
       tags:
         - always
   roles:
-    - infra.eda_configuration.eda_event_streams
+    - infra.aap_configuration.eda_event_streams
 ```
 
 ## License
diff --git a/roles/eda_event_streams/tests/test.yml b/roles/eda_event_streams/tests/test.yml
index 6abcfe369..59189655b 100644
--- a/roles/eda_event_streams/tests/test.yml
+++ b/roles/eda_event_streams/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../eda_event_streams
+    - infra.aap_configuration.eda_event_streams
 ...
diff --git a/roles/eda_projects/README.md b/roles/eda_projects/README.md
index cdd580c77..06e7d33f0 100644
--- a/roles/eda_projects/README.md
+++ b/roles/eda_projects/README.md
@@ -1,4 +1,4 @@
-# infra.eda_configuration.eda_projects
+# infra.aap_configuration.eda_projects
 
 ## Description
 
@@ -97,7 +97,7 @@ eda_projects:
       tags:
         - always
   roles:
-    - infra.eda_configuration.projects
+    - infra.aap_configuration.eda_projects
 ```
 
 ## License
diff --git a/roles/eda_projects/tests/test.yml b/roles/eda_projects/tests/test.yml
index 66365af16..b5be92b45 100644
--- a/roles/eda_projects/tests/test.yml
+++ b/roles/eda_projects/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../eda_projects
+    - infra.aap_configuration.eda_projects
 ...
diff --git a/roles/eda_rulebook_activations/README.md b/roles/eda_rulebook_activations/README.md
index ed77a094e..5f15f4d29 100644
--- a/roles/eda_rulebook_activations/README.md
+++ b/roles/eda_rulebook_activations/README.md
@@ -1,4 +1,4 @@
-# infra.eda_configuration.eda_rulebook_activations
+# infra.aap_configuration.eda_rulebook_activations
 
 ## Description
 
@@ -111,7 +111,7 @@ eda_rulebook_activations:
       tags:
         - always
   roles:
-    - ../../eda_rulebook_activations
+    - infra.aap_configuration.eda_rulebook_activations
 ```
 
 ## License
diff --git a/roles/eda_rulebook_activations/tests/test.yml b/roles/eda_rulebook_activations/tests/test.yml
index 382641a25..dbd82299a 100644
--- a/roles/eda_rulebook_activations/tests/test.yml
+++ b/roles/eda_rulebook_activations/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../eda_rulebook_activations
+    - infra.aap_configuration.eda_rulebook_activations
 ...
diff --git a/roles/eda_users/README.md b/roles/eda_users/README.md
index bcb1e5942..d16d386bd 100644
--- a/roles/eda_users/README.md
+++ b/roles/eda_users/README.md
@@ -1,4 +1,4 @@
-# infra.eda_configuration.aap_user_accounts
+# infra.aap_configuration.aap_user_accounts
 
 ## Description
 
@@ -104,7 +104,7 @@ eda_users:
       tags:
         - always
   roles:
-    - ../../eda_users
+    - infra.aap_configuration.eda_users
 ```
 
 ## License
diff --git a/roles/eda_users/tests/test.yml b/roles/eda_users/tests/test.yml
index 8b83d3652..91ad40352 100644
--- a/roles/eda_users/tests/test.yml
+++ b/roles/eda_users/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../eda_users
+    - infra.aap_configuration.eda_users
 ...
diff --git a/roles/global_vars/README.md b/roles/global_vars/README.md
index 876fb4e9c..c9da7a4c6 100644
--- a/roles/global_vars/README.md
+++ b/roles/global_vars/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.global_vars
+# infra.aap_configuration.global_vars
 
 ## Description
 
diff --git a/roles/hub_collection/README.md b/roles/hub_collection/README.md
index 3719e2503..0aa6b11ee 100644
--- a/roles/hub_collection/README.md
+++ b/roles/hub_collection/README.md
@@ -1,4 +1,4 @@
-# galaxy.galaxy.collection
+# infra.aap_configuration.hub_collection
 
 ## Description
 
@@ -108,7 +108,7 @@ hub_collections:
       tags:
         - always
   roles:
-    - ../../collection
+    - infra.aap_configuration.hub_collection
 ```
 
 ## License
diff --git a/roles/hub_collection/tests/test.yml b/roles/hub_collection/tests/test.yml
index 0bb618811..ff072a65c 100644
--- a/roles/hub_collection/tests/test.yml
+++ b/roles/hub_collection/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_collection
+    - infra.aap_configuration.hub_collection
 ...
diff --git a/roles/hub_collection_remote/README.md b/roles/hub_collection_remote/README.md
index 0b9862150..4ae21ad82 100644
--- a/roles/hub_collection_remote/README.md
+++ b/roles/hub_collection_remote/README.md
@@ -1,4 +1,4 @@
-# collection_remote
+# infra.aap_configuration.hub_collection_remote
 
 ## Description
 
@@ -119,7 +119,7 @@ hub_collection_remotes:
       tags:
         - always
   roles:
-    - ../../collection_remote
+    - infra.aap_configuration.hub_collection_remote
 ```
 
 ## License
diff --git a/roles/hub_collection_remote/tests/test.yml b/roles/hub_collection_remote/tests/test.yml
index bd117dbeb..379803fc6 100644
--- a/roles/hub_collection_remote/tests/test.yml
+++ b/roles/hub_collection_remote/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_collection_remote
+    - infra.aap_configuration.hub_collection_remote
 ...
diff --git a/roles/hub_collection_repository/README.md b/roles/hub_collection_repository/README.md
index 242df86c3..b1f57807a 100644
--- a/roles/hub_collection_repository/README.md
+++ b/roles/hub_collection_repository/README.md
@@ -1,4 +1,4 @@
-# collection_repository
+# infra.aap_configuration.hub_collection_repository
 
 ## Description
 
@@ -127,7 +127,7 @@ hub_collection_repositories:
       tags:
         - always
   roles:
-    - ../../collection_repository
+    - infra.aap_configuration.hub_collection_repository
 ```
 
 ## License
diff --git a/roles/hub_collection_repository/tests/test.yml b/roles/hub_collection_repository/tests/test.yml
index 9e80fdc2f..57e086b7e 100644
--- a/roles/hub_collection_repository/tests/test.yml
+++ b/roles/hub_collection_repository/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_collection_repository
+    - infra.aap_configuration.hub_collection_repository
 ...
diff --git a/roles/hub_collection_repository_sync/README.md b/roles/hub_collection_repository_sync/README.md
index 5a5ffebff..2f2a6d775 100644
--- a/roles/hub_collection_repository_sync/README.md
+++ b/roles/hub_collection_repository_sync/README.md
@@ -1,4 +1,4 @@
-# collection_repository_sync
+# infra.aap_configuration.hub_collection_repository_sync
 
 ## Description
 
@@ -98,7 +98,7 @@ hub_collection_repositories:
       tags:
         - always
   roles:
-    - ../../collection_repository_sync
+    - infra.aap_configuration.hub_collection_repository_sync
 ```
 
 ## License
diff --git a/roles/hub_collection_repository_sync/tests/test.yml b/roles/hub_collection_repository_sync/tests/test.yml
index 9e80fdc2f..57e086b7e 100644
--- a/roles/hub_collection_repository_sync/tests/test.yml
+++ b/roles/hub_collection_repository_sync/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_collection_repository
+    - infra.aap_configuration.hub_collection_repository
 ...
diff --git a/roles/hub_ee_image/README.md b/roles/hub_ee_image/README.md
index db499e6ca..bacc7f1b1 100644
--- a/roles/hub_ee_image/README.md
+++ b/roles/hub_ee_image/README.md
@@ -1,4 +1,4 @@
-# galaxy.galaxy.ee_image
+# infra.aap_configuration.hub_ee_image
 
 ## Description
 
@@ -96,7 +96,7 @@ hub_ee_images:
       tags:
         - always
   roles:
-    - ../../ee_image
+    - infra.aap_configuration.hub_ee_image
 ```
 
 ## License
diff --git a/roles/hub_ee_image/tests/test.yml b/roles/hub_ee_image/tests/test.yml
index 270f22ba9..c13b05951 100644
--- a/roles/hub_ee_image/tests/test.yml
+++ b/roles/hub_ee_image/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_ee_image
+    - infra.aap_configuration.hub_ee_image
 ...
diff --git a/roles/hub_ee_registry/README.md b/roles/hub_ee_registry/README.md
index d024f5464..0a59611a9 100644
--- a/roles/hub_ee_registry/README.md
+++ b/roles/hub_ee_registry/README.md
@@ -1,4 +1,4 @@
-# galaxy.galaxy.ee_registry
+# infra.aap_configuration.hub_ee_registry
 
 ## Description
 
@@ -99,7 +99,7 @@ hub_ee_registries:
       tags:
         - always
   roles:
-    - ../../ee_registry
+    - infra.aap_configuration.hub_ee_registry
 ```
 
 ## License
diff --git a/roles/hub_ee_registry/tests/test.yml b/roles/hub_ee_registry/tests/test.yml
index 42d507d0b..0abaef72c 100644
--- a/roles/hub_ee_registry/tests/test.yml
+++ b/roles/hub_ee_registry/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_ee_registry
+    - infra.aap_configuration.hub_ee_registry
 ...
diff --git a/roles/hub_ee_registry_index/README.md b/roles/hub_ee_registry_index/README.md
index 9d7aea8e6..c3b4add89 100644
--- a/roles/hub_ee_registry_index/README.md
+++ b/roles/hub_ee_registry_index/README.md
@@ -1,4 +1,4 @@
-# galaxy.galaxy.ee_registry_index
+# infra.aap_configuration.hub_ee_registry_index
 
 ## Description
 
@@ -15,7 +15,7 @@ An Ansible Role to index EE Registries in Automation Hub.
 |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.||
 |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom||
 |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.||
-|`hub_ee_registries`|`see below`|yes|Data structure describing your ee_registries, described below. (Note this is the same as for the `ee_registries` role and the variable can be combined). Note that this role will only do anything if the `index` suboption of this variable is set to true.||
+|`hub_ee_registries`|`see below`|yes|Data structure describing your ee_registries, described below. (Note this is the same as for the `ee_registries` role and the variable can be combined). Note that this role will only do anything if the `index` sub-option of this variable is set to true.||
 
 ### Secure Logging Variables
 
@@ -95,7 +95,7 @@ hub_ee_registries:
       tags:
         - always
   roles:
-    - ee_registry_index
+    - infra.aap_configuration.hub_ee_registry_index
 ```
 
 ## License
diff --git a/roles/hub_ee_registry_index/tests/test.yml b/roles/hub_ee_registry_index/tests/test.yml
index f17b3cb61..6727dd120 100644
--- a/roles/hub_ee_registry_index/tests/test.yml
+++ b/roles/hub_ee_registry_index/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_ee_registry_index
+    - infra.aap_configuration.hub_ee_registry_index
 ...
diff --git a/roles/hub_ee_registry_sync/README.md b/roles/hub_ee_registry_sync/README.md
index 0da43d1a6..eb6a653d9 100644
--- a/roles/hub_ee_registry_sync/README.md
+++ b/roles/hub_ee_registry_sync/README.md
@@ -1,4 +1,4 @@
-# galaxy.galaxy.ee_registry_sync
+# infra.aap_configuration.hub_ee_registry_sync
 
 ## Description
 
@@ -95,7 +95,7 @@ hub_ee_registries:
       tags:
         - always
   roles:
-    - ee_registry_sync
+    - infra.aap_configuration.hub_ee_registry_sync
 ```
 
 ## License
diff --git a/roles/hub_ee_registry_sync/tests/test.yml b/roles/hub_ee_registry_sync/tests/test.yml
index 946830b88..65c53f1c8 100644
--- a/roles/hub_ee_registry_sync/tests/test.yml
+++ b/roles/hub_ee_registry_sync/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_ee_registry_sync
+    - infra.aap_configuration.hub_ee_registry_sync
 ...
diff --git a/roles/hub_ee_repository/README.md b/roles/hub_ee_repository/README.md
index 5135aae3d..556c516d4 100644
--- a/roles/hub_ee_repository/README.md
+++ b/roles/hub_ee_repository/README.md
@@ -1,4 +1,4 @@
-# galaxy.galaxy.ee_repository
+# infra.aap_configuration.hub_ee_repository
 
 ## Description
 
@@ -97,7 +97,7 @@ hub_ee_repositories:
       tags:
         - always
   roles:
-    - ../../ee_repository
+    - infra.aap_configuration.hub_ee_repository
 ```
 
 ## License
diff --git a/roles/hub_ee_repository/tests/test.yml b/roles/hub_ee_repository/tests/test.yml
index 5f0d35c08..6cc6d7ea8 100644
--- a/roles/hub_ee_repository/tests/test.yml
+++ b/roles/hub_ee_repository/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_ee_repository
+    - infra.aap_configuration.hub_ee_repository
 ...
diff --git a/roles/hub_ee_repository_sync/README.md b/roles/hub_ee_repository_sync/README.md
index ab29d2fc5..c50561062 100644
--- a/roles/hub_ee_repository_sync/README.md
+++ b/roles/hub_ee_repository_sync/README.md
@@ -1,4 +1,4 @@
-# galaxy.galaxy.ee_repository_sync
+# infra.aap_configuration.hub_ee_repository_sync
 
 ## Description
 
@@ -95,7 +95,7 @@ hub_ee_repositories:
       tags:
         - always
   roles:
-    - ee_repository_sync
+    - infra.aap_configuration.hub_ee_repository_sync
 ```
 
 ## License
diff --git a/roles/hub_ee_repository_sync/tests/test.yml b/roles/hub_ee_repository_sync/tests/test.yml
index dd034f17b..ac860f535 100644
--- a/roles/hub_ee_repository_sync/tests/test.yml
+++ b/roles/hub_ee_repository_sync/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_ee_repository_sync
+    - infra.aap_configuration.hub_ee_repository_sync
 ...
diff --git a/roles/hub_group/README.md b/roles/hub_group/README.md
index 69ff1a488..f03c9ae69 100644
--- a/roles/hub_group/README.md
+++ b/roles/hub_group/README.md
@@ -1,4 +1,4 @@
-# galaxy.galaxy.group
+# infra.aap_configuration.hub_group
 
 ## Description
 
@@ -103,7 +103,7 @@ ah_groups:
       tags:
         - always
   roles:
-    - ../../group
+    - infra.aap_configuration.hub_group
 ```
 
 ## License
diff --git a/roles/hub_group/tests/test.yml b/roles/hub_group/tests/test.yml
index bb1ecbecc..8d48606af 100644
--- a/roles/hub_group/tests/test.yml
+++ b/roles/hub_group/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_group
+    - infra.aap_configuration.hub_group
 ...
diff --git a/roles/hub_group_roles/README.md b/roles/hub_group_roles/README.md
index d3bf300be..be71eade6 100644
--- a/roles/hub_group_roles/README.md
+++ b/roles/hub_group_roles/README.md
@@ -1,4 +1,4 @@
-# group_roles
+# infra.aap_configuration.hub_group_roles
 
 ## Description
 
@@ -145,7 +145,7 @@ hub_group_roles:
       tags:
         - always
   roles:
-    - ../../hub_group_roles
+    - infra.aap_configuration.hub_group_roles
 ```
 
 ## License
diff --git a/roles/hub_group_roles/tests/test.yml b/roles/hub_group_roles/tests/test.yml
index ce733d7a4..bb85335a1 100644
--- a/roles/hub_group_roles/tests/test.yml
+++ b/roles/hub_group_roles/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_group_roles
+    - infra.aap_configuration.hub_group_roles
 ...
diff --git a/roles/hub_namespace/README.md b/roles/hub_namespace/README.md
index 89b370a93..0a93a1184 100644
--- a/roles/hub_namespace/README.md
+++ b/roles/hub_namespace/README.md
@@ -1,4 +1,4 @@
-# galaxy.galaxy.namespace
+# infra.aap_configuration.hub_namespace
 
 ## Description
 
@@ -118,7 +118,7 @@ hub_namespaces:
       tags:
         - always
   roles:
-    - ../../namespace
+    - infra.aap_configuration.hub_namespace
 ```
 
 ## License
diff --git a/roles/hub_namespace/tests/test.yml b/roles/hub_namespace/tests/test.yml
index ae9013128..107938b02 100644
--- a/roles/hub_namespace/tests/test.yml
+++ b/roles/hub_namespace/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_namespace
+    - infra.aap_configuration.hub_namespace
 ...
diff --git a/roles/hub_publish/README.md b/roles/hub_publish/README.md
index 1edfc2894..2f5b788de 100644
--- a/roles/hub_publish/README.md
+++ b/roles/hub_publish/README.md
@@ -1,4 +1,4 @@
-# galaxy.galaxy.publish
+# infra.aap_configuration.hub_publish
 
 ## Description
 
@@ -101,7 +101,7 @@ ah_auto_approve: true
       tags:
         - always
   roles:
-    - galaxy.galaxy.publish
+    - infra.aap_configuration.hub_publish
 ```
 
 ## License
diff --git a/roles/hub_publish/tests/test.yml b/roles/hub_publish/tests/test.yml
index 1b809b826..4144965f1 100644
--- a/roles/hub_publish/tests/test.yml
+++ b/roles/hub_publish/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_publish
+    - infra.aap_configuration.hub_publish
 ...
diff --git a/roles/hub_role/README.md b/roles/hub_role/README.md
index 614d22e86..90f3251bd 100644
--- a/roles/hub_role/README.md
+++ b/roles/hub_role/README.md
@@ -1,4 +1,4 @@
-# galaxy.galaxy.role
+# infra.aap_configuration.hub_role
 
 ## Description
 
@@ -115,7 +115,7 @@ hub_roles:
       tags:
         - always
   roles:
-    - ../../role
+    - infra.aap_configuration.hub_role
 ```
 
 ## License
diff --git a/roles/hub_role/tests/test.yml b/roles/hub_role/tests/test.yml
index 4d1af79c3..93bc1352a 100644
--- a/roles/hub_role/tests/test.yml
+++ b/roles/hub_role/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_role
+    - infra.aap_configuration.hub_role
 ...
diff --git a/roles/hub_user/README.md b/roles/hub_user/README.md
index a46410ab4..3c107f1f0 100644
--- a/roles/hub_user/README.md
+++ b/roles/hub_user/README.md
@@ -1,4 +1,4 @@
-# galaxy.galaxy.user
+# infra.aap_configuration.hub_user
 
 ## Description
 
@@ -105,7 +105,7 @@ aap_user_accounts:
       tags:
         - always
   roles:
-    - ../../user
+    - infra.aap_configuration.hub_user
 ```
 
 ## License
diff --git a/roles/hub_user/tests/test.yml b/roles/hub_user/tests/test.yml
index e79c955d6..e863cfc29 100644
--- a/roles/hub_user/tests/test.yml
+++ b/roles/hub_user/tests/test.yml
@@ -16,5 +16,5 @@
       tags:
         - always
   roles:
-    - ../../hub_user
+    - infra.aap_configuration.hub_user
 ...
diff --git a/tests/templated_role_example/README.md b/tests/templated_role_example/README.md
index ee5decb64..0555e966b 100644
--- a/tests/templated_role_example/README.md
+++ b/tests/templated_role_example/README.md
@@ -1,4 +1,4 @@
-# controller_configuration.***********
+# infra.aap_configuration.***********
 
 ## Description
 
@@ -104,7 +104,7 @@ This also speeds up the overall role.
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: redhat_cop.controller_configuration.license, when: controller_license is defined}
+    - {role: infra.aap_configuration.license, when: controller_license is defined}
 ```
 
 ## License