diff --git a/nova/manifests/db.pp b/nova/manifests/db.pp
index 6c1fc8f40..50a02fc06 100644
--- a/nova/manifests/db.pp
+++ b/nova/manifests/db.pp
@@ -5,8 +5,8 @@ class nova::db(
   $host = 'localhost'
 ) {
   mysql::db { $name:
-    db_user => $user, 
-    db_pw => $password,  
+    user => $user, 
+    password => $password,  
     host => $host,
     # I may want to inject some sql
     # sql='',
diff --git a/nova/tests/all.pp b/nova/tests/all.pp
index 3349b7e1e..b2285900d 100644
--- a/nova/tests/all.pp
+++ b/nova/tests/all.pp
@@ -10,7 +10,7 @@ class { 'nova::repo':
   stage => 'repo-setup',
 }
 class { 'mysql::server':
-  mysql_root_pw => 'password' 
+  root_password => 'password' 
 }
 class { 'nova::all':
   verbose => 'true',