diff --git a/environments/rhsm.yaml b/environments/rhsm.yaml
index a78ff401b5..d60676e9b7 100644
--- a/environments/rhsm.yaml
+++ b/environments/rhsm.yaml
@@ -5,14 +5,14 @@ resource_registry:
 
 parameter_defaults:
 # RhsmVars:
-#   rhsub_repos:
+#   rhsm_repos:
 #     - rhel-7-server-rpms
 #     - rhel-7-server-extras-rpms
 #     - rhel-ha-for-rhel-7-server-rpms
 #     - rhel-7-server-openstack-13-rpms
 #     - rhel-7-server-rhceph-3-mon-rpms
 #     - rhel-7-server-rhceph-3-tools-rpms
-#   rhn_activation_key: 'secrete-key'
+#   rhsm_activation_key: 'secrete-key'
 
 
 # In some cases, you want to configure specific repos on some roles.
@@ -20,7 +20,7 @@ parameter_defaults:
 # Example:
 # ComputeHCIParameters:
 #   RhsmVars:
-#     rhsub_repos:
+#     rhsm_repos:
 #       - rhel-7-server-rpms
 #       - rhel-7-server-extras-rpms
 #       - rhel-ha-for-rhel-7-server-rpms
@@ -28,7 +28,7 @@ parameter_defaults:
 #       - rhel-7-server-rhceph-3-osd-rpms
 #       - rhel-7-server-rhceph-3-mon-rpms
 #       - rhel-7-server-rhceph-3-tools-rpms
-#     rhn_activation_key: 'anothersecrete-key'
+#     rhsm_activation_key: 'anothersecrete-key'
 #
 # More about composable roles:
 # https://docs.openstack.org/tripleo-docs/latest/install/advanced_deployment/role_specific_parameters.html