diff --git a/app-config.json b/app-config.json
index 561748b8..2d57ad28 100644
--- a/app-config.json
+++ b/app-config.json
@@ -714,7 +714,7 @@
                         "@type": "WebRenderingTemplate2022"
                       }
                     ],
-                    "type": ["VerifiableCredential", "DigitalProductPassport"],
+                    "type": ["DigitalProductPassport"],
                     "dlrLinkTitle": "Cherries Product Passport",
                     "dlrIdentificationKeyType": "gtin",
                     "dlrVerificationPage": "http://localhost:3003/verify"
@@ -1297,7 +1297,7 @@
                         "@type": "WebRenderingTemplate2022"
                       }
                     ],
-                    "type": ["VerifiableCredential", "DigitalIdentityAnchor"],
+                    "type": ["DigitalIdentityAnchor"],
                     "dlrLinkTitle": "DigitalIdentityAnchor",
                     "dlrIdentificationKeyType": "gtin",
                     "dlrVerificationPage": "http://localhost:3003/verify"
@@ -3026,7 +3026,7 @@
                         "@type": "WebRenderingTemplate2022"
                       }
                     ],
-                    "type": ["VerifiableCredential", "DigitalConformityCredential"],
+                    "type": ["DigitalConformityCredential"],
                     "dlrLinkTitle": "DigitalConformityCredential",
                     "dlrIdentificationKeyType": "gtin",
                     "dlrVerificationPage": "http://localhost:3003/verify"
@@ -4220,7 +4220,7 @@
                         "@type": "WebRenderingTemplate2022"
                       }
                     ],
-                    "type": ["VerifiableCredential", "DigitalFacilityRecord"],
+                    "type": ["DigitalFacilityRecord"],
                     "dlrLinkTitle": "DigitalFacilityRecord",
                     "dlrIdentificationKeyType": "gln",
                     "dlrVerificationPage": "http://localhost:3003/verify"
@@ -5445,7 +5445,7 @@
                         "@type": "WebRenderingTemplate2022"
                       }
                     ],
-                    "type": ["VerifiableCredential", "DigitalProductPassport"],
+                    "type": ["DigitalProductPassport"],
                     "dlrLinkTitle": "Cherries Product Passport",
                     "dlrIdentificationKeyType": "gtin",
                     "dlrVerificationPage": "http://localhost:3003/verify"
@@ -6680,7 +6680,7 @@
                         "@type": "WebRenderingTemplate2022"
                       }
                     ],
-                    "type": ["VerifiableCredential", "DigitalProductPassport"],
+                    "type": ["DigitalProductPassport"],
                     "dlrLinkTitle": "Cherries Product Passport",
                     "dlrIdentificationKeyType": "gtin",
                     "dlrVerificationPage": "http://localhost:3003/verify"
@@ -7915,7 +7915,7 @@
                         "@type": "WebRenderingTemplate2022"
                       }
                     ],
-                    "type": ["VerifiableCredential", "DigitalProductPassport"],
+                    "type": ["DigitalProductPassport"],
                     "dlrLinkTitle": "Cherries Product Passport",
                     "dlrIdentificationKeyType": "gtin",
                     "dlrVerificationPage": "http://localhost:3003/verify"
diff --git a/documentation/docs/mock-apps/services/process-aggregation-event.md b/documentation/docs/mock-apps/services/process-aggregation-event.md
index e43689c1..5131227e 100644
--- a/documentation/docs/mock-apps/services/process-aggregation-event.md
+++ b/documentation/docs/mock-apps/services/process-aggregation-event.md
@@ -45,7 +45,7 @@ P-->>C: Return VC and resolver URL
       },
       "epcisAggregationEvent": {
         "context": ["https://www.w3.org/2018/credentials/v1", "https://gs1.org/voc/"],
-        "type": ["VerifiableCredential", "EPCISAggregationEvent"],
+        "type": ["DigitalTraceabilityEvent"],
         "renderTemplate": [
           {
             "type": "html",
diff --git a/documentation/docs/mock-apps/services/process-digital-conformity-credential.md b/documentation/docs/mock-apps/services/process-digital-conformity-credential.md
index 5935136c..aed9d832 100644
--- a/documentation/docs/mock-apps/services/process-digital-conformity-credential.md
+++ b/documentation/docs/mock-apps/services/process-digital-conformity-credential.md
@@ -47,7 +47,7 @@ P-->>C: Return digital conformity credential VC and resolver URL
         "context": [
           "https://jargon.sh/user/unece/ConformityCredential/v/0.5.0/artefacts/jsonldContexts/ConformityCredential.jsonld?class=ConformityCredential"
         ],
-        "type": ["VerifiableCredential", "DigitalConformityCredential"],
+        "type": ["DigitalConformityCredential"],
         "renderTemplate": [
           {
             "template": "<div><h2>DigitalConformityCredential</h2></div>",
diff --git a/documentation/docs/mock-apps/services/process-digital-facility-record.md b/documentation/docs/mock-apps/services/process-digital-facility-record.md
index e25686ba..969903a0 100644
--- a/documentation/docs/mock-apps/services/process-digital-facility-record.md
+++ b/documentation/docs/mock-apps/services/process-digital-facility-record.md
@@ -45,7 +45,7 @@ P-->>C: Return digital facility record VC and resolver URL
       },
       "digitalFacilityRecord": {
         "context": ["https://www.w3.org/2018/credentials/v1", "https://gs1.org/voc/"],
-        "type": ["VerifiableCredential", "DigitalFacilityRecord"],
+        "type": ["DigitalFacilityRecord"],
         "renderTemplate": [
           {
             "template": "<div><h2>DigitalFacilityRecord</h2></div>",
diff --git a/documentation/docs/mock-apps/services/process-digital-identity-anchor.md b/documentation/docs/mock-apps/services/process-digital-identity-anchor.md
index a1174413..21654711 100644
--- a/documentation/docs/mock-apps/services/process-digital-identity-anchor.md
+++ b/documentation/docs/mock-apps/services/process-digital-identity-anchor.md
@@ -45,7 +45,7 @@ P-->>C: Return digital identity anchor VC and resolver URL
       },
       "digitalIdentityAnchor": {
         "context": ["https://www.w3.org/2018/credentials/v1", "https://gs1.org/voc/"],
-        "type": ["VerifiableCredential", "DigitalIdentityAnchor"],
+        "type": ["DigitalIdentityAnchor"],
         "renderTemplate": [
           {
             "template": "<div><h2>DigitalIdentityAnchor</h2></div>",
diff --git a/documentation/docs/mock-apps/services/process-dpp.md b/documentation/docs/mock-apps/services/process-dpp.md
index 5653abfb..dc26401d 100644
--- a/documentation/docs/mock-apps/services/process-dpp.md
+++ b/documentation/docs/mock-apps/services/process-dpp.md
@@ -68,7 +68,7 @@ P-->>C: Return VC and resolver URL
             "@type": "WebRenderingTemplate2022"
           }
         ],
-        "type": ["VerifiableCredential", " DigitalProductPassport"],
+        "type": ["DigitalProductPassport"],
         "dlrLinkTitle": "Steel Passport",
         "dlrIdentificationKeyType": "gtin",
         "dlrVerificationPage": "http://localhost:3332/verify"
diff --git a/documentation/docs/mock-apps/services/process-object-event.md b/documentation/docs/mock-apps/services/process-object-event.md
index 53c1a805..5f536f99 100644
--- a/documentation/docs/mock-apps/services/process-object-event.md
+++ b/documentation/docs/mock-apps/services/process-object-event.md
@@ -45,7 +45,7 @@ P-->>C: Return object event VC and resolver URL
       },
       "epcisObjectEvent": {
         "context": ["https://www.w3.org/2018/credentials/v1", "https://gs1.org/voc/"],
-        "type": ["VerifiableCredential", "DigitalTraceabilityEvent"],
+        "type": ["DigitalTraceabilityEvent"],
         "renderTemplate": [
           {
             "template": "<div><h2>Object Event</h2></div>",
diff --git a/documentation/docs/mock-apps/services/process-transaction-event.md b/documentation/docs/mock-apps/services/process-transaction-event.md
index 2de2da29..1b9feb84 100644
--- a/documentation/docs/mock-apps/services/process-transaction-event.md
+++ b/documentation/docs/mock-apps/services/process-transaction-event.md
@@ -47,7 +47,7 @@ P-->>C: Return VC and resolver URL
       },
       "epcisTransactionEvent": {
         "context": ["https://www.w3.org/2018/credentials/v1", "https://gs1.org/voc/"],
-        "type": ["VerifiableCredential", "EPCISTransactionEvent"],
+        "type": ["DigitalTraceabilityEvent"],
         "renderTemplate": [
           {
             "type": "html",
diff --git a/documentation/docs/mock-apps/services/process-transformation-event.md b/documentation/docs/mock-apps/services/process-transformation-event.md
index fbea3939..8b1c516b 100644
--- a/documentation/docs/mock-apps/services/process-transformation-event.md
+++ b/documentation/docs/mock-apps/services/process-transformation-event.md
@@ -52,7 +52,7 @@ P-->>C: Return EPCIS VC
       },
       "epcisTransformationEvent": {
         "context": ["https://www.w3.org/2018/credentials/v1", "https://gs1.org/voc/"],
-        "type": ["VerifiableCredential", "EPCISTransformationEvent"],
+        "type": ["DigitalTraceabilityEvent"],
         "renderTemplate": [
           {
             "type": "html",
@@ -84,7 +84,7 @@ P-->>C: Return EPCIS VC
       },
       "dpp": {
         "context": ["https://www.w3.org/2018/credentials/v1", "https://schema.org/"],
-        "type": ["VerifiableCredential", "DigitalProductPassport"],
+        "type": ["DigitalProductPassport"],
         "renderTemplate": [
           {
             "type": "html",