diff --git a/wagtail/admin/templates/wagtailadmin/generic/form.html b/wagtail/admin/templates/wagtailadmin/generic/form.html
index 3969d685fd..c5f17fa92f 100644
--- a/wagtail/admin/templates/wagtailadmin/generic/form.html
+++ b/wagtail/admin/templates/wagtailadmin/generic/form.html
@@ -32,7 +32,7 @@
     >
         {% csrf_token %}
 
-        {% block fields %}
+        {% block form_content %}
             {% if panel %}
                 {{ panel.render_form_content }}
             {% else %}
diff --git a/wagtail/documents/templates/wagtaildocs/documents/edit.html b/wagtail/documents/templates/wagtaildocs/documents/edit.html
index be336640ee..691ec63142 100644
--- a/wagtail/documents/templates/wagtaildocs/documents/edit.html
+++ b/wagtail/documents/templates/wagtaildocs/documents/edit.html
@@ -1,7 +1,7 @@
 {% extends "wagtailadmin/generic/edit.html" %}
 {% load i18n wagtailadmin_tags %}
 
-{% block fields %}
+{% block form_content %}
     <div class="w-grid w-grid-cols-1 sm:w-grid-cols-6 w-gap-8">
         <div class="sm:w-col-span-5">
             <input type="hidden" value="{{ next }}" name="next">
diff --git a/wagtail/images/templates/wagtailimages/images/edit.html b/wagtail/images/templates/wagtailimages/images/edit.html
index b3e8c52280..077838bde9 100644
--- a/wagtail/images/templates/wagtailimages/images/edit.html
+++ b/wagtail/images/templates/wagtailimages/images/edit.html
@@ -10,7 +10,7 @@
     <script src="{% versioned_static 'wagtailimages/js/focal-point-chooser.js' %}"></script>
 {% endblock %}
 
-{% block fields %}
+{% block form_content %}
     <div class="w-grid w-grid-cols-1 sm:w-grid-cols-2 w-gap-8">
         <div>
             <input type="hidden" value="{{ next }}" name="next">