diff --git a/draft-ietf-httpbis-cache-latest.xml b/draft-ietf-httpbis-cache-latest.xml
index f4ca438ea..1531af4c9 100644
--- a/draft-ietf-httpbis-cache-latest.xml
+++ b/draft-ietf-httpbis-cache-latest.xml
@@ -1139,7 +1139,7 @@
 <table align="left" anchor="iana.header.registration.table">
    <thead>
       <tr>
-         <th>Header Field Name</th>
+         <th>Field Name</th>
          <th>Status</th>
          <th>Reference</th>
       </tr>
diff --git a/draft-ietf-httpbis-messaging-latest.xml b/draft-ietf-httpbis-messaging-latest.xml
index 89d48db0a..bc068e756 100644
--- a/draft-ietf-httpbis-messaging-latest.xml
+++ b/draft-ietf-httpbis-messaging-latest.xml
@@ -790,7 +790,7 @@ https://www.example.org
 <table align="left" anchor="iana.header.registration.table">
    <thead>
       <tr>
-         <th>Header Field Name</th>
+         <th>Field Name</th>
          <th>Status</th>
          <th>Reference</th>
       </tr>
diff --git a/draft-ietf-httpbis-semantics-latest.xml b/draft-ietf-httpbis-semantics-latest.xml
index fecccce06..82dbefce0 100644
--- a/draft-ietf-httpbis-semantics-latest.xml
+++ b/draft-ietf-httpbis-semantics-latest.xml
@@ -1648,295 +1648,295 @@ deployed and not likely to be registered in a timely manner otherwise.</t>
    <t>
       The following fields are defined by this document:
    </t>
-   <?BEGININC build/draft-ietf-httpbis-semantics-latest.iana-headers ?>
-   <!--AUTOGENERATED FROM extract-header-defs.xslt, do not edit manually-->
-   <table align="left" anchor="iana.header.registration.table">
-      <thead>
-         <tr>
-            <th>Field Name</th>
-            <th>Status</th>
-            <th>Reference</th>
-         </tr>
-      </thead>
-      <tbody>
-         <tr>
-            <td>Accept</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.accept"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Accept-Charset</td>
-            <td>deprecated</td>
-            <td>
-               <xref target="header.accept-charset"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Accept-Encoding</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.accept-encoding"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Accept-Language</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.accept-language"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Accept-Ranges</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.accept-ranges"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Allow</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.allow"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Authentication-Info</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.authentication-info"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Authorization</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.authorization"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Content-Encoding</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.content-encoding"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Content-Language</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.content-language"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Content-Length</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.content-length"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Content-Location</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.content-location"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Content-Range</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.content-range"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Content-Type</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.content-type"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Date</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.date"/>
-            </td>
-         </tr>
-         <tr>
-            <td>ETag</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.etag"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Expect</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.expect"/>
-            </td>
-         </tr>
-         <tr>
-            <td>From</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.from"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Host</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.host"/>
-            </td>
-         </tr>
-         <tr>
-            <td>If-Match</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.if-match"/>
-            </td>
-         </tr>
-         <tr>
-            <td>If-Modified-Since</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.if-modified-since"/>
-            </td>
-         </tr>
-         <tr>
-            <td>If-None-Match</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.if-none-match"/>
-            </td>
-         </tr>
-         <tr>
-            <td>If-Range</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.if-range"/>
-            </td>
-         </tr>
-         <tr>
-            <td>If-Unmodified-Since</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.if-unmodified-since"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Last-Modified</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.last-modified"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Location</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.location"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Max-Forwards</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.max-forwards"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Proxy-Authenticate</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.proxy-authenticate"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Proxy-Authentication-Info</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.proxy-authentication-info"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Proxy-Authorization</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.proxy-authorization"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Range</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.range"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Referer</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.referer"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Retry-After</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.retry-after"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Server</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.server"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Trailer</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.trailer"/>
-            </td>
-         </tr>
-         <tr>
-            <td>User-Agent</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.user-agent"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Vary</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.vary"/>
-            </td>
-         </tr>
-         <tr>
-            <td>Via</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.via"/>
-            </td>
-         </tr>
-         <tr>
-            <td>WWW-Authenticate</td>
-            <td>standard</td>
-            <td>
-               <xref target="header.www-authenticate"/>
-            </td>
-         </tr>
-      </tbody>
-   </table>
-   <!--(END)-->
-
-   <?ENDINC build/draft-ietf-httpbis-semantics-latest.iana-headers ?>
+<?BEGININC build/draft-ietf-httpbis-semantics-latest.iana-headers ?>
+<!--AUTOGENERATED FROM extract-header-defs.xslt, do not edit manually-->
+<table align="left" anchor="iana.header.registration.table">
+   <thead>
+      <tr>
+         <th>Field Name</th>
+         <th>Status</th>
+         <th>Reference</th>
+      </tr>
+   </thead>
+   <tbody>
+      <tr>
+         <td>Accept</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.accept"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Accept-Charset</td>
+         <td>deprecated</td>
+         <td>
+            <xref target="header.accept-charset"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Accept-Encoding</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.accept-encoding"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Accept-Language</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.accept-language"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Accept-Ranges</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.accept-ranges"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Allow</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.allow"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Authentication-Info</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.authentication-info"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Authorization</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.authorization"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Content-Encoding</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.content-encoding"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Content-Language</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.content-language"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Content-Length</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.content-length"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Content-Location</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.content-location"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Content-Range</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.content-range"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Content-Type</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.content-type"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Date</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.date"/>
+         </td>
+      </tr>
+      <tr>
+         <td>ETag</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.etag"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Expect</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.expect"/>
+         </td>
+      </tr>
+      <tr>
+         <td>From</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.from"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Host</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.host"/>
+         </td>
+      </tr>
+      <tr>
+         <td>If-Match</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.if-match"/>
+         </td>
+      </tr>
+      <tr>
+         <td>If-Modified-Since</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.if-modified-since"/>
+         </td>
+      </tr>
+      <tr>
+         <td>If-None-Match</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.if-none-match"/>
+         </td>
+      </tr>
+      <tr>
+         <td>If-Range</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.if-range"/>
+         </td>
+      </tr>
+      <tr>
+         <td>If-Unmodified-Since</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.if-unmodified-since"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Last-Modified</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.last-modified"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Location</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.location"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Max-Forwards</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.max-forwards"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Proxy-Authenticate</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.proxy-authenticate"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Proxy-Authentication-Info</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.proxy-authentication-info"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Proxy-Authorization</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.proxy-authorization"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Range</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.range"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Referer</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.referer"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Retry-After</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.retry-after"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Server</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.server"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Trailer</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.trailer"/>
+         </td>
+      </tr>
+      <tr>
+         <td>User-Agent</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.user-agent"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Vary</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.vary"/>
+         </td>
+      </tr>
+      <tr>
+         <td>Via</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.via"/>
+         </td>
+      </tr>
+      <tr>
+         <td>WWW-Authenticate</td>
+         <td>standard</td>
+         <td>
+            <xref target="header.www-authenticate"/>
+         </td>
+      </tr>
+   </tbody>
+</table>
+<!--(END)-->
+
+<?ENDINC build/draft-ietf-httpbis-semantics-latest.iana-headers ?>
 </section>
 </section>
 
@@ -11745,8 +11745,8 @@ Content-Encoding: gzip
 <x:ref>port</x:ref> = &lt;port, see <xref target="RFC3986" x:fmt="," x:sec="3.2.3"/>&gt;
 <x:ref>product</x:ref> = token [ "/" product-version ]
 <x:ref>product-version</x:ref> = token
-<x:ref>protocol-name</x:ref> = &lt;protocol-name, see <xref target="Messaging" x:fmt="," x:sec="9.8"/>&gt;
-<x:ref>protocol-version</x:ref> = &lt;protocol-version, see <xref target="Messaging" x:fmt="," x:sec="9.8"/>&gt;
+<x:ref>protocol-name</x:ref> = &lt;protocol-name, see <xref target="Messaging" x:fmt="," x:sec="9.9"/>&gt;
+<x:ref>protocol-version</x:ref> = &lt;protocol-version, see <xref target="Messaging" x:fmt="," x:sec="9.9"/>&gt;
 <x:ref>pseudonym</x:ref> = token
 
 <x:ref>qdtext</x:ref> = HTAB / SP / "!" / %x23-5B ; '#'-'['
diff --git a/lib/extract-header-defs.xslt b/lib/extract-header-defs.xslt
index 69ecb0d77..8e0763f50 100644
--- a/lib/extract-header-defs.xslt
+++ b/lib/extract-header-defs.xslt
@@ -16,7 +16,7 @@
     <table align="left" anchor="iana.header.registration.table">
       <thead>
         <tr>
-          <th>Header Field Name</th>
+          <th>Field Name</th>
           <th>Status</th>
           <th>Reference</th>
         </tr>