diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/generic/create.html b/wagtail/wagtailadmin/templates/wagtailadmin/generic/create.html
index 1536c1b09..513dac0dd 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/generic/create.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/generic/create.html
@@ -16,7 +16,7 @@
 
         <div class="nice-padding">
             <ul class="fields">
-                {% block form %}
+                {% block visible_fields %}
                     {% for field in form.visible_fields %}
                         {% include "wagtailadmin/shared/field_as_li.html" %}
                     {% endfor %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/generic/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/generic/edit.html
index 46d0e0224..c797625ab 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/generic/edit.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/generic/edit.html
@@ -16,12 +16,12 @@
             {% endblock %}
 
             <ul class="fields">
-                {% block form %}
+                {% block visible_fields %}
                     {% for field in form.visible_fields %}
                         {% include "wagtailadmin/shared/field_as_li.html" %}
                     {% endfor %}
                 {% endblock %}
-                
+
                 <li>
                     <input type="submit" value="{% trans 'Save' %}" />
                     {% if can_delete %}