diff --git a/index.html b/index.html
index f4934ddb..92701fb6 100644
--- a/index.html
+++ b/index.html
@@ -337,7 +337,7 @@ <h2>
           construction, generate a <code>paymentRequestId</code>.
           </li>
           <li>If the <a>current settings object</a>'s <a data-cite=
-          "!html5#responsible-document">responsible document</a> is not
+          "!HTML#responsible-document">responsible document</a> is not
           <a>allowed to use</a> the feature indicated by attribute name
           <a>allowpaymentrequest</a>, then <a>throw</a> a
           "<a>SecurityError</a>" <a>DOMException</a>.
@@ -2407,37 +2407,42 @@ <h2>
           Payment Method Identifiers
         </dt>
         <dd>
-          The term <dfn data-lt=
-          "payment method identifier|payment method identifiers">payment method
+          The term <dfn data-lt="payment method identifiers">payment method
           identifier</dfn> is defined by [[!METHOD-IDENTIFIERS]].
         </dd>
         <dt>
-          HTML 5.1
+          HTML
         </dt>
         <dd>
-          The following are defined by [[!HTML51]]:
+          The following are defined by [[!HTML]]:
           <ul>
             <li>
-              <dfn>queue a task</dfn>
+              <dfn data-cite="!HTML#queuing">queue a task</dfn>
             </li>
             <li>
-              <dfn>user interaction task source</dfn>
+              <dfn data-cite="!HTML#user-interaction-task-source">user
+              interaction task source</dfn>
             </li>
             <li>
-              <dfn>top-level browsing context</dfn>
+              <dfn data-cite="!HTML#top-level-browsing-context">top-level
+              browsing context</dfn>
             </li>
             <li>
-              <dfn>current settings object</dfn>
+              <dfn data-cite="!HTML#current-settings-object">current settings
+              object</dfn>
             </li>
             <li>
-              <dfn>allowed to use</dfn>
+              <dfn data-cite="!HTML#allowed-to-use">allowed to use</dfn>
             </li>
             <li>
-              <dfn>in parallel</dfn>
+              <dfn data-cite="!HTML#in-parallel">in parallel</dfn>
             </li>
-            <li>the <dfn>iframe</dfn> element
+            <li>the <code><dfn data-cite=
+            "!HTML#elementdef-iframe">iframe</dfn></code> element
             </li>
-            <li>the <dfn>allowpaymentrequest</dfn> attribute
+            <li>the <code><dfn data-cite=
+            "!HTML#element-attrdef-iframe-allowpaymentrequest">allowpaymentrequest</dfn></code>
+            attribute
             </li>
           </ul>
         </dd>
@@ -2455,27 +2460,33 @@ <h2>
           defined by [[!ECMA-262-2015]].
           <p>
             The term <dfn data-lt=
-            "JSON-serialize|JSON-serialized|JSON-serializing">JSON-serialize</dfn>
-            applied to a given object means to run the algorithm specified by
-            the original value of the <a>JSON.stringify</a> function on the
-            supplied object, passing the supplied object as the sole argument,
-            and return the resulting string. This can throw an exception.
+            "JSON-serialized|JSON-serializing">JSON-serialize</dfn> applied to
+            a given object means to run the algorithm specified by the original
+            value of the <a>JSON.stringify</a> function on the supplied object,
+            passing the supplied object as the sole argument, and return the
+            resulting string. This can throw an exception.
           </p>
         </dd>
         <dt>
           Writing Promise-Using Specifications
         </dt>
         <dd>
-          The terms <dfn>upon fulfillment</dfn> and <dfn>upon rejection</dfn>
-          are defined by [[!PROMISES-GUIDE]].
+          The terms <dfn data-cite="!PROMISES-GUIDE#upon-fulfillment">upon
+          fulfillment</dfn> and <dfn data-cite=
+          "!PROMISES-GUIDE#upon-rejection">upon rejection</dfn> are defined by
+          [[!PROMISES-GUIDE]].
         </dd>
         <dt>
-          DOM4
+          DOM
         </dt>
         <dd>
-          The <dfn>Event</dfn> type and the terms <dfn>fire an event</dfn>,
-          <dfn>dispatch flag</dfn>, <dfn>stop propagation flag</dfn>, and
-          <dfn>stop immediate propagation flag</dfn> are defined by [[!DOM4]].
+          The <code><dfn data-cite="!whatwg-dom#event">Event</dfn></code>
+          interface and the terms <dfn data-cite=
+          "!whatwg-dom#concept-event-fire">fire an event</dfn>, <dfn data-cite=
+          "!whatwg-dom#dispatch-flag">dispatch flag</dfn>, <dfn data-cite=
+          "!whatwg-dom#stop-propagation-flag">stop propagation flag</dfn>, and
+          <dfn data-cite="!whatwg-dom#stop-immediate-propagation-flag">stop
+          immediate propagation flag</dfn> are defined by [[!DOM]].
         </dd>
         <dt>
           Web IDL