From 56cabab4e113370ff8883a054aa3b7a93c0033e1 Mon Sep 17 00:00:00 2001
From: Mahmoud Alkhraishi <mkhraisha@hotmail.com>
Date: Thu, 10 Oct 2024 15:29:48 -0400
Subject: [PATCH] updates to context v2

---
 docs/index.html                               |   8 +-
 .../components/schemas/common/LEIEntity.yml   |  10 +-
 .../components/schemas/common/Template.yml    |   8 +-
 .../components/schemas/common/WebLEI.yml      |   2 +-
 .../credentials/ActivityPubActorCard.yml      |  12 +-
 .../AgricultureActivityCredential.yml         |  20 +--
 .../credentials/AgricultureCanineCard.yml     |  14 +-
 .../credentials/BankAccountCredential.yml     |  14 +-
 .../credentials/BillOfLadingCredential.yml    |  16 +-
 .../credentials/CBP3461EntryCredential.yml    |  54 +++----
 .../CBP7501EntrySummaryCredential.yml         |  12 +-
 .../credentials/CBPEntryType86Credential.yml  |  16 +-
 .../CBPSection321DeMinimisCredential.yml      |  16 +-
 .../schemas/credentials/CTPATCertificate.yml  |  20 +--
 .../credentials/CertificationOfOrigin.yml     |  16 +-
 .../CommercialInvoiceCredential.yml           |  16 +-
 .../DCSAShippingInstructionCredential.yml     |  16 +-
 .../DCSATransportDocumentCredential.yml       |  16 +-
 .../DeliveryScheduleCredential.yml            |  14 +-
 .../DeliveryStatementCredential.yml           |  14 +-
 .../DigitalProductPassportCredential.yml      |  16 +-
 ...alProductPassportDataCarrierCredential.yml |  16 +-
 .../EPA35401PesticidesCredential.yml          |  56 +++----
 .../EPA35401PesticidesPart2Credential.yml     |  30 ++--
 .../EPA35401PesticidesPart3Credential.yml     |  22 +--
 .../credentials/EntryNumberCredential.yml     |  16 +-
 .../EnvironmentalImpactCredential.yml         |  16 +-
 .../schemas/credentials/EventCredential.yml   |  16 +-
 .../ExampleCredentialWithStatus.yml           |  14 +-
 .../credentials/FSMACreatingCTECredential.yml |  16 +-
 .../FSMAFirstReceiverDataCredential.yml       |  16 +-
 .../credentials/FSMAGrowingCTECredential.yml  |  16 +-
 .../FSMAReceivingCTECredential.yml            |  16 +-
 .../credentials/FSMAShippingCTECredential.yml |  16 +-
 .../FSMATransformingCTECredential.yml         |  16 +-
 .../credentials/FVSPImporterCredential.yml    |  18 +--
 .../FoodDefenseInspectionCredential.yml       |  16 +-
 .../FoodFacilityRegistrationCredential.yml    |  16 +-
 .../FoodGradeInspectionCredential.yml         |  16 +-
 .../credentials/FreightManifestCredential.yml |  16 +-
 .../credentials/GAPInspectionCredential.yml   |  16 +-
 .../GS18PrefixLicenseCredential.yml           |  16 +-
 .../GS1CompanyPrefixLicenseCredential.yml     |  16 +-
 .../schemas/credentials/GS1DataCredential.yml |  16 +-
 .../credentials/GS1DelegationCredential.yml   |  16 +-
 .../GS1IdentificationKeyLicenseCredential.yml |  16 +-
 .../schemas/credentials/GS1KeyCredential.yml  |  16 +-
 .../GS1PrefixLicenseCredential.yml            |  16 +-
 .../HouseBillOfLadingCredential.yml           |  16 +-
 .../credentials/IATAAirWaybillCredential.yml  |  16 +-
 .../ImporterSecurityFilingCredential.yml      |  16 +-
 .../IntellectualPropertyRightsCredential.yml  |  14 +-
 ...lectualPropertyRightsLicenseCredential.yml |  14 +-
 .../credentials/IntentToImportCredential.yml  |  16 +-
 .../InventoryRegistrationCredential.yml       |  14 +-
 .../MasterBillOfLadingCredential.yml          |  16 +-
 .../credentials/MexicoEInvoiceCredential.yml  |  16 +-
 .../credentials/MillTestReportCredential.yml  |  16 +-
 .../MonthlyAdvanceManifestCredential.yml      |  16 +-
 .../MonthlyAggregateDeliveryStatements.yml    |  14 +-
 .../MultiModalBillOfLadingCredential.yml      |  16 +-
 ...roducerEnvironmentalPassportCredential.yml |  16 +-
 .../OilAndGasDeliveryTicketCredential.yml     |  16 +-
 .../OilAndGasProductCredential.yml            |  16 +-
 .../OrderConfirmationCredential.yml           |  14 +-
 .../OrganicCertificateCredential.yml          |  16 +-
 .../PGAShipmentStatusCredential.yml           |  12 +-
 .../credentials/PackingListCredential.yml     |  12 +-
 .../credentials/PhytosanitaryCredential.yml   |  20 +--
 .../PlantSystemsInspectionCredential.yml      |  16 +-
 .../credentials/PowerOfAttorneyCredential.yml |  16 +-
 .../ProductRegistrationCredential.yml         |  14 +-
 .../credentials/PurchaseOrderCredential.yml   |  16 +-
 .../QualifiedWebLeiIssuerCredential.yml       |  16 +-
 ...teelImportLicenseApplicationCredential.yml |  14 +-
 .../SIMASteelImportLicenseCredential.yml      |  20 +--
 .../SeaCargoManifestCredential.yml            |  16 +-
 .../ShippingInstructionsCredential.yml        |  12 +-
 .../SoftwareBillofMaterialsCredential.yml     |  16 +-
 .../TSCACertificationCredential.yml           |  16 +-
 .../schemas/credentials/ThingCredential.yml   |  16 +-
 ...APPQ203ForeignSiteInspectionCredential.yml |  20 +--
 .../USDAPermitToImportCredential.yml          |  20 +--
 .../USMCACertificationOfOrigin.yml            |  20 +--
 .../credentials/VerifiableBusinessCard.yml    |  18 +--
 .../VerifiablePostmanCollection.yml           |  12 +-
 .../credentials/VerifiableScorecard.yml       |  12 +-
 .../schemas/credentials/WebLeiCredential.yml  |  34 ++---
 docs/openapi/openapi.yml                      |  13 ++
 .../traceability-schemas/services/contexts.js |   2 +-
 .../services/contexts/vc-v1.json              | 144 +++++++++++++-----
 packages/traceability-tests/examples/v2.json  |   8 +-
 .../tests/regression.test.js                  |  61 ++++----
 .../tests/sanity/context-validation.test.js   |  80 +++++-----
 .../tests/sanity/jsonld.test.js               |  33 ----
 .../sanity/traceable-presentation.test.js     |  16 +-
 96 files changed, 939 insertions(+), 886 deletions(-)
 delete mode 100644 packages/traceability-tests/tests/sanity/jsonld.test.js

diff --git a/docs/index.html b/docs/index.html
index 28ba21fa4..87508ab9f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1037,7 +1037,7 @@ <h5>Workflow Definition</h5>
           <pre class="js">
                 {
                   "@context": [
-                    "https://www.w3.org/2018/credentials/v1",
+                    "https://www.w3.org/ns/credentials/v2",
                     "https://w3id.org/traceability/v1"
                   ],
                   "id": "urn:uuid:3978344f-8596-4c3a-a978-8fcaba3903c5",
@@ -1126,7 +1126,7 @@ <h5>Workflow Instance</h5>
           <pre class="js">
 {
   "@context": [
-    "https://www.w3.org/2018/credentials/v1",
+    "https://www.w3.org/ns/credentials/v2",
     "https://w3id.org/traceability/v1"
   ],
   "id": "urn:uuid:3978344f-8596-4c3a-a978-8fcaba3903c5",
@@ -1193,7 +1193,7 @@ <h4>Presentation Replacement</h4>
           <pre class="js">
 {
   "@context": [
-    "https://www.w3.org/2018/credentials/v1",
+    "https://www.w3.org/ns/credentials/v2",
     "https://w3id.org/traceability/v1"
   ],
   "id": "urn:uuid:p2",
@@ -1219,7 +1219,7 @@ <h4>Presentation Replacement</h4>
   "verifiableCredential": [
     {
       "@context": [
-        "https://www.w3.org/2018/credentials/v1",
+        "https://www.w3.org/ns/credentials/v2",
         "https://w3id.org/traceability/v1"
       ],
       "id": "urn:uuid:c2",
diff --git a/docs/openapi/components/schemas/common/LEIEntity.yml b/docs/openapi/components/schemas/common/LEIEntity.yml
index 458e4b59e..d855ee0d3 100644
--- a/docs/openapi/components/schemas/common/LEIEntity.yml
+++ b/docs/openapi/components/schemas/common/LEIEntity.yml
@@ -86,11 +86,11 @@ properties:
     $linkedData:
       term: status
       '@id': https://schema.org/status
-  expirationDate:
-    title: ExpirationDate
+  validUntil:
+    title: validUntil
     type: string
     $linkedData:
-      term: expirationDate
+      term: validUntil
       '@id': https://schema.org/expires
       '@type': http://www.w3.org/2001/XMLSchema#date
   expirationReason:
@@ -127,7 +127,7 @@ required:
   - legalForm
   - associatedEntity
   - status
-  - expirationDate
+  - validUntil
   - expirationReason
   - successorEntity
   - otherAddresses
@@ -190,7 +190,7 @@ example: |-
       "name": "Lemke LLC"
     },
     "status": "CONFIRMED",
-    "expirationDate": "2022-07-11",
+    "validUntil": "2022-07-11",
     "expirationReason": "synergize cross-media eyeballs",
     "successorEntity": {
       "type": ["Organization"],
diff --git a/docs/openapi/components/schemas/common/Template.yml b/docs/openapi/components/schemas/common/Template.yml
index b9d6fb8a5..755715254 100644
--- a/docs/openapi/components/schemas/common/Template.yml
+++ b/docs/openapi/components/schemas/common/Template.yml
@@ -40,7 +40,7 @@ properties:
     title: Schema
     description: The JSON Schema.
     type: object
-  uiSchema: 
+  uiSchema:
     title: UI Schema
     description: Layout definitions
     type: object
@@ -52,7 +52,7 @@ properties:
     title: Organization
     description: The organization creating the template.
     $ref: ./Organization.yml
-  image: 
+  image:
     title: Image
     description: Image which can serve as an icon for the template.
     type: string
@@ -96,7 +96,7 @@ example: |-
     "uiSchema": {},
     "formData": {
         "@context": [
-            "https://www.w3.org/2018/credentials/v1",
+            "https://www.w3.org/ns/credentials/v2",
             "https://w3id.org/traceability/v1"
         ],
         "id": "https://example.com/credential/123",
@@ -122,7 +122,7 @@ example: |-
                 "linkRelationship": "millTestReportLink"
             }
         ],
-        "issuanceDate": "2019-12-11T03:50:55Z",
+        "validFrom": "2019-12-11T03:50:55Z",
         "issuer": {
             "id": "did:web:organization.example.com",
             "type": ["Organization"],
diff --git a/docs/openapi/components/schemas/common/WebLEI.yml b/docs/openapi/components/schemas/common/WebLEI.yml
index da73ca7ce..cf544a76f 100644
--- a/docs/openapi/components/schemas/common/WebLEI.yml
+++ b/docs/openapi/components/schemas/common/WebLEI.yml
@@ -110,7 +110,7 @@ example: |-
         "name": "Torphy Group"
       },
       "status": "IN PROGRESS",
-      "expirationDate": "2022-07-11",
+      "validUntil": "2022-07-11",
       "expirationReason": "whiteboard visionary web-readiness",
       "successorEntity": {
         "type": ["Organization"],
diff --git a/docs/openapi/components/schemas/credentials/ActivityPubActorCard.yml b/docs/openapi/components/schemas/credentials/ActivityPubActorCard.yml
index aa858391c..de95fa5a3 100644
--- a/docs/openapi/components/schemas/credentials/ActivityPubActorCard.yml
+++ b/docs/openapi/components/schemas/credentials/ActivityPubActorCard.yml
@@ -12,7 +12,7 @@ required:
   - '@context'
   - id
   - type
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSchema
   - credentialSubject
@@ -21,11 +21,11 @@ properties:
     type: array
     readOnly: true
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://www.w3.org/ns/activitystreams
     items:
       - type: string
-        const: https://www.w3.org/2018/credentials/v1
+        const: https://www.w3.org/ns/credentials/v2
     additionalItems:
       type: string
       enum:
@@ -47,7 +47,7 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
   issuer:
@@ -99,7 +99,7 @@ additionalProperties: false
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://www.w3.org/ns/activitystreams"
     ],
     "id": "urn:credential:1a667a1c-f761-4172-b110-5610ad25f50b",
@@ -111,7 +111,7 @@ example: |-
       "id": "https://w3c-ccg.github.io/traceability-vocab/openapi/components/schemas/credentials/ActivityPubActorCard.yml",
       "type": "JsonSchema"
     },
-    "issuanceDate": "2023-05-21T15:39:57.944Z",
+    "validFrom": "2023-05-21T15:39:57.944Z",
     "issuer": {
       "id": "did:web:organization.example.com"
     },
diff --git a/docs/openapi/components/schemas/credentials/AgricultureActivityCredential.yml b/docs/openapi/components/schemas/credentials/AgricultureActivityCredential.yml
index 8081e5351..a21a884bb 100644
--- a/docs/openapi/components/schemas/credentials/AgricultureActivityCredential.yml
+++ b/docs/openapi/components/schemas/credentials/AgricultureActivityCredential.yml
@@ -13,15 +13,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -43,10 +43,10 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -79,8 +79,8 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
-  - expirationDate
+  - validFrom
+  - validUntil
   - issuer
   - credentialSubject
 example: |-
@@ -90,7 +90,7 @@ example: |-
       "AgricultureActivityCredential"
     ],
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:2385e117-8011-4n15-bcae-64e4e26856c8",
@@ -103,8 +103,8 @@ example: |-
       "id": "did:web:organization.example.com",
       "name": "Binky's Farm"
     },
-    "issuanceDate": "2022-01-13T09:16:46Z",
-    "expirationDate": "2122-01-13T09:16:46Z",
+    "validFrom": "2022-01-13T09:16:46Z",
+    "validUntil": "2122-01-13T09:16:46Z",
     "credentialSubject": {
       "agActivities": [
         {
diff --git a/docs/openapi/components/schemas/credentials/AgricultureCanineCard.yml b/docs/openapi/components/schemas/credentials/AgricultureCanineCard.yml
index 8859958c9..c985ba6e1 100644
--- a/docs/openapi/components/schemas/credentials/AgricultureCanineCard.yml
+++ b/docs/openapi/components/schemas/credentials/AgricultureCanineCard.yml
@@ -14,15 +14,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -41,7 +41,7 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
   issuer:
@@ -156,14 +156,14 @@ required:
   - '@context'
   - id
   - type
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
   - credentialSchema
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:credential:5c375bcd-a6e1-4b36-90be-8fd33118669a",
@@ -175,7 +175,7 @@ example: |-
       "id": "https://w3c-ccg.github.io/traceability-vocab/openapi/components/schemas/credentials/AgricultureCanineCard.yml",
       "type": "OpenApiSpecificationValidator2022"
     },
-    "issuanceDate": "2019-12-11T03:50:55Z",
+    "validFrom": "2019-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": "Organization",
diff --git a/docs/openapi/components/schemas/credentials/BankAccountCredential.yml b/docs/openapi/components/schemas/credentials/BankAccountCredential.yml
index 3690a0b09..fa9f0d492 100644
--- a/docs/openapi/components/schemas/credentials/BankAccountCredential.yml
+++ b/docs/openapi/components/schemas/credentials/BankAccountCredential.yml
@@ -21,15 +21,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -50,7 +50,7 @@ properties:
 
   issuer:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
   credentialSchema:
@@ -77,13 +77,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://acmebank.com/credentials/1111111",
@@ -92,7 +92,7 @@ example: |-
       "BankAccountCredential"
     ],
     "issuer": "urn:uuid:11111111-1111-1111-1111-111111111111",
-    "issuanceDate": "2022-04-11T16:36:24Z",
+    "validFrom": "2022-04-11T16:36:24Z",
     "credentialSubject": {
       "type": [
         "BankAccount"
diff --git a/docs/openapi/components/schemas/credentials/BillOfLadingCredential.yml b/docs/openapi/components/schemas/credentials/BillOfLadingCredential.yml
index 8713fea9e..8f6d92334 100644
--- a/docs/openapi/components/schemas/credentials/BillOfLadingCredential.yml
+++ b/docs/openapi/components/schemas/credentials/BillOfLadingCredential.yml
@@ -23,15 +23,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -50,10 +50,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -82,13 +82,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -96,7 +96,7 @@ example: |-
       "VerifiableCredential",
       "BillOfLadingCredential"
     ],
-    "issuanceDate": "2019-12-11T03:50:55Z",
+    "validFrom": "2019-12-11T03:50:55Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/CBP3461EntryCredential.yml b/docs/openapi/components/schemas/credentials/CBP3461EntryCredential.yml
index d17e54650..99ddd4169 100644
--- a/docs/openapi/components/schemas/credentials/CBP3461EntryCredential.yml
+++ b/docs/openapi/components/schemas/credentials/CBP3461EntryCredential.yml
@@ -16,7 +16,7 @@ properties:
     items:
       type: string
       enum:
-        - 'https://www.w3.org/2018/credentials/v1'
+        - 'https://www.w3.org/ns/credentials/v2'
         - 'https://w3id.org/traceability/v1'
   type:
     type: array
@@ -34,15 +34,15 @@ properties:
         - CBP3461EntryCredential
   id:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
     title: Issuer Organization
-    description: Commercial invoice issuing organization. 
+    description: Commercial invoice issuing organization.
     type: object
     properties:
       type:
@@ -56,7 +56,7 @@ properties:
           type: string
           enum:
             - Organization
-      id: 
+      id:
         title: Issuer's Identifier
         description: Issuing organization identifier, typically a Decentralized Identifier (DID).
         type: string
@@ -182,7 +182,7 @@ properties:
               type: string
               enum:
                 - Place
-          usPortCode: 
+          usPortCode:
             title: US CBP Port Code
             description: CBP Automated Manifest Interface Requirements, Appendix E - Schedule D – U.S. CBP Port Codes. 4 character port code (https://www.cbp.gov/sites/default/files/assets/documents/2020-Jan/ACE%20Appendix%20E%20Schedule%20D%20January%202020%20(1).pdf).
             type: string
@@ -286,7 +286,7 @@ properties:
           - type
           - name
           - location
-      importerOfRecord: 
+      importerOfRecord:
         title: Importer Of Record
         description: US CBP importer of record.
         type: object
@@ -302,7 +302,7 @@ properties:
               type: string
               enum:
                 - CBPImporterOfRecord
-          number: 
+          number:
             title: importerOfRecordNumber
             description: Importer Of Record Number
             type: string
@@ -336,7 +336,7 @@ properties:
         type: string
       entryType:
         title: Entry Type
-        description: >- 
+        description: >-
           Record the appropriate entry type code by selecting the two-digit code for the type of entry summary
           being filed. The first digit of the code identifies the general category of the entry (i.e., consumption = 0,
           informal = 1). The second digit further defines the specific processing type within the entry category.
@@ -360,7 +360,7 @@ properties:
           Note: When the importer of record of emergency war materials is not a government
           agency, entry type codes 01, 02, 03, etc., as appropriate, are to be used.
         type: string
-        enum: 
+        enum:
           - Free and Dutiable 01
           - Quota/Visa 02
           - Antidumping/Countervailing Duty (AD/CVD) 03
@@ -379,7 +379,7 @@ properties:
         type: string
       suretyCode:
         title: Surety Code
-        description: Provide the surety code. The surety code identifies the surety company, authorized by the Department of the Treasury, for the bond. 
+        description: Provide the surety code. The surety code identifies the surety company, authorized by the Department of the Treasury, for the bond.
         type: string
       portOfUnlading:
         title: Port Of Unlading
@@ -397,7 +397,7 @@ properties:
               type: string
               enum:
                 - Place
-          usPortCode: 
+          usPortCode:
             title: US CBP Port Code
             description: CBP Automated Manifest Interface Requirements, Appendix E - Schedule D – U.S. CBP Port Codes. 4 character port code (https://www.cbp.gov/sites/default/files/assets/documents/2020-Jan/ACE%20Appendix%20E%20Schedule%20D%20January%202020%20(1).pdf).
             type: string
@@ -409,7 +409,7 @@ properties:
         title: Mode Of Transportation
         description: The Mode of Transportation from the available options Air, Ocean, Rail, Truck, Hand Carry, Pipeline, or Other.
         type: string
-        enum: 
+        enum:
           - Air
           - Ocean
           - Rail
@@ -433,7 +433,7 @@ properties:
               type: string
               enum:
                 - Place
-          firmsCode: 
+          firmsCode:
             title: FIRMS Code
             description: Facilities Information and Resources Management Code
             type: string
@@ -484,7 +484,7 @@ properties:
         required:
           - type
       generalOrderNumber:
-        title: General Order Number 
+        title: General Order Number
         description: If the shipment has been placed in a general order warehouse, enter the G.O. number (e.g., 2016--0638).
         type: string
       conveyanceNameOrFreeTradeZoneID:
@@ -502,7 +502,7 @@ properties:
       lineItems:
         title: Line Items
         type: array
-        items: 
+        items:
           type: object
           properties:
             type:
@@ -516,7 +516,7 @@ properties:
                 type: string
                 enum:
                   - CBPEntryLineItem
-            commodity: 
+            commodity:
               title: Commodity
               description: 10-digit USITS HTS commodity code.
               type: object
@@ -562,13 +562,13 @@ properties:
                     type: string
                     enum:
                       - CBPEntryEntity
-                role: 
+                role:
                   title: A quantity despatched in the trade delivery.
                   type: string
                   enum:
                     - Manufacturer
                     - Consignee
-                    - Seller 
+                    - Seller
                     - Buyer
                 organization:
                   title: Organization
@@ -585,7 +585,7 @@ properties:
                         type: string
                         enum:
                           - Organization
-                    id: 
+                    id:
                       title: Issuer's Identifier
                       description: Issuing organization identifier, typically a Decentralized Identifier (DID).
                       type: string
@@ -653,7 +653,7 @@ properties:
                                 The two-letter ISO 3166-1 alpha-2 country code.
                               type: string
                           additionalProperties: false
-                importerOfRecord: 
+                importerOfRecord:
                   title: Importer Of Record
                   description: US CBP importer of record identifier and identifier type (IRS, SSN, or CBP).
                   type: object
@@ -669,7 +669,7 @@ properties:
                         type: string
                         enum:
                           - CBPImporterOfRecord
-                    number: 
+                    number:
                       title: importerOfRecordNumber
                       description: Importer Of Record Number
                       type: string
@@ -705,7 +705,7 @@ properties:
               title: Free Trade Zone Status
               description: For Entry type 06, select P for Privileged Foreign or N for Non-privileged Foreign. For all other entry types leave blank
               type: string
-            countryOfOrigin: 
+            countryOfOrigin:
               title: Country of Origin
               description: The two-letter ISO 3166-1 alpha-2 country code.
               type: string
@@ -721,7 +721,7 @@ properties:
             - countryOfOrigin
       nonAMS:
         title: Non AMS
-        description: Indicates if the Bill of Lading is not automated. 
+        description: Indicates if the Bill of Lading is not automated.
         type: boolean
       splitBill:
         title: Split Bill
@@ -804,13 +804,13 @@ required:
   - id
   - '@context'
   - type
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:14583cb3-8ce8-4dc5-89f7-1ee5cda8c068",
@@ -818,7 +818,7 @@ example: |-
       "VerifiableCredential",
       "CBP3461EntryCredential"
     ],
-    "issuanceDate": "2022-02-25T14:34:00Z",
+    "validFrom": "2022-02-25T14:34:00Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/CBP7501EntrySummaryCredential.yml b/docs/openapi/components/schemas/credentials/CBP7501EntrySummaryCredential.yml
index c500610a1..f2acd192e 100644
--- a/docs/openapi/components/schemas/credentials/CBP7501EntrySummaryCredential.yml
+++ b/docs/openapi/components/schemas/credentials/CBP7501EntrySummaryCredential.yml
@@ -16,7 +16,7 @@ properties:
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -34,10 +34,10 @@ properties:
         - CBP7501EntrySummaryCredential
   id:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -66,13 +66,13 @@ required:
   - id
   - '@context'
   - type
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:96d1840d-a5ad-4185-9de5-7fc3eac2cc4c",
@@ -101,7 +101,7 @@ example: |-
         }
       }
     },
-    "issuanceDate": "2022-03-03T15:20:00Z",
+    "validFrom": "2022-03-03T15:20:00Z",
     "credentialSubject": {
       "type": [
         "CBPEntrySummary"
diff --git a/docs/openapi/components/schemas/credentials/CBPEntryType86Credential.yml b/docs/openapi/components/schemas/credentials/CBPEntryType86Credential.yml
index c00171bed..5a610c8e1 100644
--- a/docs/openapi/components/schemas/credentials/CBPEntryType86Credential.yml
+++ b/docs/openapi/components/schemas/credentials/CBPEntryType86Credential.yml
@@ -11,15 +11,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -37,10 +37,10 @@ properties:
         - CBPEntryType86Credential
   id:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -442,13 +442,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:14583cb3-8ce8-4dc5-89f7-1ee5cda8c068",
@@ -456,7 +456,7 @@ example: |-
       "VerifiableCredential",
       "CBPEntryType86Credential"
     ],
-    "issuanceDate": "2022-02-25T14:34:00Z",
+    "validFrom": "2022-02-25T14:34:00Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/CBPSection321DeMinimisCredential.yml b/docs/openapi/components/schemas/credentials/CBPSection321DeMinimisCredential.yml
index 9d22bdc81..9b09e58b2 100644
--- a/docs/openapi/components/schemas/credentials/CBPSection321DeMinimisCredential.yml
+++ b/docs/openapi/components/schemas/credentials/CBPSection321DeMinimisCredential.yml
@@ -11,15 +11,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -37,10 +37,10 @@ properties:
         - CBPSection321DeMinimisCredential
   id:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -609,13 +609,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:1c118bf0-01bd-43b0-n158-f0c58dbfea87",
@@ -623,7 +623,7 @@ example: |-
       "VerifiableCredential",
       "CBPSection321DeMinimisCredential"
     ],
-    "issuanceDate": "2022-07-12T10:00:00Z",
+    "validFrom": "2022-07-12T10:00:00Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/CTPATCertificate.yml b/docs/openapi/components/schemas/credentials/CTPATCertificate.yml
index 1dcb9126e..249aa453e 100644
--- a/docs/openapi/components/schemas/credentials/CTPATCertificate.yml
+++ b/docs/openapi/components/schemas/credentials/CTPATCertificate.yml
@@ -26,17 +26,17 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
       - https://w3id.org/vc/status-list/2021/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
       - https://w3id.org/vc/status-list/2021/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
         - https://w3id.org/vc/status-list/2021/v1
   type:
@@ -59,10 +59,10 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -110,8 +110,8 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
-  - expirationDate
+  - validFrom
+  - validUntil
   - issuer
   - credentialSubject
 example: |-
@@ -121,7 +121,7 @@ example: |-
       "CTPATCertificate"
     ],
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1",
       "https://w3id.org/vc/status-list/2021/v1"
     ],
@@ -135,8 +135,8 @@ example: |-
       "id": "did:web:organization.example.com",
       "name": "Customs Trade Partnership Against Terrorism"
     },
-    "issuanceDate": "2022-01-13T09:16:46Z",
-    "expirationDate": "2122-01-13T09:16:46Z",
+    "validFrom": "2022-01-13T09:16:46Z",
+    "validUntil": "2122-01-13T09:16:46Z",
     "credentialSubject": {
       "type": [
         "CTPAT"
diff --git a/docs/openapi/components/schemas/credentials/CertificationOfOrigin.yml b/docs/openapi/components/schemas/credentials/CertificationOfOrigin.yml
index b9e958153..25aa06569 100644
--- a/docs/openapi/components/schemas/credentials/CertificationOfOrigin.yml
+++ b/docs/openapi/components/schemas/credentials/CertificationOfOrigin.yml
@@ -16,15 +16,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -43,10 +43,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -94,13 +94,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:326c74c8-f4d7-4c1b-b158-2683deb8768e",
@@ -108,7 +108,7 @@ example: |-
       "VerifiableCredential",
       "CertificationOfOrigin"
     ],
-    "issuanceDate": "2019-12-11T03:50:55Z",
+    "validFrom": "2019-12-11T03:50:55Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/CommercialInvoiceCredential.yml b/docs/openapi/components/schemas/credentials/CommercialInvoiceCredential.yml
index a8f4aca23..6c9ec1989 100644
--- a/docs/openapi/components/schemas/credentials/CommercialInvoiceCredential.yml
+++ b/docs/openapi/components/schemas/credentials/CommercialInvoiceCredential.yml
@@ -18,15 +18,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -45,10 +45,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -1169,13 +1169,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:5e45f155-c949-4005-a7e5-26ni58b6a59a",
@@ -1183,7 +1183,7 @@ example: |-
       "VerifiableCredential",
       "CommercialInvoiceCredential"
     ],
-    "issuanceDate": "2022-02-23T11:55:00Z",
+    "validFrom": "2022-02-23T11:55:00Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/DCSAShippingInstructionCredential.yml b/docs/openapi/components/schemas/credentials/DCSAShippingInstructionCredential.yml
index d5681257e..1ef599c45 100644
--- a/docs/openapi/components/schemas/credentials/DCSAShippingInstructionCredential.yml
+++ b/docs/openapi/components/schemas/credentials/DCSAShippingInstructionCredential.yml
@@ -21,15 +21,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -48,10 +48,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -80,13 +80,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:key:z6MkheSarjLFMn8QkJENopCr1ryPSSdKGHQfHtPinkb516kG",
@@ -94,7 +94,7 @@ example: |-
       "VerifiableCredential",
       "DCSAShippingInstructionCredential"
     ],
-    "issuanceDate": "2022-01-24T05:22:00Z",
+    "validFrom": "2022-01-24T05:22:00Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/DCSATransportDocumentCredential.yml b/docs/openapi/components/schemas/credentials/DCSATransportDocumentCredential.yml
index 50e64a949..f75a19362 100644
--- a/docs/openapi/components/schemas/credentials/DCSATransportDocumentCredential.yml
+++ b/docs/openapi/components/schemas/credentials/DCSATransportDocumentCredential.yml
@@ -19,15 +19,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -46,10 +46,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -84,13 +84,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:web:organization.example.com",
@@ -107,7 +107,7 @@ example: |-
         "linkRelationship": "shippingInstructionLink"
       }
     ],
-    "issuanceDate": "2022-01-24T09:50:30Z",
+    "validFrom": "2022-01-24T09:50:30Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/DeliveryScheduleCredential.yml b/docs/openapi/components/schemas/credentials/DeliveryScheduleCredential.yml
index d30b6adbf..34f0b6bc3 100644
--- a/docs/openapi/components/schemas/credentials/DeliveryScheduleCredential.yml
+++ b/docs/openapi/components/schemas/credentials/DeliveryScheduleCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -42,7 +42,7 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -70,7 +70,7 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
@@ -80,7 +80,7 @@ example: |-
       "DeliveryScheduleCredential"
     ],
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:web:organization.example.com",
@@ -91,7 +91,7 @@ example: |-
       "id": "did:web:organization.example.com",
       "name": "Everything Garden Stuff"
     },
-    "issuanceDate": "2022-01-13T09:16:46Z",
+    "validFrom": "2022-01-13T09:16:46Z",
     "credentialSubject": {
       "type": [
         "DeliverySchedule"
diff --git a/docs/openapi/components/schemas/credentials/DeliveryStatementCredential.yml b/docs/openapi/components/schemas/credentials/DeliveryStatementCredential.yml
index 7412a68a9..f8543d03d 100644
--- a/docs/openapi/components/schemas/credentials/DeliveryStatementCredential.yml
+++ b/docs/openapi/components/schemas/credentials/DeliveryStatementCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -42,7 +42,7 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -70,7 +70,7 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
@@ -80,7 +80,7 @@ example: |-
       "DeliveryStatementCredential"
     ],
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:web:organization.example.com",
@@ -91,7 +91,7 @@ example: |-
       "id": "did:web:organization.example.com",
       "name": "Everything Garden Stuff"
     },
-    "issuanceDate": "2022-01-13T09:16:46Z",
+    "validFrom": "2022-01-13T09:16:46Z",
     "credentialSubject": {
       "type": [
         "DeliveryStatement"
diff --git a/docs/openapi/components/schemas/credentials/DigitalProductPassportCredential.yml b/docs/openapi/components/schemas/credentials/DigitalProductPassportCredential.yml
index 5a658d286..103426c5f 100644
--- a/docs/openapi/components/schemas/credentials/DigitalProductPassportCredential.yml
+++ b/docs/openapi/components/schemas/credentials/DigitalProductPassportCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -39,10 +39,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -204,13 +204,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "type": [
@@ -225,7 +225,7 @@ example: |-
       "id": "did:web:byacre.com",
       "name": "byACRE"
     },
-    "issuanceDate": "2023-06-23T10:00:00.000Z",
+    "validFrom": "2023-06-23T10:00:00.000Z",
     "credentialSubject": {
       "type": [
         "DigitalProductPassport"
diff --git a/docs/openapi/components/schemas/credentials/DigitalProductPassportDataCarrierCredential.yml b/docs/openapi/components/schemas/credentials/DigitalProductPassportDataCarrierCredential.yml
index cb738bec0..0b12565ac 100644
--- a/docs/openapi/components/schemas/credentials/DigitalProductPassportDataCarrierCredential.yml
+++ b/docs/openapi/components/schemas/credentials/DigitalProductPassportDataCarrierCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -39,10 +39,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -199,14 +199,14 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
   - relatedLinks
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "type": [
@@ -221,7 +221,7 @@ example: |-
       "id": "did:web:byacre.com",
       "name": "byACRE"
     },
-    "issuanceDate": "2023-06-23T10:00:00.000Z",
+    "validFrom": "2023-06-23T10:00:00.000Z",
     "credentialSubject": {
       "type": [
         "DigitalProductPassportDataCarrier"
diff --git a/docs/openapi/components/schemas/credentials/EPA35401PesticidesCredential.yml b/docs/openapi/components/schemas/credentials/EPA35401PesticidesCredential.yml
index 21f233f46..3b0cbe990 100644
--- a/docs/openapi/components/schemas/credentials/EPA35401PesticidesCredential.yml
+++ b/docs/openapi/components/schemas/credentials/EPA35401PesticidesCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -38,10 +38,10 @@ properties:
         - EPA35401PesticidesCredential
   id:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -60,7 +60,7 @@ properties:
           type: string
           enum:
             - Organization
-      id: 
+      id:
         title: Issuer's Identifier
         description: Issuing organization identifier, typically a Decentralized Identifier (DID).
         type: string
@@ -219,7 +219,7 @@ properties:
             title: Email Address
             description: Primary email address.
             type: string
-          return: 
+          return:
             title: Return Form to this Party
             type: boolean
         additionalProperties: false
@@ -343,7 +343,7 @@ properties:
             title: Email Address
             description: Primary email address.
             type: string
-          return: 
+          return:
             title: Return Form to this Party
             type: boolean
         additionalProperties: false
@@ -489,7 +489,7 @@ properties:
         title: Active Ingredients and Percentage of Each
         description: Active Ingredients and Percentage of Each. List each active ingredient by percentage. If the product is a pesticide device, this block may be left blank.
         type: array
-        items: 
+        items:
           type: string
       unitSize:
         title: Unit Size
@@ -596,7 +596,7 @@ properties:
               type: string
               enum:
                 - Place
-          usPortCode: 
+          usPortCode:
             title: US CBP Port Code
             description: CBP Automated Manifest Interface Requirements, Appendix E - Schedule D – U.S. CBP Port Codes. 4 character port code (https://www.cbp.gov/sites/default/files/assets/documents/2020-Jan/ACE%20Appendix%20E%20Schedule%20D%20January%202020%20(1).pdf).
             type: string
@@ -734,9 +734,9 @@ properties:
         title: Confidential Business Information Assertion
         description: Confidential Business Information (BI) Designation. Please note that the information provided in blocks 4, 5, 6, and 7 is not entitled to confidential treatment under section 7(d) of FIFRA and under labeling requirements for pesticides at 40 CFR 156.10. Information provided in those blocks will be made public with no further notice.
         type: array
-        items: 
+        items:
           type: string
-      examinationLocation: 
+      examinationLocation:
         title: Location of Goods for Examination after Importation
         description: Enter the physical address of the location of goods after release to the consignee. This is the physical location where the goods will be available for EPA inspection. In the case of unregistered pesticides products imported between establishments operated by the same or different producers), enter the EPA establishment number for the importing registered establishment. [Note Section 17(c) of FIFRA and 19 CFR 12.115 give EPA the authority to instruct CBP to conditionally release a shipment of pesticides or pesticide devices into the importer of record's custody, under a bond, pending resolution of certain issues with the shipment. Typically, the shipment is held by the importer of record until EPA conducts an inspection under FIFRA § 8(b) and makes a determination of compliance.]
         type: object
@@ -804,7 +804,7 @@ properties:
         required:
           - type
           - address
-      unregisteredPesticides: 
+      unregisteredPesticides:
         title: Importation of Pesticides without an EPA Registration Number
         description: It is recommended that block 18 be completed when importing an unregistered pesticide. Check all that apply and provide additional information as indicated.
         type: object
@@ -820,12 +820,12 @@ properties:
               type: string
               enum:
                 - UnregisteredPesticides
-          18a: 
+          18a:
             title: A pesticide transferred between registered establishments operated by the same producer
             description: It is recommended that block 18 be completed when importing an unregistered pesticide. Check all that apply and provide additional information as indicated.
             type: boolean
             default: false
-          18b: 
+          18b:
             title: A pesticide transferred between registered establishments not operated by the same producer
             description: It is recommended that block 18 be completed when importing an unregistered pesticide. Check all that apply and provide additional information as indicated.
             type: boolean
@@ -835,17 +835,17 @@ properties:
             description: It is recommended that block 18 be completed when importing an unregistered pesticide. Check all that apply and provide additional information as indicated.
             type: boolean
             default: false
-          18d: 
+          18d:
             title: A Pesticide distributed for research and development purposes without an Experimental Use Permit
             description: 40 CF §152.30(c)(2). It is recommended that block 18 be completed when importing an unregistered pesticide. Check all that apply and provide additional information as indicated.
             type: boolean
             default: false
-          18e: 
+          18e:
             title: A pesticide transferred solely for export
             description: 40 CFR §152.30d)/ PRN 99-1. Enter the foreign purchaser details in Box 19. It is recommended that block 18 be completed when importing an unregistered pesticide. Check all that apply and provide additional information as indicated.
             type: boolean
             default: false
-          18f: 
+          18f:
             title: A pesticide distributed under an emergency exemption.
             description: It is recommended that block 18 be completed when importing an unregistered pesticide. Check all that apply and provide additional information as indicated.
             type: boolean
@@ -860,27 +860,27 @@ properties:
             description: Provide an explanation including the intended use and a description of why the product is being imported into the United States in Block 19 -- Remarks.
             type: boolean
             default: false
-          domesticProducerEstablishmentNumber: 
+          domesticProducerEstablishmentNumber:
             title: Domestic Producer Establishment Number
             description: 40 CFR §152.30.
             type: string
-          epaRegistrationNumber: 
+          epaRegistrationNumber:
             title: EPA Registration Number
             description: EPA Registration Number of Product being Formulated, if applicable.
             type: string
-          experimentalUsePermitNumber: 
+          experimentalUsePermitNumber:
             title: Experimental Use Permit Number
             description: 40 CFR §152.30(c)(1).
             type: string
-          emergencyExemptionNumber: 
+          emergencyExemptionNumber:
             title: Emergency Exemption Number
             description: 40 CFR §152.30(e). It is recommended that block 18 be completed when importing an unregistered pesticide. Check all that apply and provide additional information as indicated.
             type: string
-      remarks: 
+      remarks:
         title: Remarks
-        description: This block may be used to provide additional information. 
+        description: This block may be used to provide additional information.
         type: string
-      label: 
+      label:
         title: Label
         description: It is recommended that a copy of the label affixed to the product be submitted with the Notice of Arrival (NOA).
         type: string
@@ -909,13 +909,13 @@ required:
   - id
   - '@context'
   - type
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:02n15620-1962-482a-9bd9-b065928f3838",
@@ -923,7 +923,7 @@ example: |-
       "VerifiableCredential",
       "EPA35401PesticidesCredential"
     ],
-    "issuanceDate": "2022-02-25T14:34:00Z",
+    "validFrom": "2022-02-25T14:34:00Z",
     "issuer": {
       "id": "did:web:superbrokerage.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/EPA35401PesticidesPart2Credential.yml b/docs/openapi/components/schemas/credentials/EPA35401PesticidesPart2Credential.yml
index 19549c3f3..cd2ec6408 100644
--- a/docs/openapi/components/schemas/credentials/EPA35401PesticidesPart2Credential.yml
+++ b/docs/openapi/components/schemas/credentials/EPA35401PesticidesPart2Credential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -38,10 +38,10 @@ properties:
         - EPA35401PesticidesPart2Credential
   id:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -60,7 +60,7 @@ properties:
           type: string
           enum:
             - Organization
-      id: 
+      id:
         title: Issuer's Identifier
         description: Part II to by U.S. Environmental Protection Agency.
         type: string
@@ -133,12 +133,12 @@ properties:
         description: Reference to part I of of the Pesticices Notice of Arrival, issued by Importer of Record or Licensed Customs Broker.
         type: string
         format: uri
-      releaseShipment: 
+      releaseShipment:
         title: Release Shipment
         description: Release shipment.
         type: boolean
         default: false
-      detainForInspection: 
+      detainForInspection:
         title: Detain for Inspection
         description: Detain for inspection.
         type: boolean
@@ -148,19 +148,19 @@ properties:
         description: Request CBP to collect samples (19 CFR §12.116).
         type: boolean
         default: false
-      releaseUnderBond: 
+      releaseUnderBond:
         title: Release Under Bond
         description: Release shipment to consignee under bond. Shipment must be held intact pending inspection.
         type: boolean
         default: false
-      Other: 
+      Other:
         title: Other
         description: Other. (Specify)
         type: boolean
         default: false
-      epaRemarks: 
+      epaRemarks:
         title: EPA Remarks
-        description: EPA Remarks. 
+        description: EPA Remarks.
         type: string
     additionalProperties: false
     required:
@@ -171,13 +171,13 @@ required:
   - id
   - '@context'
   - type
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:66eni5ab-4111-4cc0-9195-2b221d076384",
@@ -185,7 +185,7 @@ example: |-
       "VerifiableCredential",
       "EPA35401PesticidesPart2Credential"
     ],
-    "issuanceDate": "2022-02-27T09:00:00Z",
+    "validFrom": "2022-02-27T09:00:00Z",
     "issuer": {
       "id": "did:web:epa.gov",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/EPA35401PesticidesPart3Credential.yml b/docs/openapi/components/schemas/credentials/EPA35401PesticidesPart3Credential.yml
index f64e10b5e..d46039ac4 100644
--- a/docs/openapi/components/schemas/credentials/EPA35401PesticidesPart3Credential.yml
+++ b/docs/openapi/components/schemas/credentials/EPA35401PesticidesPart3Credential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -38,10 +38,10 @@ properties:
         - EPA35401PesticidesPart3Credential
   id:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -60,7 +60,7 @@ properties:
           type: string
           enum:
             - Organization
-      id: 
+      id:
         title: Issuer's Identifier
         description: Issuing organization identifier, typically a Decentralized Identifier (DID).
         type: string
@@ -138,9 +138,9 @@ properties:
         description: Reference to part II of of the Pesticices Notice of Arrival, issued by Environmental Protection Agency.
         type: string
         format: uri
-      cbpRemarks: 
+      cbpRemarks:
         title: CBP Remarks
-        description: CBP Remarks. 
+        description: CBP Remarks.
         type: string
     additionalProperties: false
     required:
@@ -152,13 +152,13 @@ required:
   - id
   - '@context'
   - type
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:699577d5-6fa0-47c4-a3ca-58n157084e8c",
@@ -166,7 +166,7 @@ example: |-
       "VerifiableCredential",
       "EPA35401PesticidesPart3Credential"
     ],
-    "issuanceDate": "2022-02-25T14:34:00Z",
+    "validFrom": "2022-02-25T14:34:00Z",
     "issuer": {
       "id": "did:web:cbp.dhs.gov",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/EntryNumberCredential.yml b/docs/openapi/components/schemas/credentials/EntryNumberCredential.yml
index 183a19047..50e937161 100644
--- a/docs/openapi/components/schemas/credentials/EntryNumberCredential.yml
+++ b/docs/openapi/components/schemas/credentials/EntryNumberCredential.yml
@@ -15,15 +15,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -42,10 +42,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -93,13 +93,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "http://example.com/dd0c6f9a-5df6-40a3-bb34-863cd1fda606",
@@ -129,7 +129,7 @@ example: |-
         }
       }
     },
-    "issuanceDate": "2022-11-01T10:58:45-04:00",
+    "validFrom": "2022-11-01T10:58:45-04:00",
     "credentialSubject": {
       "type": [
         "EntryNumber"
diff --git a/docs/openapi/components/schemas/credentials/EnvironmentalImpactCredential.yml b/docs/openapi/components/schemas/credentials/EnvironmentalImpactCredential.yml
index 46c5c1634..5538cc70e 100644
--- a/docs/openapi/components/schemas/credentials/EnvironmentalImpactCredential.yml
+++ b/docs/openapi/components/schemas/credentials/EnvironmentalImpactCredential.yml
@@ -11,15 +11,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -38,10 +38,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -112,13 +112,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "http://example.com/dd0c6f9a-5df6-40a3-bb34-863cd1fda606",
@@ -132,7 +132,7 @@ example: |-
       ],
       "id": "did:web:organization.example.com"
     },
-    "issuanceDate": "2022-11-01T10:58:45-04:00",
+    "validFrom": "2022-11-01T10:58:45-04:00",
     "credentialSubject": {
       "impactTimeStart": "2024-03-10T10:58:45-04:00",
       "impactTimeEnd": "2024-03-19T10:58:45-04:00",
diff --git a/docs/openapi/components/schemas/credentials/EventCredential.yml b/docs/openapi/components/schemas/credentials/EventCredential.yml
index 0d3df54d8..9b8b05cd0 100644
--- a/docs/openapi/components/schemas/credentials/EventCredential.yml
+++ b/docs/openapi/components/schemas/credentials/EventCredential.yml
@@ -15,15 +15,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -42,10 +42,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -79,13 +79,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "http://example.com/dd0c6f9a-5df6-40a3-bb34-863cd1fda606",
@@ -99,7 +99,7 @@ example: |-
       ],
       "id": "did:web:organization.example.com"
     },
-    "issuanceDate": "2022-11-01T10:58:45-04:00",
+    "validFrom": "2022-11-01T10:58:45-04:00",
     "credentialSubject": {
       "type": [
         "Event",
diff --git a/docs/openapi/components/schemas/credentials/ExampleCredentialWithStatus.yml b/docs/openapi/components/schemas/credentials/ExampleCredentialWithStatus.yml
index 63fa440d5..75bb76982 100644
--- a/docs/openapi/components/schemas/credentials/ExampleCredentialWithStatus.yml
+++ b/docs/openapi/components/schemas/credentials/ExampleCredentialWithStatus.yml
@@ -9,17 +9,17 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
       - https://w3id.org/vc/status-list/2021/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
       - https://w3id.org/vc/status-list/2021/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
         - https://w3id.org/vc/status-list/2021/v1
   type:
@@ -41,7 +41,7 @@ properties:
 
   issuer:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
   credentialSchema:
     type: object
@@ -69,13 +69,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1",
       "https://w3id.org/vc/status-list/2021/v1"
     ],
@@ -85,7 +85,7 @@ example: |-
       "ExampleCredential"
     ],
     "issuer": "urn:uuid:11111111-1111-1111-1111-111111111111",
-    "issuanceDate": "2023-04-11T16:36:24Z",
+    "validFrom": "2023-04-11T16:36:24Z",
     "credentialSubject": {
       "type": [
         "Example"
diff --git a/docs/openapi/components/schemas/credentials/FSMACreatingCTECredential.yml b/docs/openapi/components/schemas/credentials/FSMACreatingCTECredential.yml
index 3733f0011..5db6f3c4f 100644
--- a/docs/openapi/components/schemas/credentials/FSMACreatingCTECredential.yml
+++ b/docs/openapi/components/schemas/credentials/FSMACreatingCTECredential.yml
@@ -19,15 +19,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -49,9 +49,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -85,13 +85,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -100,7 +100,7 @@ example: |-
       "FSMACreatingCTECredential"
     ],
     "name": "FSMA Creating CTE Certificate",
-    "issuanceDate": "2021-12-11T03:50:55Z",
+    "validFrom": "2021-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/FSMAFirstReceiverDataCredential.yml b/docs/openapi/components/schemas/credentials/FSMAFirstReceiverDataCredential.yml
index 266bc7dec..b656c0d06 100644
--- a/docs/openapi/components/schemas/credentials/FSMAFirstReceiverDataCredential.yml
+++ b/docs/openapi/components/schemas/credentials/FSMAFirstReceiverDataCredential.yml
@@ -19,15 +19,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -49,9 +49,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -85,13 +85,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -100,7 +100,7 @@ example: |-
       "FSMAFirstReceiverDataCredential"
     ],
     "name": "FSMA First Receiver Data Certificate",
-    "issuanceDate": "2021-12-11T03:50:55Z",
+    "validFrom": "2021-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/FSMAGrowingCTECredential.yml b/docs/openapi/components/schemas/credentials/FSMAGrowingCTECredential.yml
index 7648c7c1c..d15be91db 100644
--- a/docs/openapi/components/schemas/credentials/FSMAGrowingCTECredential.yml
+++ b/docs/openapi/components/schemas/credentials/FSMAGrowingCTECredential.yml
@@ -19,15 +19,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -49,9 +49,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -85,13 +85,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -100,7 +100,7 @@ example: |-
       "FSMAGrowingCTECredential"
     ],
     "name": "FSMA Growing CTE Certificate",
-    "issuanceDate": "2021-12-11T03:50:55Z",
+    "validFrom": "2021-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/FSMAReceivingCTECredential.yml b/docs/openapi/components/schemas/credentials/FSMAReceivingCTECredential.yml
index b0056da97..299286870 100644
--- a/docs/openapi/components/schemas/credentials/FSMAReceivingCTECredential.yml
+++ b/docs/openapi/components/schemas/credentials/FSMAReceivingCTECredential.yml
@@ -19,15 +19,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -49,9 +49,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -85,13 +85,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -100,7 +100,7 @@ example: |-
       "FSMAReceivingCTECredential"
     ],
     "name": "FSMA Receiving CTE Certificate",
-    "issuanceDate": "2021-12-11T03:50:55Z",
+    "validFrom": "2021-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/FSMAShippingCTECredential.yml b/docs/openapi/components/schemas/credentials/FSMAShippingCTECredential.yml
index a6273070c..8e5882611 100644
--- a/docs/openapi/components/schemas/credentials/FSMAShippingCTECredential.yml
+++ b/docs/openapi/components/schemas/credentials/FSMAShippingCTECredential.yml
@@ -19,15 +19,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -49,9 +49,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -85,13 +85,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -100,7 +100,7 @@ example: |-
       "FSMAShippingCTECredential"
     ],
     "name": "FSMA Shipping CTE Certificate",
-    "issuanceDate": "2021-12-11T03:50:55Z",
+    "validFrom": "2021-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/FSMATransformingCTECredential.yml b/docs/openapi/components/schemas/credentials/FSMATransformingCTECredential.yml
index 9d8ba0d42..3d1044ae4 100644
--- a/docs/openapi/components/schemas/credentials/FSMATransformingCTECredential.yml
+++ b/docs/openapi/components/schemas/credentials/FSMATransformingCTECredential.yml
@@ -19,15 +19,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -49,9 +49,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -85,13 +85,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -100,7 +100,7 @@ example: |-
       "FSMATransformingCTECredential"
     ],
     "name": "FSMA Transforming CTE Certificate",
-    "issuanceDate": "2021-12-11T03:50:55Z",
+    "validFrom": "2021-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/FVSPImporterCredential.yml b/docs/openapi/components/schemas/credentials/FVSPImporterCredential.yml
index 87d83f22b..feeeb1421 100644
--- a/docs/openapi/components/schemas/credentials/FVSPImporterCredential.yml
+++ b/docs/openapi/components/schemas/credentials/FVSPImporterCredential.yml
@@ -19,15 +19,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -49,9 +49,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -89,7 +89,7 @@ properties:
           - FSVP Exempt, product is for research and evaluation (R&E)
     additionalProperties: false
     required:
-      - importer		  
+      - importer
       - importerDUNS
       - shipment
       - fsvpAssertion
@@ -98,13 +98,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -113,7 +113,7 @@ example: |-
       "FSVPImporterCredential"
     ],
     "name": "FSVP Importer Credential",
-    "issuanceDate": "2021-12-11T03:50:55Z",
+    "validFrom": "2021-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/FoodDefenseInspectionCredential.yml b/docs/openapi/components/schemas/credentials/FoodDefenseInspectionCredential.yml
index 16a210f21..6786bbc50 100644
--- a/docs/openapi/components/schemas/credentials/FoodDefenseInspectionCredential.yml
+++ b/docs/openapi/components/schemas/credentials/FoodDefenseInspectionCredential.yml
@@ -21,15 +21,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -51,9 +51,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -87,13 +87,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -102,7 +102,7 @@ example: |-
       "FoodDefenseInspectionCredential"
     ],
     "name": "Food Defense Inspection Credential",
-    "issuanceDate": "2021-12-11T03:50:55Z",
+    "validFrom": "2021-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/FoodFacilityRegistrationCredential.yml b/docs/openapi/components/schemas/credentials/FoodFacilityRegistrationCredential.yml
index b788fd077..f3a826de8 100644
--- a/docs/openapi/components/schemas/credentials/FoodFacilityRegistrationCredential.yml
+++ b/docs/openapi/components/schemas/credentials/FoodFacilityRegistrationCredential.yml
@@ -16,15 +16,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -48,10 +48,10 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -132,14 +132,14 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
   - credentialSchema
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "http://example.com/dd0c6f9a-5df6-40a3-bb34-863cd1fda606",
@@ -155,7 +155,7 @@ example: |-
       "id": "did:web:qualified-organization.example.com",
       "name": "US-FDA"
     },
-    "issuanceDate": "2022-11-01T10:58:45-04:00",
+    "validFrom": "2022-11-01T10:58:45-04:00",
     "credentialSubject": {
       "id": "did:web:organization.example.com",
       "number": "12345678901",
diff --git a/docs/openapi/components/schemas/credentials/FoodGradeInspectionCredential.yml b/docs/openapi/components/schemas/credentials/FoodGradeInspectionCredential.yml
index d8a371fe2..2652e9896 100644
--- a/docs/openapi/components/schemas/credentials/FoodGradeInspectionCredential.yml
+++ b/docs/openapi/components/schemas/credentials/FoodGradeInspectionCredential.yml
@@ -23,15 +23,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -53,9 +53,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -87,13 +87,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -102,7 +102,7 @@ example: |-
       "FoodGradeInspectionCredential"
     ],
     "name": "Food Grade Inspection Certificate",
-    "issuanceDate": "2021-12-11T03:50:55Z",
+    "validFrom": "2021-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/FreightManifestCredential.yml b/docs/openapi/components/schemas/credentials/FreightManifestCredential.yml
index 5f8fff57a..ea28aeab8 100644
--- a/docs/openapi/components/schemas/credentials/FreightManifestCredential.yml
+++ b/docs/openapi/components/schemas/credentials/FreightManifestCredential.yml
@@ -20,15 +20,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -47,10 +47,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -79,13 +79,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:key:z6Mkki9HaBA2cB5kETPzsKSR661Erzw13joNt4HqhhAY7Nqi",
@@ -93,7 +93,7 @@ example: |-
       "VerifiableCredential",
       "FreightManifestCredential"
     ],
-    "issuanceDate": "2022-01-25T11:10:00Z",
+    "validFrom": "2022-01-25T11:10:00Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/GAPInspectionCredential.yml b/docs/openapi/components/schemas/credentials/GAPInspectionCredential.yml
index f30726449..775e62202 100644
--- a/docs/openapi/components/schemas/credentials/GAPInspectionCredential.yml
+++ b/docs/openapi/components/schemas/credentials/GAPInspectionCredential.yml
@@ -19,15 +19,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -49,9 +49,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -85,13 +85,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -100,7 +100,7 @@ example: |-
       "GAPInspectionCredential"
     ],
     "name": "GAP Inspection Certificate",
-    "issuanceDate": "2021-12-11T03:50:55Z",
+    "validFrom": "2021-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/GS18PrefixLicenseCredential.yml b/docs/openapi/components/schemas/credentials/GS18PrefixLicenseCredential.yml
index c5e9d7e26..c4edeccb6 100644
--- a/docs/openapi/components/schemas/credentials/GS18PrefixLicenseCredential.yml
+++ b/docs/openapi/components/schemas/credentials/GS18PrefixLicenseCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/license-context/
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/license-context/
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://ref.gs1.org/gs1/vc/license-context/
   type:
     type: array
@@ -40,10 +40,10 @@ properties:
     description: A resolvable URI where this credential is stored. Note that the URI contains the GS1-8 Prefix.
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -108,13 +108,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://ref.gs1.org/gs1/vc/license-context/"
     ],
     "id": "https://id.gs1.org/vc/license/gs1_8_prefix/754",
@@ -123,7 +123,7 @@ example: |-
       "GS18PrefixLicenseCredential"
     ],
     "issuer": "did:web:organization.example.com",
-    "issuanceDate": "2005-01-01T00:00:00Z",
+    "validFrom": "2005-01-01T00:00:00Z",
     "credentialSubject": {
       "id": "did:web:www.gs1ca.org",
       "partyGLN": "7541230000000",
diff --git a/docs/openapi/components/schemas/credentials/GS1CompanyPrefixLicenseCredential.yml b/docs/openapi/components/schemas/credentials/GS1CompanyPrefixLicenseCredential.yml
index 35dc43772..46e06f48b 100644
--- a/docs/openapi/components/schemas/credentials/GS1CompanyPrefixLicenseCredential.yml
+++ b/docs/openapi/components/schemas/credentials/GS1CompanyPrefixLicenseCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/license-context/
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/license-context/
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://ref.gs1.org/gs1/vc/license-context/
   type:
     type: array
@@ -40,10 +40,10 @@ properties:
     description: A DID for this credential. The ID is not resolvable because the credential is sensitive information and only the user company can decide when it is presented.
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -98,13 +98,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://ref.gs1.org/gs1/vc/license-context/"
     ],
     "id": "did:example:b6d13abe-464d-4bb9-a568-b6d81efd57e3",
@@ -113,7 +113,7 @@ example: |-
       "GS1CompanyPrefixLicenseCredential"
     ],
     "issuer": "did:web:organization.example.com",
-    "issuanceDate": "2020-11-19T14:56:37Z",
+    "validFrom": "2020-11-19T14:56:37Z",
     "credentialSubject": {
       "id": "did:web:www.example.ca",
       "partyGLN": "7541234000006",
diff --git a/docs/openapi/components/schemas/credentials/GS1DataCredential.yml b/docs/openapi/components/schemas/credentials/GS1DataCredential.yml
index 22168a938..91d77266d 100644
--- a/docs/openapi/components/schemas/credentials/GS1DataCredential.yml
+++ b/docs/openapi/components/schemas/credentials/GS1DataCredential.yml
@@ -15,19 +15,19 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/trade-item-context/
       - https://ref.gs1.org/gs1/vc/declaration-context/
       - https://w3id.org/vc/status-list/2021/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/trade-item-context/
       - https://ref.gs1.org/gs1/vc/declaration-context/
       - https://w3id.org/vc/status-list/2021/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://ref.gs1.org/gs1/vc/trade-item-context/
         - https://ref.gs1.org/gs1/vc/declaration-context/
         - https://w3id.org/vc/status-list/2021/v1
@@ -48,10 +48,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -122,13 +122,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://ref.gs1.org/gs1/vc/trade-item-context/",
       "https://ref.gs1.org/gs1/vc/declaration-context/",
       "https://w3id.org/vc/status-list/2021/v1"
@@ -139,7 +139,7 @@ example: |-
       "GS1DataCredential"
     ],
     "issuer": "did:web:organization.example.com",
-    "issuanceDate": "2020-12-03T03:14:59Z",
+    "validFrom": "2020-12-03T03:14:59Z",
     "credentialSubject": {
       "id": "https://id.gs1.org/01/07541234555551",
       "keyAuthorization": "did:example:60cda318-a0a7-4e39-b600-ea38bf68a31f",
diff --git a/docs/openapi/components/schemas/credentials/GS1DelegationCredential.yml b/docs/openapi/components/schemas/credentials/GS1DelegationCredential.yml
index d7fed35bd..ef5b2431f 100644
--- a/docs/openapi/components/schemas/credentials/GS1DelegationCredential.yml
+++ b/docs/openapi/components/schemas/credentials/GS1DelegationCredential.yml
@@ -12,17 +12,17 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/declaration-context/
       - https://w3id.org/vc/status-list/2021/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/declaration-context/
       - https://w3id.org/vc/status-list/2021/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://ref.gs1.org/gs1/vc/declaration-context/
         - https://w3id.org/vc/status-list/2021/v1
   type:
@@ -42,10 +42,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -98,14 +98,14 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
   - credentialStatus
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://ref.gs1.org/gs1/vc/declaration-context/",
       "https://w3id.org/vc/status-list/2021/v1"
     ],
@@ -115,7 +115,7 @@ example: |-
       "GS1DelegationCredential"
     ],
     "issuer": "did:web:organization.example.com",
-    "issuanceDate": "2020-12-03T03:14:59Z",
+    "validFrom": "2020-12-03T03:14:59Z",
     "credentialSubject": {
       "id": "did:web:www.egsolutionprovider.ca",
       "delegation": [
diff --git a/docs/openapi/components/schemas/credentials/GS1IdentificationKeyLicenseCredential.yml b/docs/openapi/components/schemas/credentials/GS1IdentificationKeyLicenseCredential.yml
index 9ee42b99c..1fd90c26b 100644
--- a/docs/openapi/components/schemas/credentials/GS1IdentificationKeyLicenseCredential.yml
+++ b/docs/openapi/components/schemas/credentials/GS1IdentificationKeyLicenseCredential.yml
@@ -12,17 +12,17 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/license-context/
       - https://w3id.org/vc/status-list/2021/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/license-context/
       - https://w3id.org/vc/status-list/2021/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://ref.gs1.org/gs1/vc/license-context/
         - https://w3id.org/vc/status-list/2021/v1
   type:
@@ -43,10 +43,10 @@ properties:
     description: A DID for this credential. The ID is not resolvable because the credential is sensitive information and only the user company can decide when it is presented.
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -117,14 +117,14 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
   - credentialStatus
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://ref.gs1.org/gs1/vc/license-context/",
       "https://w3id.org/vc/status-list/2021/v1"
     ],
@@ -134,7 +134,7 @@ example: |-
       "GS1IdentificationKeyLicenseCredential"
     ],
     "issuer": "did:web:organization.example.com",
-    "issuanceDate": "2020-11-19T14:56:37Z",
+    "validFrom": "2020-11-19T14:56:37Z",
     "credentialSubject": {
       "id": "did:web:www.example.ca",
       "partyGLN": "7541234000006",
diff --git a/docs/openapi/components/schemas/credentials/GS1KeyCredential.yml b/docs/openapi/components/schemas/credentials/GS1KeyCredential.yml
index 736c885a4..590348ac4 100644
--- a/docs/openapi/components/schemas/credentials/GS1KeyCredential.yml
+++ b/docs/openapi/components/schemas/credentials/GS1KeyCredential.yml
@@ -13,19 +13,19 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/declaration-context/
       - https://ref.gs1.org/gs1/vc/license-context/
       - https://w3id.org/vc/status-list/2021/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/declaration-context/
       - https://ref.gs1.org/gs1/vc/license-context/
       - https://w3id.org/vc/status-list/2021/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://ref.gs1.org/gs1/vc/declaration-context/
         - https://ref.gs1.org/gs1/vc/license-context/
         - https://w3id.org/vc/status-list/2021/v1
@@ -47,10 +47,10 @@ properties:
     description: A DID for this credential. The ID is not resolvable because the credential is sensitive information and only the user company can decide when it is presented.
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -99,14 +99,14 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
   - credentialStatus
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://ref.gs1.org/gs1/vc/declaration-context/",
       "https://ref.gs1.org/gs1/vc/license-context/",
       "https://w3id.org/vc/status-list/2021/v1"
@@ -117,7 +117,7 @@ example: |-
       "GS1KeyCredential"
     ],
     "issuer": "did:web:organization.example.com",
-    "issuanceDate": "2020-12-02T09:48:11Z",
+    "validFrom": "2020-12-02T09:48:11Z",
     "credentialSubject": {
       "id": "https://id.gs1.org/01/07541234555551",
       "extendsCredential": "did:example:b6d13abe-464d-4bb9-a568-b6d81efd57e3"
diff --git a/docs/openapi/components/schemas/credentials/GS1PrefixLicenseCredential.yml b/docs/openapi/components/schemas/credentials/GS1PrefixLicenseCredential.yml
index 0d21e7177..d8439819e 100644
--- a/docs/openapi/components/schemas/credentials/GS1PrefixLicenseCredential.yml
+++ b/docs/openapi/components/schemas/credentials/GS1PrefixLicenseCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/license-context/
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://ref.gs1.org/gs1/vc/license-context/
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://ref.gs1.org/gs1/vc/license-context/
   type:
     type: array
@@ -40,10 +40,10 @@ properties:
     description: A resolvable URI where this credential is stored. Note that the URI contains the GS1 Prefix.
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -95,13 +95,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://ref.gs1.org/gs1/vc/license-context/"
     ],
     "id": "https://id.gs1.org/vc/license/gs1_prefix/754",
@@ -110,7 +110,7 @@ example: |-
       "GS1PrefixLicenseCredential"
     ],
     "issuer": "did:web:organization.example.com",
-    "issuanceDate": "2005-01-01T00:00:00Z",
+    "validFrom": "2005-01-01T00:00:00Z",
     "credentialSubject": {
       "id": "did:web:www.gs1ca.org",
       "partyGLN": "7541230000000",
diff --git a/docs/openapi/components/schemas/credentials/HouseBillOfLadingCredential.yml b/docs/openapi/components/schemas/credentials/HouseBillOfLadingCredential.yml
index ce717c7e7..8556fc728 100644
--- a/docs/openapi/components/schemas/credentials/HouseBillOfLadingCredential.yml
+++ b/docs/openapi/components/schemas/credentials/HouseBillOfLadingCredential.yml
@@ -17,15 +17,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -44,10 +44,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -76,13 +76,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:web:organization.example.com",
@@ -90,7 +90,7 @@ example: |-
       "VerifiableCredential",
       "HouseBillOfLadingCredential"
     ],
-    "issuanceDate": "2022-03-04T13:40:00Z",
+    "validFrom": "2022-03-04T13:40:00Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/IATAAirWaybillCredential.yml b/docs/openapi/components/schemas/credentials/IATAAirWaybillCredential.yml
index 095a8ee36..910a415f7 100644
--- a/docs/openapi/components/schemas/credentials/IATAAirWaybillCredential.yml
+++ b/docs/openapi/components/schemas/credentials/IATAAirWaybillCredential.yml
@@ -17,15 +17,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -44,10 +44,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -76,13 +76,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:web:organization.example.com",
@@ -90,7 +90,7 @@ example: |-
       "VerifiableCredential",
       "IATAAirWaybillCredential"
     ],
-    "issuanceDate": "2028-02-28T16:04:20Z",
+    "validFrom": "2028-02-28T16:04:20Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/ImporterSecurityFilingCredential.yml b/docs/openapi/components/schemas/credentials/ImporterSecurityFilingCredential.yml
index 246b91fd6..bb967a9fc 100644
--- a/docs/openapi/components/schemas/credentials/ImporterSecurityFilingCredential.yml
+++ b/docs/openapi/components/schemas/credentials/ImporterSecurityFilingCredential.yml
@@ -14,15 +14,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -41,10 +41,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -73,13 +73,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:key:z6MkpnRaj2ajC29t2ejMS4tTtF6BZm76NRLDowLGm3ywPNHn",
@@ -87,7 +87,7 @@ example: |-
       "VerifiableCredential",
       "ImporterSecurityFilingCredential"
     ],
-    "issuanceDate": "2022-02-24T12:10:00Z",
+    "validFrom": "2022-02-24T12:10:00Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/IntellectualPropertyRightsCredential.yml b/docs/openapi/components/schemas/credentials/IntellectualPropertyRightsCredential.yml
index 2cbdc44ec..364771551 100644
--- a/docs/openapi/components/schemas/credentials/IntellectualPropertyRightsCredential.yml
+++ b/docs/openapi/components/schemas/credentials/IntellectualPropertyRightsCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -39,7 +39,7 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
   issuer:
@@ -70,7 +70,7 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
@@ -80,7 +80,7 @@ example: |-
       "IntellectualPropertyRightsCredential"
     ],
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:web:organization.example.com",
@@ -91,7 +91,7 @@ example: |-
       "id": "did:web:organization.example.com",
       "name": "Everything Garden Stuff"
     },
-    "issuanceDate": "2022-01-13T09:16:46Z",
+    "validFrom": "2022-01-13T09:16:46Z",
     "credentialSubject": {
       "type": [
         "IntellectualPropertyRights"
diff --git a/docs/openapi/components/schemas/credentials/IntellectualPropertyRightsLicenseCredential.yml b/docs/openapi/components/schemas/credentials/IntellectualPropertyRightsLicenseCredential.yml
index f4810e48e..e274121cd 100644
--- a/docs/openapi/components/schemas/credentials/IntellectualPropertyRightsLicenseCredential.yml
+++ b/docs/openapi/components/schemas/credentials/IntellectualPropertyRightsLicenseCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -39,7 +39,7 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
   issuer:
@@ -287,7 +287,7 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
@@ -297,7 +297,7 @@ example: |-
       "IntellectualPropertyRightsLicenseCredential"
     ],
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:009a4c44-5d3a-4a1f-a1b4-642b9c08f9a5",
@@ -308,7 +308,7 @@ example: |-
       "id": "did:web:organization.example.com",
       "name": "Everything Garden Stuff"
     },
-    "issuanceDate": "2022-01-13T09:16:46Z",
+    "validFrom": "2022-01-13T09:16:46Z",
     "credentialSubject": {
       "type": [
         "IntellectualPropertyRightsLicense"
diff --git a/docs/openapi/components/schemas/credentials/IntentToImportCredential.yml b/docs/openapi/components/schemas/credentials/IntentToImportCredential.yml
index fa70b7b3a..1b26a9389 100644
--- a/docs/openapi/components/schemas/credentials/IntentToImportCredential.yml
+++ b/docs/openapi/components/schemas/credentials/IntentToImportCredential.yml
@@ -20,15 +20,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -47,11 +47,11 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     description: Date on which the import intention is declared.
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -212,13 +212,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:55791fb7-058f-409a-8a32-e6229n159144",
@@ -248,7 +248,7 @@ example: |-
         }
       }
     },
-    "issuanceDate": "2022-03-03T15:20:00Z",
+    "validFrom": "2022-03-03T15:20:00Z",
     "credentialSubject": {
       "type": [
         "IntentToImport"
diff --git a/docs/openapi/components/schemas/credentials/InventoryRegistrationCredential.yml b/docs/openapi/components/schemas/credentials/InventoryRegistrationCredential.yml
index 5ec0ecbc3..0b7587d8e 100644
--- a/docs/openapi/components/schemas/credentials/InventoryRegistrationCredential.yml
+++ b/docs/openapi/components/schemas/credentials/InventoryRegistrationCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -39,7 +39,7 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
   issuer:
@@ -68,7 +68,7 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
@@ -78,7 +78,7 @@ example: |-
       "InventoryRegistrationCredential"
     ],
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:web:organization.example.com",
@@ -89,7 +89,7 @@ example: |-
       "id": "did:web:organization.example.com",
       "name": "Example Ecommerce Marketplace, Inc"
     },
-    "issuanceDate": "2022-01-13T09:16:46Z",
+    "validFrom": "2022-01-13T09:16:46Z",
     "credentialSubject": {
       "type": [
         "Product"
diff --git a/docs/openapi/components/schemas/credentials/MasterBillOfLadingCredential.yml b/docs/openapi/components/schemas/credentials/MasterBillOfLadingCredential.yml
index e55916c84..58c947447 100644
--- a/docs/openapi/components/schemas/credentials/MasterBillOfLadingCredential.yml
+++ b/docs/openapi/components/schemas/credentials/MasterBillOfLadingCredential.yml
@@ -18,15 +18,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -45,10 +45,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -77,13 +77,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:web:organization.example.com",
@@ -91,7 +91,7 @@ example: |-
       "VerifiableCredential",
       "MasterBillOfLadingCredential"
     ],
-    "issuanceDate": "2022-03-04T13:40:00Z",
+    "validFrom": "2022-03-04T13:40:00Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/MexicoEInvoiceCredential.yml b/docs/openapi/components/schemas/credentials/MexicoEInvoiceCredential.yml
index ea1b0467e..c5b5ab8f6 100644
--- a/docs/openapi/components/schemas/credentials/MexicoEInvoiceCredential.yml
+++ b/docs/openapi/components/schemas/credentials/MexicoEInvoiceCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -39,10 +39,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -847,14 +847,14 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
   - credentialSchema
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "type": [
@@ -862,7 +862,7 @@ example: |-
       "MexicoEInvoiceCredential"
     ],
     "id": "urn:uuid:5e45f155-c949-4005-a7e5-26ni58b6a59a",
-    "issuanceDate": "2022-02-23T11:55:00Z",
+    "validFrom": "2022-02-23T11:55:00Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/MillTestReportCredential.yml b/docs/openapi/components/schemas/credentials/MillTestReportCredential.yml
index 6a6a7aa4c..f5653a47f 100644
--- a/docs/openapi/components/schemas/credentials/MillTestReportCredential.yml
+++ b/docs/openapi/components/schemas/credentials/MillTestReportCredential.yml
@@ -13,15 +13,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -41,10 +41,10 @@ properties:
     type: string
     format: uri
     description: Mill test report identifier; this must be an Internationalized Resource Identifier such as an DID, URI, URL, or URN.
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -970,13 +970,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "type": [
@@ -1008,7 +1008,7 @@ example: |-
       "phoneNumber": "+1-675-555-6659",
       "faxNumber": "+1-527-555-1986"
     },
-    "issuanceDate": "2022-06-06T08:10:00+00:00",
+    "validFrom": "2022-06-06T08:10:00+00:00",
     "credentialSubject": {
       "certificateNumber": "202304215088",
       "certification": "EN 10204.3.1",
diff --git a/docs/openapi/components/schemas/credentials/MonthlyAdvanceManifestCredential.yml b/docs/openapi/components/schemas/credentials/MonthlyAdvanceManifestCredential.yml
index bed86cb9c..dceac8fa0 100644
--- a/docs/openapi/components/schemas/credentials/MonthlyAdvanceManifestCredential.yml
+++ b/docs/openapi/components/schemas/credentials/MonthlyAdvanceManifestCredential.yml
@@ -11,15 +11,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -42,10 +42,10 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -80,13 +80,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "http://example.org/credentials/",
@@ -94,7 +94,7 @@ example: |-
       "VerifiableCredential",
       "MonthlyAdvanceManifestCredential"
     ],
-    "issuanceDate": "2021-02-04T20:29:37+00:00",
+    "validFrom": "2021-02-04T20:29:37+00:00",
     "issuer": "did:web:organization.example.com",
     "credentialSubject": {
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/MonthlyAggregateDeliveryStatements.yml b/docs/openapi/components/schemas/credentials/MonthlyAggregateDeliveryStatements.yml
index 2f89235c3..c43a0f001 100644
--- a/docs/openapi/components/schemas/credentials/MonthlyAggregateDeliveryStatements.yml
+++ b/docs/openapi/components/schemas/credentials/MonthlyAggregateDeliveryStatements.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -42,7 +42,7 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -83,7 +83,7 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
@@ -93,7 +93,7 @@ example: |-
       "MonthlyAggregateDeliveryStatementCredential"
     ],
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:credential:123",
@@ -104,7 +104,7 @@ example: |-
       "id": "did:web:organization.example.com",
       "name": "Everything Garden Stuff"
     },
-    "issuanceDate": "2022-01-13T09:16:46Z",
+    "validFrom": "2022-01-13T09:16:46Z",
     "credentialSubject": {
       "type": [
         "MonthlyAggregateDeliveryStatement"
diff --git a/docs/openapi/components/schemas/credentials/MultiModalBillOfLadingCredential.yml b/docs/openapi/components/schemas/credentials/MultiModalBillOfLadingCredential.yml
index 6e58ec167..4f98deeb3 100644
--- a/docs/openapi/components/schemas/credentials/MultiModalBillOfLadingCredential.yml
+++ b/docs/openapi/components/schemas/credentials/MultiModalBillOfLadingCredential.yml
@@ -18,15 +18,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -45,10 +45,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -1283,13 +1283,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:web:organization.example.com",
@@ -1297,7 +1297,7 @@ example: |-
       "VerifiableCredential",
       "MultiModalBillOfLadingCredential"
     ],
-    "issuanceDate": "2022-03-04T13:40:00Z",
+    "validFrom": "2022-03-04T13:40:00Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/NaturalGasProducerEnvironmentalPassportCredential.yml b/docs/openapi/components/schemas/credentials/NaturalGasProducerEnvironmentalPassportCredential.yml
index 43aea1fe8..321e5b2a1 100644
--- a/docs/openapi/components/schemas/credentials/NaturalGasProducerEnvironmentalPassportCredential.yml
+++ b/docs/openapi/components/schemas/credentials/NaturalGasProducerEnvironmentalPassportCredential.yml
@@ -11,15 +11,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -38,10 +38,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -141,13 +141,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "http://example.com/dd0c6f9a-5df6-40a3-bb34-863cd1fda606",
@@ -161,7 +161,7 @@ example: |-
       ],
       "id": "did:web:organization.example.com"
     },
-    "issuanceDate": "2022-11-01T10:58:45-04:00",
+    "validFrom": "2022-11-01T10:58:45-04:00",
     "credentialSubject": {
       "organization": {
         "legalName": "Example Company",
diff --git a/docs/openapi/components/schemas/credentials/OilAndGasDeliveryTicketCredential.yml b/docs/openapi/components/schemas/credentials/OilAndGasDeliveryTicketCredential.yml
index a3633796a..bae8c2c29 100644
--- a/docs/openapi/components/schemas/credentials/OilAndGasDeliveryTicketCredential.yml
+++ b/docs/openapi/components/schemas/credentials/OilAndGasDeliveryTicketCredential.yml
@@ -11,15 +11,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -41,9 +41,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     type: string
@@ -77,13 +77,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "http://example.org/credentials/",
@@ -91,7 +91,7 @@ example: |-
       "VerifiableCredential",
       "OilAndGasDeliveryTicketCredential"
     ],
-    "issuanceDate": "2021-02-04T20:29:37+00:00",
+    "validFrom": "2021-02-04T20:29:37+00:00",
     "issuer": "did:web:organization.example.com",
     "credentialSubject": {
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/OilAndGasProductCredential.yml b/docs/openapi/components/schemas/credentials/OilAndGasProductCredential.yml
index 0b4e0001a..9b27d27ee 100644
--- a/docs/openapi/components/schemas/credentials/OilAndGasProductCredential.yml
+++ b/docs/openapi/components/schemas/credentials/OilAndGasProductCredential.yml
@@ -11,15 +11,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -41,9 +41,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     type: string
@@ -77,13 +77,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "http://example.org/credentials/",
@@ -91,7 +91,7 @@ example: |-
       "VerifiableCredential",
       "OilAndGasProductCredential"
     ],
-    "issuanceDate": "2021-02-04T20:29:37+00:00",
+    "validFrom": "2021-02-04T20:29:37+00:00",
     "issuer": "did:web:organization.example.com",
     "credentialSubject": {
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/OrderConfirmationCredential.yml b/docs/openapi/components/schemas/credentials/OrderConfirmationCredential.yml
index 678925c15..9c428b2e4 100644
--- a/docs/openapi/components/schemas/credentials/OrderConfirmationCredential.yml
+++ b/docs/openapi/components/schemas/credentials/OrderConfirmationCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -39,7 +39,7 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
   issuer:
@@ -68,7 +68,7 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
@@ -78,7 +78,7 @@ example: |-
       "OrderConfirmationCredential"
     ],
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:web:organization.example.com",
@@ -89,7 +89,7 @@ example: |-
       "id": "did:web:organization.example.com",
       "name": "Everything Garden Stuff"
     },
-    "issuanceDate": "2022-01-13T09:16:46Z",
+    "validFrom": "2022-01-13T09:16:46Z",
     "credentialSubject": {
       "type": [
         "Order"
diff --git a/docs/openapi/components/schemas/credentials/OrganicCertificateCredential.yml b/docs/openapi/components/schemas/credentials/OrganicCertificateCredential.yml
index 32920c062..0398f4a94 100644
--- a/docs/openapi/components/schemas/credentials/OrganicCertificateCredential.yml
+++ b/docs/openapi/components/schemas/credentials/OrganicCertificateCredential.yml
@@ -20,15 +20,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -50,9 +50,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -86,13 +86,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -101,7 +101,7 @@ example: |-
       "OrganicCertificateCredential"
     ],
     "name": "Organic Certificate Credential",
-    "issuanceDate": "2021-12-11T03:50:55Z",
+    "validFrom": "2021-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/PGAShipmentStatusCredential.yml b/docs/openapi/components/schemas/credentials/PGAShipmentStatusCredential.yml
index 7c286462e..bda771835 100644
--- a/docs/openapi/components/schemas/credentials/PGAShipmentStatusCredential.yml
+++ b/docs/openapi/components/schemas/credentials/PGAShipmentStatusCredential.yml
@@ -23,7 +23,7 @@ properties:
     items:
       type: string
       enum:
-        - 'https://www.w3.org/2018/credentials/v1'
+        - 'https://www.w3.org/ns/credentials/v2'
         - 'https://w3id.org/traceability/v1'
   type:
     type: array
@@ -46,10 +46,10 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -78,13 +78,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -94,7 +94,7 @@ example: |-
     ],
     "name": "PGA Shipment Status Credential",
     "description": "Credential Issued by a PGA for the status of Cargo",
-    "issuanceDate": "2019-12-11T03:50:55Z",
+    "validFrom": "2019-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/PackingListCredential.yml b/docs/openapi/components/schemas/credentials/PackingListCredential.yml
index 4dc9cf1c4..bf311cc19 100644
--- a/docs/openapi/components/schemas/credentials/PackingListCredential.yml
+++ b/docs/openapi/components/schemas/credentials/PackingListCredential.yml
@@ -22,7 +22,7 @@ properties:
     items:
       type: string
       enum:
-        - 'https://www.w3.org/2018/credentials/v1'
+        - 'https://www.w3.org/ns/credentials/v2'
         - 'https://w3id.org/traceability/v1'
   type:
     type: array
@@ -41,10 +41,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -1033,13 +1033,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:a0c56350-8a15-434a-a406-0741df31c8b2",
@@ -1047,7 +1047,7 @@ example: |-
       "VerifiableCredential",
       "PackingListCredential"
     ],
-    "issuanceDate": "2019-12-11T03:50:55Z",
+    "validFrom": "2019-12-11T03:50:55Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/PhytosanitaryCredential.yml b/docs/openapi/components/schemas/credentials/PhytosanitaryCredential.yml
index ce113520f..42abbe51b 100644
--- a/docs/openapi/components/schemas/credentials/PhytosanitaryCredential.yml
+++ b/docs/openapi/components/schemas/credentials/PhytosanitaryCredential.yml
@@ -13,15 +13,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -43,10 +43,10 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -73,8 +73,8 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
-  - expirationDate
+  - validFrom
+  - validUntil
   - issuer
   - credentialSubject
 example: |-
@@ -84,7 +84,7 @@ example: |-
       "PhytosanitaryCredential"
     ],
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:2385e117-8011-4n15-bcae-64e4e26856c8",
@@ -97,8 +97,8 @@ example: |-
       "id": "did:web:organization.example.com",
       "name": "Binky's Farm"
     },
-    "issuanceDate": "2022-01-13T09:16:46Z",
-    "expirationDate": "2122-01-13T09:16:46Z",
+    "validFrom": "2022-01-13T09:16:46Z",
+    "validUntil": "2122-01-13T09:16:46Z",
     "credentialSubject": {
       "type": [
         "Phytosanitary"
diff --git a/docs/openapi/components/schemas/credentials/PlantSystemsInspectionCredential.yml b/docs/openapi/components/schemas/credentials/PlantSystemsInspectionCredential.yml
index 824cbaced..74d39c0d2 100644
--- a/docs/openapi/components/schemas/credentials/PlantSystemsInspectionCredential.yml
+++ b/docs/openapi/components/schemas/credentials/PlantSystemsInspectionCredential.yml
@@ -20,15 +20,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -50,9 +50,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     $ref: ../common/Organization.yml
@@ -86,13 +86,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -101,7 +101,7 @@ example: |-
       "PlantSystemsInspectionCredential"
     ],
     "name": "Plant Systems Inspection Credential",
-    "issuanceDate": "2021-12-11T03:50:55Z",
+    "validFrom": "2021-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/PowerOfAttorneyCredential.yml b/docs/openapi/components/schemas/credentials/PowerOfAttorneyCredential.yml
index d5b5f71c1..b349ff472 100644
--- a/docs/openapi/components/schemas/credentials/PowerOfAttorneyCredential.yml
+++ b/docs/openapi/components/schemas/credentials/PowerOfAttorneyCredential.yml
@@ -15,15 +15,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -42,10 +42,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -254,13 +254,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:d11a8700-5872-46ea-ni56-46bec4ec94ea",
@@ -290,7 +290,7 @@ example: |-
         }
       }
     },
-    "issuanceDate": "2022-11-01T10:58:45-04:00",
+    "validFrom": "2022-11-01T10:58:45-04:00",
     "credentialSubject": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/ProductRegistrationCredential.yml b/docs/openapi/components/schemas/credentials/ProductRegistrationCredential.yml
index a231fa683..4bc91a9b3 100644
--- a/docs/openapi/components/schemas/credentials/ProductRegistrationCredential.yml
+++ b/docs/openapi/components/schemas/credentials/ProductRegistrationCredential.yml
@@ -12,15 +12,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -39,7 +39,7 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
   issuer:
@@ -68,7 +68,7 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
@@ -78,7 +78,7 @@ example: |-
       "ProductRegistrationCredential"
     ],
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:web:organization.example.com",
@@ -89,7 +89,7 @@ example: |-
       "id": "did:web:organization.example.com",
       "name": "Everything Garden Stuff"
     },
-    "issuanceDate": "2022-01-13T09:16:46Z",
+    "validFrom": "2022-01-13T09:16:46Z",
     "credentialSubject": {
       "type": [
         "Product"
diff --git a/docs/openapi/components/schemas/credentials/PurchaseOrderCredential.yml b/docs/openapi/components/schemas/credentials/PurchaseOrderCredential.yml
index 52404cd93..9475c65c7 100644
--- a/docs/openapi/components/schemas/credentials/PurchaseOrderCredential.yml
+++ b/docs/openapi/components/schemas/credentials/PurchaseOrderCredential.yml
@@ -26,15 +26,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -53,10 +53,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -1031,13 +1031,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://example.com/credential/123",
@@ -1045,7 +1045,7 @@ example: |-
       "VerifiableCredential",
       "PurchaseOrderCredential"
     ],
-    "issuanceDate": "2019-12-11T03:50:55Z",
+    "validFrom": "2019-12-11T03:50:55Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/QualifiedWebLeiIssuerCredential.yml b/docs/openapi/components/schemas/credentials/QualifiedWebLeiIssuerCredential.yml
index 9336f5128..124b6e403 100644
--- a/docs/openapi/components/schemas/credentials/QualifiedWebLeiIssuerCredential.yml
+++ b/docs/openapi/components/schemas/credentials/QualifiedWebLeiIssuerCredential.yml
@@ -13,15 +13,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -40,10 +40,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -124,14 +124,14 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
   - credentialSchema
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "http://example.com/dd0c6f9a-5df6-40a3-bb34-863cd1fda606",
@@ -150,7 +150,7 @@ example: |-
       "id": "did:web:gleif.example.org",
       "name": "GLEIF"
     },
-    "issuanceDate": "2022-11-01T10:58:45-04:00",
+    "validFrom": "2022-11-01T10:58:45-04:00",
     "credentialSubject": {
       "type": [
         "LEIAuthority"
diff --git a/docs/openapi/components/schemas/credentials/SIMASteelImportLicenseApplicationCredential.yml b/docs/openapi/components/schemas/credentials/SIMASteelImportLicenseApplicationCredential.yml
index 126d900a4..738d51117 100644
--- a/docs/openapi/components/schemas/credentials/SIMASteelImportLicenseApplicationCredential.yml
+++ b/docs/openapi/components/schemas/credentials/SIMASteelImportLicenseApplicationCredential.yml
@@ -11,15 +11,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -38,7 +38,7 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     description: Date of Application
     type: string
     format: date-time
@@ -463,13 +463,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:key:z6MknrcKsbzfy6kKFxtJQHxq43zHofhBuUqB6QGvvqF6FX7c",
@@ -499,7 +499,7 @@ example: |-
         }
       }
     },
-    "issuanceDate": "2023-02-28T11:23:00Z",
+    "validFrom": "2023-02-28T11:23:00Z",
     "credentialSubject": {
       "type": [
         "SIMASteelImportLicense"
diff --git a/docs/openapi/components/schemas/credentials/SIMASteelImportLicenseCredential.yml b/docs/openapi/components/schemas/credentials/SIMASteelImportLicenseCredential.yml
index 660317656..9b436cee1 100644
--- a/docs/openapi/components/schemas/credentials/SIMASteelImportLicenseCredential.yml
+++ b/docs/openapi/components/schemas/credentials/SIMASteelImportLicenseCredential.yml
@@ -11,15 +11,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -37,12 +37,12 @@ properties:
         - SIMASteelImportLicenseCredential
   id:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
     title: License Valid From
     description: Date product(s) expected to be shipped from the country of exportation.
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
     title: License Valid Through
@@ -497,14 +497,14 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
-  - expirationDate
+  - validFrom
+  - validUntil
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:2c9f4c3d-0874-44ce-a3a8-617e55454fc1",
@@ -519,8 +519,8 @@ example: |-
       "id": "did:web:organization.example.com",
       "name": "US Steel Import Monitoring and Analysis (SIMA)"
     },
-    "issuanceDate": "2023-02-28T11:23:00Z",
-    "expirationDate": "2024-02-28T11:23:00Z",
+    "validFrom": "2023-02-28T11:23:00Z",
+    "validUntil": "2024-02-28T11:23:00Z",
     "credentialSubject": {
       "type": [
         "SIMASteelImportLicense"
diff --git a/docs/openapi/components/schemas/credentials/SeaCargoManifestCredential.yml b/docs/openapi/components/schemas/credentials/SeaCargoManifestCredential.yml
index faa947bf2..0b7526e40 100644
--- a/docs/openapi/components/schemas/credentials/SeaCargoManifestCredential.yml
+++ b/docs/openapi/components/schemas/credentials/SeaCargoManifestCredential.yml
@@ -16,15 +16,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -43,10 +43,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -75,13 +75,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "did:web:organization.example.com",
@@ -89,7 +89,7 @@ example: |-
       "VerifiableCredential",
       "SeaCargoManifestCredential"
     ],
-    "issuanceDate": "2022-03-16T14:13:30Z",
+    "validFrom": "2022-03-16T14:13:30Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/ShippingInstructionsCredential.yml b/docs/openapi/components/schemas/credentials/ShippingInstructionsCredential.yml
index 70af83ac0..3ff73a32f 100644
--- a/docs/openapi/components/schemas/credentials/ShippingInstructionsCredential.yml
+++ b/docs/openapi/components/schemas/credentials/ShippingInstructionsCredential.yml
@@ -19,7 +19,7 @@ properties:
     items:
       type: string
       enum:
-        - 'https://www.w3.org/2018/credentials/v1'
+        - 'https://www.w3.org/ns/credentials/v2'
         - 'https://w3id.org/traceability/v1'
   type:
     type: array
@@ -38,10 +38,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -70,13 +70,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:bc2a72a9-fe02-414a-8291-c9c988b2n156",
@@ -84,7 +84,7 @@ example: |-
       "VerifiableCredential",
       "ShippingInstructionsCredential"
     ],
-    "issuanceDate": "2022-03-04T13:40:00Z",
+    "validFrom": "2022-03-04T13:40:00Z",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/SoftwareBillofMaterialsCredential.yml b/docs/openapi/components/schemas/credentials/SoftwareBillofMaterialsCredential.yml
index 34dae0173..2056e3c7f 100644
--- a/docs/openapi/components/schemas/credentials/SoftwareBillofMaterialsCredential.yml
+++ b/docs/openapi/components/schemas/credentials/SoftwareBillofMaterialsCredential.yml
@@ -16,15 +16,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -47,10 +47,10 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -79,13 +79,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "https://github.com/spdx/spdx-examples/blob/master/example1/spdx/example1.spdx",
@@ -95,7 +95,7 @@ example: |-
     ],
     "name": "SPDX Software Bill of Materials Credential",
     "description": "Credential Issued by Software Vendor for information on packages and binaries",
-    "issuanceDate": "2021-08-26T01:46:00Z",
+    "validFrom": "2021-08-26T01:46:00Z",
     "issuer": {
       "id": "did:web:organization.example.com",
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/TSCACertificationCredential.yml b/docs/openapi/components/schemas/credentials/TSCACertificationCredential.yml
index 475b17774..4754c6f13 100644
--- a/docs/openapi/components/schemas/credentials/TSCACertificationCredential.yml
+++ b/docs/openapi/components/schemas/credentials/TSCACertificationCredential.yml
@@ -11,15 +11,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -41,9 +41,9 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
-  expirationDate:
+  validUntil:
     type: string
   issuer:
     type: string
@@ -77,13 +77,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "http://example.org/credentials/",
@@ -91,7 +91,7 @@ example: |-
       "VerifiableCredential",
       "TSCACertificationCredential"
     ],
-    "issuanceDate": "2024-01-04T20:29:37+00:00",
+    "validFrom": "2024-01-04T20:29:37+00:00",
     "issuer": "did:web:organization.example.com",
     "credentialSubject": {
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/ThingCredential.yml b/docs/openapi/components/schemas/credentials/ThingCredential.yml
index f50e81413..54d577b91 100644
--- a/docs/openapi/components/schemas/credentials/ThingCredential.yml
+++ b/docs/openapi/components/schemas/credentials/ThingCredential.yml
@@ -15,15 +15,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -42,10 +42,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -72,13 +72,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "http://example.com/dd0c6f9a-5df6-40a3-bb34-863cd1fda606",
@@ -92,7 +92,7 @@ example: |-
       ],
       "id": "did:web:organization.example.com"
     },
-    "issuanceDate": "2022-11-01T10:58:45-04:00",
+    "validFrom": "2022-11-01T10:58:45-04:00",
     "credentialSubject": {
       "type": [
         "Thing"
diff --git a/docs/openapi/components/schemas/credentials/USDAPPQ203ForeignSiteInspectionCredential.yml b/docs/openapi/components/schemas/credentials/USDAPPQ203ForeignSiteInspectionCredential.yml
index 67859e330..5ba753b27 100644
--- a/docs/openapi/components/schemas/credentials/USDAPPQ203ForeignSiteInspectionCredential.yml
+++ b/docs/openapi/components/schemas/credentials/USDAPPQ203ForeignSiteInspectionCredential.yml
@@ -13,15 +13,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -43,10 +43,10 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -73,8 +73,8 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
-  - expirationDate
+  - validFrom
+  - validUntil
   - issuer
   - credentialSubject
 example: |-
@@ -84,7 +84,7 @@ example: |-
       "USDAPPQ203ForeignSiteInspectionCredential"
     ],
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:2385e117-8011-4n15-bcae-64e4e26856c8",
@@ -97,8 +97,8 @@ example: |-
       "id": "did:web:organization.example.com",
       "name": "Binky's Farm"
     },
-    "issuanceDate": "2022-01-13T09:16:46Z",
-    "expirationDate": "2122-01-13T09:16:46Z",
+    "validFrom": "2022-01-13T09:16:46Z",
+    "validUntil": "2122-01-13T09:16:46Z",
     "credentialSubject": {
       "type": [
         "USDAPPQ203ForeignSiteInspection"
diff --git a/docs/openapi/components/schemas/credentials/USDAPermitToImportCredential.yml b/docs/openapi/components/schemas/credentials/USDAPermitToImportCredential.yml
index 85db88ba6..beb868e24 100644
--- a/docs/openapi/components/schemas/credentials/USDAPermitToImportCredential.yml
+++ b/docs/openapi/components/schemas/credentials/USDAPermitToImportCredential.yml
@@ -11,15 +11,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -37,10 +37,10 @@ properties:
         - USDAPermitToImportCredential
   id:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -116,10 +116,10 @@ properties:
         type: string
     additionalProperties: false
     required:
-      - applicationNumber		
+      - applicationNumber
       - permitNumber
       - applicant
-      - permittee	
+      - permittee
       - intendedUse
       - approvalDate
       - ppqHeadquarterOfficial
@@ -129,13 +129,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "http://example.com/dd0c6f9a-5df6-40a3-bb34-863cd1fda606",
@@ -154,7 +154,7 @@ example: |-
       "id": "did:web:usda.example.org",
       "name": "USDA"
     },
-    "issuanceDate": "2022-11-01T10:58:45-04:00",
+    "validFrom": "2022-11-01T10:58:45-04:00",
     "credentialSubject": {
       "applicationNumber": "A-0000XXXX",
       "permitNumber": "5A-91-287-XXXXX",
diff --git a/docs/openapi/components/schemas/credentials/USMCACertificationOfOrigin.yml b/docs/openapi/components/schemas/credentials/USMCACertificationOfOrigin.yml
index 23c47ceed..158662739 100644
--- a/docs/openapi/components/schemas/credentials/USMCACertificationOfOrigin.yml
+++ b/docs/openapi/components/schemas/credentials/USMCACertificationOfOrigin.yml
@@ -18,15 +18,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -45,14 +45,14 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
     description: >-
       The date upon which the certification becomes applicable to the good
       covered by the blanket Certification (it may be prior to the date of
       signing this certification).
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
     description: >-
@@ -679,14 +679,14 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
-  - expirationDate
+  - validFrom
+  - validUntil
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "type": [
@@ -694,8 +694,8 @@ example: |-
       "USMCACertificationOfOrigin"
     ],
     "id": "urn:uuid:c9d24347-0e04-4e01-9567-7f2778fed94a",
-    "issuanceDate": "2023-01-01T20:29:37+00:00",
-    "expirationDate": "2023-12-31T20:29:37+00:00",
+    "validFrom": "2023-01-01T20:29:37+00:00",
+    "validUntil": "2023-12-31T20:29:37+00:00",
     "issuer": {
       "type": [
         "Organization"
diff --git a/docs/openapi/components/schemas/credentials/VerifiableBusinessCard.yml b/docs/openapi/components/schemas/credentials/VerifiableBusinessCard.yml
index 8489603bb..557719f21 100644
--- a/docs/openapi/components/schemas/credentials/VerifiableBusinessCard.yml
+++ b/docs/openapi/components/schemas/credentials/VerifiableBusinessCard.yml
@@ -16,15 +16,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -47,10 +47,10 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -107,7 +107,7 @@ properties:
               type: string
               enum:
                 - Organization
-          id: 
+          id:
             title: Identifier
             description: Organization identifier.
             type: string
@@ -320,7 +320,7 @@ required:
   - '@context'
   - id
   - type
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
   - relatedLink
@@ -328,7 +328,7 @@ required:
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:credential:5c375bcd-a6e1-4b36-90be-8fd33118669a",
@@ -351,7 +351,7 @@ example: |-
       "id": "https://w3c-ccg.github.io/traceability-vocab/openapi/components/schemas/credentials/VerifiableBusinessCard.yml",
       "type": "OpenApiSpecificationValidator2022"
     },
-    "issuanceDate": "2019-12-11T03:50:55Z",
+    "validFrom": "2019-12-11T03:50:55Z",
     "issuer": "did:web:organization.example.com",
     "credentialSubject": {
       "type": [
diff --git a/docs/openapi/components/schemas/credentials/VerifiablePostmanCollection.yml b/docs/openapi/components/schemas/credentials/VerifiablePostmanCollection.yml
index 75b8692c6..00000d7b2 100644
--- a/docs/openapi/components/schemas/credentials/VerifiablePostmanCollection.yml
+++ b/docs/openapi/components/schemas/credentials/VerifiablePostmanCollection.yml
@@ -13,7 +13,7 @@ properties:
   '@context':
     type: array
     const:
-      - 'https://www.w3.org/2018/credentials/v1'
+      - 'https://www.w3.org/ns/credentials/v2'
       - 'https://w3id.org/traceability/v1'
   type:
     type: array
@@ -36,10 +36,10 @@ properties:
     type: string
   description:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -68,13 +68,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:07aa969e-b40d-4c1b-ab46-ded252003ded",
@@ -85,7 +85,7 @@ example: |-
     "name": "Verifiable Postman Collection",
     "description": "Postman is an API platform for developers to design, build, test, and iterate",
     "issuer": "did:web:organization.example.com",
-    "issuanceDate": "2010-01-01T19:23:24Z",
+    "validFrom": "2010-01-01T19:23:24Z",
     "credentialSubject": {
       "info": {
         "_postman_id": "2319fa29-4ea8-4739-96ea-bda2b74f92bb",
diff --git a/docs/openapi/components/schemas/credentials/VerifiableScorecard.yml b/docs/openapi/components/schemas/credentials/VerifiableScorecard.yml
index a488277e4..bef33ec0c 100644
--- a/docs/openapi/components/schemas/credentials/VerifiableScorecard.yml
+++ b/docs/openapi/components/schemas/credentials/VerifiableScorecard.yml
@@ -15,7 +15,7 @@ properties:
   '@context':
     type: array
     const:
-      - 'https://www.w3.org/2018/credentials/v1'
+      - 'https://www.w3.org/ns/credentials/v2'
       - 'https://w3id.org/traceability/v1'
   type:
     type: array
@@ -40,10 +40,10 @@ properties:
     type: string
   issuer:
     type: string
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   credentialSchema:
@@ -75,13 +75,13 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "urn:uuid:07aa969e-b40d-4c1b-ab46-ded252003ded",
@@ -92,7 +92,7 @@ example: |-
       "VerifiableScorecard"
     ],
     "issuer": "did:web:organization.example.com",
-    "issuanceDate": "2010-01-01T19:23:24Z",
+    "validFrom": "2010-01-01T19:23:24Z",
     "credentialSubject": {
       "id": "https://github.com/ossf/scorecard",
       "items": [
diff --git a/docs/openapi/components/schemas/credentials/WebLeiCredential.yml b/docs/openapi/components/schemas/credentials/WebLeiCredential.yml
index 375630b2e..87799cfa5 100644
--- a/docs/openapi/components/schemas/credentials/WebLeiCredential.yml
+++ b/docs/openapi/components/schemas/credentials/WebLeiCredential.yml
@@ -13,15 +13,15 @@ properties:
     type: array
     readOnly: true
     const:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     default:
-      - https://www.w3.org/2018/credentials/v1
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       type: string
       enum:
-        - https://www.w3.org/2018/credentials/v1
+        - https://www.w3.org/ns/credentials/v2
         - https://w3id.org/traceability/v1
   type:
     type: array
@@ -40,10 +40,10 @@ properties:
   id:
     type: string
     format: uri
-  issuanceDate:
+  validFrom:
     type: string
     format: date-time
-  expirationDate:
+  validUntil:
     type: string
     format: date-time
   issuer:
@@ -114,10 +114,10 @@ properties:
         title: LEI Code
         description: 20-digit LEI code.
         type: string
-      entity: 
-        title: Entity 
-        type: object 
-        properties: 
+      entity:
+        title: Entity
+        type: object
+        properties:
           type:
             type: array
             readOnly: true
@@ -135,7 +135,7 @@ properties:
           legalAddress:
             title: LegalAddress
             type: object
-            properties: 
+            properties:
               type:
                 type: array
                 readOnly: true
@@ -157,7 +157,7 @@ properties:
                 title: Additional Address Lines
                 type: array
                 items:
-                  type: string      
+                  type: string
               addressNumber:
                 title: Address Number
                 type: string
@@ -183,7 +183,7 @@ properties:
           headquartersAddress:
             title: HeadquartersAddress
             type: object
-            properties: 
+            properties:
               type:
                 type: array
                 readOnly: true
@@ -205,7 +205,7 @@ properties:
                 title: Additional Address Lines
                 type: array
                 items:
-                  type: string      
+                  type: string
               addressNumber:
                 title: Address Number
                 type: string
@@ -231,7 +231,7 @@ properties:
           registration:
             title: Registration
             type: object
-            properties: 
+            properties:
               type:
                 type: array
                 readOnly: true
@@ -267,14 +267,14 @@ required:
   - '@context'
   - type
   - id
-  - issuanceDate
+  - validFrom
   - issuer
   - credentialSubject
   - credentialSchema
 example: |-
   {
     "@context": [
-      "https://www.w3.org/2018/credentials/v1",
+      "https://www.w3.org/ns/credentials/v2",
       "https://w3id.org/traceability/v1"
     ],
     "id": "http://example.com/dd0c6f9a-5df6-40a3-bb34-863cd1fda606",
@@ -293,7 +293,7 @@ example: |-
       "id": "did:web:qualified-organization.example.com",
       "name": "United FinSec Corp."
     },
-    "issuanceDate": "2022-11-01T10:58:45-04:00",
+    "validFrom": "2022-11-01T10:58:45-04:00",
     "credentialSubject": {
       "type": [
         "WebLEI"
diff --git a/docs/openapi/openapi.yml b/docs/openapi/openapi.yml
index 93b81e82e..f62635a37 100644
--- a/docs/openapi/openapi.yml
+++ b/docs/openapi/openapi.yml
@@ -970,6 +970,19 @@ paths:
                 $ref: './components/schemas/common/Instructions.yml'
     
 
+  /schemas/common/InstrumentOfTrade.yml:
+    get:
+      tags:
+      - common
+      responses:
+        '200':
+          description: 'successfully issued InstrumentOfTrade schema.'
+          content:
+            application/yml:
+              schema:
+                $ref: './components/schemas/common/InstrumentOfTrade.yml'
+    
+
   /schemas/common/IntellectualPropertyRights.yml:
     get:
       tags:
diff --git a/packages/traceability-schemas/services/contexts.js b/packages/traceability-schemas/services/contexts.js
index 73798eef9..0843d5ab6 100644
--- a/packages/traceability-schemas/services/contexts.js
+++ b/packages/traceability-schemas/services/contexts.js
@@ -3,7 +3,7 @@ const path = require('path');
 
 const contexts = {
   'https://www.w3.org/ns/activitystreams': require('./contexts/activity-pub.json'),
-  'https://www.w3.org/2018/credentials/v1': require('./contexts/vc-v1.json'),
+  'https://www.w3.org/ns/credentials/v2': require('./contexts/vc-v1.json'),
   'https://ref.gs1.org/gs1/vc/license-context/': require('./contexts/gs1-license-context.json'),
   'https://ref.gs1.org/gs1/vc/declaration-context/': require('./contexts/declaration-context.json'),
   'https://ref.gs1.org/gs1/vc/trade-item-context/': require('./contexts/trade-item-context.json'),
diff --git a/packages/traceability-schemas/services/contexts/vc-v1.json b/packages/traceability-schemas/services/contexts/vc-v1.json
index 26169278c..1c31cca26 100644
--- a/packages/traceability-schemas/services/contexts/vc-v1.json
+++ b/packages/traceability-schemas/services/contexts/vc-v1.json
@@ -34,15 +34,21 @@
             "JsonSchemaValidator2018": "cred:JsonSchemaValidator2018"
           }
         },
-        "credentialStatus": {"@id": "cred:credentialStatus", "@type": "@id"},
-        "credentialSubject": {"@id": "cred:credentialSubject", "@type": "@id"},
-        "evidence": {"@id": "cred:evidence", "@type": "@id"},
-        "expirationDate": {"@id": "cred:expirationDate", "@type": "xsd:dateTime"},
-        "holder": {"@id": "cred:holder", "@type": "@id"},
-        "issued": {"@id": "cred:issued", "@type": "xsd:dateTime"},
-        "issuer": {"@id": "cred:issuer", "@type": "@id"},
-        "issuanceDate": {"@id": "cred:issuanceDate", "@type": "xsd:dateTime"},
-        "proof": {"@id": "sec:proof", "@type": "@id", "@container": "@graph"},
+        "credentialStatus": { "@id": "cred:credentialStatus", "@type": "@id" },
+        "credentialSubject": {
+          "@id": "cred:credentialSubject",
+          "@type": "@id"
+        },
+        "evidence": { "@id": "cred:evidence", "@type": "@id" },
+        "validUntil": {
+          "@id": "cred:validUntil",
+          "@type": "xsd:dateTime"
+        },
+        "holder": { "@id": "cred:holder", "@type": "@id" },
+        "issued": { "@id": "cred:issued", "@type": "xsd:dateTime" },
+        "issuer": { "@id": "cred:issuer", "@type": "@id" },
+        "validFrom": { "@id": "cred:validFrom", "@type": "xsd:dateTime" },
+        "proof": { "@id": "sec:proof", "@type": "@id", "@container": "@graph" },
         "refreshService": {
           "@id": "cred:refreshService",
           "@type": "@id",
@@ -58,9 +64,9 @@
             "ManualRefreshService2018": "cred:ManualRefreshService2018"
           }
         },
-        "termsOfUse": {"@id": "cred:termsOfUse", "@type": "@id"},
-        "validFrom": {"@id": "cred:validFrom", "@type": "xsd:dateTime"},
-        "validUntil": {"@id": "cred:validUntil", "@type": "xsd:dateTime"}
+        "termsOfUse": { "@id": "cred:termsOfUse", "@type": "@id" },
+        "validFrom": { "@id": "cred:validFrom", "@type": "xsd:dateTime" },
+        "validUntil": { "@id": "cred:validUntil", "@type": "xsd:dateTime" }
       }
     },
 
@@ -76,9 +82,13 @@
         "cred": "https://www.w3.org/2018/credentials#",
         "sec": "https://w3id.org/security#",
 
-        "holder": {"@id": "cred:holder", "@type": "@id"},
-        "proof": {"@id": "sec:proof", "@type": "@id", "@container": "@graph"},
-        "verifiableCredential": {"@id": "cred:verifiableCredential", "@type": "@id", "@container": "@graph"}
+        "holder": { "@id": "cred:holder", "@type": "@id" },
+        "proof": { "@id": "sec:proof", "@type": "@id", "@container": "@graph" },
+        "verifiableCredential": {
+          "@id": "cred:verifiableCredential",
+          "@type": "@id",
+          "@container": "@graph"
+        }
       }
     },
 
@@ -95,9 +105,12 @@
         "xsd": "http://www.w3.org/2001/XMLSchema#",
 
         "challenge": "sec:challenge",
-        "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+        "created": {
+          "@id": "http://purl.org/dc/terms/created",
+          "@type": "xsd:dateTime"
+        },
         "domain": "sec:domain",
-        "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+        "expires": { "@id": "sec:expiration", "@type": "xsd:dateTime" },
         "jws": "sec:jws",
         "nonce": "sec:nonce",
         "proofPurpose": {
@@ -112,12 +125,23 @@
 
             "sec": "https://w3id.org/security#",
 
-            "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
-            "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+            "assertionMethod": {
+              "@id": "sec:assertionMethod",
+              "@type": "@id",
+              "@container": "@set"
+            },
+            "authentication": {
+              "@id": "sec:authenticationMethod",
+              "@type": "@id",
+              "@container": "@set"
+            }
           }
         },
         "proofValue": "sec:proofValue",
-        "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+        "verificationMethod": {
+          "@id": "sec:verificationMethod",
+          "@type": "@id"
+        }
       }
     },
 
@@ -134,9 +158,12 @@
         "xsd": "http://www.w3.org/2001/XMLSchema#",
 
         "challenge": "sec:challenge",
-        "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+        "created": {
+          "@id": "http://purl.org/dc/terms/created",
+          "@type": "xsd:dateTime"
+        },
         "domain": "sec:domain",
-        "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+        "expires": { "@id": "sec:expiration", "@type": "xsd:dateTime" },
         "jws": "sec:jws",
         "nonce": "sec:nonce",
         "proofPurpose": {
@@ -151,12 +178,23 @@
 
             "sec": "https://w3id.org/security#",
 
-            "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
-            "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+            "assertionMethod": {
+              "@id": "sec:assertionMethod",
+              "@type": "@id",
+              "@container": "@set"
+            },
+            "authentication": {
+              "@id": "sec:authenticationMethod",
+              "@type": "@id",
+              "@container": "@set"
+            }
           }
         },
         "proofValue": "sec:proofValue",
-        "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+        "verificationMethod": {
+          "@id": "sec:verificationMethod",
+          "@type": "@id"
+        }
       }
     },
 
@@ -173,9 +211,12 @@
         "xsd": "http://www.w3.org/2001/XMLSchema#",
 
         "challenge": "sec:challenge",
-        "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+        "created": {
+          "@id": "http://purl.org/dc/terms/created",
+          "@type": "xsd:dateTime"
+        },
         "domain": "sec:domain",
-        "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+        "expires": { "@id": "sec:expiration", "@type": "xsd:dateTime" },
         "jws": "sec:jws",
         "nonce": "sec:nonce",
         "proofPurpose": {
@@ -190,12 +231,23 @@
 
             "sec": "https://w3id.org/security#",
 
-            "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
-            "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+            "assertionMethod": {
+              "@id": "sec:assertionMethod",
+              "@type": "@id",
+              "@container": "@set"
+            },
+            "authentication": {
+              "@id": "sec:authenticationMethod",
+              "@type": "@id",
+              "@container": "@set"
+            }
           }
         },
         "proofValue": "sec:proofValue",
-        "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+        "verificationMethod": {
+          "@id": "sec:verificationMethod",
+          "@type": "@id"
+        }
       }
     },
 
@@ -206,9 +258,12 @@
         "@protected": true,
 
         "challenge": "sec:challenge",
-        "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+        "created": {
+          "@id": "http://purl.org/dc/terms/created",
+          "@type": "xsd:dateTime"
+        },
         "domain": "sec:domain",
-        "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+        "expires": { "@id": "sec:expiration", "@type": "xsd:dateTime" },
         "jws": "sec:jws",
         "nonce": "sec:nonce",
         "proofPurpose": {
@@ -223,15 +278,30 @@
 
             "sec": "https://w3id.org/security#",
 
-            "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
-            "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+            "assertionMethod": {
+              "@id": "sec:assertionMethod",
+              "@type": "@id",
+              "@container": "@set"
+            },
+            "authentication": {
+              "@id": "sec:authenticationMethod",
+              "@type": "@id",
+              "@container": "@set"
+            }
           }
         },
         "proofValue": "sec:proofValue",
-        "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+        "verificationMethod": {
+          "@id": "sec:verificationMethod",
+          "@type": "@id"
+        }
       }
     },
 
-    "proof": {"@id": "https://w3id.org/security#proof", "@type": "@id", "@container": "@graph"}
+    "proof": {
+      "@id": "https://w3id.org/security#proof",
+      "@type": "@id",
+      "@container": "@graph"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/traceability-tests/examples/v2.json b/packages/traceability-tests/examples/v2.json
index 9dfe6dffd..930e2e0d5 100644
--- a/packages/traceability-tests/examples/v2.json
+++ b/packages/traceability-tests/examples/v2.json
@@ -9,7 +9,7 @@
   },
   "examples": [
     {
-      "issued": "eyJpc3MiOiJkaWQ6andrOmV5SnJkSGtpT2lKRlF5SXNJbU55ZGlJNklsQXRNemcwSWl3aVlXeG5Jam9pUlZNek9EUWlMQ0o0SWpvaU9XcHpSbEpXVm1weFNsazFTa2w1U25JMU9HZEZRblZ5YW10emFreHdUVUp2V1ZaRFpUWmxNRUo2VXpoQlV6Tk1RWGx5TjNoTGVGTm5VRTlwVUdOSFRTSXNJbmtpT2lKaWRIUk1YMlpWYTNSa2NpMU1hSGhOWTNwSmFtbDBaRnBXY0c5cGFYcHBVR2xuT0cxbk9ERmlkR1ZVVW0welFtcGFMV3c0ZFU1cWRrcExZV3RuVWpOQ0luMCIsImtpZCI6IiMwIiwiYWxnIjoiRVMzODQiLCJjdHkiOiJ2YytsZCtqc29uIn0.eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vd3d3LnczLm9yZy9ucy9hY3Rpdml0eXN0cmVhbXMiXSwiaWQiOiJ1cm46dXVpZDo4YTMyMjdkNC1kZmFmLTQ2MGMtOGY2My1lZDRhODAyY2UzNjIiLCJ0eXBlIjpbIlZlcmlmaWFibGVDcmVkZW50aWFsIiwiQWN0aXZpdHlQdWJBY3RvckNhcmQiXSwiY3JlZGVudGlhbFNjaGVtYSI6eyJpZCI6Imh0dHBzOi8vdzNjLWNjZy5naXRodWIuaW8vdHJhY2VhYmlsaXR5LXZvY2FiL29wZW5hcGkvY29tcG9uZW50cy9zY2hlbWFzL2NyZWRlbnRpYWxzL0FjdGl2aXR5UHViQWN0b3JDYXJkLnltbCIsInR5cGUiOiJKc29uU2NoZW1hIn0sImlzc3VhbmNlRGF0ZSI6IjIwMjMtMDUtMjFUMTU6Mzk6NTcuOTQ0WiIsImlzc3VlciI6eyJpZCI6ImRpZDpqd2s6ZXlKcmRIa2lPaUpGUXlJc0ltTnlkaUk2SWxBdE16ZzBJaXdpWVd4bklqb2lSVk16T0RRaUxDSjRJam9pT1dwelJsSldWbXB4U2xrMVNrbDVTbkkxT0dkRlFuVnlhbXR6YWt4d1RVSnZXVlpEWlRabE1FSjZVemhCVXpOTVFYbHlOM2hMZUZOblVFOXBVR05IVFNJc0lua2lPaUppZEhSTVgyWlZhM1JrY2kxTWFIaE5ZM3BKYW1sMFpGcFdjRzlwYVhwcFVHbG5PRzFuT0RGaWRHVlVVbTB6UW1wYUxXdzRkVTVxZGtwTFlXdG5Vak5DSW4wIn0sImNyZWRlbnRpYWxTdWJqZWN0Ijp7InR5cGUiOlsiUGVyc29uIl0sImlkIjoiaHR0cHM6Ly9rZW56b2lzaGlpLmV4YW1wbGUuY29tLyIsImZvbGxvd2luZyI6Imh0dHBzOi8va2Vuem9pc2hpaS5leGFtcGxlLmNvbS9mb2xsb3dpbmcuanNvbiIsImZvbGxvd2VycyI6Imh0dHBzOi8va2Vuem9pc2hpaS5leGFtcGxlLmNvbS9mb2xsb3dlcnMuanNvbiIsImxpa2VkIjoiaHR0cHM6Ly9rZW56b2lzaGlpLmV4YW1wbGUuY29tL2xpa2VkLmpzb24iLCJpbmJveCI6Imh0dHBzOi8va2Vuem9pc2hpaS5leGFtcGxlLmNvbS9pbmJveC5qc29uIiwib3V0Ym94IjoiaHR0cHM6Ly9rZW56b2lzaGlpLmV4YW1wbGUuY29tL2ZlZWQuanNvbiIsInByZWZlcnJlZFVzZXJuYW1lIjoia2Vuem9pc2hpaSIsIm5hbWUiOiLnn7PkupXlgaXolLUiLCJzdW1tYXJ5Ijoi44GT44Gu5pa544Gv44Gf44Gg44Gu5L6L44Gn44GZIiwiaWNvbiI6WyJodHRwczovL2tlbnpvaXNoaWkuZXhhbXBsZS5jb20vaW1hZ2UvMTY1OTg3YWtscmU0Il19fQ.gJ8EKG76Hwr58HsuXb-gtQ-auU0V3gRbYuHFPflaUI-XqEcGPTbhrcGsbgZM8rdmA3HuAHBFhdgKMq3BbDQHTOy3WYJ0W5Agcu_FEyJi7ti1otc7jh9IY8P-NvcBdORQ",
+      "issued": "eyJpc3MiOiJkaWQ6andrOmV5SnJkSGtpT2lKRlF5SXNJbU55ZGlJNklsQXRNemcwSWl3aVlXeG5Jam9pUlZNek9EUWlMQ0o0SWpvaU9XcHpSbEpXVm1weFNsazFTa2w1U25JMU9HZEZRblZ5YW10emFreHdUVUp2V1ZaRFpUWmxNRUo2VXpoQlV6Tk1RWGx5TjNoTGVGTm5VRTlwVUdOSFRTSXNJbmtpT2lKaWRIUk1YMlpWYTNSa2NpMU1hSGhOWTNwSmFtbDBaRnBXY0c5cGFYcHBVR2xuT0cxbk9ERmlkR1ZVVW0welFtcGFMV3c0ZFU1cWRrcExZV3RuVWpOQ0luMCIsImtpZCI6IiMwIiwiYWxnIjoiRVMzODQiLCJjdHkiOiJ2YytsZCtqc29uIn0.eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvbnMvY3JlZGVudGlhbHMvdjIiLCJodHRwczovL3d3dy53My5vcmcvbnMvYWN0aXZpdHlzdHJlYW1zIl0sImlkIjoidXJuOnV1aWQ6ZWE1YWE3ZTctOTUwMC00MDMxLTg1YjktZmQ0OWE1ZGJiODM5IiwidHlwZSI6WyJWZXJpZmlhYmxlQ3JlZGVudGlhbCIsIkFjdGl2aXR5UHViQWN0b3JDYXJkIl0sImNyZWRlbnRpYWxTY2hlbWEiOnsiaWQiOiJodHRwczovL3czYy1jY2cuZ2l0aHViLmlvL3RyYWNlYWJpbGl0eS12b2NhYi9vcGVuYXBpL2NvbXBvbmVudHMvc2NoZW1hcy9jcmVkZW50aWFscy9BY3Rpdml0eVB1YkFjdG9yQ2FyZC55bWwiLCJ0eXBlIjoiSnNvblNjaGVtYSJ9LCJ2YWxpZEZyb20iOiIyMDIzLTA1LTIxVDE1OjM5OjU3Ljk0NFoiLCJpc3N1ZXIiOnsiaWQiOiJkaWQ6andrOmV5SnJkSGtpT2lKRlF5SXNJbU55ZGlJNklsQXRNemcwSWl3aVlXeG5Jam9pUlZNek9EUWlMQ0o0SWpvaU9XcHpSbEpXVm1weFNsazFTa2w1U25JMU9HZEZRblZ5YW10emFreHdUVUp2V1ZaRFpUWmxNRUo2VXpoQlV6Tk1RWGx5TjNoTGVGTm5VRTlwVUdOSFRTSXNJbmtpT2lKaWRIUk1YMlpWYTNSa2NpMU1hSGhOWTNwSmFtbDBaRnBXY0c5cGFYcHBVR2xuT0cxbk9ERmlkR1ZVVW0welFtcGFMV3c0ZFU1cWRrcExZV3RuVWpOQ0luMCJ9LCJjcmVkZW50aWFsU3ViamVjdCI6eyJ0eXBlIjpbIlBlcnNvbiJdLCJpZCI6Imh0dHBzOi8va2Vuem9pc2hpaS5leGFtcGxlLmNvbS8iLCJmb2xsb3dpbmciOiJodHRwczovL2tlbnpvaXNoaWkuZXhhbXBsZS5jb20vZm9sbG93aW5nLmpzb24iLCJmb2xsb3dlcnMiOiJodHRwczovL2tlbnpvaXNoaWkuZXhhbXBsZS5jb20vZm9sbG93ZXJzLmpzb24iLCJsaWtlZCI6Imh0dHBzOi8va2Vuem9pc2hpaS5leGFtcGxlLmNvbS9saWtlZC5qc29uIiwiaW5ib3giOiJodHRwczovL2tlbnpvaXNoaWkuZXhhbXBsZS5jb20vaW5ib3guanNvbiIsIm91dGJveCI6Imh0dHBzOi8va2Vuem9pc2hpaS5leGFtcGxlLmNvbS9mZWVkLmpzb24iLCJwcmVmZXJyZWRVc2VybmFtZSI6ImtlbnpvaXNoaWkiLCJuYW1lIjoi55-z5LqV5YGl6JS1Iiwic3VtbWFyeSI6IuOBk-OBruaWueOBr-OBn-OBoOOBruS-i-OBp-OBmSIsImljb24iOlsiaHR0cHM6Ly9rZW56b2lzaGlpLmV4YW1wbGUuY29tL2ltYWdlLzE2NTk4N2FrbHJlNCJdfX0.-PPuIYEDZOd5OyMKyL37bGO3KM-1JvgzSGsgmhsSyMVsZlfihsT5NOGhYeQk9V4ype8PPAgrrfqYtNOXaL2gtICsAMQBYBf9hArk3R78m9r7bDKtHbnHREnB8zYUa-42",
       "verified": {
         "protectedHeader": {
           "iss": "did:jwk:eyJrdHkiOiJFQyIsImNydiI6IlAtMzg0IiwiYWxnIjoiRVMzODQiLCJ4IjoiOWpzRlJWVmpxSlk1Skl5SnI1OGdFQnVyamtzakxwTUJvWVZDZTZlMEJ6UzhBUzNMQXlyN3hLeFNnUE9pUGNHTSIsInkiOiJidHRMX2ZVa3Rkci1MaHhNY3pJaml0ZFpWcG9paXppUGlnOG1nODFidGVUUm0zQmpaLWw4dU5qdkpLYWtnUjNCIn0",
@@ -19,10 +19,10 @@
         },
         "payload": {
           "@context": [
-            "https://www.w3.org/2018/credentials/v1",
+            "https://www.w3.org/ns/credentials/v2",
             "https://www.w3.org/ns/activitystreams"
           ],
-          "id": "urn:uuid:8a3227d4-dfaf-460c-8f63-ed4a802ce362",
+          "id": "urn:uuid:ea5aa7e7-9500-4031-85b9-fd49a5dbb839",
           "type": [
             "VerifiableCredential",
             "ActivityPubActorCard"
@@ -31,7 +31,7 @@
             "id": "https://w3c-ccg.github.io/traceability-vocab/openapi/components/schemas/credentials/ActivityPubActorCard.yml",
             "type": "JsonSchema"
           },
-          "issuanceDate": "2023-05-21T15:39:57.944Z",
+          "validFrom": "2023-05-21T15:39:57.944Z",
           "issuer": {
             "id": "did:jwk:eyJrdHkiOiJFQyIsImNydiI6IlAtMzg0IiwiYWxnIjoiRVMzODQiLCJ4IjoiOWpzRlJWVmpxSlk1Skl5SnI1OGdFQnVyamtzakxwTUJvWVZDZTZlMEJ6UzhBUzNMQXlyN3hLeFNnUE9pUGNHTSIsInkiOiJidHRMX2ZVa3Rkci1MaHhNY3pJaml0ZFpWcG9paXppUGlnOG1nODFidGVUUm0zQmpaLWw4dU5qdkpLYWtnUjNCIn0"
           },
diff --git a/packages/traceability-tests/tests/regression.test.js b/packages/traceability-tests/tests/regression.test.js
index 78cc1db1c..31d2d3153 100644
--- a/packages/traceability-tests/tests/regression.test.js
+++ b/packages/traceability-tests/tests/regression.test.js
@@ -1,56 +1,59 @@
-const fs = require('fs');
-const { v4: uuidv4 } = require('uuid');
-const { schemas } = require('traceability-schemas');
-const { issuer, verifier } = require('../utils');
+const fs = require('fs')
+const { v4: uuidv4 } = require('uuid')
+const { schemas } = require('traceability-schemas')
+const { issuer, verifier } = require('../utils')
 
 const upgradeClaimset = (example) => {
-  const claimset = JSON.parse(JSON.stringify(example));
+  const claimset = JSON.parse(JSON.stringify(example))
   // claimset['@context'][0] = 'https://www.w3.org/ns/credentials/v2';
-  claimset.id = `urn:uuid:${uuidv4()}`;
+  claimset.id = `urn:uuid:${uuidv4()}`
   if (claimset.issuer.id) {
-    claimset.issuer.id = issuer.id;
+    claimset.issuer.id = issuer.id
   } else {
-    claimset.issuer = issuer.id;
+    claimset.issuer = issuer.id
   }
   // TODO: https://github.com/w3c-ccg/traceability-vocab/issues/787
-  // claimset.validFrom = claimset.issuanceDate;
-  // delete claimset.issuanceDate;
-  delete claimset.proof;
-  return claimset;
-};
+  // claimset.validFrom = claimset.validFrom;
+  // delete claimset.validFrom;
+  delete claimset.proof
+  return claimset
+}
 
 describe('regression tests', () => {
-  const fixture = { privateKeyJwk: issuer.privateKeyJwk, examples: [] };
+  const fixture = { privateKeyJwk: issuer.privateKeyJwk, examples: [] }
   schemas.forEach(async (schema) => {
     // only apply the upgrade to tagged schemas
     if (schema.tags && schema.tags.includes('VCDMv2')) {
       it(schema.title, async () => {
-        const claimset = upgradeClaimset(JSON.parse(schema.example), { issuer });
+        const claimset = upgradeClaimset(JSON.parse(schema.example), { issuer })
         // issuer validates against a schema before signing...
         const issuerValidation = await issuer
           .validator(claimset.credentialSchema.id)
-          .validate(claimset);
-        expect(issuerValidation).toBe(true);
+          .validate(claimset)
+        expect(issuerValidation).toBe(true)
         // credential issuance
-        const vc = await issuer.signer.sign(claimset);
+        const vc = await issuer.signer.sign(claimset)
         // credential verification
-        const { payload, protectedHeader } = await verifier.verify(vc);
+        const { payload, protectedHeader } = await verifier.verify(vc)
         // verifier validates against a schema after verifying...
         const verifierValidation = await verifier
           .validator(claimset.credentialSchema.id)
-          .validate(claimset);
-        expect(verifierValidation).toBe(true);
-        expect(protectedHeader.iss).toBe(issuer.id);
-        expect(protectedHeader.cty).toBe('vc+ld+json');
-        fixture.examples.push({ issued: vc, verified: { protectedHeader, payload } });
-      });
+          .validate(claimset)
+        expect(verifierValidation).toBe(true)
+        expect(protectedHeader.iss).toBe(issuer.id)
+        expect(protectedHeader.cty).toBe('vc+ld+json')
+        fixture.examples.push({
+          issued: vc,
+          verified: { protectedHeader, payload },
+        })
+      })
     }
-  });
+  })
 
   afterAll(() => {
     // all these examples will be broken because of the unresolved issue here:
     // https://github.com/w3c-ccg/traceability-vocab/issues/786
     // except for the schemas that are tagged VCDMv2
-    fs.writeFileSync('./examples/v2.json', JSON.stringify(fixture, null, 2));
-  });
-});
+    fs.writeFileSync('./examples/v2.json', JSON.stringify(fixture, null, 2))
+  })
+})
diff --git a/packages/traceability-tests/tests/sanity/context-validation.test.js b/packages/traceability-tests/tests/sanity/context-validation.test.js
index 2ce96552e..25167139d 100644
--- a/packages/traceability-tests/tests/sanity/context-validation.test.js
+++ b/packages/traceability-tests/tests/sanity/context-validation.test.js
@@ -1,12 +1,12 @@
-const Ajv = require('ajv');
-const yaml = require('js-yaml');
+const Ajv = require('ajv')
+const yaml = require('js-yaml')
 
 const ajv = new Ajv({
   strict: false,
   // In order to get strict mode back on, and warnings off,
   // We may need these if statements in the future
   // https://github.com/ajv-validator/ajv/issues/1417#issuecomment-1431435887
-});
+})
 
 describe('v2', () => {
   const validate = ajv.compile(
@@ -19,11 +19,11 @@ properties:
     type: array
     readOnly: true
     default:
-      - https://www.w3.org/2018/credentials/v2
+      - https://www.w3.org/ns/credentials/v2
       - https://w3id.org/traceability/v1
     items:
       - type: string
-        const: https://www.w3.org/2018/credentials/v2
+        const: https://www.w3.org/ns/credentials/v2
     additionalItems:
       type: string
       enum:
@@ -33,70 +33,70 @@ properties:
         - https://ref.gs1.org/gs1/vc/trade-item-context/
         - https://ref.gs1.org/gs1/vc/declaration-context/
 `)
-  );
+  )
 
   it('minimal context', async () => {
     const instance1 = {
-      '@context': ['https://www.w3.org/2018/credentials/v2'],
-    };
-    const validation1 = validate(instance1);
-    expect(validation1).toBe(true);
-  });
+      '@context': ['https://www.w3.org/ns/credentials/v2'],
+    }
+    const validation1 = validate(instance1)
+    expect(validation1).toBe(true)
+  })
 
   describe('extended contexts', () => {
     describe('valid', () => {
       it('https://w3id.org/traceability/v1', async () => {
         const instance1 = {
           '@context': [
-            'https://www.w3.org/2018/credentials/v2',
+            'https://www.w3.org/ns/credentials/v2',
             'https://w3id.org/traceability/v1',
           ],
-        };
-        const validation1 = validate(instance1);
-        expect(validation1).toBe(true);
-      });
+        }
+        const validation1 = validate(instance1)
+        expect(validation1).toBe(true)
+      })
       it('https://w3id.org/vc/status-list/2021/v1', async () => {
         const instance1 = {
           '@context': [
-            'https://www.w3.org/2018/credentials/v2',
+            'https://www.w3.org/ns/credentials/v2',
             'https://w3id.org/vc/status-list/2021/v1',
           ],
-        };
-        const validation1 = validate(instance1);
-        expect(validation1).toBe(true);
-      });
+        }
+        const validation1 = validate(instance1)
+        expect(validation1).toBe(true)
+      })
       it('https://ref.gs1.org/gs1/vc/license-context/', async () => {
         const instance1 = {
           '@context': [
-            'https://www.w3.org/2018/credentials/v2',
+            'https://www.w3.org/ns/credentials/v2',
             'https://ref.gs1.org/gs1/vc/license-context/',
           ],
-        };
-        const validation1 = validate(instance1);
-        expect(validation1).toBe(true);
-      });
-    });
+        }
+        const validation1 = validate(instance1)
+        expect(validation1).toBe(true)
+      })
+    })
     describe('invalid', () => {
       it('unknown url', async () => {
         const instance1 = {
           '@context': [
-            'https://www.w3.org/2018/credentials/v2',
+            'https://www.w3.org/ns/credentials/v2',
             'https://extension.example/v42', // not in allow list
           ],
-        };
-        const validation1 = validate(instance1);
-        expect(validation1).toBe(false);
-      });
+        }
+        const validation1 = validate(instance1)
+        expect(validation1).toBe(false)
+      })
       it('unknown object', async () => {
         const instance2 = {
           '@context': [
-            'https://www.w3.org/2018/credentials/v2',
+            'https://www.w3.org/ns/credentials/v2',
             { '@vocab': 'https://extension.example/#' }, // not in allow list
           ],
-        };
-        const validation2 = validate(instance2);
-        expect(validation2).toBe(false);
-      });
-    });
-  });
-});
+        }
+        const validation2 = validate(instance2)
+        expect(validation2).toBe(false)
+      })
+    })
+  })
+})
diff --git a/packages/traceability-tests/tests/sanity/jsonld.test.js b/packages/traceability-tests/tests/sanity/jsonld.test.js
deleted file mode 100644
index c1ebc1ef1..000000000
--- a/packages/traceability-tests/tests/sanity/jsonld.test.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// https://github.com/digitalbazaar/jsonld.js/issues/516#issuecomment-1485959372
-const { kyPromise } = require('@digitalbazaar/http-client');
-const { canonize } = require('jsonld');
-
-beforeAll(async () => {
-  // https://github.com/digitalbazaar/jsonld.js/issues/516#issuecomment-1485959372
-  await kyPromise;
-});
-
-it('canonize', async () => {
-  expect(
-    await canonize(
-      {
-        '@context': { '@vocab': 'https://www.w3.org/2018/credentials#' },
-        type: ['VerifiableCredential'],
-        issuer: 'https://example.org/issuers/565049',
-        issuanceDate: '2010-01-01T19:23:24Z',
-        credentialSubject: {
-          id: 'did:example:ebfeb1f712ebc6f1c276e12ec21',
-        },
-      },
-      {
-        format: 'application/n-quads',
-      }
-    )
-  )
-    .toBe(`_:c14n0 <https://www.w3.org/2018/credentials#id> "did:example:ebfeb1f712ebc6f1c276e12ec21" .
-_:c14n1 <https://www.w3.org/2018/credentials#credentialSubject> _:c14n0 .
-_:c14n1 <https://www.w3.org/2018/credentials#issuanceDate> "2010-01-01T19:23:24Z" .
-_:c14n1 <https://www.w3.org/2018/credentials#issuer> "https://example.org/issuers/565049" .
-_:c14n1 <https://www.w3.org/2018/credentials#type> "VerifiableCredential" .
-`);
-});
diff --git a/packages/traceability-tests/tests/sanity/traceable-presentation.test.js b/packages/traceability-tests/tests/sanity/traceable-presentation.test.js
index 0b8cc9660..836bf241b 100644
--- a/packages/traceability-tests/tests/sanity/traceable-presentation.test.js
+++ b/packages/traceability-tests/tests/sanity/traceable-presentation.test.js
@@ -1,23 +1,23 @@
 // https://github.com/digitalbazaar/jsonld.js/issues/516#issuecomment-1485959372
-const { kyPromise } = require('@digitalbazaar/http-client');
-const { canonize } = require('jsonld');
+const { kyPromise } = require('@digitalbazaar/http-client')
+const { canonize } = require('jsonld')
 
 beforeAll(async () => {
   // https://github.com/digitalbazaar/jsonld.js/issues/516#issuecomment-1485959372
-  await kyPromise;
-});
+  await kyPromise
+})
 
 it('canonize', async () => {
   const data = await canonize(
     {
       '@context': [
-        'https://www.w3.org/2018/credentials/v1',
+        'https://www.w3.org/ns/credentials/v2',
         {
           '@vocab': 'https://w3id.org/traceability#',
           TraceablePresentation: {
             '@id': 'https://w3id.org/traceability#TraceablePresentation',
             '@context': {
-              '@vocab': 'https://w3id.org/traceability#'
+              '@vocab': 'https://w3id.org/traceability#',
             },
           },
         },
@@ -45,5 +45,5 @@ it('canonize', async () => {
 <urn:uuid:00000000-8596-4c3a-a978-8fcaba3903c5> <https://www.w3.org/2018/credentials#holder> <did:web:sender.example> .
 _:c14n0 <https://w3id.org/traceability#definition> "urn:uuid:11111111-cc91-4bb3-91f1-5466a0be084e" .
 _:c14n0 <https://w3id.org/traceability#instance> "urn:uuid:22222222-b0b1-41b8-89b0-331ni58b7ee0" .
-`);
-});
+`)
+})