diff --git a/contexts/2021/v1.jsonld b/contexts/2021/v1.jsonld
new file mode 100644
index 0000000..4027c1d
--- /dev/null
+++ b/contexts/2021/v1.jsonld
@@ -0,0 +1,55 @@
+{
+  "@context": {
+    "@protected": true,
+
+    "StatusList2021Credential": {
+      "@id":
+        "https://w3id.org/vc/status-list#StatusList2021Credential",
+      "@context": {
+        "@protected": true,
+
+        "id": "@id",
+        "type": "@type",
+
+        "description": "http://schema.org/description",
+        "name": "http://schema.org/name"
+      }
+    },
+
+    "StatusList2021": {
+      "@id":
+        "https://w3id.org/vc/status-list#StatusList2021",
+      "@context": {
+        "@protected": true,
+
+        "id": "@id",
+        "type": "@type",
+
+        "statusPurpose":
+          "https://w3id.org/vc/status-list#statusPurpose",
+        "encodedList": "https://w3id.org/vc/status-list#encodedList"
+      }
+    },
+
+    "StatusList2021Entry": {
+      "@id":
+        "https://w3id.org/vc/status-list#StatusList2021Entry",
+      "@context": {
+        "@protected": true,
+
+        "id": "@id",
+        "type": "@type",
+
+        "statusPurpose":
+          "https://w3id.org/vc/status-list#statusPurpose",
+        "statusListIndex":
+          "https://w3id.org/vc/status-list#statusListIndex",
+        "statusListCredential": {
+          "@id":
+            "https://w3id.org/vc/status-list#statusListCredential",
+          "@type": "@id"
+        }
+      }
+    }
+  }
+}
diff --git a/contexts/v1.jsonld b/contexts/v1.jsonld
index 4027c1d..5d8d458 100644
--- a/contexts/v1.jsonld
+++ b/contexts/v1.jsonld
@@ -2,23 +2,10 @@
   "@context": {
     "@protected": true,
 
-    "StatusList2021Credential": {
-      "@id":
-        "https://w3id.org/vc/status-list#StatusList2021Credential",
-      "@context": {
-        "@protected": true,
-
-        "id": "@id",
-        "type": "@type",
+    "BitstringStatusListCredential": "https://www.w3.org/ns/credentials/status#BitstringStatusListCredential",
 
-        "description": "http://schema.org/description",
-        "name": "http://schema.org/name"
-      }
-    },
-
-    "StatusList2021": {
-      "@id":
-        "https://w3id.org/vc/status-list#StatusList2021",
+    "BitstringStatusList": {
+      "@id": "https://www.w3.org/ns/credentials/status#BitstringStatusList",
       "@context": {
         "@protected": true,
 
@@ -26,14 +13,32 @@
         "type": "@type",
 
         "statusPurpose":
-          "https://w3id.org/vc/status-list#statusPurpose",
-        "encodedList": "https://w3id.org/vc/status-list#encodedList"
+          "https://www.w3.org/ns/credentials/status#statusPurpose",
+        "encodedList":
+          "https://www.w3.org/ns/credentials/status#encodedList",
+        "ttl": "https://www.w3.org/ns/credentials/status#ttl",
+        "statusReference":
+          "https://www.w3.org/ns/credentials/status#statusReference",
+        "statusSize":
+          "https://www.w3.org/ns/credentials/status#statusSize",
+        "statusMessage": {
+          "@id": "https://www.w3.org/ns/credentials/status#statusMessage",
+          "@context": {
+            "@protected": true,
+
+            "id": "@id",
+            "type": "@type",
+
+            "status": "https://www.w3.org/ns/credentials/status#status",
+            "message": "https://www.w3.org/ns/credentials/status#message"
+          }
+        }
       }
     },
 
-    "StatusList2021Entry": {
+    "BitstringStatusListEntry": {
       "@id":
-        "https://w3id.org/vc/status-list#StatusList2021Entry",
+        "https://www.w3.org/ns/credentials/status#BitstringStatusListEntry",
       "@context": {
         "@protected": true,
 
@@ -41,12 +46,12 @@
         "type": "@type",
 
         "statusPurpose":
-          "https://w3id.org/vc/status-list#statusPurpose",
+          "https://www.w3.org/ns/credentials/status#statusPurpose",
         "statusListIndex":
-          "https://w3id.org/vc/status-list#statusListIndex",
+          "https://www.w3.org/ns/credentials/status#statusListIndex",
         "statusListCredential": {
           "@id":
-            "https://w3id.org/vc/status-list#statusListCredential",
+            "https://www.w3.org/ns/credentials/status#statusListCredential",
           "@type": "@id"
         }
       }
diff --git a/index.html b/index.html
index 2fcb162..b668773 100644
--- a/index.html
+++ b/index.html
@@ -541,8 +541,8 @@ <h3>BitstringStatusListCredential</h3>
                       <td>
 Used to indicate a status message associated with a <a>verifiable
 credential</a>. The status message descriptions MUST be defined in
-`credentialSubject.statusMessages`. `credentialSubject.size` MUST be specified
-when this `statusPurpose` value is used.
+`credentialSubject.statusMessages`. `credentialSubject.statusSize` MUST be
+specified when this `statusPurpose` value is used.
                       </td>
                     </tr>
                   </tbody>
@@ -577,14 +577,14 @@ <h3>BitstringStatusListCredential</h3>
               </td>
             </tr>
             <tr>
-              <td id="size">credentialSubject.size</td>
+              <td id="statusSize">credentialSubject.statusSize</td>
               <td>
-The `size` indicates the size of the status entry in bits. `size` MAY be
-provided. If `size` is not present as a property of the `credentialStatus`, then
-`size` MUST be processed as `1`.  `size` MUST be an integer greater than zero.
-If `size` is provided and is greater than `1`, then the property
-`credentialStatus.statusMessage` MUST be present, and the number of status
-messages must equal the number of possible values.
+The `statusSize` indicates the size of the status entry in bits. `statusSize`
+MAY be provided. If `statusSize` is not present as a property of the
+`credentialStatus`, then `statusSize` MUST be processed as `1`.  `statusSize`
+MUST be an integer greater than zero. If `statusSize` is provided and is greater
+than `1`, then the property `credentialStatus.statusMessage` MUST be present,
+and the number of status messages must equal the number of possible values.
               </td>
             </tr>
             <tr>
@@ -592,9 +592,9 @@ <h3>BitstringStatusListCredential</h3>
               <td>
 The `statusMessage` property MUST be an array. If present,
 the length of the array must equal the number of possible status states
-indicated by `size`. `statusMessage` MAY be present if
-`size` is `1`. `statusMessage` MUST be present if
-`size` is greater than `1`.  If not present, the message value
+indicated by `statusSize`. `statusMessages` MAY be present if
+`statusSize` is `1`. `statusMessages` MUST be present if
+`statusSize` is greater than `1`.  If not present, the message value
 associated with the bit value of `0` is "unset" and the bit
 value of `1` is "set".
 If present, elements in the `statusMessage` array MUST contain at
@@ -617,16 +617,16 @@ <h3>BitstringStatusListCredential</h3>
               </td>
             </tr>
             <tr>
-              <td id="reference">credentialSubject.reference</td>
+              <td id="statusReference">credentialSubject.statusReference</td>
               <td>
-The `reference` property provides a point for implementers to include a [[URL]]
-to material related to the status. An implementer MAY include the `reference`
-property, and if they do, the value MUST be a [[URL]] or an array of URLs.
-Implementers using a `statusPurpose` of `status` are strongly encouraged to
-provide a `reference`.
+The `statusReference` property provides a point for implementers to include a
+[[URL]] to material related to the status. An implementer MAY include the
+`statusReference` property, and if they do, the value MUST be a [[URL]] or an
+array of URLs. Implementers using a `statusPurpose` of `status` are strongly
+encouraged to provide a `statusReference`.
                 <p class="note" title="Details around reference">
-`reference` is especially important when interpretation of the status for a
-credential may involve some understanding of the business case involved.
+`statusReference` is especially important when interpretation of the status for
+a credential may involve some understanding of the business case involved.
                 </p>
               </td>
             </tr>
@@ -832,7 +832,7 @@ <h3>Bitstring Generation Algorithm</h3>
 corresponding `statusListIndex` value in
 a credential in `issuedCredentials`, set the value to the
 appropriate status. The position of the value is computed as `statusListIndex`
-times the `size`.
+times the `statusSize`.
         </li>
         <li>
 Generate a |compressed bitstring| by using the GZIP
diff --git a/vocab/vocabulary.yml b/vocab/vocabulary.yml
index 353ed7b..9fa0bf2 100644
--- a/vocab/vocabulary.yml
+++ b/vocab/vocabulary.yml
@@ -11,7 +11,7 @@ ontology:
     value: Verifiable Credentials Bitstring Status List v1.0
 
   - property: dc:description
-    value: RDFS [[RDF-SCHEMA]] vocabulary used by the [[[VC-BITSTRING-STATUS-LIST]]] [[VC-BITSTRING-STATUS-LIST]]
+    value: RDFS [[RDF-SCHEMA]] vocabulary used by the [[[VC-BITSTRING-STATUS-LIST]]] [[VC-BITSTRING-STATUS-LIST]]
 
   - property: rdfs:seeAlso
     value: https://www.w3.org/TR/vc-bitstring-status-list/
@@ -64,7 +64,7 @@ property:
 
   - id: size
     label: Bitstring entry size in bits
-    defined_by: https://www.w3.org/TR/vc-bitstring-status-list/#size
+    defined_by: https://www.w3.org/TR/vc-bitstring-status-list/#statusSize
     domain: cs:BitstringStatusList
     range: xsd:string
 
@@ -86,6 +86,6 @@ property:
 
   - id: reference
     label: Reference documentation for status messages
-    defined_by: https://www.w3.org/TR/vc-bitstring-status-list/#reference
+    defined_by: https://www.w3.org/TR/vc-bitstring-status-list/#statusReference
     domain: cs:BitstringStatusList
     range: xsd:string