diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml
index 5db71b8570b..99bed4c7c10 100644
--- a/playbooks/common/openshift-cluster/openshift_hosted.yml
+++ b/playbooks/common/openshift-cluster/openshift_hosted.yml
@@ -43,7 +43,7 @@
     openshift_hosted_logging_elasticsearch_ops_pvc_size: "{{ openshift.hosted.logging.storage.volume.size if openshift_hosted_logging_storage_kind | default(none) in ['dynamic','nfs' ] else ''  }}"
     openshift_hosted_logging_elasticsearch_ops_pvc_prefix: "{{ 'logging-es-ops' if openshift_hosted_loggingops_storage_kind | default(none) =='dynamic' else '' }}"
 
-  - role: cockpit-ui
+  - role: openshift_hosted_registry_console
     when: ( openshift.common.version_gte_3_3_or_1_3  | bool ) and ( openshift_hosted_manage_registry | default(true) | bool ) and not (openshift.docker.hosted_registry_insecure | default(false) | bool)
 
 - name: Update master-config for publicLoggingURL
diff --git a/roles/cockpit-ui/defaults/main.yml b/roles/openshift_hosted_registry_console/defaults/main.yml
similarity index 100%
rename from roles/cockpit-ui/defaults/main.yml
rename to roles/openshift_hosted_registry_console/defaults/main.yml
diff --git a/roles/cockpit-ui/meta/main.yml b/roles/openshift_hosted_registry_console/meta/main.yml
similarity index 79%
rename from roles/cockpit-ui/meta/main.yml
rename to roles/openshift_hosted_registry_console/meta/main.yml
index 4d619fff635..b10d83c7908 100644
--- a/roles/cockpit-ui/meta/main.yml
+++ b/roles/openshift_hosted_registry_console/meta/main.yml
@@ -1,7 +1,7 @@
 ---
 galaxy_info:
   author: Samuel Munilla
-  description: Deploy and Enable cockpit-ui
+  description: Deploy and Enable Registry Console (cockpit-ui)
   company: Red Hat, Inc.
   license: Apache License, Version 2.0
   min_ansible_version: 2.1
diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/openshift_hosted_registry_console/tasks/main.yml
similarity index 100%
rename from roles/cockpit-ui/tasks/main.yml
rename to roles/openshift_hosted_registry_console/tasks/main.yml
diff --git a/roles/cockpit-ui/tasks/route/passthrough.yml b/roles/openshift_hosted_registry_console/tasks/route/passthrough.yml
similarity index 100%
rename from roles/cockpit-ui/tasks/route/passthrough.yml
rename to roles/openshift_hosted_registry_console/tasks/route/passthrough.yml
diff --git a/roles/cockpit-ui/tasks/route/reencrypt.yml b/roles/openshift_hosted_registry_console/tasks/route/reencrypt.yml
similarity index 100%
rename from roles/cockpit-ui/tasks/route/reencrypt.yml
rename to roles/openshift_hosted_registry_console/tasks/route/reencrypt.yml