diff --git a/vocab/credentials/v2/template.html b/vocab/credentials/v2/template.html
index 38cd41d0c..f2075a071 100644
--- a/vocab/credentials/v2/template.html
+++ b/vocab/credentials/v2/template.html
@@ -112,6 +112,11 @@
           margin: auto;
           height: auto;
       }
+
+      summary {
+        font-weight: normal !important;
+      }
+
     </style>
   </head>
   <body  typeof="owl:Ontology">
@@ -164,17 +169,24 @@ <h2>Namespaces</h2>
       </dl>
     </section>
 
+    <section>
+      <h2><code>@context</code> files</h2>
+      <p>The following <code>@context</code> files make use of the terms defined in this specification:</p>
+      <ul id="contexts">
+      </ul>
+    </section>
+
     <section id="term_definitions">
       <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="class_definitions" class="term_definitions">
+        <h2>Class definitions</h2>
+      </section>
+
       <section id="datatype_definitions" class="term_definitions">
         <h2>Datatype definitions</h2>
       </section>
@@ -193,14 +205,14 @@ <h1>Reserved terms</h1>
         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_class_definitions" class="term_definitions">
+        <h2>Reserved classes</h2>
+      </section>
+
       <section id="reserved_datatype_definitions" class="term_definitions">
         <h2>Reserved datatype definitions</h2>
       </section>
@@ -217,14 +229,14 @@ <h1>Deprecated terms</h1>
         <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_class_definitions" class="term_definitions">
+        <h2>Deprecated classes</h2>
+      </section>
+
       <section id="deprecated_property_definitions" class="term_definitions">
         <h2>Deprecated properties</h2>
       </section>
diff --git a/vocab/credentials/v2/vocabulary.yml b/vocab/credentials/v2/vocabulary.yml
index 779701731..8e3fbe90d 100644
--- a/vocab/credentials/v2/vocabulary.yml
+++ b/vocab/credentials/v2/vocabulary.yml
@@ -1,7 +1,7 @@
 vocab:
   - id: cred
     value: https://www.w3.org/2018/credentials#
-
+    context: https://www.w3.org/ns/credentials/v2
 # prefix:
 #   - id: odrl
 #     value: http://www.w3.org/ns/odrl/2/
@@ -18,26 +18,26 @@ ontology:
 
 class:
   - id: CredentialEvidence
-    label: Credential Evidence
     defined_by: https://www.w3.org/TR/vc-data-model-2.0/#bc-credential-evidence
     status: reserved
+    context: none
 
   - id: CredentialSchema
-    label: Credential schema
     defined_by: https://www.w3.org/TR/vc-data-model-2.0/#bc-credential-schema
+    context: none
 
   - id: CredentialStatus
-    label: Credential status
     defined_by: https://www.w3.org/TR/vc-data-model-2.0/#bc-credential-status
+    context: none
 
   - id: ConfidenceMethod
     label: Confidence method
     defined_by: https://www.w3.org/TR/vc-data-model-2.0/#bc-confidence-method
     status: reserved
+    context: none
 
   - id: EnvelopedVerifiableCredential
     defined_by: https://www.w3.org/TR/vc-data-model-2.0/#defn-EnvelopedVerifiableCredential
-    label: Enveloped verifiable credential
 
   - id: JsonSchema
     label: JSON schema validator
@@ -53,16 +53,19 @@ class:
     label: Refresh service
     defined_by: https://www.w3.org/TR/vc-data-model-2.0/#bc-refresh-service
     status: reserved
+    context: none
 
   - id: RenderMethod
     label: Render method
     defined_by: https://www.w3.org/TR/vc-data-model-2.0/#bc-render-method
     status: reserved
+    context: none
 
   - id: TermsOfUse
     label: Terms of use
     defined_by: https://www.w3.org/TR/vc-data-model-2.0/#bc-terms-of-use
     status: reserved
+    context: none
 
   - id: VerifiableCredential
     defined_by: https://www.w3.org/TR/vc-data-model-2.0/#credentials
@@ -72,6 +75,7 @@ class:
     label: Verifiable credential graph
     defined_by: https://www.w3.org/TR/vc-data-model-2.0/#dfn-verifiablecredentialgraph
     comment: Instances of this class are <a href="https://www.w3.org/TR/rdf12-concepts/#section-rdf-graph">RDF Graphs</a> [[RDF12-CONCEPTS]].
+    context: none
 
   - id: VerifiablePresentation
     defined_by: https://www.w3.org/TR/vc-data-model-2.0/#presentations
@@ -162,6 +166,7 @@ property:
     defined_by: https://w3c-ccg.github.io/vc-render-method/#the-rendermethod-property
     status: reserved
     range: cred:RenderMethod
+    context: none
 
   - id: relatedResource
     label: Related resource
