diff --git a/manifests/controller.pp b/manifests/controller.pp
index b75954f..19f10ba 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -156,22 +156,22 @@ class openstack::controller (
 
   ####### KEYSTONE ###########
   class { 'openstack::keystone':
-    verbose                   => $verbose,
-    db_type                   => $db_type,
-    db_host                   => $db_host,
-    keystone_db_password      => $keystone_db_password,
-    keystone_db_dbname        => $keystone_db_dbname,
-    keystone_db_user          => $keystone_db_user,
-    keystone_admin_token      => $keystone_admin_token,
-    keystone_admin_tenant     => $keystone_admin_tenant,
-    admin_email               => $admin_email,
-    admin_password            => $admin_password,
-    public_address            => $public_address,
-    internal_address          => $internal_address,
-    admin_address             => $admin_address,
-    glance_user_password      => $glance_user_password,
-    nova_user_password        => $nova_user_password,
-    enabled                   => $enabled,
+    verbose              => $verbose,
+    db_type              => $db_type,
+    db_host              => $db_host,
+    db_password          => $keystone_db_password,
+    db_name              => $keystone_db_dbname,
+    db_user              => $keystone_db_user,
+    admin_token          => $keystone_admin_token,
+    admin_tenant         => $keystone_admin_tenant,
+    admin_email          => $admin_email,
+    admin_password       => $admin_password,
+    public_address       => $public_address,
+    internal_address     => $internal_address,
+    admin_address        => $admin_address,
+    glance_user_password => $glance_user_password,
+    nova_user_password   => $nova_user_password,
+    enabled              => $enabled,
   }
 
 
diff --git a/manifests/keystone.pp b/manifests/keystone.pp
index af06a9f..ba2f82e 100644
--- a/manifests/keystone.pp
+++ b/manifests/keystone.pp
@@ -9,7 +9,7 @@
 # [keystone_db_password] Password for keystone DB. Required.
 # [keystone_admin_token]. Auth token for keystone admin. Required.
 # [admin_email] Email address of system admin. Required.
-# [admin_password] 
+# [admin_password]
 # [glance_user_password] Auth password for glance user. Required.
 # [nova_user_password] Auth password for nova user. Required.
 # [public_address] Public address where keystone can be accessed. Required.
@@ -39,16 +39,13 @@
 
 class openstack::keystone (
   $db_host,
-  $keystone_db_password,
-  $keystone_admin_token,
+  $db_password,
+  $admin_token,
   $admin_email,
   $admin_password,
   $glance_user_password,
   $nova_user_password,
   $public_address,
-  $db_type               = 'mysql',
-  $keystone_db_user      = 'keystone',
-  $keystone_db_dbname    = 'keystone',
   $keystone_admin_tenant = 'admin',
   $verbose               = 'False',
   $bind_host             = '0.0.0.0',
@@ -57,6 +54,9 @@ class openstack::keystone (
   $glance                = true,
   $nova                  = true,
   $enabled               = true,
+  $db_type                 = 'mysql',
+  $db_user                 = 'keystone',
+  $db_name                 = 'keystone',
 ) {
 
   # Install and configure Keystone