diff --git a/subdoc/gen_tests/struct-complex/S.html b/subdoc/gen_tests/struct-complex/S.html
index 50abddedf..d486691e4 100644
--- a/subdoc/gen_tests/struct-complex/S.html
+++ b/subdoc/gen_tests/struct-complex/S.html
@@ -118,14 +118,14 @@
         </div>
         <div class="section-items">
           <div class="section-item">
-            <div class="item-name member-signature"><span class="static">static</span> bool <a class="field-name" name="field.static_bool_member" href="S.html#field.static_bool_member">static_bool_member</a></div>
+            <div class="item-name member-signature"><a name="field.static_bool_member"></a><span class="static">static</span> bool <a class="field-name" href="S.html#field.static_bool_member">static_bool_member</a></div>
             <div class="description long">
               <p>Comment headline static_bool_member</p>
 
             </div>
           </div>
           <div class="section-item">
-            <div class="item-name member-signature"><span class="static">static</span> <span class="volatile">volatile</span> <a class="type-name" href="OtherType.html" title="OtherType">OtherType</a> <a class="field-name" name="field.static_type_member" href="S.html#field.static_type_member">static_type_member</a></div>
+            <div class="item-name member-signature"><a name="field.static_type_member"></a><span class="static">static</span> <span class="volatile">volatile</span> <a class="type-name" href="OtherType.html" title="OtherType">OtherType</a> <a class="field-name" href="S.html#field.static_type_member">static_type_member</a></div>
             <div class="description long">
               <p>Comment headline static_type_member</p>
 
@@ -196,14 +196,14 @@
         </div>
         <div class="section-items">
           <div class="section-item">
-            <div class="item-name member-signature">bool <a class="field-name" name="field.bool_field" href="S.html#field.bool_field">bool_field</a></div>
+            <div class="item-name member-signature"><a name="field.bool_field"></a>bool <a class="field-name" href="S.html#field.bool_field">bool_field</a></div>
             <div class="description long">
               <p>Comment headline bool_field</p>
 
             </div>
           </div>
           <div class="section-item">
-            <div class="item-name member-signature"><span class="const">const</span> <a class="type-name" href="OtherType.html" title="OtherType">OtherType</a> <a class="field-name" name="field.type_field" href="S.html#field.type_field">type_field</a></div>
+            <div class="item-name member-signature"><a name="field.type_field"></a><span class="const">const</span> <a class="type-name" href="OtherType.html" title="OtherType">OtherType</a> <a class="field-name" href="S.html#field.type_field">type_field</a></div>
             <div class="description long">
               <p>Comment headline type_field</p>
 
diff --git a/subdoc/gen_tests/templates/TemplateMethods.html b/subdoc/gen_tests/templates/TemplateMethods.html
index 336748113..b86789771 100644
--- a/subdoc/gen_tests/templates/TemplateMethods.html
+++ b/subdoc/gen_tests/templates/TemplateMethods.html
@@ -117,7 +117,7 @@
         </div>
         <div class="section-items">
           <div class="section-item">
-            <div class="item-name member-signature"><div class="template">template &lt;class U&gt;</div><span class="static">static</span> U <a class="field-name" name="field.member" href="TemplateMethods.html#field.member">member</a></div>
+            <div class="item-name member-signature"><a name="field.member"></a><div class="template">template &lt;class U&gt;</div><span class="static">static</span> U <a class="field-name" href="TemplateMethods.html#field.member">member</a></div>
             <div class="description long">
             </div>
           </div>
@@ -212,7 +212,7 @@
         </div>
         <div class="section-items">
           <div class="section-item">
-            <div class="item-name member-signature"><a class="type-name" href="S.html" title="S">S</a>&lt;<a class="type-name" href="S.html" title="S">S</a>&lt;int&gt;&gt; <a class="field-name" name="field.template_field" href="TemplateMethods.html#field.template_field">template_field</a></div>
+            <div class="item-name member-signature"><a name="field.template_field"></a><a class="type-name" href="S.html" title="S">S</a>&lt;<a class="type-name" href="S.html" title="S">S</a>&lt;int&gt;&gt; <a class="field-name" href="TemplateMethods.html#field.template_field">template_field</a></div>
             <div class="description long">
             </div>
           </div>
diff --git a/subdoc/gen_tests/typenames-across-paths/n-HoldS.html b/subdoc/gen_tests/typenames-across-paths/n-HoldS.html
index 3523fdc55..371ff7e5e 100644
--- a/subdoc/gen_tests/typenames-across-paths/n-HoldS.html
+++ b/subdoc/gen_tests/typenames-across-paths/n-HoldS.html
@@ -88,12 +88,12 @@
         </div>
         <div class="section-items">
           <div class="section-item">
-            <div class="item-name member-signature"><a class="type-name" href="other-subother-S-FirstNested-Nested.html" title="other::subother::S::FirstNested::Nested">Nested</a> <a class="field-name" name="field.nested" href="n-HoldS.html#field.nested">nested</a></div>
+            <div class="item-name member-signature"><a name="field.nested"></a><a class="type-name" href="other-subother-S-FirstNested-Nested.html" title="other::subother::S::FirstNested::Nested">Nested</a> <a class="field-name" href="n-HoldS.html#field.nested">nested</a></div>
             <div class="description long">
             </div>
           </div>
           <div class="section-item">
-            <div class="item-name member-signature"><a class="type-name" href="other-subother-S.html" title="other::subother::S">S</a> <a class="field-name" name="field.s" href="n-HoldS.html#field.s">s</a></div>
+            <div class="item-name member-signature"><a name="field.s"></a><a class="type-name" href="other-subother-S.html" title="other::subother::S">S</a> <a class="field-name" href="n-HoldS.html#field.s">s</a></div>
             <div class="description long">
             </div>
           </div>
diff --git a/subdoc/lib/gen/generate_record.cc b/subdoc/lib/gen/generate_record.cc
index 3eba6f3c8..412d3ab93 100644
--- a/subdoc/lib/gen/generate_record.cc
+++ b/subdoc/lib/gen/generate_record.cc
@@ -221,6 +221,10 @@ sus::Result<void, MarkdownToHtmlError> generate_record_fields(
         name_div.add_class("item-name");
         name_div.add_class("member-signature");
 
+        {
+          auto anchor = name_div.open_a();
+          anchor.add_name(construct_html_url_anchor_for_field(fe));
+        }
         if (!fe.template_params.is_empty()) {
           auto template_div = name_div.open_div(HtmlWriter::SingleLine);
           template_div.add_class("template");
@@ -241,7 +245,6 @@ sus::Result<void, MarkdownToHtmlError> generate_record_fields(
         }
         generate_type(name_div, fe.type, [&](HtmlWriter::OpenDiv& div) {
           auto anchor = div.open_a();
-          anchor.add_name(construct_html_url_anchor_for_field(fe));
           anchor.add_href(construct_html_url_for_field(fe));
           anchor.add_class("field-name");
           anchor.write_text(fe.name);