diff --git a/recipes/api.rb b/recipes/api.rb
index 287ae5f..bfbc21d 100644
--- a/recipes/api.rb
+++ b/recipes/api.rb
@@ -37,7 +37,7 @@ platform_options['cinder_api_packages'].each do |pkg|
   end
 end
 
-db_type = node['openstack']['db']['block-storage']['service_type']
+db_type = node['openstack']['db']['block_storage']['service_type']
 node['openstack']['db']['python_packages'][db_type].each do |pkg|
   package pkg do
     action :upgrade
diff --git a/recipes/backup.rb b/recipes/backup.rb
index 7a158a5..3c1b11a 100644
--- a/recipes/backup.rb
+++ b/recipes/backup.rb
@@ -27,7 +27,7 @@ platform_options['cinder_backup_packages'].each do |pkg|
   end
 end
 
-db_type = node['openstack']['db']['block-storage']['service_type']
+db_type = node['openstack']['db']['block_storage']['service_type']
 node['openstack']['db']['python_packages'][db_type].each do |pkg|
   package pkg do
     action :upgrade
diff --git a/recipes/cinder-common.rb b/recipes/cinder-common.rb
index 3e40703..b560b4d 100644
--- a/recipes/cinder-common.rb
+++ b/recipes/cinder-common.rb
@@ -29,20 +29,20 @@ platform_options['cinder_common_packages'].each do |pkg|
   end
 end
 
-db_user = node['openstack']['db']['block-storage']['username']
+db_user = node['openstack']['db']['block_storage']['username']
 db_pass = get_password 'db', 'cinder'
 node.default['openstack']['block-storage']['conf_secrets']
   .[]('database')['connection'] =
-  db_uri('block-storage', db_user, db_pass)
+  db_uri('block_storage', db_user, db_pass)
 
 if node['openstack']['endpoints']['db']['enabled_slave']
   node.default['openstack']['block-storage']['conf_secrets']
     .[]('database')['slave_connection'] =
-    db_uri('block-storage', db_user, db_pass, true)
+    db_uri('block_storage', db_user, db_pass, true)
 end
 
 if node['openstack']['mq']['service_type'] == 'rabbit'
-  node.default['openstack']['block-storage']['conf_secrets']['DEFAULT']['transport_url'] = rabbit_transport_url 'block-storage'
+  node.default['openstack']['block-storage']['conf_secrets']['DEFAULT']['transport_url'] = rabbit_transport_url 'block_storage'
 end
 
 glance_api_endpoint = internal_endpoint 'image_api'
diff --git a/recipes/scheduler.rb b/recipes/scheduler.rb
index 0ae374e..b9c7b34 100644
--- a/recipes/scheduler.rb
+++ b/recipes/scheduler.rb
@@ -32,7 +32,7 @@ platform_options['cinder_scheduler_packages'].each do |pkg|
   end
 end
 
-db_type = node['openstack']['db']['block-storage']['service_type']
+db_type = node['openstack']['db']['block_storage']['service_type']
 node['openstack']['db']['python_packages'][db_type].each do |pkg|
   package pkg do
     action :upgrade
diff --git a/recipes/volume.rb b/recipes/volume.rb
index 7e06a98..79edf8b 100644
--- a/recipes/volume.rb
+++ b/recipes/volume.rb
@@ -38,7 +38,7 @@ platform_options['cinder_volume_packages'].each do |pkg|
   end
 end
 
-db_type = node['openstack']['db']['block-storage']['service_type']
+db_type = node['openstack']['db']['block_storage']['service_type']
 node['openstack']['db']['python_packages'][db_type].each do |pkg|
   package pkg do
     action :upgrade
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5a04965..073be16 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -53,7 +53,7 @@ shared_context 'block-storage-stubs' do
       .with('user', 'ibmnas_admin')
       .and_return('test_pass')
     allow_any_instance_of(Chef::Recipe).to receive(:rabbit_transport_url)
-      .with('block-storage')
+      .with('block_storage')
       .and_return('rabbit://guest:mypass@127.0.0.1:5672')
     stub_command('/usr/sbin/httpd -t').and_return(true)
     stub_command('/usr/sbin/apache2 -t').and_return(true)