diff --git a/defaults/main.yml b/defaults/main.yml
index 32a4a65..d7b1d19 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -49,7 +49,7 @@ postgres_users: []
 
 postgres_users_extra: []
 
-postgres_db: []
+postgres_dbs: []
 # @var postgres_db:example: >
 # postgres_db:
 #   - name: "my_app"
@@ -66,7 +66,7 @@ postgres_db: []
 #     state: "present"
 # @end
 
-postgres_db_extra: []
+postgres_dbs_extra: []
 
 postgres_clean_hba_file: True
 postgres_hba_entries:
diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml
index cd3de72..8a70980 100644
--- a/molecule/default/playbook.yml
+++ b/molecule/default/playbook.yml
@@ -3,12 +3,12 @@
   hosts: all
   vars:
     postgres_repository_enabled: True
-    postgres_user:
+    postgres_users:
       - name: "pgdemo"
         password: "secure"
         priv: ALL
         db: "demo"
-    postgres_db:
+    postgres_dbs:
       - name: demo
     postgres_no_log: False