diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7ad08a78..cdc9d74c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,5 @@
 ====================================
-ansible.automation_hub Release Notes
+galaxy.galaxy Release Notes
 ====================================
 
 .. contents:: Topics
@@ -50,7 +50,7 @@ Breaking Changes / Porting Guide
 New Modules
 -----------
 
-- ansible.automation_hub.ah_role - Manage a role of group permissions
+- galaxy.galaxy.ah_role - Manage a role of group permissions
 
 v1.0.1
 ======
@@ -199,7 +199,7 @@ Breaking Changes / Porting Guide
 New Modules
 -----------
 
-- ansible.automation_hub.ah_ee_registry - Manage private automation hub execution environment remote registries.
+- galaxy.galaxy.ah_ee_registry - Manage private automation hub execution environment remote registries.
 
 v0.6.1
 ======
diff --git a/README.md b/README.md
index 790df092..8ab50143 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Click the `Content` button to see the list of content included in this collectio
 You can install the ansible automation_hub collection with the Ansible Galaxy CLI:
 
 ```bash
-ansible-galaxy collection install ansible.automation_hub
+ansible-galaxy collection install galaxy.galaxy
 ```
 
 You can also include it in a `requirements.yml` file and install it with `ansible-galaxy collection install -r requirements.yml`, using the format:
@@ -39,7 +39,7 @@ You can also include it in a `requirements.yml` file and install it with `ansibl
 ```yaml
 ---
 collections:
-  - name: ansible.automation_hub
+  - name: galaxy.galaxy
     # If you need a specific version of the collection, you can specify like this:
     # version: ...
 ```
diff --git a/changelogs/config.yaml b/changelogs/config.yaml
index 1bd66d07..c0cb7457 100644
--- a/changelogs/config.yaml
+++ b/changelogs/config.yaml
@@ -28,7 +28,7 @@ sections:
   - Bugfixes
 - - known_issues
   - Known Issues
-title: ansible.automation_hub
+title: galaxy.galaxy
 trivial_section_name: trivial
 use_fqcn: true
 ...
diff --git a/playbooks/testing_playbook.yml b/playbooks/testing_playbook.yml
index 0fbf0ba8..59d0caae 100644
--- a/playbooks/testing_playbook.yml
+++ b/playbooks/testing_playbook.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: false
   collections:
-    - ansible.automation_hub
+    - galaxy.galaxy
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:
@@ -21,7 +21,7 @@
 
   tasks:
     - name: Authenticate and get an API token
-      ansible.automation_hub.ah_token:
+      galaxy.galaxy.ah_token:
         ah_host: "{{ ah_hostname }}"
         ah_username: "{{ ah_username }}"
         ah_password: "{{ ah_password }}"
@@ -43,7 +43,7 @@
     #      ah_auto_approve: true
 
     - name: Remove collection
-      ansible.automation_hub.ah_collection:
+      galaxy.galaxy.ah_collection:
         namespace: community_test
         name: test
         version: 1.0.1
@@ -54,11 +54,11 @@
         validate_certs: "{{ ah_validate_certs }}"
 
     - name: Configure community repo
-      ansible.automation_hub.ah_repository:
+      galaxy.galaxy.ah_repository:
         name: community
         url: https://galaxy.ansible.com/api/
         requirements:
-          - name: ansible.automation_hub
+          - name: galaxy.galaxy
           - name: infra.controller_configuration
         ah_host: "{{ ah_hostname }}"
         ah_token: "{{ ah_token }}"
@@ -66,7 +66,7 @@
         validate_certs: "{{ ah_validate_certs }}"
 
     - name: Configure community repo from file
-      ansible.automation_hub.ah_repository:
+      galaxy.galaxy.ah_repository:
         name: community
         url: https://galaxy.ansible.com/api/
         requirements_file: files/collection_requirement_file.yml
@@ -76,7 +76,7 @@
         validate_certs: "{{ ah_validate_certs }}"
 
     - name: Sync community repo
-      ansible.automation_hub.ah_repository_sync:
+      galaxy.galaxy.ah_repository_sync:
         name: community
         wait: true
         ah_host: "{{ ah_hostname }}"
@@ -85,7 +85,7 @@
         validate_certs: "{{ ah_validate_certs }}"
 
     - name: Configure rh-certified repo
-      ansible.automation_hub.ah_repository:
+      galaxy.galaxy.ah_repository:
         name: rh-certified
         url: https://cloud.redhat.com/api/automation-hub/
         auth_url: https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
@@ -96,7 +96,7 @@
         validate_certs: "{{ ah_validate_certs }}"
 
     - name: Add EE Registry
-      ansible.automation_hub.ah_ee_registry:
+      galaxy.galaxy.ah_ee_registry:
         name: myreg
         url: https://registry.redhat.io
         ah_host: "{{ ah_hostname }}"
@@ -106,7 +106,7 @@
         validate_certs: "{{ ah_validate_certs }}"
 
     - name: Deauthenticate
-      ansible.automation_hub.ah_token:
+      galaxy.galaxy.ah_token:
         ah_host: "{{ ah_hostname }}"
         ah_token: "{{ ah_token }}"
         ah_path_prefix: "{{ ah_path_prefix }}"
diff --git a/plugins/lookup/ah_api.py b/plugins/lookup/ah_api.py
index 1c7a7e21..91bcf6c6 100644
--- a/plugins/lookup/ah_api.py
+++ b/plugins/lookup/ah_api.py
@@ -71,7 +71,7 @@
       - If a list view returns more an max_objects an exception will be raised
     type: integer
     default: 1000
-extends_documentation_fragment: ansible.automation_hub.auth_plugin
+extends_documentation_fragment: galaxy.galaxy.auth_plugin
 notes:
   - If the query is not filtered properly this can cause a performance impact.
   - Two options take multiple terms. 'ee_images' and 'collection'. See the _terms choices above or the examples below for more details.
@@ -80,20 +80,20 @@
 EXAMPLES = """
 - name: Report the usernames of all users
   debug:
-    msg: "Users: {{ query('ansible.automation_hub.ah_api', 'users', return_all=true) | map(attribute='username') | list }}"
+    msg: "Users: {{ query('galaxy.galaxy.ah_api', 'users', return_all=true) | map(attribute='username') | list }}"
 
 - name: List all collection namespaces by the devops team
   debug:
-    msg: "{{ lookup('ansible.automation_hub.ah_api', 'namespaces', host='https://ah.example.com', username='ansible',
+    msg: "{{ lookup('galaxy.galaxy.ah_api', 'namespaces', host='https://ah.example.com', username='ansible',
               password='Passw0rd123', verify_ssl=false, query_params={'company': 'Devops'}) }}"
 
 - name: Get the list of tags for my_ee
   set_fact:
-    my_ee_tags: "{{ lookup('ansible.automation_hub.ah_api', 'ee_images', 'my_ee') | map(attribute='tags') | list | flatten }}"
+    my_ee_tags: "{{ lookup('galaxy.galaxy.ah_api', 'ee_images', 'my_ee') | map(attribute='tags') | list | flatten }}"
 
 - name: Get the list of versions for a collection in the published repo
   set_fact:
-    collection_versions: "{{ lookup('ansible.automation_hub.ah_api', 'collection', 'published', 'fake_namespace',
+    collection_versions: "{{ lookup('galaxy.galaxy.ah_api', 'collection', 'published', 'fake_namespace',
                             'collection_name').all_versions | map(attribute='version') | list }}"
 """
 
diff --git a/plugins/modules/ah_approval.py b/plugins/modules/ah_approval.py
index 684da94b..fbce9e72 100644
--- a/plugins/modules/ah_approval.py
+++ b/plugins/modules/ah_approval.py
@@ -41,13 +41,13 @@
       required: True
       type: str
 
-extends_documentation_fragment: ansible.automation_hub.auth
+extends_documentation_fragment: galaxy.galaxy.auth
 """
 
 
 EXAMPLES = """
 - name: Approve namespace.collection_name:v1.0.0
-  ansible.automation_hub.ah_approval:
+  galaxy.galaxy.ah_approval:
     namespace: namespace
     name: collection_name
     version: v1.0.0
diff --git a/plugins/modules/ah_build.py b/plugins/modules/ah_build.py
index 100132a0..00d252ff 100644
--- a/plugins/modules/ah_build.py
+++ b/plugins/modules/ah_build.py
@@ -50,8 +50,8 @@
 
 
 EXAMPLES = """
-- name: Build ansible.automation_hub:v1.0.0
-  ansible.automation_hub.ah_build:
+- name: Build galaxy.galaxy:v1.0.0
+  galaxy.galaxy.ah_build:
     path: /home/ansible/ah_configuration
     force: true
     output_path: /var/tmp
diff --git a/plugins/modules/ah_collection.py b/plugins/modules/ah_collection.py
index 59f1ceb9..96231bbb 100644
--- a/plugins/modules/ah_collection.py
+++ b/plugins/modules/ah_collection.py
@@ -84,20 +84,20 @@
       default: "present"
       type: str
 
-extends_documentation_fragment: ansible.automation_hub.auth
+extends_documentation_fragment: galaxy.galaxy.auth
 """
 
 
 EXAMPLES = """
 - name: Upload collection to automation hub
-  ansible.automation_hub.ah_collection:
+  galaxy.galaxy.ah_collection:
     namespace: awx
     name: awx
     path: /var/tmp/collections/awx-awx-15.0.0.tar.gz
 
 
 - name: Remove collection
-  ansible.automation_hub.ah_collection:
+  galaxy.galaxy.ah_collection:
     namespace: test_collection
     name: test
     version: 4.1.2
diff --git a/plugins/modules/ah_collection_upload.py b/plugins/modules/ah_collection_upload.py
index e609f149..3151a01a 100644
--- a/plugins/modules/ah_collection_upload.py
+++ b/plugins/modules/ah_collection_upload.py
@@ -37,17 +37,17 @@
       default: True
       type: bool
 
-extends_documentation_fragment: ansible.automation_hub.auth
+extends_documentation_fragment: galaxy.galaxy.auth
 """
 
 
 EXAMPLES = """
 - name: Upload collection to automation hub
-  ansible.automation_hub.ah_collection_upload:
+  galaxy.galaxy.ah_collection_upload:
     path: /var/tmp/collections/awx_awx-15.0.0.tar.gz
 
 - name: Upload collection to automation hub from galaxy
-  ansible.automation_hub.ah_collection_upload:
+  galaxy.galaxy.ah_collection_upload:
     path: https://galaxy.ansible.com/download/theforeman-foreman-3.2.0.tar.gz
 
 """
diff --git a/plugins/modules/ah_ee_image.py b/plugins/modules/ah_ee_image.py
index 6a333057..de72e987 100644
--- a/plugins/modules/ah_ee_image.py
+++ b/plugins/modules/ah_ee_image.py
@@ -51,12 +51,12 @@
 notes:
   - Supports C(check_mode).
   - Only works with private automation hub v4.3.2 or later.
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 EXAMPLES = r"""
 - name: Ensure the image has the additional tags
-  ansible.automation_hub.ah_ee_image:
+  galaxy.galaxy.ah_ee_image:
     name: ansible-automation-platform-20-early-access/ee-supported-rhel8:2.0.0-15
     state: present
     tags:
@@ -68,7 +68,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Replace all the image tags
-  ansible.automation_hub.ah_ee_image:
+  galaxy.galaxy.ah_ee_image:
     name: ansible-automation-platform-20-early-access/ee-supported-rhel8:2.0.0-15
     state: present
     append: false
@@ -80,7 +80,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the image does not exist
-  ansible.automation_hub.ah_ee_image:
+  galaxy.galaxy.ah_ee_image:
     name: ansible-automation-platform-20-early-access/ee-supported-rhel8:2.0
     state: absent
     ah_host: hub.example.com
diff --git a/plugins/modules/ah_ee_namespace.py b/plugins/modules/ah_ee_namespace.py
index 6e58ffed..167a0da4 100644
--- a/plugins/modules/ah_ee_namespace.py
+++ b/plugins/modules/ah_ee_namespace.py
@@ -33,7 +33,7 @@
   why: The endpoint has been removed and is not supported in AAP 2.3 onwards
   alternative: None
   removed_in: 3.0.0
-  removed_from_collection: ansible.automation_hub
+  removed_from_collection: galaxy.galaxy
 options:
   name:
     description:
@@ -71,12 +71,12 @@
   - When the module creates a namespace, the private automation hub web UI does not display that new namespace.
     You must first create a repository in the namespace, with C(podman push) for example, for the web UI to show the namespace.
   - When the module grants access to a group, the permissions associated to that group apply.
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 EXAMPLES = r"""
 - name: Ensure the namespace exists
-  ansible.automation_hub.ah_ee_namespace:
+  galaxy.galaxy.ah_ee_namespace:
     name: ansible-automation-platform-20-early-access
     state: present
     ah_host: hub.example.com
@@ -84,7 +84,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the namespace has a new name
-  ansible.automation_hub.ah_ee_namespace:
+  galaxy.galaxy.ah_ee_namespace:
     name: ansible-automation-platform-20-early-access
     new_name: custom-ee-01
     state: present
@@ -93,7 +93,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the namespace is removed
-  ansible.automation_hub.ah_ee_namespace:
+  galaxy.galaxy.ah_ee_namespace:
     name: custom-ee-01
     state: absent
     ah_host: hub.example.com
@@ -101,7 +101,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure only the operators group can manage the namespace
-  ansible.automation_hub.ah_ee_namespace:
+  galaxy.galaxy.ah_ee_namespace:
     name: ansible-automation-platform-20-early-access
     state: present
     groups:
@@ -112,7 +112,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the managers group can also manage the namespace
-  ansible.automation_hub.ah_ee_namespace:
+  galaxy.galaxy.ah_ee_namespace:
     name: ansible-automation-platform-20-early-access
     state: present
     groups:
diff --git a/plugins/modules/ah_ee_registry.py b/plugins/modules/ah_ee_registry.py
index 09dd06ad..1b5495b1 100644
--- a/plugins/modules/ah_ee_registry.py
+++ b/plugins/modules/ah_ee_registry.py
@@ -107,12 +107,12 @@
 notes:
   - Supports C(check_mode).
   - Only works with private automation hub v4.4.0 or later.
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 EXAMPLES = r"""
 - name: Add a remote registry to AH
-  ansible.automation_hub.ah_ee_registry:
+  galaxy.galaxy.ah_ee_registry:
     name: my_quayio
     state: present
     url: https://quay.io/my/registry
@@ -121,7 +121,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Add a remote registry which requires auth to AH
-  ansible.automation_hub.ah_ee_registry:
+  galaxy.galaxy.ah_ee_registry:
     name: my_quayio_auth
     state: present
     url: https://quay.io/my/registry
@@ -132,7 +132,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Remove a remote registry from AH
-  ansible.automation_hub.ah_ee_registry:
+  galaxy.galaxy.ah_ee_registry:
     name: examplehub
     state: absent
     ah_host: hub.example.com
diff --git a/plugins/modules/ah_ee_registry_index.py b/plugins/modules/ah_ee_registry_index.py
index 00d63a02..0c93477a 100644
--- a/plugins/modules/ah_ee_registry_index.py
+++ b/plugins/modules/ah_ee_registry_index.py
@@ -49,18 +49,18 @@
       type: int
 notes:
   - Only works when registry URL is registry.redhat.io
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 
 EXAMPLES = """
 - name: Index redhat registry without waiting
-  ansible.automation_hub.ah_ee_registry_index:
+  galaxy.galaxy.ah_ee_registry_index:
     name: redhat
     wait: false
 
 - name: Index registry.redhat.io registry and wait up to 300 seconds
-  ansible.automation_hub.ah_ee_registry_index:
+  galaxy.galaxy.ah_ee_registry_index:
     name: registry_redhat_io
     wait: true
     timeout: 300
diff --git a/plugins/modules/ah_ee_registry_sync.py b/plugins/modules/ah_ee_registry_sync.py
index 7439474e..fe23f739 100644
--- a/plugins/modules/ah_ee_registry_sync.py
+++ b/plugins/modules/ah_ee_registry_sync.py
@@ -47,18 +47,18 @@
         - If waiting for the registry to update this will abort after this
           amount of seconds
       type: int
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 
 EXAMPLES = """
 - name: Sync my_registry without waiting
-  ansible.automation_hub.ah_ee_registry_sync:
+  galaxy.galaxy.ah_ee_registry_sync:
     name: my_registry
     wait: false
 
 - name: Sync registry.redhat.io registry and wait up to 300 seconds
-  ansible.automation_hub.ah_ee_registry_sync:
+  galaxy.galaxy.ah_ee_registry_sync:
     name: registry_redhat_io
     wait: true
     timeout: 300
diff --git a/plugins/modules/ah_ee_repository.py b/plugins/modules/ah_ee_repository.py
index 6a4c0605..4b58ec3b 100644
--- a/plugins/modules/ah_ee_repository.py
+++ b/plugins/modules/ah_ee_repository.py
@@ -75,12 +75,12 @@
   - Only works with private automation hub v4.3.2 or later for local repositories and v4.4.0 for remote repositories.
   - The module cannot be use to create repositories.
     Use C(podman push) for example to create repositories.
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 EXAMPLES = r"""
 - name: Ensure the repository description and README are set
-  ansible.automation_hub.ah_ee_repository:
+  galaxy.galaxy.ah_ee_repository:
     name: ansible-automation-platform-20-early-access/ee-supported-rhel8
     state: present
     description: Supported execution environment
@@ -94,7 +94,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the repository README is set
-  ansible.automation_hub.ah_ee_repository:
+  galaxy.galaxy.ah_ee_repository:
     name: ansible-automation-platform-20-early-access/ee-supported-rhel8
     state: present
     readme_file: README.md
@@ -103,7 +103,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the repository is removed
-  ansible.automation_hub.ah_ee_repository:
+  galaxy.galaxy.ah_ee_repository:
     name: ansible-automation-platform-20-early-access/ee-supported-rhel8
     state: absent
     ah_host: hub.example.com
@@ -111,7 +111,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Add a remote repository from quayio registry
-  ansible.automation_hub.ah_ee_repository:
+  galaxy.galaxy.ah_ee_repository:
     name: myrepo
     upstream_name: repo
     registry: quayio
diff --git a/plugins/modules/ah_ee_repository_sync.py b/plugins/modules/ah_ee_repository_sync.py
index 98c81230..dcd2bc7b 100644
--- a/plugins/modules/ah_ee_repository_sync.py
+++ b/plugins/modules/ah_ee_repository_sync.py
@@ -47,18 +47,18 @@
         - If waiting for the repository to update this will abort after this
           amount of seconds
       type: int
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 
 EXAMPLES = """
 - name: Sync my_repository without waiting
-  ansible.automation_hub.ah_ee_repository_sync:
+  galaxy.galaxy.ah_ee_repository_sync:
     name: my_repository
     wait: false
 
 - name: Sync ee-supported-rhel8 repository and wait up to 300 seconds
-  ansible.automation_hub.ah_ee_repository_sync:
+  galaxy.galaxy.ah_ee_repository_sync:
     name: ansible-automation-platform-21/ee-supported-rhel8
     wait: true
     timeout: 300
diff --git a/plugins/modules/ah_group.py b/plugins/modules/ah_group.py
index 406c3e75..97e18965 100644
--- a/plugins/modules/ah_group.py
+++ b/plugins/modules/ah_group.py
@@ -36,16 +36,16 @@
     default: present
     choices: [absent, present]
 seealso:
-  - module: ansible.automation_hub.ah_group_perm
-  - module: ansible.automation_hub.ah_user
+  - module: galaxy.galaxy.ah_group_perm
+  - module: galaxy.galaxy.ah_user
 notes:
   - Supports C(check_mode).
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 EXAMPLES = r"""
 - name: Ensure the group exists
-  ansible.automation_hub.ah_group:
+  galaxy.galaxy.ah_group:
     name: administrators
     state: present
     ah_host: hub.example.com
@@ -53,7 +53,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the group is removed
-  ansible.automation_hub.ah_group:
+  galaxy.galaxy.ah_group:
     name: operators
     state: absent
     ah_host: hub.example.com
diff --git a/plugins/modules/ah_group_perm.py b/plugins/modules/ah_group_perm.py
index a6148985..59adaf2d 100644
--- a/plugins/modules/ah_group_perm.py
+++ b/plugins/modules/ah_group_perm.py
@@ -30,7 +30,7 @@
   why: The endpoint has been removed and is not supported in AAP 2.3 onwards. It is replaaced by role permisions.
   alternative: None
   removed_in: 3.0.0
-  removed_from_collection: ansible.automation_hub
+  removed_from_collection: galaxy.galaxy
 options:
   name:
     description:
@@ -65,8 +65,8 @@
     default: present
     choices: [absent, present]
 seealso:
-  - module: ansible.automation_hub.ah_group
-  - module: ansible.automation_hub.ah_user
+  - module: galaxy.galaxy.ah_group
+  - module: galaxy.galaxy.ah_user
 notes:
   - Supports C(check_mode).
   - This module only works up to Automation Hub version 4.5 (AAP 2.2)
@@ -74,13 +74,13 @@
     C(change_container), C(change_image_tag), C(create_container), and
     C(push_container)) are only available with private automation hub v4.3.2 or
     later.
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 
 EXAMPLES = r"""
 - name: Ensure the operators have the correct permissions to manage users
-  ansible.automation_hub.ah_group_perm:
+  galaxy.galaxy.ah_group_perm:
     name: operators
     perms:
       - add_user
@@ -93,7 +93,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the administrators have all the permissions
-  ansible.automation_hub.ah_group_perm:
+  galaxy.galaxy.ah_group_perm:
     name: administrators
     perms: "*"
     state: present
@@ -102,7 +102,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the developers cannot manage groups nor users
-  ansible.automation_hub.ah_group_perm:
+  galaxy.galaxy.ah_group_perm:
     name: developers
     perms:
       - add_user
diff --git a/plugins/modules/ah_namespace.py b/plugins/modules/ah_namespace.py
index b7c5d6a9..695acc7f 100644
--- a/plugins/modules/ah_namespace.py
+++ b/plugins/modules/ah_namespace.py
@@ -83,13 +83,13 @@
       elements: str
       default: []
 
-extends_documentation_fragment: ansible.automation_hub.auth
+extends_documentation_fragment: galaxy.galaxy.auth
 """
 
 
 EXAMPLES = """
 - name: Create Tower Ping job template
-  ansible.automation_hub.ah_namespace:
+  galaxy.galaxy.ah_namespace:
     name: Redhat
     company: Redhat
     email: user@example.com
diff --git a/plugins/modules/ah_repository.py b/plugins/modules/ah_repository.py
index ff50878c..5ff1f1bb 100644
--- a/plugins/modules/ah_repository.py
+++ b/plugins/modules/ah_repository.py
@@ -28,7 +28,7 @@
   why: The endpoint has been removed and is not supported in AAP 2.4 onwards. It is replaced by collection_remote
   alternative: collection_remote
   removed_in: 3.0.0
-  removed_from_collection: ansible.automation_hub
+  removed_from_collection: galaxy.galaxy
 options:
     name:
       description:
@@ -129,28 +129,28 @@
       type: str
       default: "8"
 
-extends_documentation_fragment: ansible.automation_hub.auth
+extends_documentation_fragment: galaxy.galaxy.auth
 """
 
 
 EXAMPLES = """
 - name: Configure rh-certified repo
-  ansible.automation_hub.ah_repository:
+  galaxy.galaxy.ah_repository:
     name: rh-certified
     url: https://cloud.redhat.com/api/automation-hub/
     token: aabbcc
     auth_url: https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
 
 - name: Configure community repo
-  ansible.automation_hub.ah_repository:
+  galaxy.galaxy.ah_repository:
     name: community
     url: https://galaxy.ansible.com/api/
     requirements:
-      - ansible.automation_hub
+      - galaxy.galaxy
       - infra.controller_configuration
 
 - name: Configure community repo from a file
-  ansible.automation_hub.ah_repository:
+  galaxy.galaxy.ah_repository:
     name: community
     url: https://galaxy.ansible.com/api/
     requirements_file: "/tmp/requirements.yml"
diff --git a/plugins/modules/ah_repository_sync.py b/plugins/modules/ah_repository_sync.py
index 0beab100..5f1653df 100644
--- a/plugins/modules/ah_repository_sync.py
+++ b/plugins/modules/ah_repository_sync.py
@@ -28,7 +28,7 @@
   why: The endpoint has been removed and is not supported in AAP 2.4 onwards. It's functionality has been replaced by collection_remote_sync.
   alternative: collection_remote_sync
   removed_in: 3.0.0
-  removed_from_collection: ansible.automation_hub
+  removed_from_collection: galaxy.galaxy
 options:
     name:
       description:
@@ -52,18 +52,18 @@
         - If waiting for the project to update this will abort after this
           amount of seconds
       type: int
-extends_documentation_fragment: ansible.automation_hub.auth
+extends_documentation_fragment: galaxy.galaxy.auth
 """
 
 
 EXAMPLES = """
 - name: Sync rh-certified repo without waiting
-  ansible.automation_hub.ah_repository_sync:
+  galaxy.galaxy.ah_repository_sync:
     name: rh-certified
     wait: false
 
 - name: Sync community repo and wait up to 60 seconds
-  ansible.automation_hub.ah_repository_sync:
+  galaxy.galaxy.ah_repository_sync:
     name: community
     wait: true
     timeout: 60
diff --git a/plugins/modules/ah_role.py b/plugins/modules/ah_role.py
index 6c147e98..ecb2be7f 100644
--- a/plugins/modules/ah_role.py
+++ b/plugins/modules/ah_role.py
@@ -63,18 +63,18 @@
     default: present
     choices: [absent, present]
 seealso:
-  - module: ansible.automation_hub.ah_group
-  - module: ansible.automation_hub.ah_user
+  - module: galaxy.galaxy.ah_group
+  - module: galaxy.galaxy.ah_user
 notes:
   - Supports C(check_mode).
   - This module only works up to Automation Hub version 4.6 (AAP 2.3)
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 
 EXAMPLES = r"""
 - name: Ensure the operators have the correct permissions to manage users
-  ansible.automation_hub.ah_role:
+  galaxy.galaxy.ah_role:
     name: galaxy.operators
     perms:
       - add_user
@@ -87,7 +87,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the administrators have all the permissions
-  ansible.automation_hub.ah_role:
+  galaxy.galaxy.ah_role:
     name: galaxy.administrators
     perms: "*"
     state: present
@@ -96,7 +96,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the developers cannot manage groups nor users
-  ansible.automation_hub.ah_role:
+  galaxy.galaxy.ah_role:
     name: galaxy.developers
     perms:
       - add_user
diff --git a/plugins/modules/ah_token.py b/plugins/modules/ah_token.py
index 24771675..64571f8a 100644
--- a/plugins/modules/ah_token.py
+++ b/plugins/modules/ah_token.py
@@ -40,21 +40,21 @@
       choices: ["present", "absent"]
       default: "present"
       type: str
-extends_documentation_fragment: ansible.automation_hub.auth
+extends_documentation_fragment: galaxy.galaxy.auth
 """
 
 EXAMPLES = """
 - name: Create a new token using an existing token
-  ansible.automation_hub.ah_token:
+  galaxy.galaxy.ah_token:
     ah_token: "{{ my_existing_token }}"
 
 - name: Delete this token
-  ansible.automation_hub.ah_token:
+  galaxy.galaxy.ah_token:
     ah_token: "{{ ah_token }}"
     state: absent
 
 - name: Create a new token using username/password
-  ansible.automation_hub.ah_token:
+  galaxy.galaxy.ah_token:
     state: present
     ah_username: "{{ my_username }}"
     ah_password: "{{ my_password }}"
diff --git a/plugins/modules/ah_user.py b/plugins/modules/ah_user.py
index 30390410..344c6452 100644
--- a/plugins/modules/ah_user.py
+++ b/plugins/modules/ah_user.py
@@ -72,16 +72,16 @@
     default: present
     choices: [absent, present]
 seealso:
-  - module: ansible.automation_hub.ah_group_perm
-  - module: ansible.automation_hub.ah_group
+  - module: galaxy.galaxy.ah_group_perm
+  - module: galaxy.galaxy.ah_group
 notes:
   - Supports C(check_mode).
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 EXAMPLES = r"""
 - name: Ensure the user exists
-  ansible.automation_hub.ah_user:
+  galaxy.galaxy.ah_user:
     username: lvasquez
     first_name: Lena
     last_name: Vasquez
@@ -95,7 +95,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the user is removed
-  ansible.automation_hub.ah_user:
+  galaxy.galaxy.ah_user:
     username:  dwilde
     state: absent
     ah_host: hub.example.com
@@ -103,7 +103,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the user only belongs to the operators and developers groups
-  ansible.automation_hub.ah_user:
+  galaxy.galaxy.ah_user:
     username: qhazelrigg
     state: present
     groups:
@@ -115,7 +115,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the user is added to the managers group
-  ansible.automation_hub.ah_user:
+  galaxy.galaxy.ah_user:
     username: chorwitz
     state: present
     groups:
@@ -126,7 +126,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the password is changed
-  ansible.automation_hub.ah_user:
+  galaxy.galaxy.ah_user:
     username: jziglar
     state: present
     password: bQtVeBUK2F
@@ -135,7 +135,7 @@
     ah_password: Sup3r53cr3t
 
 - name: Ensure the user is a super user
-  ansible.automation_hub.ah_user:
+  galaxy.galaxy.ah_user:
     username:  ekrob
     state: present
     is_superuser: true
diff --git a/plugins/modules/collection_remote.py b/plugins/modules/collection_remote.py
index 8d816d38..f5c229cc 100644
--- a/plugins/modules/collection_remote.py
+++ b/plugins/modules/collection_remote.py
@@ -148,7 +148,7 @@
     type: str
     default: present
     choices: [present, absent]
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 
@@ -165,7 +165,7 @@
     name: community
     url: https://galaxy.ansible.com/api/
     requirements:
-      - ansible.automation_hub
+      - galaxy.galaxy
       - infra.controller_configuration
 
 - name: Configure community collection_remote from a file
diff --git a/plugins/modules/collection_repository.py b/plugins/modules/collection_repository.py
index 70d0318b..84eccbf1 100644
--- a/plugins/modules/collection_repository.py
+++ b/plugins/modules/collection_repository.py
@@ -106,7 +106,7 @@
       type: str
       choices: ["present", "absent"]
       default: present
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 
diff --git a/plugins/modules/collection_repository_sync.py b/plugins/modules/collection_repository_sync.py
index d56cb634..a553be28 100644
--- a/plugins/modules/collection_repository_sync.py
+++ b/plugins/modules/collection_repository_sync.py
@@ -46,7 +46,7 @@
         - If waiting for the repository to update this will abort after this
           amount of seconds
       type: int
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 
diff --git a/plugins/modules/group_roles.py b/plugins/modules/group_roles.py
index 57819afd..93ab0975 100644
--- a/plugins/modules/group_roles.py
+++ b/plugins/modules/group_roles.py
@@ -98,12 +98,12 @@
     type: str
     default: present
     choices: [present, enforced, absent]
-extends_documentation_fragment: ansible.automation_hub.auth_ui
+extends_documentation_fragment: galaxy.galaxy.auth_ui
 """
 
 EXAMPLES = """
 - name: Ensure the group exists
-  ansible.automation_hub.group_roles:
+  galaxy.galaxy.group_roles:
     groups:
       - santa
       - group1
diff --git a/roles/ansible_config/README.md b/roles/ansible_config/README.md
index 9b28e4fb..ddffd9c4 100644
--- a/roles/ansible_config/README.md
+++ b/roles/ansible_config/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.ansible_config
+# galaxy.galaxy.ansible_config
 
 ## Description
 
diff --git a/roles/collection/README.md b/roles/collection/README.md
index 7f0b7887..a9fd1e1d 100644
--- a/roles/collection/README.md
+++ b/roles/collection/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.collection
+# galaxy.galaxy.collection
 
 ## Description
 
diff --git a/roles/dispatch/README.md b/roles/dispatch/README.md
index d581877d..590f7406 100644
--- a/roles/dispatch/README.md
+++ b/roles/dispatch/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.dispatch
+# galaxy.galaxy.dispatch
 
 ## Description
 
@@ -8,7 +8,7 @@ An Ansible Role to run all roles for which variables are found on Ansible Automa
 
 This collection is most useful for experienced AAP2 users who want to quickly configure a Automation Hub instance.
 
-If you are new to AAP2 and/or to the ansible.automation_hub collection, it is highly recommended that you ensure that you're familiar with both AAP2 and the collection, before using this role.
+If you are new to AAP2 and/or to the galaxy.galaxy collection, it is highly recommended that you ensure that you're familiar with both AAP2 and the collection, before using this role.
 
 ## Variables
 
@@ -34,7 +34,7 @@ ah_configuration_dispatcher_roles:
 
 Each item within the variable has three elements:
 
-- `role` which is the name of the role within ansible.automation_hub
+- `role` which is the name of the role within galaxy.galaxy
 - `var` which is the variable or variables in that role. We use this to prevent the role being called if the variable is not set.
 - `tags` the tags which are applied to the role so it is possible to apply tags to a playbook using the dispatcher with these tags.
 
@@ -96,7 +96,7 @@ This also speeds up the overall role. Each individual role has its own variable
         ignore_files: [ah_config.yml.template]
         extensions: ["yml"]
   roles:
-    - ansible.automation_hub.dispatch
+    - galaxy.galaxy.dispatch
 ```
 
 ## License
diff --git a/roles/dispatch/tasks/main.yml b/roles/dispatch/tasks/main.yml
index c93792eb..f612ec82 100644
--- a/roles/dispatch/tasks/main.yml
+++ b/roles/dispatch/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: "Run ansible.automation_hub.{{ __role.role }}"
+- name: "Run galaxy.galaxy.{{ __role.role }}"
   ansible.builtin.include_role:
     name: "{{ __role.role }}"
     apply:
diff --git a/roles/ee_image/README.md b/roles/ee_image/README.md
index 52b00ddc..39d5d9bb 100644
--- a/roles/ee_image/README.md
+++ b/roles/ee_image/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.ee_image
+# galaxy.galaxy.ee_image
 
 ## Description
 
diff --git a/roles/ee_namespace/README.md b/roles/ee_namespace/README.md
index dae6ab47..fff6a562 100644
--- a/roles/ee_namespace/README.md
+++ b/roles/ee_namespace/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.ee_namespace
+# galaxy.galaxy.ee_namespace
 
 ## Description
 
diff --git a/roles/ee_registry/README.md b/roles/ee_registry/README.md
index 27894d35..4a2ba891 100644
--- a/roles/ee_registry/README.md
+++ b/roles/ee_registry/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.ee_registry
+# galaxy.galaxy.ee_registry
 
 ## Description
 
diff --git a/roles/ee_registry_index/README.md b/roles/ee_registry_index/README.md
index 29308dba..91b8ec75 100644
--- a/roles/ee_registry_index/README.md
+++ b/roles/ee_registry_index/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.ee_registry_index
+# galaxy.galaxy.ee_registry_index
 
 ## Description
 
diff --git a/roles/ee_registry_sync/README.md b/roles/ee_registry_sync/README.md
index 8087fca5..01d2d8bc 100644
--- a/roles/ee_registry_sync/README.md
+++ b/roles/ee_registry_sync/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.ee_registry_sync
+# galaxy.galaxy.ee_registry_sync
 
 ## Description
 
diff --git a/roles/ee_repository/README.md b/roles/ee_repository/README.md
index 1172a4b9..90e83681 100644
--- a/roles/ee_repository/README.md
+++ b/roles/ee_repository/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.ee_repository
+# galaxy.galaxy.ee_repository
 
 ## Description
 
diff --git a/roles/ee_repository_sync/README.md b/roles/ee_repository_sync/README.md
index 35404dea..f7a08ce3 100644
--- a/roles/ee_repository_sync/README.md
+++ b/roles/ee_repository_sync/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.ee_repository_sync
+# galaxy.galaxy.ee_repository_sync
 
 ## Description
 
diff --git a/roles/group/README.md b/roles/group/README.md
index d7a79dca..1083ac91 100644
--- a/roles/group/README.md
+++ b/roles/group/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.group
+# galaxy.galaxy.group
 
 ## Description
 
diff --git a/roles/namespace/README.md b/roles/namespace/README.md
index acde05cd..15e4c7b2 100644
--- a/roles/namespace/README.md
+++ b/roles/namespace/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.namespace
+# galaxy.galaxy.namespace
 
 ## Description
 
diff --git a/roles/publish/README.md b/roles/publish/README.md
index 29d93864..28db4fc7 100644
--- a/roles/publish/README.md
+++ b/roles/publish/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.publish
+# galaxy.galaxy.publish
 
 ## Description
 
@@ -97,7 +97,7 @@ ah_auto_approve: true
       tags:
         - always
   roles:
-    - ansible.automation_hub.publish
+    - galaxy.galaxy.publish
 ```
 
 ## License
diff --git a/roles/repository/README.md b/roles/repository/README.md
index 3ef1db56..477231f4 100644
--- a/roles/repository/README.md
+++ b/roles/repository/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.repository
+# galaxy.galaxy.repository
 
 ## Description
 
@@ -88,7 +88,7 @@ ah_repository_certified:
 ah_repository_community:
   url: https://galaxy.ansible.com/api/
   requirements:
-    - ansible.automation_hub
+    - galaxy.galaxy
     - infra.controller_configuration
     - infra.aap_utilities
     - infra.ee_utilities
diff --git a/roles/repository_sync/README.md b/roles/repository_sync/README.md
index 80f8f56f..6dd87a24 100644
--- a/roles/repository_sync/README.md
+++ b/roles/repository_sync/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.repository_sync
+# galaxy.galaxy.repository_sync
 
 ## Description
 
@@ -71,7 +71,7 @@ ah_repository_certified:
 ah_repository_community:
   url: https://galaxy.ansible.com/api/
   requirements:
-    - ansible.automation_hub
+    - galaxy.galaxy
     - infra.controller_configuration
     - infra.aap_utilities
     - infra.ee_utilities
diff --git a/roles/role/README.md b/roles/role/README.md
index 65f9bd9d..368200c8 100644
--- a/roles/role/README.md
+++ b/roles/role/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.role
+# galaxy.galaxy.role
 
 ## Description
 
diff --git a/roles/user/README.md b/roles/user/README.md
index 3405ce9c..83d1baab 100644
--- a/roles/user/README.md
+++ b/roles/user/README.md
@@ -1,4 +1,4 @@
-# ansible.automation_hub.user
+# galaxy.galaxy.user
 
 ## Description
 
diff --git a/tests/collections/requirements.yml b/tests/collections/requirements.yml
index 5bb58275..375f2d9f 100644
--- a/tests/collections/requirements.yml
+++ b/tests/collections/requirements.yml
@@ -1,4 +1,4 @@
 ---
 collections:
-  - name: ansible.automation_hub
+  - name: galaxy.galaxy
 ...
diff --git a/tests/pah_configure.yml b/tests/pah_configure.yml
index cb797065..4070c70a 100644
--- a/tests/pah_configure.yml
+++ b/tests/pah_configure.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: false
   collections:
-    - ansible.automation_hub
+    - galaxy.galaxy
 
   vars:
     target_state: "present"
diff --git a/tests/playbooks/testing_collections_playbook.yml b/tests/playbooks/testing_collections_playbook.yml
index 75f218ae..578d5292 100644
--- a/tests/playbooks/testing_collections_playbook.yml
+++ b/tests/playbooks/testing_collections_playbook.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: false
   collections:
-    - ansible.automation_hub
+    - galaxy.galaxy
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:
diff --git a/tests/playbooks/testing_collections_repos.yml b/tests/playbooks/testing_collections_repos.yml
index c6090ba7..825717ea 100644
--- a/tests/playbooks/testing_collections_repos.yml
+++ b/tests/playbooks/testing_collections_repos.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: false
   collections:
-    - ansible.automation_hub
+    - galaxy.galaxy
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:
diff --git a/tests/playbooks/testing_playbook_ee_namespace.yml b/tests/playbooks/testing_playbook_ee_namespace.yml
index bdc2779d..6e59d537 100644
--- a/tests/playbooks/testing_playbook_ee_namespace.yml
+++ b/tests/playbooks/testing_playbook_ee_namespace.yml
@@ -5,7 +5,7 @@
   become: false
   gather_facts: false
   collections:
-    - ansible.automation_hub
+    - galaxy.galaxy
   vars:
     ah_hostname: http://localhost:8002/
     ah_username: admin
diff --git a/tests/playbooks/testing_playbook_ee_repository.yml b/tests/playbooks/testing_playbook_ee_repository.yml
index 61a64fa6..1f590a85 100644
--- a/tests/playbooks/testing_playbook_ee_repository.yml
+++ b/tests/playbooks/testing_playbook_ee_repository.yml
@@ -5,7 +5,7 @@
   become: false
   gather_facts: false
   collections:
-    - ansible.automation_hub
+    - galaxy.galaxy
   vars:
     hub_host: localhost:5001
     ah_hostname: http://localhost:8002/
diff --git a/tests/playbooks/testing_playbook_user.yml b/tests/playbooks/testing_playbook_user.yml
index e12987be..5b92af53 100644
--- a/tests/playbooks/testing_playbook_user.yml
+++ b/tests/playbooks/testing_playbook_user.yml
@@ -5,7 +5,7 @@
   become: false
   gather_facts: false
   collections:
-    - ansible.automation_hub
+    - galaxy.galaxy
   vars:
     ah_hostname: http://localhost:8002/
     ah_username: admin
diff --git a/tests/tasks/manage_ansible_config.yml b/tests/tasks/manage_ansible_config.yml
index 0046ecc8..e8a875fe 100644
--- a/tests/tasks/manage_ansible_config.yml
+++ b/tests/tasks/manage_ansible_config.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.ansible_config
+    name: galaxy.galaxy.ansible_config
   tags:
     - ansible_config
 
diff --git a/tests/tasks/manage_collection_namespaces.yml b/tests/tasks/manage_collection_namespaces.yml
index 338481d2..60cbaab6 100644
--- a/tests/tasks/manage_collection_namespaces.yml
+++ b/tests/tasks/manage_collection_namespaces.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.namespace
+    name: galaxy.galaxy.namespace
   tags:
     - namespaces
 ...
diff --git a/tests/tasks/manage_collection_publish.yml b/tests/tasks/manage_collection_publish.yml
index f285d5d0..9b5d2d7b 100644
--- a/tests/tasks/manage_collection_publish.yml
+++ b/tests/tasks/manage_collection_publish.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.publish
+    name: galaxy.galaxy.publish
   tags:
     - publish
 ...
diff --git a/tests/tasks/manage_ee_images.yml b/tests/tasks/manage_ee_images.yml
index 4a7910f4..a62bfc79 100644
--- a/tests/tasks/manage_ee_images.yml
+++ b/tests/tasks/manage_ee_images.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.ee_image
+    name: galaxy.galaxy.ee_image
   tags:
     - ee_images
 ...
diff --git a/tests/tasks/manage_ee_namespaces.yml b/tests/tasks/manage_ee_namespaces.yml
index f188687f..94fb3d74 100644
--- a/tests/tasks/manage_ee_namespaces.yml
+++ b/tests/tasks/manage_ee_namespaces.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.ee_namespace
+    name: galaxy.galaxy.ee_namespace
   tags:
     - ee_namespaces
 ...
diff --git a/tests/tasks/manage_ee_registries.yml b/tests/tasks/manage_ee_registries.yml
index ed07e501..ea84175e 100644
--- a/tests/tasks/manage_ee_registries.yml
+++ b/tests/tasks/manage_ee_registries.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.ee_registry
+    name: galaxy.galaxy.ee_registry
   tags:
     - registries
 ...
diff --git a/tests/tasks/manage_ee_registry_indices.yml b/tests/tasks/manage_ee_registry_indices.yml
index 6bea8f54..fbdc6e8a 100644
--- a/tests/tasks/manage_ee_registry_indices.yml
+++ b/tests/tasks/manage_ee_registry_indices.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.ee_registry_index
+    name: galaxy.galaxy.ee_registry_index
   tags:
     - indices
 ...
diff --git a/tests/tasks/manage_ee_registry_sync.yml b/tests/tasks/manage_ee_registry_sync.yml
index 21f3e0e3..d4ea79c9 100644
--- a/tests/tasks/manage_ee_registry_sync.yml
+++ b/tests/tasks/manage_ee_registry_sync.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.ee_registry_sync
+    name: galaxy.galaxy.ee_registry_sync
   tags:
     - regsync
 ...
diff --git a/tests/tasks/manage_ee_repositories.yml b/tests/tasks/manage_ee_repositories.yml
index debd717f..a13ad063 100644
--- a/tests/tasks/manage_ee_repositories.yml
+++ b/tests/tasks/manage_ee_repositories.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.ee_repository
+    name: galaxy.galaxy.ee_repository
   tags:
     - repos
 ...
diff --git a/tests/tasks/manage_ee_repository_sync.yml b/tests/tasks/manage_ee_repository_sync.yml
index 0747f827..8fedac5c 100644
--- a/tests/tasks/manage_ee_repository_sync.yml
+++ b/tests/tasks/manage_ee_repository_sync.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.ee_repository_sync
+    name: galaxy.galaxy.ee_repository_sync
   tags:
     - reposync
 ...
diff --git a/tests/tasks/manage_groups.yml b/tests/tasks/manage_groups.yml
index 93026a05..a52b4d7d 100644
--- a/tests/tasks/manage_groups.yml
+++ b/tests/tasks/manage_groups.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.group
+    name: galaxy.galaxy.group
   tags:
     - groups
 ...
diff --git a/tests/tasks/manage_users.yml b/tests/tasks/manage_users.yml
index 39fd1bdd..df0a9acc 100644
--- a/tests/tasks/manage_users.yml
+++ b/tests/tasks/manage_users.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.user
+    name: galaxy.galaxy.user
   tags:
     - users
 ...