diff --git a/index.html b/index.html
index f8461c89..2ec7cde6 100644
--- a/index.html
+++ b/index.html
@@ -841,7 +841,7 @@ <h2>Terminology</h2>
 subject</a>.
       </dd>
 
-      <dt><dfn>DID delegate</dfn></dt>
+      <dt><dfn class="export">DID delegate</dfn></dt>
 
       <dd>
 An entity to whom a [=DID controller=] has granted permission to use a
@@ -864,14 +864,14 @@ <h2>Terminology</h2>
 defined in <a href="#representations"></a> or in the W3C [[[DID-EXTENSIONS]]].
       </dd>
 
-      <dt><dfn data-lt="DID fragments">DID fragment</dfn></dt>
+      <dt><dfn class="export" data-lt="DID fragments">DID fragment</dfn></dt>
 
       <dd>
 The portion of a [=DID URL=] that follows the first hash sign character
 (<code>#</code>). DID fragment syntax is identical to URI fragment syntax.
       </dd>
 
-      <dt><dfn class="export" data-lt="DID methods">DID method</dfn></dt>
+      <dt><dfn class="export" data-lt="DID methods|DID method's">DID method</dfn></dt>
 
       <dd>
 A definition of how a specific [=DID method scheme=] is implemented. A DID method is
@@ -880,7 +880,7 @@ <h2>Terminology</h2>
 and deactivated. See <a href="#methods"></a>.
       </dd>
 
-      <dt><dfn data-lt="DID paths">DID path</dfn></dt>
+      <dt><dfn class="export" data-lt="DID paths">DID path</dfn></dt>
 
       <dd>
 The portion of a [=DID URL=] that begins with and includes the first forward
@@ -890,7 +890,7 @@ <h2>Terminology</h2>
 See <a href="#path"></a>.
       </dd>
 
-      <dt><dfn data-lt="DID queries">DID query</dfn></dt>
+      <dt><dfn class="export" data-lt="DID queries">DID query</dfn></dt>
 
       <dd>
 The portion of a [=DID URL=] that follows and includes the first question
@@ -908,7 +908,7 @@ <h2>Terminology</h2>
 defined in [[?DID-RESOLUTION]].
       </dd>
 
-      <dt><dfn class="export" data-lt="DID resolvers">DID resolver</dfn></dt>
+      <dt><dfn class="export" data-lt="DID resolvers|DID resolver's">DID resolver</dfn></dt>
 
       <dd>
 A [=DID resolver=] is a software and/or hardware component that performs the
@@ -916,7 +916,7 @@ <h2>Terminology</h2>
 conforming [=DID document=] as output.
       </dd>
 
-      <dt><dfn data-lt="DID schemes|DID method scheme">DID scheme</dfn></dt>
+      <dt><dfn class="export" data-lt="DID schemes|DID method scheme">DID scheme</dfn></dt>
 
       <dd>
 The formal syntax of a [=decentralized identifier=]. The generic DID scheme
@@ -927,7 +927,7 @@ <h2>Terminology</h2>
 the second colon, e.g., <code>did:example:</code>
       </dd>
 
-      <dt><dfn data-lt="DID subjects">DID subject</dfn></dt>
+      <dt><dfn class="export" data-lt="DID subjects">DID subject</dfn></dt>
 
       <dd>
 The entity identified by a [=DID=] and described by a [=DID document=].
@@ -935,7 +935,7 @@ <h2>Terminology</h2>
 digital thing, logical thing, etc.
       </dd>
 
-      <dt><dfn data-lt="DID URLs">DID URL</dfn></dt>
+      <dt><dfn class="export" data-lt="DID URLs">DID URL</dfn></dt>
 
       <dd>
 A [=DID=] plus any additional syntactic component that conforms to the
@@ -945,7 +945,7 @@ <h2>Terminology</h2>
 (with its leading <code>#</code> character).
       </dd>
 
-      <dt><dfn>DID URL dereferencing</dfn></dt>
+      <dt><dfn class="export">DID URL dereferencing</dfn></dt>
 
       <dd>
 The process that takes as its input a [=DID URL=] and a set of input
@@ -960,7 +960,7 @@ <h2>Terminology</h2>
 [[?DID-RESOLUTION]].
       </dd>
 
-      <dt><dfn data-lt="DID URL dereferencers">DID URL dereferencer</dfn></dt>
+      <dt><dfn class="export" data-lt="DID URL dereferencers">DID URL dereferencer</dfn></dt>
 
       <dd>
 A software and/or hardware system that performs the [=DID URL dereferencing=]
@@ -1014,7 +1014,7 @@ <h2>Terminology</h2>
 services, file storage services, and verifiable credential repository services.
       </dd>
 
-      <dt><dfn data-lt="service endpoints">service endpoint</dfn></dt>
+      <dt><dfn class="export" data-lt="did service endpoints" data-local-lt="service endpoint">did service endpoint</dfn></dt>
 
       <dd>
 A network address, such as an HTTP URL, at which [=services=] operate on