diff --git a/index.html b/index.html
index ca705cdbf..16a6f4e7a 100644
--- a/index.html
+++ b/index.html
@@ -1493,7 +1493,7 @@ <h3>Credential Subject</h3>
         </p>
 
         <dl>
-          <dt>credentialSubject</dt>
+          <dt><dfn id="defn-credentialSubject">credentialSubject</dfn></dt>
           <dd>
 The value of the <code>credentialSubject</code> <a>property</a> is defined as
 a set of objects that MUST contain one or more claims that are each related to a
@@ -1569,7 +1569,7 @@ <h3>Issuer</h3>
         </p>
 
         <dl>
-          <dt><var>issuer</var></dt>
+          <dt><var id="defn-issuer">issuer</var></dt>
           <dd>
 The value of the <code>issuer</code> <a>property</a> MUST be either a
 <a>URL</a> or an object containing an <code>id</code> <a>property</a>. It is
@@ -1650,7 +1650,7 @@ <h3>Validity Period</h3>
         </p>
 
         <dl>
-          <dt><var>validFrom</var></dt>
+          <dt><var id="defn-validFrom">validFrom</var></dt>
           <dd>
 If present, the value of the <code>validFrom</code> <a>property</a> MUST be
 an [<a data-cite="XMLSCHEMA11-2#dateTime">XMLSCHEMA11-2</a>]
@@ -1660,7 +1660,7 @@ <h3>Validity Period</h3>
 at which the information associated with the <code>credentialSubject</code>
 <a>property</a> becomes valid.
           </dd>
-          <dt><var>validUntil</var></dt>
+          <dt><var id="defn-validUntil">validUntil</var></dt>
           <dd>
 If present, the value of the <code>validUntil</code> <a>property</a> MUST be an
 [<a data-cite="XMLSCHEMA11-2#dateTimeStamp">XMLSCHEMA11-2</a>]
@@ -1896,7 +1896,7 @@ <h3>Status</h3>
         </p>
 
         <dl>
-          <dt><var>credentialStatus</var></dt>
+          <dt><var id="defn-credentialStatus">credentialStatus</var></dt>
           <dd>
 If present, the value of the <code>credentialStatus</code> <a>property</a> MUST
 include the following:
@@ -1996,14 +1996,14 @@ <h3>Presentations</h3>
 <code>VerifiablePresentation</code>, but additional types MAY be included. The
 related normative guidance in Section <a href="#types"></a> MUST be followed.
           </dd>
-          <dt><var>verifiableCredential</var></dt>
+          <dt><var id="defn-verifiableCredential">verifiableCredential</var></dt>
           <dd>
 The <code>verifiableCredential</code> <a>property</a> MAY be present. The value
 MUST be an array of one or more <a>verifiable credentials</a>, or of data
 derived from <a>verifiable credentials</a> in a cryptographically
 <a>verifiable</a> format.
           </dd>
-          <dt><var>holder</var></dt>
+          <dt><var id="defn-holder">holder</var></dt>
           <dd>
 The <a>verifiable presentation</a> MAY include a <code>holder</code>
 <a>property</a>. If present, the value MUST be either a <a>URL</a> or an object
@@ -2903,7 +2903,7 @@ <h3>Refreshing</h3>
         </p>
 
         <dl>
-          <dt><var>refreshService</var></dt>
+          <dt><var id="defn-refreshService">refreshService</var></dt>
           <dd>
 The value of the <code>refreshService</code> <a>property</a> MUST be one or more
 refresh services that provides enough information to the recipient's software
@@ -2991,7 +2991,7 @@ <h3>Terms of Use</h3>
         </p>
 
         <dl>
-          <dt><var>termsOfUse</var></dt>
+          <dt><var id="defn-termsOfUse">termsOfUse</var></dt>
           <dd>
 The value of the <code>termsOfUse</code> <a>property</a> MUST specify one or
 more terms of use policies under which the creator issued the <a>credential</a>
@@ -3154,7 +3154,7 @@ <h3>Evidence</h3>
         </p>
 
         <dl>
-          <dt><dfn>evidence</dfn></dt>
+          <dt><dfn id="defn-evidence">evidence</dfn></dt>
           <dd>
 The value of the <code>evidence</code> <a>property</a> MUST be one or more
 evidence schemes providing enough information for a <a>verifier</a> to determine
diff --git a/vocab/credentials/v2/template.html b/vocab/credentials/v2/template.html
index 3e529b349..0b7c893c1 100644
--- a/vocab/credentials/v2/template.html
+++ b/vocab/credentials/v2/template.html
@@ -133,7 +133,15 @@
         <a href="https://lists.w3.org/Archives/Public/public-vc-comments/">archives</a>).
       </p>
     </section>
-    <section id="conformance"></section>
+    <section>
+      <h2>Specification of terms</h2>
+      <p>
+        In general, the terms &mdash; i.e., the properties and classes &mdash; used in the VCDM are formally specified in Recommendation Track documents published by the <a href="https://www.w3.org/groups/wg/vc">W3C Verifiable Credentials Working Group</a> or, for some deprecated or reserved terms, in Reports published by the <a href="https://www.w3.org/groups/cg/credentials">W3C Credentials Community Group</a>. In each case of such external definition, the term's description in this document contains a link to the relevant specification. Additionally, the `rdfs:definedBy` property in the RDFS representation(s) refers to the formal specification.
+      </p>
+      <p>
+        In some cases, a local explanation is necessary to complement, or to replace, the definition found in an external specification. For instance, this is so when the term is needed to provide a consistent structure to the RDFS vocabulary, such as when the term defines a common supertype for class instances that are used as objects of specific properties, or when <a href="https://www.w3.org/TR/rdf12-concepts/#section-rdf-graph">RDF Graphs</a> are involved. For such cases, the extra definition is included in the current document (and the `rdfs:comment` property is used to include them in the RDFS representations).
+      </p>
+    </section>
     <section>
       <h2>Namespaces</h2>
       <p>This specification makes use of the following namespaces:</p>
@@ -142,40 +150,62 @@ <h2>Namespaces</h2>
     </section>
 
     <section id="term_definitions">
-      <h1>Term definitions</h1>
+      <h1>Regular terms</h1>
 
       <section id="class_definitions" class="term_definitions">
         <h2>Class definitions</h2>
       </section>
-  
+
       <section id="property_definitions" class="term_definitions">
         <h2>Property definitions</h2>
       </section>
-  
+
       <section id="individual_definitions" class="term_definitions">
         <h2>Definitions for individuals</h2>
       </section>
-    </section>   
+    </section>
+
+    <section id="reserved_term_definitions">
+      <h1>Reserved term definitions</h1>
+
+      <p>All terms in this section are
+        <a href="https://www.w3.org/TR/vc-data-model-2.0/#reserved-extension-points"><em><strong>reserved</strong></em></a>.
+        Implementers may use these properties, but should expect them and/or their meanings to change during the process to
+        normatively specify them.
+      </p>
+
+      <section id="reserved_class_definitions" class="term_definitions">
+        <h2>Reserved classes</h2>
+      </section>
+
+      <section id="reserved_property_definitions" class="term_definitions">
+        <h2>Reserved properties</h2>
+      </section>
+
+      <section id="reserved_individual_definitions" class="term_definitions">
+        <h2>Reserved individuals</h2>
+      </section>
+    </section>
 
     <section id="deprecated_term_definitions">
-      <h1>Deprecated term definitions</h1>
+      <h1>Deprecated terms</h1>
 
-      <p class="annoy">All terms in this section are <em><strong>deprecated</strong></em>, and are only kept in this vocabulary for backward compatibility. 
+      <p class="annoy">All terms in this section are <em><strong>deprecated</strong></em>, and are only kept in this vocabulary for backward compatibility.
         <br>New applications should not use them.
       </p>
 
       <section id="deprecated_class_definitions" class="term_definitions">
         <h2>Deprecated classes</h2>
       </section>
-  
+
       <section id="deprecated_property_definitions" class="term_definitions">
         <h2>Deprecated properties</h2>
       </section>
-  
+
       <section id="deprecated_individual_definitions" class="term_definitions">
         <h2>Deprecated individuals</h2>
       </section>
-    </section>   
+    </section>
 
 
 
diff --git a/vocab/credentials/v2/vocabulary.yml b/vocab/credentials/v2/vocabulary.yml
index ddc7a584a..305711062 100644
--- a/vocab/credentials/v2/vocabulary.yml
+++ b/vocab/credentials/v2/vocabulary.yml
@@ -2,9 +2,9 @@ vocab:
   - id: cred
     value: https://w3.org/2018/credentials#
 
-prefix:
-  - id: odrl
-    value: http://www.w3.org/ns/odrl/2/
+# prefix:
+#   - id: odrl
+#     value: http://www.w3.org/ns/odrl/2/
 
 ontology:
   - property: dc:title
@@ -17,160 +17,144 @@ ontology:
     value: https://www.w3.org/TR/vc-data-model-2.0/
 
 class:
-  - id: JsonSchemaValidator2018
-    label: Json schema validator 2018
-    upper_value: cred:CredentialSchema
-    deprecated: true
-    comment: A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language.
-
-  - id: JsonSchema2023
-    label: JSON schema validator 2023
-    upper_value: cred:CredentialSchema
-    comment: A type of validator that can be used to syntactically validate JSON documents using the JSON Schema language.
-
-  - id: VerifiableCredentialSchema2023
-    label: Credential schema validator 2023
-    comment: A type of validator that can be used to syntactically validate JSON documents packaged as Verifiable Credentials using the JSON Schema language.
-
-  - id: ManualRefreshService2018
-    label: Manual refresh service 2018
-    upper_value: cred:RefreshService
-    deprecated: true
-    comment: A type of Refresh Service that must be interacted with in a manual fashion.
-
-  - id: RefreshService
-    label: Refresh service
-    comment: A Refresh Service is a mechanism that can be utilized by software agents to retrieve an updated copy of a Verifiable Credential.
+  - id: CredentialEvidence
+    label: Credential Evidence
+    comment: A Credential Evidence provides evidence schemes that are used by the <a href="#evidence">evidence</a> property. This class serves as a supertype for specific evidence types.
 
   - id: CredentialSchema
     label: Credential schema
-    comment: A Credential Schema provides verifiers with enough information to determine if the provided data conforms to the provided schema.
+    comment: A Credential Schema provides verifiers with enough information to determine if the provided data conforms to the provided schema. This class serves as a supertype for specific schemas (e.g., <a href="#JsonSchema2023">JsonSchema2023</a>).
 
   - id: CredentialStatus
     label: Credential status
-    comment: A Credential Status provides enough information to determine the current status of the credential (for example, suspended or revoked). It MUST include the `id` property, which MUST be a URL, and the `type` property, which expresses the credential status type (also referred to as the credential status scheme)
+    comment: A Credential Status provides enough information to determine the current status of the credential (for example, suspended or revoked). This class serves as a supertype for specific status types.
+
+  - id: JsonSchema2023
+    label: JSON schema validator 2023
+    defined_by: https://www.w3.org/TR/vc-json-schema/#jsonschema2023
+    upper_value: cred:CredentialSchema
+    comment: A type of validator for the validation of <a href="#VerifiableCredential">Verifiable Credentials</a>, based on JSON Schema.
 
-  - id: StatusList2021Entry
-    label: Status List 2021 Entry
-    comment: A Status List 2021 Entry provides issuers with a mechanism to provide status information for verifiable credentials.
+  - id: RefreshService
+    label: Refresh service
+    comment: A Refresh Service is a mechanism that can be utilized by software agents to retrieve an updated copy of a Verifiable Credential. This class serves as a supertype for specific refresh service types.
 
-  - id: StatusList2021Credential
-    label: Status List 2021 Credential
-    comment: A Status List 2021 Credential provides issuers with a mechanism to publish a verifiable credential which encapsulates a status list.
+  - id: TermsOfUse
+    label: Terms of use
+    comment: Policy under which the creator issued the credential or presentation. This class serves as a supertype for specific types for terms of use.
 
-  - id: CredentialEvidence
-    label: Credential evidence
-    comment: A Credential Evidence scheme provides enough information to a verifier to determine whether the evidence gathered meets their requirements for issuing a credential. The precise content of each evidence scheme is determined by the specific evidence type definition.
+  # - id: StatusList2021Entry
+  #   label: Status List 2021 Entry
+  #   comment: A Status List 2021 Entry provides issuers with a mechanism to provide status information for verifiable credentials.
 
   - id: VerifiableCredential
+    defined_by: https://www.w3.org/TR/vc-data-model-2.0/#credentials
     label: Verifiable credential
-    comment: |
-      A Credential is a set of one or more claims made by an issuer. A Verifiable Credential is a tamper-evident credential that has authorship that can be cryptographically verified. Verifiable Credentials can be used to build Verifiable Presentations, which can also be cryptographically verified.
 
   - id: VerifiableCredentialGraph
     label: Verifiable credential graph
-    comment: Instances of this class are RDF Graphs, where each of these graphs must include exactly one Verifiable Credential
+    comment: Instances of this class are <a href="https://www.w3.org/TR/rdf12-concepts/#section-rdf-graph">RDF Graphs</a> [[RDF12-CONCEPTS]], where each of these graphs must include exactly one <a href="#VerifiableCredential">Verifiable Credential</a>.
 
   - id: VerifiablePresentation
+    defined_by: https://www.w3.org/TR/vc-data-model-2.0/#presentations
     label: Verifiable presentation
-    comment: |
-      A Presentation is data derived from one or more Credentials, issued by one or more `issuers`, that is shared with a specific `verifier`. A Verifiable Presentation is a tamper-evident Presentation encoded in such a way that authorship of the data can be trusted after a process of cryptographic verification. Certain types of verifiable presentations might contain data that is synthesized from, but do not contain, the original verifiable credentials (for example, zero-knowledge proofs).
 
 property:
   - id: credentialSchema
     label: Credential schema
+    defined_by: https://www.w3.org/TR/vc-data-model-2.0/#defn-credentialSchema
     domain: cred:VerifiableCredential
     range: cred:CredentialSchema
-    comment: The value of the `credentialSchema` property MUST be one or more <a href="#CredentialSchema">Credential schema</a> instances.
 
   - id: credentialStatus
     label: Credential status
+    defined_by: https://www.w3.org/TR/vc-data-model-2.0/#defn-credentialStatus
     domain: cred:VerifiableCredential
     range: cred:CredentialStatus
-    comment: The value of the `credentialStatus` property MUST be an instance of a <a href="#CredentialStatus">Credential status</a>.
 
   - id: credentialSubject
     label: Credential subject
+    defined_by: https://www.w3.org/TR/vc-data-model-2.0/#defn-credentialSubject
     domain: cred:VerifiableCredential
     range: IRI
     comment: An entity about which claims are made.
 
   - id: evidence
     label: Evidence
+    defined_by: https://www.w3.org/TR/vc-data-model-2.0/#defn-evidence
     domain: cred:VerifiableCredential
+    status: reserved
     range: cred:CredentialEvidence
-    comment: The value of the `evidence` property MUST be one or more <a href="#CredentialEvidence">Credential evidence</a> instances.
 
   - id: expirationDate
     label: Expiration date
-    domain: cred:VerifiableCredential
+    defined_by: https://www.w3.org/TR/2022/REC-vc-data-model-20220303/#expiration
     range: xsd:dateTime
     deprecated: true
-    comment: The value of the `expirationDate` property was used to express the date and time the credential ceases to be valid. It has been deprecated in favor of <a href="#validUntil">`validUntil`</a>
+    comment: The value of this property was used in the past to express the date and time the credential ceased to be valid. It has been deprecated in favor of <a href="#validUntil">validUntil</a>
 
   - id: holder
     label: Holder
     domain: cred:VerifiablePresentation
+    defined_by: https://www.w3.org/TR/vc-data-model-2.0/#defn-holder
     range : IRI
-    comment: |
-      The value of the `holder` property MUST be a URI. It is RECOMMENDED that dereferencing the URI results in a document containing machine-readable information about the holder that can be used to verify the information expressed in the credential.
 
   - id: issuanceDate
     label: Issuance date
-    domain: cred:VerifiableCredential
+    defined_by: https://www.w3.org/TR/2022/REC-vc-data-model-20220303/#issuance-date
     range: xsd:dateTime
     deprecated: true
-    comment: |
-      The value of the `issuanceDate` property was used to represents the earliest date when the information associated with the <a href="#credentialSubject">`credentialSubject`</a> property became valid. This property has been deprecated in favour of <a href="#validFrom">`validFrom`</a>.
-
-  - id: issued
-    label: issue date
-    domain: cred:VerifiableCredential
-    range: xsd:dateTime
-    comment: |
-      The value of the `issued` property MUST be a string value of an ISO8601 combined date and time string representing the date and time the credential was issued. Note that this date represents the earliest date when the information associated with the <a href="#credentialSubject>`credentialSubject`</a> property became valid.
+    comment: The value of this property was used in the past to represent the earliest date when the information associated with the <a href="#credentialSubject">credentialSubject</a> property became valid. This property has been deprecated in favor of <a href="#validFrom">validFrom</a>.
 
   - id: issuer
-    label: issuer
+    label: Issuer
+    defined_by: https://www.w3.org/TR/vc-data-model-2.0/#defn-issuer
     domain: cred:VerifiableCredential
     range: IRI
-    comment: |
-      The value of the `issuer` property MUST be a URI. It is RECOMMENDED that dereferencing the URI results in a document containing machine-readable information about the issuer that can be used to verify the information expressed in the credential.
+    comment: The value of this property must be a URL uniquely identifying the issuer.
 
   - id: refreshService
-    label: refresh service
+    label: Refresh service
+    defined_by: https://www.w3.org/TR/vc-data-model-2.0/#defn-refreshService
+    domain: cred:VerifiableCredential
+    status: reserved
+    range: cred:RefreshService
+
+  - id: renderMethod
+    label: Render method
     domain: cred:VerifiableCredential
+    defined_by: https://w3c-ccg.github.io/vc-render-method/#the-rendermethod-property
+    status: reserved
     range: cred:RefreshService
-    comment: The value of the `refreshService` property MUST be one or more Refresh Service instances such that the holder can refresh the credential.
 
   - id: serviceEndpoint
-    label: service endpoint
+    label: Service endpoint
     domain: cred:RefreshService
     range: IRI
-    comment: The value of the `serviceEndpoint` property MUST be a URL to the service endpoint associated with the subject.
+    comment: The value of this property must be a URL to the service endpoint associated with the subject. <b><em>There is no URL yet in a VCWG document to <em>define</em> this term.</em></b>
 
   - id: termsOfUse
-    label: terms of use
-    domain: cred:VerifiableCredential,cred:VerifiablePresentation
-    range: odrl:Policy
-    comment: |
-      If specified, the value of the optional `termsOfUse` property MUST specify one or more terms of use policies under which the issuer issued the credential or presentation. Each `termsOfUse` policy MUST specify its type (for example, `IssuerPolicy`) and MAY specify its instance `id`. The precise content of each term of use is determined by the specific `TermsOfUse` type definition. If the recipient (a holder or verifier) violates the specified terms of use, the responsibility is their own, and such violation may incur legal liability.
+    label: Terms of use
+    defined_by: https://www.w3.org/TR/vc-data-model-2.0/#defn-termsOfUse
+    domain: [cred:VerifiableCredential, cred:VerifiablePresentation]
+    status: reserved
+    range: cred:TermsOfUse
 
   - id: validFrom
     label: Valid from
-    domain: cred:VerifiableCredential
+    domain: [cred:VerifiableCredential, cred:VerifiablePresentation]
+    defined_by: https://www.w3.org/TR/vc-data-model-2.0/#defn-validFrom
     range: xsd:dateTime
-    comment: |
-      The value of the `validFrom` property MUST be a string value of an ISO8601 combined date and time string representing the date and time the credential was issued. Note that this date represents the earliest date when the information associated with the <a href="#credentialSubject>`credentialSubject`</a> property became valid.
 
   - id: validUntil
+    defined_by: https://www.w3.org/TR/vc-data-model-2.0/#defn-validUntil
     label: Valid until
-    domain: cred:VerifiableCredential
+    domain: [cred:VerifiableCredential, cred:VerifiablePresentation]
     range: xsd:dateTime
-    comment: The value of the `validUntil` property MUST be a string value of an ISO8601 combined date and time string representing the date and time the credential ceases to be valid.
 
   - id: verifiableCredential
-    label: verifiable credential
+    defined_by: https://www.w3.org/TR/vc-data-model-2.0/#defn-verifiableCredential
+    label: Verifiable credential
     domain: cred:VerifiablePresentation
     range: cred:VerifiableCredentialGraph
-    comment: The value of the `verifiableCredential` property MUST identify a <a href="#VerifiableCredentialGraph">Verifiable credential graph</a> (informally, it indirectly identifies a <a href="#VerifiableCredential">Verifiable credential</a> contained in a separate graph).
+    comment: The value of this property identifies a <a href="#VerifiableCredentialGraph">Verifiable credential graph</a>. (Informally, it indirectly identifies a <a href="#VerifiableCredential">Verifiable credential</a> contained in a separate graph.)