diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp
index d0596bfc..ad82373a 100644
--- a/manifests/compute/hypervisor.pp
+++ b/manifests/compute/hypervisor.pp
@@ -34,9 +34,9 @@ class cloud::compute::hypervisor(
   $nova_ssh_private_key       = $os_params::nova_ssh_private_key,
   $nova_ssh_public_key        = $os_params::nova_ssh_public_key,
   $spice_port                 = $os_params::spice_port,
-  $rbd_user                   = $os_params::nova_rbd_user,
-  $rbd_pool                   = $os_params::nova_rbd_pool,
-  $rbd_secret_uuid            = $os_params::ceph_fsid,
+  $nova_rbd_user              = $os_params::nova_rbd_user,
+  $nova_rbd_pool              = $os_params::nova_rbd_pool,
+  $nova_rbd_secret_uuid       = $os_params::ceph_fsid,
   $has_ceph                   = false
 ) {
 
@@ -118,10 +118,10 @@ Host *
     # TODO(EmilienM) Temporary, while https://review.openstack.org/#/c/72440 got merged
     nova_config {
       'DEFAULT/libvirt_images_type':          value => 'rbd';
-      'DEFAULT/libvirt_images_rbd_pool':      value => $rbd_pool;
+      'DEFAULT/libvirt_images_rbd_pool':      value => $nova_rbd_pool;
       'DEFAULT/libvirt_images_rbd_ceph_conf': value => '/etc/ceph/ceph.conf';
-      'DEFAULT/rbd_user':                     value => $rbd_user;
-      'DEFAULT/rbd_secret_uuid':              value => $rbd_secret_uuid;
+      'DEFAULT/rbd_user':                     value => $nova_rbd_pool;
+      'DEFAULT/rbd_secret_uuid':              value => $nova_rbd_secret_uuid;
     }
 
     # Extra config for nova-compute
diff --git a/manifests/image.pp b/manifests/image.pp
index 54568ff8..ada01c44 100644
--- a/manifests/image.pp
+++ b/manifests/image.pp
@@ -80,8 +80,8 @@ class cloud::image(
   $rabbit_host                      = $os_params::rabbit_host,
   $api_eth                          = $os_params::api_eth,
   $openstack_vip                    = $os_params::vip_public_ip,
-  $rbd_store_pool                   = $os_params::glance_rbd_pool,
-  $rbd_store_user                   = $os_params::glance_rbd_user,
+  $glance_rbd_pool                  = $os_params::glance_rbd_pool,
+  $glance_rbd_user                  = $os_params::glance_rbd_user,
   $verbose                          = $os_params::verbose,
   $debug                            = $os_params::debug,
   $log_facility                     = $os_params::log_facility,
@@ -132,8 +132,8 @@ class cloud::image(
   # }
 
   class { 'glance::backend::rbd':
-    rbd_store_user => $rbd_store_user,
-    rbd_store_pool => $rbd_store_pool
+    rbd_store_user => $glance_rbd_user,
+    rbd_store_pool => $glance_rbd_pool
   }
 
   Ceph::Key <<| title == $glance_user |>>
diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb
index d9688701..0fda854e 100644
--- a/spec/classes/cloud_compute_hypervisor_spec.rb
+++ b/spec/classes/cloud_compute_hypervisor_spec.rb
@@ -71,9 +71,9 @@ describe 'cloud::compute::hypervisor' do
         :server_proxyclient_address           => '7.0.0.1',
         :spice_port                           => '6082',
         :has_ceph                             => true,
-        :rbd_user                             => 'cinder',
-        :rbd_pool                             => 'cinder',
-        :rbd_secret_uuid                      => 'secrete',
+        :nova_rbd_user                        => 'nova',
+        :nova_rbd_pool                        => 'nova',
+        :nova_rbd_secret_uuid                 => 'secrete',
         :nova_ssh_private_key                 => 'secrete',
         :nova_ssh_public_key                  => 'public',
         :ks_nova_public_proto                 => 'http',
@@ -233,9 +233,9 @@ describe 'cloud::compute::hypervisor' do
 
     it 'configure nova-conpute to support RBD backend' do
       should contain_nova_config('DEFAULT/libvirt_images_type').with('value' => 'rbd')
-      should contain_nova_config('DEFAULT/libvirt_images_rbd_pool').with('value' => 'cinder')
+      should contain_nova_config('DEFAULT/libvirt_images_rbd_pool').with('value' => 'nova')
       should contain_nova_config('DEFAULT/libvirt_images_rbd_ceph_conf').with('value' => '/etc/ceph/ceph.conf')
-      should contain_nova_config('DEFAULT/rbd_user').with('value' => 'cinder')
+      should contain_nova_config('DEFAULT/rbd_user').with('value' => 'nova')
       should contain_nova_config('DEFAULT/rbd_secret_uuid').with('value' => 'secrete')
     end
 
diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb
index 804bf282..2502ea2f 100644
--- a/spec/classes/cloud_image_spec.rb
+++ b/spec/classes/cloud_image_spec.rb
@@ -31,8 +31,8 @@ describe 'cloud::image' do
       :ks_glance_password               => 'secrete',
       :rabbit_host                      => '10.0.0.1',
       :rabbit_password                  => 'secrete',
-      :rbd_store_user                   => 'glance',
-      :rbd_store_pool                   => 'images',
+      :glance_rbd_user                  => 'glance',
+      :glance_rbd_pool                  => 'images',
       :debug                            => true,
       :verbose                          => true,
       :use_syslog                       => true,