diff --git a/manifests/compute.pp b/manifests/compute.pp
index adce51e..e444b50 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -179,10 +179,10 @@ class openstack::compute (
   } else {
 
     if ! $quantum_user_password {
-      fail('quantum user password must be set when quantum is configured')
+      fail('quantum_user_password must be set when quantum is configured')
     }
     if ! $keystone_host {
-      fail('keystone host must be configured when quantum is installed')
+      fail('keystone_host must be configured when quantum is installed')
     }
 
     class { 'openstack::quantum':
diff --git a/manifests/quantum.pp b/manifests/quantum.pp
index 2d5e546..1d65dc3 100644
--- a/manifests/quantum.pp
+++ b/manifests/quantum.pp
@@ -236,7 +236,7 @@ class openstack::quantum (
 
   if $enable_metadata_agent {
     if ! $shared_secret {
-      fail('Shared secret parameter must be set when using metadata agent')
+      fail('metadata_shared_secret parameter must be set when using metadata agent')
     }
     class { 'quantum::agents::metadata':
       auth_password  => $user_password,
diff --git a/spec/classes/openstack_all_spec.rb b/spec/classes/openstack_all_spec.rb
index fde0786..2d61d0c 100644
--- a/spec/classes/openstack_all_spec.rb
+++ b/spec/classes/openstack_all_spec.rb
@@ -85,7 +85,7 @@ describe 'openstack::all' do
         )
       end
       it 'raises an error if no shared metadata key is set' do
-        expect { subject }.to raise_error(Puppet::Error, /Shared secret parameter must be set when using metadata agent/)
+        expect { subject }.to raise_error(Puppet::Error, /metadata_shared_secret parameter must be set when using metadata agent/)
       end
     end
 
diff --git a/spec/classes/openstack_quantum_spec.rb b/spec/classes/openstack_quantum_spec.rb
index 1b1ffbf..826008c 100644
--- a/spec/classes/openstack_quantum_spec.rb
+++ b/spec/classes/openstack_quantum_spec.rb
@@ -115,7 +115,7 @@ describe 'openstack::quantum' do
     it 'should fail' do
       expect do
         subject
-      end.to raise_error(Puppet::Error, /Shared secret parameter must be set/)
+      end.to raise_error(Puppet::Error, /metadata_shared_secret parameter must be set/)
     end
     context 'with a shared secret' do
       before do