diff --git a/attributes/default.rb b/attributes/default.rb
index c7c7cff4..af9d2247 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -34,6 +34,8 @@ default['openstack']['common']['custom_template_banner'] = '
 default['openstack']['common']['services'] = {
   'aodh' => 'aodh',
   'baremetal' => 'ironic',
+  'bare_metal' => 'ironic',
+  'block_storage' => 'cinder',
   'block-storage' => 'cinder',
   'compute' => 'nova',
   'compute_api' => 'nova_api',
@@ -44,11 +46,11 @@ default['openstack']['common']['services'] = {
   'identity' => 'keystone',
   'image' => 'glance',
   'network' => 'neutron',
-  'object-storage' => 'swift',
+  'object_storage' => 'swift',
   'orchestration' => 'heat',
   'telemetry' => 'ceilometer',
-  'telemetry-metric' => 'gnocchi',
-  'application-catalog' => 'murano',
+  'telemetry_metric' => 'gnocchi',
+  'application_catalog' => 'murano',
 }
 
 # Setting this to True means that database passwords and service user
diff --git a/attributes/messaging.rb b/attributes/messaging.rb
index 579b97c9..e61c3b3f 100644
--- a/attributes/messaging.rb
+++ b/attributes/messaging.rb
@@ -34,8 +34,9 @@ default['openstack']['bind_service']['mq']['interface'] = nil
 ###################################################################
 # Services to assign mq attributes for
 ###################################################################
-services = %w(aodh baremetal block-storage compute database dns image
-              identity telemetry network orchestration)
+services = %w(aodh bare_metal block_storage compute database dns image
+              identity telemetry network orchestration
+              baremetal block-storage)
 
 ###################################################################
 # Generic default attributes
diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index a2c349a9..bf55fb45 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -4,7 +4,7 @@ require_relative 'spec_helper'
 describe 'openstack-common::default' do
   describe 'ubuntu' do
     let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
-    let(:mq_services) { %w(baremetal block-storage compute database image telemetry network orchestration) }
+    let(:mq_services) { %w(bare_metal block_storage compute database image telemetry network orchestration) }
     let(:node) { runner.node }
     let(:chef_run) do
       runner.converge(described_recipe)