diff --git a/postgres/macros.jinja b/postgres/macros.jinja
index 4eedddb..e61754a 100644
--- a/postgres/macros.jinja
+++ b/postgres/macros.jinja
@@ -12,7 +12,9 @@
 
 {%- macro format_state(name, state, kwarg) %}
 
-  {%- do kwarg.update({'name': name}) %}
+  {%- if 'name' not in kwarg %}
+    {%- do kwarg.update({'name': name}) %}
+  {%- endif %}
   {%- if 'ensure' in kwarg %}
     {%- set ensure = kwarg.pop('ensure') %}
   {%- endif %}
diff --git a/postgres/manage.sls b/postgres/manage.sls
index 59c98b0..3128da3 100644
--- a/postgres/manage.sls
+++ b/postgres/manage.sls
@@ -46,7 +46,7 @@ postgres-reload-modules:
 {%- for name, db in postgres.databases|dictsort() %}
   {%- if 'extensions' in db %}
     {%- for ext_name, extension in db.pop('extensions')|dictsort() %}
-      {%- do extension.update({'maintenance_db': name }) %}
+      {%- do extension.update({'name': ext_name, 'maintenance_db': name}) %}
 
 {{ format_state( name + '-' + ext_name, 'postgres_extension', extension) }}
     - require:
@@ -59,9 +59,9 @@ postgres-reload-modules:
   {%- endif %}
   {%- if 'schemas' in db %}
     {%- for schema_name, schema in db.pop('schemas')|dictsort() %}
-      {%- do schema.update({'dbname': name }) %}
+      {%- do schema.update({'name': schema_name, 'dbname': name }) %}
 
-{{ format_state( schema_name, 'postgres_schema', schema) }}
+{{ format_state( name + '-' + schema_name, 'postgres_schema', schema) }}
     - require:
       - postgres_database: postgres_database-{{ name }}