diff --git a/index.html b/index.html
index dea00c1..beac9ea 100644
--- a/index.html
+++ b/index.html
@@ -226,7 +226,7 @@
             restrictRefs,
             window.respecVc.createVcExamples
           ],
-          xref: ["INFRA", "MIMESNIFF", "VC-DATA-MODEL-2.0", "CONTROLLER-DOCUMENT"],
+          xref: ["INFRA", "MIMESNIFF", "VC-DATA-MODEL-2.0", "CID-1.0"],
           otherLinks: [{
             key: "Related Specifications",
             data: [{
@@ -618,11 +618,11 @@ <h3>Terminology</h3>
 [[[#cryptographic-suites]]] for further detail.
           </dd>
 
-          <dt><dfn>controller document</dfn></dt>
+          <dt><dfn>controlled identifier document</dfn></dt>
 
           <dd>
 A document that contains public cryptographic material as defined in the
-[[[CONTROLLER-DOCUMENT]]] specification.
+[[[CID-1.0]]] specification.
           </dd>
 
           <dt><dfn data-lt="verifier|verifiers|verifier's">verifier</dfn></dt>
@@ -657,7 +657,7 @@ <h3>Terminology</h3>
             <p>
 An expression of the relationship between the [=subject=] and a
 [=verification method=]. An example of a verification relationship is
-<a data-cite="CONTROLLER-DOCUMENT#authentication">authentication</a>.
+<a data-cite="CID-1.0#authentication">authentication</a>.
             </p>
           </dd>
 
@@ -763,7 +763,7 @@ <h3>Proofs</h3>
 expressed in a [=data integrity proof=], the value points to the actual location
 of the data; that is, the `verificationMethod` references, via a URL, the
 location of the [=public key=] that can be used to verify the proof. This
-[=public key=] data is stored in a [=controller document=], which contains a
+[=public key=] data is stored in a [=controlled identifier document=], which contains a
 full description of the verification method.
           </dd>
 
@@ -823,8 +823,8 @@ <h3>Proofs</h3>
 A [=string=] value that expresses base-encoded binary data necessary to verify the
 digital proof using the `verificationMethod` specified. The value MUST use a
 header and encoding as described in Section
-<a data-cite="CONTROLLER-DOCUMENT#multibase-0">2.4 Multibase</a> of the
-[[[CONTROLLER-DOCUMENT]]] specification to express the binary data.
+<a data-cite="CID-1.0#multibase-0">2.4 Multibase</a> of the
+[[[CID-1.0]]] specification to express the binary data.
 The contents of this value are determined by a specific cryptosuite and set
 to the <em>proof value</em> generated by the <a href="#add-proof">Add Proof Algorithm</a>
 for that cryptosuite. Alternative properties with different encodings specified by the
@@ -1157,8 +1157,8 @@ <h2>Resource Integrity</h2>
 property named <dfn class="lint-ignore">`digestMultibase`</dfn> in any object
 that includes an `id` property. If present, the `digestMultibase` value MUST be
 a single [=string=] value, or an [=list=] of [=string=] values, each of which is a
-<a data-cite="CONTROLLER-DOCUMENT#multibase">Multibase</a>-encoded
-<a data-cite="CONTROLLER-DOCUMENT#multihash">Multihash</a> value.
+<a data-cite="CID-1.0#multibase">Multibase</a>-encoded
+<a data-cite="CID-1.0#multihash">Multihash</a> value.
         </p>
         <p>
 JSON-LD context authors are expected to add `digestMultibase` to contexts that
@@ -1259,7 +1259,7 @@ <h2>Contexts and Vocabularies</h2>
         <p class="note">
 Beyond the security terms defined by this specification, the
 <a href="https://w3id.org/security">https://w3id.org/security#</a> namespace
-also includes the terms defined in the [[[CONTROLLER-DOCUMENT]]] [[CONTROLLER-DOCUMENT]]
+also includes the terms defined in the [[[CID-1.0]]] [[CID-1.0]]
 specification, with the corresponding mappings in the context files listed above.
         </p>
 
@@ -1641,11 +1641,11 @@ <h2>Relationship to Verifiable Credentials</h2>
         <p>
 Finally, implementers are also urged to understand that there is a difference
 between the revocation information associated with a [=verifiable credential=],
-and the <a data-cite="CONTROLLER-DOCUMENT#dfn-revoked">revocation</a>
-and <a data-cite="CONTROLLER-DOCUMENT#defn-vm-expires">expiration</a> times
+and the <a data-cite="CID-1.0#dfn-revoked">revocation</a>
+and <a data-cite="CID-1.0#defn-vm-expires">expiration</a> times
 for a [=verification method=]. The
-<a data-cite="CONTROLLER-DOCUMENT#dfn-revoked">revocation</a> and
-<a data-cite="CONTROLLER-DOCUMENT#defn-vm-expires">expiration</a> times for a
+<a data-cite="CID-1.0#dfn-revoked">revocation</a> and
+<a data-cite="CID-1.0#defn-vm-expires">expiration</a> times for a
 [=verification method=] are expressed using the `revocation` and `expires`
 properties, respectively; are related to events such as a [=secret key=] being
 compromised or expiring; and can provide timing information which might reveal
@@ -2874,10 +2874,10 @@ <h3>Verification Method Binding</h3>
         <p>
 Implementers ensure that a [=verification method=] is bound to a particular
 controller by going from the definition of the [=verification method=] to the
-[=controller document=], and then ensuring that the [=controller document=] also
+[=controlled identifier document=], and then ensuring that the [=controlled identifier document=] also
 contains a reference to the [=verification method=]. This process is described
 in the algorithm for
-<a data-cite="?CONTROLLER-DOCUMENT#retrieve-verification-method">
+<a data-cite="?CID-1.0#retrieve-verification-method">
 retrieving a verification method</a>.
         </p>
       </section>
@@ -2888,15 +2888,15 @@ <h3>Verification Relationship Validation</h3>
         <p>
 When an implementation is <a href="#verify-proof">verifying a proof</a>, it is
 imperative that it verify not only that the [=verification method=] used to
-generate the proof is listed in the [=controller document=], but also that it
+generate the proof is listed in the [=controlled identifier document=], but also that it
 was intended to be used to generate the proof that is being verified. This process
 is known as "verification relationship validation".
         </p>
         <p>
 The process of validating a verification relationship is outlined in
 Section
-<a data-cite="CONTROLLER-DOCUMENT#retrieve-verification-method">
-3.3 Retrieve Verification Method</a> of the [[[CONTROLLER-DOCUMENT]]]
+<a data-cite="CID-1.0#retrieve-verification-method">
+3.3 Retrieve Verification Method</a> of the [[[CID-1.0]]]
 specification.
         </p>
         <p>
@@ -3507,7 +3507,7 @@ <h2>Revision History</h2>
 Various editorial changes in algorithms and descriptions to improve readability.
         </li>
         <li>
-Moved Multikey definitions to Controller Document.
+Moved Multikey definitions to controlled identifier document.
         </li>
         <li>
 Unify error handling between all Data Integrity cryptosuites.