diff --git a/manifests/messaging/rabbit.pp b/manifests/messaging/rabbit.pp
index 4cd629f..9169ecf 100644
--- a/manifests/messaging/rabbit.pp
+++ b/manifests/messaging/rabbit.pp
@@ -215,17 +215,17 @@ rabbit_password, rabbit_virtual_host parameters have been deprecated by the \
                       'oslo_messaging_rabbit/rabbit_retry_backoff' => { value => $rabbit_retry_backoff },
                       'oslo_messaging_rabbit/rabbit_retry_interval' => { value => $rabbit_retry_interval },
                       'oslo_messaging_rabbit/rabbit_transient_queues_ttl' => { value => $rabbit_transient_queues_ttl },
-                      'oslo_messaging_rabbit/rabbit_use_ssl' => { value => $rabbit_use_ssl },
+                      'oslo_messaging_rabbit/ssl' => { value => $rabbit_use_ssl },
                       'oslo_messaging_rabbit/rabbit_userid' => { value => $rabbit_userid },
                       'oslo_messaging_rabbit/rabbit_virtual_host' => { value => $rabbit_virtual_host },
                       'oslo_messaging_rabbit/rabbit_hosts' => { value => $rabbit_hosts_orig },
                       'oslo_messaging_rabbit/rabbit_port' => { value => $rabbit_port_orig },
                       'oslo_messaging_rabbit/rabbit_host' => { value => $rabbit_host_orig },
                       'oslo_messaging_rabbit/rabbit_ha_queues' => { value => $rabbit_ha_queues_orig },
-                      'oslo_messaging_rabbit/kombu_ssl_ca_certs' => { value => $kombu_ssl_ca_certs },
-                      'oslo_messaging_rabbit/kombu_ssl_certfile' => { value => $kombu_ssl_certfile },
-                      'oslo_messaging_rabbit/kombu_ssl_keyfile' => { value => $kombu_ssl_keyfile },
-                      'oslo_messaging_rabbit/kombu_ssl_version' => { value => $kombu_ssl_version },
+                      'oslo_messaging_rabbit/ssl_ca_file' => { value => $kombu_ssl_ca_certs },
+                      'oslo_messaging_rabbit/ssl_cert_file' => { value => $kombu_ssl_certfile },
+                      'oslo_messaging_rabbit/ssl_key_file' => { value => $kombu_ssl_keyfile },
+                      'oslo_messaging_rabbit/ssl_version' => { value => $kombu_ssl_version },
                       'DEFAULT/rpc_backend' => { value => 'rabbit' },
                     }
 
diff --git a/spec/defines/oslo_messaging_rabbit_spec.rb b/spec/defines/oslo_messaging_rabbit_spec.rb
index 58cad52..9bedc73 100644
--- a/spec/defines/oslo_messaging_rabbit_spec.rb
+++ b/spec/defines/oslo_messaging_rabbit_spec.rb
@@ -16,7 +16,7 @@ describe 'oslo::messaging::rabbit' do
        is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_host').with_value('<SERVICE DEFAULT>')
        is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_port').with_value('<SERVICE DEFAULT>')
        is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_hosts').with_value('<SERVICE DEFAULT>')
-       is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('<SERVICE DEFAULT>')
+       is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl').with_value('<SERVICE DEFAULT>')
        is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_userid').with_value('<SERVICE DEFAULT>')
        is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_password').with_value('<SERVICE DEFAULT>')
        is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_login_method').with_value('<SERVICE DEFAULT>')
@@ -107,11 +107,11 @@ describe 'oslo::messaging::rabbit' do
       end
 
       it 'configures rabbit' do
-        is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(true)
-        is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('/etc/ca.cert')
-        is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('/etc/certfile')
-        is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('/etc/key')
-        is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1')
+        is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl').with_value(true)
+        is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_ca_file').with_value('/etc/ca.cert')
+        is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_cert_file').with_value('/etc/certfile')
+        is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_key_file').with_value('/etc/key')
+        is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_version').with_value('TLSv1')
       end
     end
 
@@ -121,11 +121,11 @@ describe 'oslo::messaging::rabbit' do
       end
 
       it 'configures rabbit' do
-        is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(true)
-        is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('<SERVICE DEFAULT>')
-        is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('<SERVICE DEFAULT>')
-        is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('<SERVICE DEFAULT>')
-        is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl').with_value(true)
+        is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_ca_file').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_cert_file').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_key_file').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_version').with_value('<SERVICE DEFAULT>')
       end
     end