diff --git a/manifests/init.pp b/manifests/init.pp
index 65146fda9..27b95cbc9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -88,8 +88,8 @@ class keystone(
   }
 
   package { 'keystone':
-    name   => $::keystone::params::package_name,
     ensure => $package_ensure,
+    name   => $::keystone::params::package_name,
   }
 
   group { 'keystone':
@@ -178,8 +178,8 @@ class keystone(
   }
 
   service { 'keystone':
-    name       => $::keystone::params::service_name,
     ensure     => $service_ensure,
+    name       => $::keystone::params::service_name,
     enable     => $enabled,
     hasstatus  => true,
     hasrestart => true,
diff --git a/manifests/python.pp b/manifests/python.pp
index ea3a5191c..858fd6504 100644
--- a/manifests/python.pp
+++ b/manifests/python.pp
@@ -8,8 +8,8 @@ class keystone::python (
 ) inherits keystone::params {
 
   package { 'python-keystone' :
-    name   => $client_package_name,
     ensure => $ensure,
+    name   => $client_package_name,
   }
 
 }
diff --git a/manifests/roles/admin.pp b/manifests/roles/admin.pp
index d1e81af6f..9af1f846e 100644
--- a/manifests/roles/admin.pp
+++ b/manifests/roles/admin.pp
@@ -55,8 +55,8 @@ class keystone::roles::admin(
     ensure => present,
   }
   keystone_user_role { "${admin}@${admin_tenant}":
-    roles  => 'admin',
     ensure => present,
+    roles  => 'admin',
   }
 
 }