diff --git a/common/algorithm-terms.html b/common/algorithm-terms.html
index e9968d2e..3cc56e8f 100644
--- a/common/algorithm-terms.html
+++ b/common/algorithm-terms.html
@@ -49,8 +49,8 @@
     copied into a new <a>processor state</a> when entering a new
     <a>JSON object</a>.</dd>
   <dt><dfn data-lt="promises">promise</dfn></dt><dd>
-    A <a data-cite="ECMASCRIPT-6.0#sec-promise-objects" class="externalDFN">promise</a> is an object that represents the eventual result of a single asynchronous operation.
-    Promises are defined in [[ECMASCRIPT-6.0]].</dd>
+    A <a data-cite="ECMASCRIPT#sec-promise-objects" class="externalDFN">promise</a> is an object that represents the eventual result of a single asynchronous operation.
+    Promises are defined in [[ECMASCRIPT]].</dd>
   <dt><dfn>require all flag</dfn></dt><dd>
     A flag specifying that all properties present in the <a>input frame</a>
     MUST either have a default value or be present in the <a>JSON-LD
diff --git a/common/terms.html b/common/terms.html
index 322b72b7..a44f9b3f 100644
--- a/common/terms.html
+++ b/common/terms.html
@@ -10,19 +10,19 @@
     <a data-cite="JSON-LD11#sets-and-lists" class="externalDFN">Sets and Lists</a> in
     the JSON-LD Syntax specification [[JSON-LD11]]).</dd>
   <dt><dfn data-lt="JSON objects">JSON object</dfn></dt><dd>
-    In the JSON serialization, an <a data-cite="RFC7159#section-4" class="externalDFN">object</a> structure is represented as a pair of curly brackets surrounding zero or
+    In the JSON serialization, an <a data-cite="RFC8259#section-4" class="externalDFN">object</a> structure is represented as a pair of curly brackets surrounding zero or
     more key-value pairs. A key is a <a>string</a>. A single colon comes after
     each key, separating the key from the value. A single comma separates a value
     from a following key. In JSON-LD the keys in an object MUST be unique.
     In the <a>internal representation</a> a <a>JSON object</a> is equivalent to a
-    <dfn data-cite="WEBIDL#dfn-dictionary" data-lt="dictionaries" class="preserve">dictionary</dfn> (see [[WEBIDL]]).</dd>
+    <dfn data-cite="WEBIDL#dfn-dictionary" data-lt="dictionaries" class="preserve">dictionary</dfn> (see [[!WEBIDL]]).</dd>
   <dt class="changed"><dfn data-lt="internal representation">JSON-LD internal representation</dfn></dt><dd class="changed">The JSON-LD
     internal representation is the result of transforming a JSON syntactic structure
     into the core data structures suitable for direct processing:
     <a>arrays</a>, <a>dictionaries</a>,
     <a>strings</a>, <a>numbers</a>, <a>booleans</a>, and <a>null</a>.</dd>
   <dt><dfn>null</dfn></dt><dd>
-    The use of the <a data-cite="RFC7159#section-3" class="externalDFN">null</a> value within JSON-LD is used to
+    The use of the <a data-cite="RFC8259#section-3" class="externalDFN">null</a> value within JSON-LD is used to
     ignore or reset values. A key-value pair in the <code>@context</code> where
     the value, or the <code>@id</code> of the value, is <code>null</code>
     explicitly decouples a term's association with an IRI. A key-value pair in
@@ -32,22 +32,22 @@
     <code>null</code> in expanded form, then the entire <a>JSON
     object</a> is ignored.</dd>
   <dt><dfn data-lt="numbers|JSON number|JSON numbers">number</dfn></dt><dd>
-    In the JSON serialization, a <a data-cite="RFC7159#section-6" class="externalDFN">number</a> is similar to that used in most programming languages, except
+    In the JSON serialization, a <a data-cite="RFC8259#section-6" class="externalDFN">number</a> is similar to that used in most programming languages, except
     that the octal and hexadecimal formats are not used and that leading
     zeros are not allowed.
     In the <a>internal representation</a>, a <a>number</a> is equivalent to either
     a <dfn data-cite="WEBIDL#idl-long" class="preserve">long</dfn>
     or <dfn data-cite="WEBIDL#idl-double" class="preserve">double</dfn>, depending
-    on if the number has a non-zero fractional part (see [[WEBIDL]]).</dd>
+    on if the number has a non-zero fractional part (see [[!WEBIDL]]).</dd>
   <dt><dfn>scalar</dfn></dt><dd>
     A scalar is either a JSON <a>string</a>, <a>number</a>, <a>true</a>,
     or <a>false</a>.</dd>
   <dt><dfn data-lt="strings">string</dfn></dt><dd>
-    A <a data-cite="RFC7159#section-7" class="externalDFN">string</a> is a sequence of zero or more Unicode (UTF-8) characters,
+    A <a data-cite="RFC8259#section-7" class="externalDFN">string</a> is a sequence of zero or more Unicode (UTF-8) characters,
     wrapped in double quotes, using backslash escapes (if necessary). A
     character is represented as a single character string.</dd>
   <dt><dfn>true</dfn> and <dfn>false</dfn></dt><dd>
-    <a data-cite="RFC7159#section-3" class="externalDFN">Values</a> that are used to express one of two possible
+    <a data-cite="RFC8259#section-3" class="externalDFN">Values</a> that are used to express one of two possible
     <dfn data-cite="WEBIDL#idl-boolean" data-lt="booleans" class="preserve">boolean</dfn> states.</dd>
 </dl>
 
@@ -182,12 +182,12 @@
     section of the JSON-LD specification [[JSON-LD11]].
     A <a>linked data graph</a> is a generalized representation of an
     <a data-cite="RDF11-CONCEPTS#dfn-rdf-graph">RDF graph</a>
-    as defined in [[!RDF-CONCEPTS]].</dd>
+    as defined in [[!RDF11-CONCEPTS]].</dd>
   <dt><dfn data-lt="lists">list</dfn></dt><dd>
     A <a>list</a> is an ordered sequence of <a>IRIs</a>,
     <a>blank nodes</a>, and <a>JSON-LD values</a>.
     See <dfn data-cite="RDF-SCHEMA#ch_collectionvocab" data-lt="collection" class="preserve">RDF collection</dfn>
-    in [[RDF-SCHEMA]].</dd>
+    in [[!RDF-SCHEMA]].</dd>
   <dt><dfn data-lt="list objects">list object</dfn></dt><dd>
     A <a>list object</a> is a <a>JSON object</a> that has an <code>@list</code>
     member.</dd>
@@ -282,7 +282,7 @@
   <dt><dfn>typed literal</dfn></dt><dd>
     A <a data-cite="RDF11-CONCEPTS#dfn-typed-literal" class="externalDFN">typed literal</a> is a <a>literal</a> with an associated <a>IRI</a>
     which indicates the literal's datatype.
-    See <dfn data-cite="RDF11-CONCEPTS#dfn-literal" data-lt="RDF literals" class="preserve">RDF literal</dfn> in [[!RDF-CONCEPTS]].</dd>
+    See <dfn data-cite="RDF11-CONCEPTS#dfn-literal" data-lt="RDF literals" class="preserve">RDF literal</dfn> in [[!RDF11-CONCEPTS]].</dd>
   <dt><dfn data-lt="typed values">typed value</dfn></dt><dd>
     A <a>typed value</a> consists of a value, which is a <a>string</a>, and a type,
     which is an <a>IRI</a>.</dd>
diff --git a/index.html b/index.html
index f92b2ca3..a9505463 100644
--- a/index.html
+++ b/index.html
@@ -202,11 +202,11 @@ <h1>Introduction</h1>
   </ul>
 
   <p>To understand the basics in this specification you must first be familiar with
-    <a data-cite="RFC7159">JSON</a>, which is detailed in [[!RFC7159]]. You must also understand the
+    <a data-cite="RFC8288">JSON</a>, which is detailed in [[!RFC8288]]. You must also understand the
     <a data-cite="JSON-LD11">JSON-LD syntax</a> defined in the JSON-LD 1.1 Syntax specification [[!JSON-LD11]], which is the base syntax used by all
     of the algorithms in this document. To understand the API and how it is
     intended to operate in a programming environment, it is useful to have working
-    knowledge of the JavaScript programming language [[ECMASCRIPT-6.0]] and
+    knowledge of the JavaScript programming language [[ECMASCRIPT]] and
     WebIDL [[WEBIDL]]. To understand how JSON-LD maps to RDF, it is helpful to be
     familiar with the basic RDF concepts [[RDF11-CONCEPTS]].</p>
 
@@ -232,8 +232,8 @@ <h2>Contributing</h2>
   <section>
     <h2>Terminology</h2>
 
-    <p>This document uses the following terms as defined in JSON [[!RFC7159]]. Refer
-      to the <a data-cite="RFC7159#section-2">JSON Grammar section</a> in [[!RFC7159]] for formal definitions.</p>
+    <p>This document uses the following terms as defined in JSON [[!RFC8288]]. Refer
+      to the <a data-cite="RFC8288#section-2">JSON Grammar section</a> in [[!RFC8288]] for formal definitions.</p>
 
     <div data-include="common/terms.html"
          data-oninclude="restrictReferences">
@@ -4395,7 +4395,7 @@ <h2>Data Round Tripping</h2>
       when converted from RDF to JSON-LD and back to RDF. It is important
       to highlight that in practice it might be impossible to losslessly
       convert an <code>xsd:integer</code> to a <a>number</a> because
-      its value space is not limited. While the JSON specification [[!RFC7159]]
+      its value space is not limited. While the JSON specification [[!RFC8288]]
       does not limit the value space of <a>numbers</a>
       either, concrete implementations typically do have a limited value
       space.</p>
@@ -4431,7 +4431,7 @@ <h2>The Application Programming Interface</h2>
 
   <p>The JSON-LD API uses <a>Promises</a> to represent
     the result of the various asynchronous operations.
-    <a data-cite="ECMASCRIPT-6.0#sec-promise-objects">Promises</a> are defined in [[ECMASCRIPT-6.0]].
+    <a data-cite="ECMASCRIPT#sec-promise-objects">Promises</a> are defined in [[ECMASCRIPT]].
     General use within specifications can be found in [[promises-guide]].</p>
 
   <section>
@@ -4548,7 +4548,7 @@ <h3>The <dfn>JsonLdProcessor</dfn> Interface</h3>
             as <var>local context</var>. If
             <a data-link-for="JsonldOptions">expandContext</a>
             is a <a class="changed">dictionary</a> having an <code>@context</code> member, pass that member's value instead.</li>
-          <li>Once <a data-lt="jsonldprocessor-expand-input">input</a> has been retrieved, the response has an HTTP Link Header [[!RFC5988]]
+          <li>Once <a data-lt="jsonldprocessor-expand-input">input</a> has been retrieved, the response has an HTTP Link Header [[!RFC8288]]
             using the <code>http://www.w3.org/ns/json-ld#context</code> link relation
             and a content type of <code>application/json</code> or any media type
             with a <code>+json</code> suffix as defined in [[RFC6839]] except
@@ -4765,7 +4765,7 @@ <h3>RemoteDocument</h3>
 
       <dl>
         <dt><dfn data-dfn-for="RemoteDocument">contextUrl</dfn></dt>
-        <dd>If available, the value of the HTTP Link Header [[!RFC5988]] using the
+        <dd>If available, the value of the HTTP Link Header [[!RFC8288]] using the
           <code>http://www.w3.org/ns/json-ld#context</code> link relation in the
           response. If the response's content type is <code>application/ld+json</code>,
           the HTTP Link Header is ignored. If multiple HTTP Link Headers using
@@ -4963,7 +4963,7 @@ <h4>JsonLdErrorCode</h4>
         <dt><dfn>loading remote context failed</dfn></dt>
         <dd>There was a problem encountered loading a remote context.</dd>
         <dt><dfn>multiple context link headers</dfn></dt>
-        <dd>Multiple HTTP Link Headers [[!RFC5988]] using the
+        <dd>Multiple HTTP Link Headers [[!RFC8288]] using the
           <code>http://www.w3.org/ns/json-ld#context</code> link relation
           have been detected.</dd>
         <dt><dfn>processing mode conflict</dfn></dt>