diff --git a/environments/ssl/enable-internal-tls.yaml b/environments/ssl/enable-internal-tls.yaml
index 80148fd363..7e1e67de9b 100644
--- a/environments/ssl/enable-internal-tls.yaml
+++ b/environments/ssl/enable-internal-tls.yaml
@@ -17,9 +17,9 @@ parameter_defaults:
   # Type: boolean
   EnableInternalTLS: True
 
-  # Rabbit client subscriber parameter to specify an SSL connection to the RabbitMQ host.
+  # Messaging client subscriber parameter to specify an SSL connection to the messaging host.
   # Type: string
-  RabbitClientUseSSL: True
+  RpcUseSSL: True
 
   # Extra properties or metadata passed to Nova for the created nodes in the overcloud. It's accessible via the Nova metadata API.
   # Type: json
diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml
index 0fbc313e37..94d4c0772b 100644
--- a/sample-env-generator/ssl.yaml
+++ b/sample-env-generator/ssl.yaml
@@ -34,17 +34,17 @@ environments:
           - EnableInternalTLS
       puppet/services/nova-base.yaml:
         parameters:
-          - RabbitClientUseSSL
+          - RpcUseSSL
       overcloud.yaml:
         parameters:
           - ServerMetadata
     static:
       - EnableInternalTLS
-      - RabbitClientUseSSL
+      - RpcUseSSL
       - ServerMetadata
     sample_values:
       EnableInternalTLS: True
-      RabbitClientUseSSL: True
+      RpcUseSSL: True
       ServerMetadata: |-2
 
             ipa_enroll: True
diff --git a/tools/check-up-to-date.sh b/tools/check-up-to-date.sh
index bb5bed1fb7..eaa29d31c1 100755
--- a/tools/check-up-to-date.sh
+++ b/tools/check-up-to-date.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Report an error if the generated sample environments are not in sync with
 # the current configuration and templates.