diff --git a/manifests/init.pp b/manifests/init.pp
index 3a174db5..bfb25a20 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -41,8 +41,8 @@ class cinder (
   anchor { 'cinder-start': }
 
   package { 'cinder':
-    name => $::cinder::params::package_name,
-    ensure => $package_ensure,
+    name    => $::cinder::params::package_name,
+    ensure  => $package_ensure,
     require => Anchor['cinder-start'],
   }
 
@@ -51,7 +51,7 @@ class cinder (
     owner   => 'cinder',
     group   => 'cinder',
     mode    => '0600',
-    require => Package[$::cinder::params::package_name],
+    require => Package['cinder'],
   }
 
   file { $::cinder::params::cinder_paste_api_ini:
@@ -59,7 +59,7 @@ class cinder (
     owner   => 'cinder',
     group   => 'cinder',
     mode    => '0600',
-    require => Package[$::cinder::params::package_name],
+    require => Package['cinder'],
   }
 
   if $rpc_backend == 'cinder.openstack.common.rpc.impl_kombu' {
diff --git a/spec/classes/cinder_spec.rb b/spec/classes/cinder_spec.rb
index 732c7ebb..d67a41c9 100644
--- a/spec/classes/cinder_spec.rb
+++ b/spec/classes/cinder_spec.rb
@@ -58,14 +58,14 @@ describe 'cinder' do
       :owner   => 'cinder',
       :group   => 'cinder',
       :mode    => '0600',
-      :require => 'Package[cinder-common]'
+      :require => 'Package[cinder]'
     ) }
 
     it { should contain_file('/etc/cinder/api-paste.ini').with(
       :owner   => 'cinder',
       :group   => 'cinder',
       :mode    => '0600',
-      :require => 'Package[cinder-common]'
+      :require => 'Package[cinder]'
     ) }
 
   end