diff --git a/bindings/wasm/docs/api-reference.md b/bindings/wasm/docs/api-reference.md
index 81983cc9f0..40686ddf64 100644
--- a/bindings/wasm/docs/api-reference.md
+++ b/bindings/wasm/docs/api-reference.md
@@ -76,8 +76,6 @@ and resolution of DID documents in Alias Outputs.</p>
 <dt><a href="#JwtCredentialValidator">JwtCredentialValidator</a></dt>
 <dd><p>A type for decoding and validating <code>Credentials</code>.</p>
 </dd>
-<dt><a href="#JwtPresentation">JwtPresentation</a></dt>
-<dd></dd>
 <dt><a href="#JwtPresentationOptions">JwtPresentationOptions</a></dt>
 <dd></dd>
 <dt><a href="#JwtPresentationValidationOptions">JwtPresentationValidationOptions</a></dt>
@@ -102,6 +100,8 @@ use the methods <code>pack</code> and <code>unpack</code> instead.</p>
 <dt><a href="#MethodType">MethodType</a></dt>
 <dd><p>Supported verification method types.</p>
 </dd>
+<dt><a href="#Presentation">Presentation</a></dt>
+<dd></dd>
 <dt><a href="#Resolver">Resolver</a></dt>
 <dd><p>Convenience type for resolving DID documents from different DID methods.</p>
 <p>Also provides methods for resolving DID Documents associated with
@@ -121,6 +121,8 @@ working with storage backed DID documents.</p>
 </dd>
 <dt><a href="#Timestamp">Timestamp</a></dt>
 <dd></dd>
+<dt><a href="#UnknownCredential">UnknownCredential</a></dt>
+<dd></dd>
 <dt><a href="#VerificationMethod">VerificationMethod</a></dt>
 <dd><p>A DID Document Verification Method.</p>
 </dd>
@@ -183,6 +185,12 @@ This variant is the default used if no other variant is specified when construct
 <dt><a href="#start">start()</a></dt>
 <dd><p>Initializes the console error panic hook for better error messages</p>
 </dd>
+<dt><a href="#encodeB64">encodeB64(data)</a> ⇒ <code>string</code></dt>
+<dd><p>Encode the given bytes in url-safe base64.</p>
+</dd>
+<dt><a href="#decodeB64">decodeB64(data)</a> ⇒ <code>Uint8Array</code></dt>
+<dd><p>Decode the given url-safe base64-encoded slice into its raw bytes.</p>
+</dd>
 <dt><a href="#verifyEdDSA">verifyEdDSA(alg, signingInput, decodedSignature, publicKey)</a></dt>
 <dd><p>Verify a JWS signature secured with the <code>JwsAlgorithm::EdDSA</code> algorithm.
 Only the <code>EdCurve::Ed25519</code> variant is supported for now.</p>
@@ -192,12 +200,6 @@ the IOTA Identity Framework.</p>
 <p>This function does not check whether <code>alg = EdDSA</code> in the protected header. Callers are expected to assert this
 prior to calling the function.</p>
 </dd>
-<dt><a href="#encodeB64">encodeB64(data)</a> ⇒ <code>string</code></dt>
-<dd><p>Encode the given bytes in url-safe base64.</p>
-</dd>
-<dt><a href="#decodeB64">decodeB64(data)</a> ⇒ <code>Uint8Array</code></dt>
-<dd><p>Decode the given url-safe base64-encoded slice into its raw bytes.</p>
-</dd>
 </dl>
 
 <a name="CoreDID"></a>
@@ -849,7 +851,7 @@ produced by the corresponding private key backed by the `storage` in accordance
 | --- | --- |
 | storage | [<code>Storage</code>](#Storage) | 
 | fragment | <code>string</code> | 
-| presentation | [<code>JwtPresentation</code>](#JwtPresentation) | 
+| presentation | [<code>Presentation</code>](#Presentation) | 
 | signature_options | [<code>JwsSignatureOptions</code>](#JwsSignatureOptions) | 
 | presentation_options | [<code>JwtPresentationOptions</code>](#JwtPresentationOptions) | 
 
@@ -1285,16 +1287,16 @@ It does not imply anything about a potentially present proof property on the pre
 **Kind**: global class  
 
 * [DecodedJwtPresentation](#DecodedJwtPresentation)
-    * [.presentation()](#DecodedJwtPresentation+presentation) ⇒ [<code>JwtPresentation</code>](#JwtPresentation)
+    * [.presentation()](#DecodedJwtPresentation+presentation) ⇒ [<code>Presentation</code>](#Presentation)
     * [.protectedHeader()](#DecodedJwtPresentation+protectedHeader) ⇒ [<code>JwsHeader</code>](#JwsHeader)
-    * [.intoPresentation()](#DecodedJwtPresentation+intoPresentation) ⇒ [<code>JwtPresentation</code>](#JwtPresentation)
+    * [.intoPresentation()](#DecodedJwtPresentation+intoPresentation) ⇒ [<code>Presentation</code>](#Presentation)
     * [.expirationDate()](#DecodedJwtPresentation+expirationDate) ⇒ [<code>Timestamp</code>](#Timestamp) \| <code>undefined</code>
     * [.issuanceDate()](#DecodedJwtPresentation+issuanceDate) ⇒ [<code>Timestamp</code>](#Timestamp) \| <code>undefined</code>
     * [.audience()](#DecodedJwtPresentation+audience) ⇒ <code>string</code> \| <code>undefined</code>
 
 <a name="DecodedJwtPresentation+presentation"></a>
 
-### decodedJwtPresentation.presentation() ⇒ [<code>JwtPresentation</code>](#JwtPresentation)
+### decodedJwtPresentation.presentation() ⇒ [<code>Presentation</code>](#Presentation)
 **Kind**: instance method of [<code>DecodedJwtPresentation</code>](#DecodedJwtPresentation)  
 <a name="DecodedJwtPresentation+protectedHeader"></a>
 
@@ -1304,7 +1306,7 @@ Returns a copy of the protected header parsed from the decoded JWS.
 **Kind**: instance method of [<code>DecodedJwtPresentation</code>](#DecodedJwtPresentation)  
 <a name="DecodedJwtPresentation+intoPresentation"></a>
 
-### decodedJwtPresentation.intoPresentation() ⇒ [<code>JwtPresentation</code>](#JwtPresentation)
+### decodedJwtPresentation.intoPresentation() ⇒ [<code>Presentation</code>](#Presentation)
 Consumes the object and returns the decoded presentation.
 
 ### Warning
@@ -2273,7 +2275,7 @@ produced by the corresponding private key backed by the `storage` in accordance
 | --- | --- |
 | storage | [<code>Storage</code>](#Storage) | 
 | fragment | <code>string</code> | 
-| presentation | [<code>JwtPresentation</code>](#JwtPresentation) | 
+| presentation | [<code>Presentation</code>](#Presentation) | 
 | signature_options | [<code>JwsSignatureOptions</code>](#JwsSignatureOptions) | 
 | presentation_options | [<code>JwtPresentationOptions</code>](#JwtPresentationOptions) | 
 
@@ -3362,7 +3364,7 @@ Options to declare validation criteria when validating credentials.
 
 | Param | Type |
 | --- | --- |
-| options | <code>IJwtCredentialValidationOptions</code> | 
+| options | <code>IJwtCredentialValidationOptions</code> \| <code>undefined</code> | 
 
 <a name="JwtCredentialValidationOptions+toJSON"></a>
 
@@ -3572,129 +3574,6 @@ If the JWT decoding fails or the issuer field is not a valid DID.
 | --- | --- |
 | credential | [<code>Jwt</code>](#Jwt) | 
 
-<a name="JwtPresentation"></a>
-
-## JwtPresentation
-**Kind**: global class  
-
-* [JwtPresentation](#JwtPresentation)
-    * [new JwtPresentation(values)](#new_JwtPresentation_new)
-    * _instance_
-        * [.context()](#JwtPresentation+context) ⇒ <code>Array.&lt;(string\|Record.&lt;string, any&gt;)&gt;</code>
-        * [.id()](#JwtPresentation+id) ⇒ <code>string</code> \| <code>undefined</code>
-        * [.type()](#JwtPresentation+type) ⇒ <code>Array.&lt;string&gt;</code>
-        * [.verifiableCredential()](#JwtPresentation+verifiableCredential) ⇒ [<code>Array.&lt;Jwt&gt;</code>](#Jwt)
-        * [.holder()](#JwtPresentation+holder) ⇒ <code>string</code>
-        * [.refreshService()](#JwtPresentation+refreshService) ⇒ <code>Array.&lt;RefreshService&gt;</code>
-        * [.termsOfUse()](#JwtPresentation+termsOfUse) ⇒ <code>Array.&lt;Policy&gt;</code>
-        * [.proof()](#JwtPresentation+proof) ⇒ <code>Map.&lt;string, any&gt;</code> \| <code>undefined</code>
-        * [.properties()](#JwtPresentation+properties) ⇒ <code>Map.&lt;string, any&gt;</code>
-        * [.toJSON()](#JwtPresentation+toJSON) ⇒ <code>any</code>
-        * [.clone()](#JwtPresentation+clone) ⇒ [<code>JwtPresentation</code>](#JwtPresentation)
-    * _static_
-        * [.BaseContext()](#JwtPresentation.BaseContext) ⇒ <code>string</code>
-        * [.BaseType()](#JwtPresentation.BaseType) ⇒ <code>string</code>
-        * [.fromJSON(json)](#JwtPresentation.fromJSON) ⇒ [<code>JwtPresentation</code>](#JwtPresentation)
-
-<a name="new_JwtPresentation_new"></a>
-
-### new JwtPresentation(values)
-Constructs a new presentation.
-
-
-| Param | Type |
-| --- | --- |
-| values | <code>IJwtPresentation</code> | 
-
-<a name="JwtPresentation+context"></a>
-
-### jwtPresentation.context() ⇒ <code>Array.&lt;(string\|Record.&lt;string, any&gt;)&gt;</code>
-Returns a copy of the JSON-LD context(s) applicable to the presentation.
-
-**Kind**: instance method of [<code>JwtPresentation</code>](#JwtPresentation)  
-<a name="JwtPresentation+id"></a>
-
-### jwtPresentation.id() ⇒ <code>string</code> \| <code>undefined</code>
-Returns a copy of the unique `URI` identifying the presentation.
-
-**Kind**: instance method of [<code>JwtPresentation</code>](#JwtPresentation)  
-<a name="JwtPresentation+type"></a>
-
-### jwtPresentation.type() ⇒ <code>Array.&lt;string&gt;</code>
-Returns a copy of the URIs defining the type of the presentation.
-
-**Kind**: instance method of [<code>JwtPresentation</code>](#JwtPresentation)  
-<a name="JwtPresentation+verifiableCredential"></a>
-
-### jwtPresentation.verifiableCredential() ⇒ [<code>Array.&lt;Jwt&gt;</code>](#Jwt)
-Returns the JWT credentials expressing the claims of the presentation.
-
-**Kind**: instance method of [<code>JwtPresentation</code>](#JwtPresentation)  
-<a name="JwtPresentation+holder"></a>
-
-### jwtPresentation.holder() ⇒ <code>string</code>
-Returns a copy of the URI of the entity that generated the presentation.
-
-**Kind**: instance method of [<code>JwtPresentation</code>](#JwtPresentation)  
-<a name="JwtPresentation+refreshService"></a>
-
-### jwtPresentation.refreshService() ⇒ <code>Array.&lt;RefreshService&gt;</code>
-Returns a copy of the service(s) used to refresh an expired [Credential](#Credential) in the presentation.
-
-**Kind**: instance method of [<code>JwtPresentation</code>](#JwtPresentation)  
-<a name="JwtPresentation+termsOfUse"></a>
-
-### jwtPresentation.termsOfUse() ⇒ <code>Array.&lt;Policy&gt;</code>
-Returns a copy of the terms-of-use specified by the presentation holder
-
-**Kind**: instance method of [<code>JwtPresentation</code>](#JwtPresentation)  
-<a name="JwtPresentation+proof"></a>
-
-### jwtPresentation.proof() ⇒ <code>Map.&lt;string, any&gt;</code> \| <code>undefined</code>
-Optional proof that can be verified by users in addition to JWS.
-
-**Kind**: instance method of [<code>JwtPresentation</code>](#JwtPresentation)  
-<a name="JwtPresentation+properties"></a>
-
-### jwtPresentation.properties() ⇒ <code>Map.&lt;string, any&gt;</code>
-Returns a copy of the miscellaneous properties on the presentation.
-
-**Kind**: instance method of [<code>JwtPresentation</code>](#JwtPresentation)  
-<a name="JwtPresentation+toJSON"></a>
-
-### jwtPresentation.toJSON() ⇒ <code>any</code>
-Serializes this to a JSON object.
-
-**Kind**: instance method of [<code>JwtPresentation</code>](#JwtPresentation)  
-<a name="JwtPresentation+clone"></a>
-
-### jwtPresentation.clone() ⇒ [<code>JwtPresentation</code>](#JwtPresentation)
-Deep clones the object.
-
-**Kind**: instance method of [<code>JwtPresentation</code>](#JwtPresentation)  
-<a name="JwtPresentation.BaseContext"></a>
-
-### JwtPresentation.BaseContext() ⇒ <code>string</code>
-Returns the base JSON-LD context.
-
-**Kind**: static method of [<code>JwtPresentation</code>](#JwtPresentation)  
-<a name="JwtPresentation.BaseType"></a>
-
-### JwtPresentation.BaseType() ⇒ <code>string</code>
-Returns the base type.
-
-**Kind**: static method of [<code>JwtPresentation</code>](#JwtPresentation)  
-<a name="JwtPresentation.fromJSON"></a>
-
-### JwtPresentation.fromJSON(json) ⇒ [<code>JwtPresentation</code>](#JwtPresentation)
-Deserializes an instance from a JSON object.
-
-**Kind**: static method of [<code>JwtPresentation</code>](#JwtPresentation)  
-
-| Param | Type |
-| --- | --- |
-| json | <code>any</code> | 
-
 <a name="JwtPresentationOptions"></a>
 
 ## JwtPresentationOptions
@@ -3776,7 +3655,7 @@ Throws an error if any of the options are invalid.
 
 | Param | Type |
 | --- | --- |
-| options | <code>IJwtPresentationValidationOptions</code> | 
+| options | <code>IJwtPresentationValidationOptions</code> \| <code>undefined</code> | 
 
 <a name="JwtPresentationValidationOptions+toJSON"></a>
 
@@ -3838,28 +3717,26 @@ algorithm will be used.
 Validates a [`JwtPresentation`].
 
 The following properties are validated according to `options`:
-- the JWT can be decoded into semantically valid presentation.
+- the JWT can be decoded into a semantically valid presentation.
 - the expiration and issuance date contained in the JWT claims.
 - the holder's signature.
 
 Validation is done with respect to the properties set in `options`.
 
 # Warning
-* This method does NOT validate the constituent credentials, nor the relationship between the
-credentials' issuers and the presentation holder.
+
+* This method does NOT validate the constituent credentials and therefore also not the relationship between the
+credentials' subjects and the presentation holder. This can be done with `JwtCredentialValidationOptions`.
 * The lack of an error returned from this method is in of itself not enough to conclude that the presentation can
 be trusted. This section contains more information on additional checks that should be carried out before and
 after calling this method.
 
 ## The state of the supplied DID Documents.
-The caller must ensure that the DID Documents in `holder` and `issuers` are up-to-date.
 
-## Properties that are not validated
- There are many properties defined in [The Verifiable Credentials Data Model](https://www.w3.org/TR/vc-data-model/) that are **not** validated, such as:
-`verifiableCredential`, credentialStatus`, `type`, `credentialSchema`, `refreshService`, **and more**.
-These should be manually checked after validation, according to your requirements.
+The caller must ensure that the DID Documents in `holder` are up-to-date.
 
 # Errors
+
 An error is returned whenever a validated condition is not satisfied or when decoding fails.
 
 **Kind**: instance method of [<code>JwtPresentationValidator</code>](#JwtPresentationValidator)  
@@ -3879,7 +3756,7 @@ Validates the semantic structure of the `JwtPresentation`.
 
 | Param | Type |
 | --- | --- |
-| presentation | [<code>JwtPresentation</code>](#JwtPresentation) | 
+| presentation | [<code>Presentation</code>](#Presentation) | 
 
 <a name="JwtPresentationValidator.extractHolder"></a>
 
@@ -4246,6 +4123,129 @@ Deserializes an instance from a JSON object.
 | --- | --- |
 | json | <code>any</code> | 
 
+<a name="Presentation"></a>
+
+## Presentation
+**Kind**: global class  
+
+* [Presentation](#Presentation)
+    * [new Presentation(values)](#new_Presentation_new)
+    * _instance_
+        * [.context()](#Presentation+context) ⇒ <code>Array.&lt;(string\|Record.&lt;string, any&gt;)&gt;</code>
+        * [.id()](#Presentation+id) ⇒ <code>string</code> \| <code>undefined</code>
+        * [.type()](#Presentation+type) ⇒ <code>Array.&lt;string&gt;</code>
+        * [.verifiableCredential()](#Presentation+verifiableCredential) ⇒ [<code>Array.&lt;UnknownCredential&gt;</code>](#UnknownCredential)
+        * [.holder()](#Presentation+holder) ⇒ <code>string</code>
+        * [.refreshService()](#Presentation+refreshService) ⇒ <code>Array.&lt;RefreshService&gt;</code>
+        * [.termsOfUse()](#Presentation+termsOfUse) ⇒ <code>Array.&lt;Policy&gt;</code>
+        * [.proof()](#Presentation+proof) ⇒ <code>Map.&lt;string, any&gt;</code> \| <code>undefined</code>
+        * [.properties()](#Presentation+properties) ⇒ <code>Map.&lt;string, any&gt;</code>
+        * [.toJSON()](#Presentation+toJSON) ⇒ <code>any</code>
+        * [.clone()](#Presentation+clone) ⇒ [<code>Presentation</code>](#Presentation)
+    * _static_
+        * [.BaseContext()](#Presentation.BaseContext) ⇒ <code>string</code>
+        * [.BaseType()](#Presentation.BaseType) ⇒ <code>string</code>
+        * [.fromJSON(json)](#Presentation.fromJSON) ⇒ [<code>Presentation</code>](#Presentation)
+
+<a name="new_Presentation_new"></a>
+
+### new Presentation(values)
+Constructs a new presentation.
+
+
+| Param | Type |
+| --- | --- |
+| values | <code>IPresentation</code> | 
+
+<a name="Presentation+context"></a>
+
+### presentation.context() ⇒ <code>Array.&lt;(string\|Record.&lt;string, any&gt;)&gt;</code>
+Returns a copy of the JSON-LD context(s) applicable to the presentation.
+
+**Kind**: instance method of [<code>Presentation</code>](#Presentation)  
+<a name="Presentation+id"></a>
+
+### presentation.id() ⇒ <code>string</code> \| <code>undefined</code>
+Returns a copy of the unique `URI` identifying the presentation.
+
+**Kind**: instance method of [<code>Presentation</code>](#Presentation)  
+<a name="Presentation+type"></a>
+
+### presentation.type() ⇒ <code>Array.&lt;string&gt;</code>
+Returns a copy of the URIs defining the type of the presentation.
+
+**Kind**: instance method of [<code>Presentation</code>](#Presentation)  
+<a name="Presentation+verifiableCredential"></a>
+
+### presentation.verifiableCredential() ⇒ [<code>Array.&lt;UnknownCredential&gt;</code>](#UnknownCredential)
+Returns the JWT credentials expressing the claims of the presentation.
+
+**Kind**: instance method of [<code>Presentation</code>](#Presentation)  
+<a name="Presentation+holder"></a>
+
+### presentation.holder() ⇒ <code>string</code>
+Returns a copy of the URI of the entity that generated the presentation.
+
+**Kind**: instance method of [<code>Presentation</code>](#Presentation)  
+<a name="Presentation+refreshService"></a>
+
+### presentation.refreshService() ⇒ <code>Array.&lt;RefreshService&gt;</code>
+Returns a copy of the service(s) used to refresh an expired [Credential](#Credential) in the presentation.
+
+**Kind**: instance method of [<code>Presentation</code>](#Presentation)  
+<a name="Presentation+termsOfUse"></a>
+
+### presentation.termsOfUse() ⇒ <code>Array.&lt;Policy&gt;</code>
+Returns a copy of the terms-of-use specified by the presentation holder
+
+**Kind**: instance method of [<code>Presentation</code>](#Presentation)  
+<a name="Presentation+proof"></a>
+
+### presentation.proof() ⇒ <code>Map.&lt;string, any&gt;</code> \| <code>undefined</code>
+Optional proof that can be verified by users in addition to JWS.
+
+**Kind**: instance method of [<code>Presentation</code>](#Presentation)  
+<a name="Presentation+properties"></a>
+
+### presentation.properties() ⇒ <code>Map.&lt;string, any&gt;</code>
+Returns a copy of the miscellaneous properties on the presentation.
+
+**Kind**: instance method of [<code>Presentation</code>](#Presentation)  
+<a name="Presentation+toJSON"></a>
+
+### presentation.toJSON() ⇒ <code>any</code>
+Serializes this to a JSON object.
+
+**Kind**: instance method of [<code>Presentation</code>](#Presentation)  
+<a name="Presentation+clone"></a>
+
+### presentation.clone() ⇒ [<code>Presentation</code>](#Presentation)
+Deep clones the object.
+
+**Kind**: instance method of [<code>Presentation</code>](#Presentation)  
+<a name="Presentation.BaseContext"></a>
+
+### Presentation.BaseContext() ⇒ <code>string</code>
+Returns the base JSON-LD context.
+
+**Kind**: static method of [<code>Presentation</code>](#Presentation)  
+<a name="Presentation.BaseType"></a>
+
+### Presentation.BaseType() ⇒ <code>string</code>
+Returns the base type.
+
+**Kind**: static method of [<code>Presentation</code>](#Presentation)  
+<a name="Presentation.fromJSON"></a>
+
+### Presentation.fromJSON(json) ⇒ [<code>Presentation</code>](#Presentation)
+Deserializes an instance from a JSON object.
+
+**Kind**: static method of [<code>Presentation</code>](#Presentation)  
+
+| Param | Type |
+| --- | --- |
+| json | <code>any</code> | 
+
 <a name="Resolver"></a>
 
 ## Resolver
@@ -4596,6 +4596,62 @@ Deserializes an instance from a JSON object.
 | --- | --- |
 | json | <code>any</code> | 
 
+<a name="UnknownCredential"></a>
+
+## UnknownCredential
+**Kind**: global class  
+
+* [UnknownCredential](#UnknownCredential)
+    * _instance_
+        * [.tryIntoJwt()](#UnknownCredential+tryIntoJwt) ⇒ [<code>Jwt</code>](#Jwt) \| <code>undefined</code>
+        * [.tryIntoCredential()](#UnknownCredential+tryIntoCredential) ⇒ [<code>Credential</code>](#Credential) \| <code>undefined</code>
+        * [.tryIntoRaw()](#UnknownCredential+tryIntoRaw) ⇒ <code>Record.&lt;string, any&gt;</code> \| <code>undefined</code>
+        * [.toJSON()](#UnknownCredential+toJSON) ⇒ <code>any</code>
+        * [.clone()](#UnknownCredential+clone) ⇒ [<code>UnknownCredential</code>](#UnknownCredential)
+    * _static_
+        * [.fromJSON(json)](#UnknownCredential.fromJSON) ⇒ [<code>UnknownCredential</code>](#UnknownCredential)
+
+<a name="UnknownCredential+tryIntoJwt"></a>
+
+### unknownCredential.tryIntoJwt() ⇒ [<code>Jwt</code>](#Jwt) \| <code>undefined</code>
+Returns a `Jwt` if the credential is of type string, `undefined` otherwise.
+
+**Kind**: instance method of [<code>UnknownCredential</code>](#UnknownCredential)  
+<a name="UnknownCredential+tryIntoCredential"></a>
+
+### unknownCredential.tryIntoCredential() ⇒ [<code>Credential</code>](#Credential) \| <code>undefined</code>
+Returns a `Credential` if the credential is of said type, `undefined` otherwise.
+
+**Kind**: instance method of [<code>UnknownCredential</code>](#UnknownCredential)  
+<a name="UnknownCredential+tryIntoRaw"></a>
+
+### unknownCredential.tryIntoRaw() ⇒ <code>Record.&lt;string, any&gt;</code> \| <code>undefined</code>
+Returns the contained value as JSON, if it can be converted, `undefined` otherwise.
+
+**Kind**: instance method of [<code>UnknownCredential</code>](#UnknownCredential)  
+<a name="UnknownCredential+toJSON"></a>
+
+### unknownCredential.toJSON() ⇒ <code>any</code>
+Serializes this to a JSON object.
+
+**Kind**: instance method of [<code>UnknownCredential</code>](#UnknownCredential)  
+<a name="UnknownCredential+clone"></a>
+
+### unknownCredential.clone() ⇒ [<code>UnknownCredential</code>](#UnknownCredential)
+Deep clones the object.
+
+**Kind**: instance method of [<code>UnknownCredential</code>](#UnknownCredential)  
+<a name="UnknownCredential.fromJSON"></a>
+
+### UnknownCredential.fromJSON(json) ⇒ [<code>UnknownCredential</code>](#UnknownCredential)
+Deserializes an instance from a JSON object.
+
+**Kind**: static method of [<code>UnknownCredential</code>](#UnknownCredential)  
+
+| Param | Type |
+| --- | --- |
+| json | <code>any</code> | 
+
 <a name="VerificationMethod"></a>
 
 ## VerificationMethod
@@ -4848,28 +4904,6 @@ Return after the first error occurs.
 Initializes the console error panic hook for better error messages
 
 **Kind**: global function  
-<a name="verifyEdDSA"></a>
-
-## verifyEdDSA(alg, signingInput, decodedSignature, publicKey)
-Verify a JWS signature secured with the `JwsAlgorithm::EdDSA` algorithm.
-Only the `EdCurve::Ed25519` variant is supported for now.
-
-This function is useful when one is building an `IJwsVerifier` that extends the default provided by
-the IOTA Identity Framework.
-
-# Warning
-This function does not check whether `alg = EdDSA` in the protected header. Callers are expected to assert this
-prior to calling the function.
-
-**Kind**: global function  
-
-| Param | Type |
-| --- | --- |
-| alg | <code>JwsAlgorithm</code> | 
-| signingInput | <code>Uint8Array</code> | 
-| decodedSignature | <code>Uint8Array</code> | 
-| publicKey | [<code>Jwk</code>](#Jwk) | 
-
 <a name="encodeB64"></a>
 
 ## encodeB64(data) ⇒ <code>string</code>
@@ -4892,3 +4926,25 @@ Decode the given url-safe base64-encoded slice into its raw bytes.
 | --- | --- |
 | data | <code>Uint8Array</code> | 
 
+<a name="verifyEdDSA"></a>
+
+## verifyEdDSA(alg, signingInput, decodedSignature, publicKey)
+Verify a JWS signature secured with the `JwsAlgorithm::EdDSA` algorithm.
+Only the `EdCurve::Ed25519` variant is supported for now.
+
+This function is useful when one is building an `IJwsVerifier` that extends the default provided by
+the IOTA Identity Framework.
+
+# Warning
+This function does not check whether `alg = EdDSA` in the protected header. Callers are expected to assert this
+prior to calling the function.
+
+**Kind**: global function  
+
+| Param | Type |
+| --- | --- |
+| alg | <code>JwsAlgorithm</code> | 
+| signingInput | <code>Uint8Array</code> | 
+| decodedSignature | <code>Uint8Array</code> | 
+| publicKey | [<code>Jwk</code>](#Jwk) | 
+
diff --git a/bindings/wasm/examples/src/0_basic/6_create_vp.ts b/bindings/wasm/examples/src/0_basic/6_create_vp.ts
index e321f040e6..deb43a8476 100644
--- a/bindings/wasm/examples/src/0_basic/6_create_vp.ts
+++ b/bindings/wasm/examples/src/0_basic/6_create_vp.ts
@@ -15,11 +15,11 @@ import {
     Jwt,
     JwtCredentialValidationOptions,
     JwtCredentialValidator,
-    JwtPresentation,
     JwtPresentationOptions,
     JwtPresentationValidationOptions,
     JwtPresentationValidator,
     KeyIdMemStore,
+    Presentation,
     Resolver,
     Storage,
     SubjectHolderRelationship,
@@ -130,7 +130,7 @@ export async function createVP() {
     // ===========================================================================
 
     // Create a Verifiable Presentation from the Credential
-    const unsignedVp = new JwtPresentation({
+    const unsignedVp = new Presentation({
         holder: aliceDocument.id(),
         verifiableCredential: [credentialJwt],
     });
@@ -188,13 +188,16 @@ export async function createVP() {
     // Validate the credentials in the presentation.
     let credentialValidator = new JwtCredentialValidator();
     let validationOptions = new JwtCredentialValidationOptions({
-        subjectHolderRelationship: [presentationHolderDID.toString(), SubjectHolderRelationship.AlwaysSubject],
+        subjectHolderRelationship: [
+            presentationHolderDID.toString(),
+            SubjectHolderRelationship.AlwaysSubject,
+        ],
     });
 
     let jwtCredentials: Jwt[] = decodedPresentation
         .presentation()
         .verifiableCredential()
-        .map(credential => {
+        .map((credential) => {
             const jwt = credential.tryIntoJwt();
             if (!jwt) {
                 throw new Error("expected a JWT credential");
diff --git a/bindings/wasm/examples/src/0_basic/7_revoke_vc.ts b/bindings/wasm/examples/src/0_basic/7_revoke_vc.ts
index cacb2963fb..06fdcc7701 100644
--- a/bindings/wasm/examples/src/0_basic/7_revoke_vc.ts
+++ b/bindings/wasm/examples/src/0_basic/7_revoke_vc.ts
@@ -47,7 +47,10 @@ export async function revokeVC() {
     };
 
     // Create an identity for the issuer with one verification method `key-1`.
-    const issuerStorage: Storage = new Storage(new JwkMemStore(), new KeyIdMemStore());
+    const issuerStorage: Storage = new Storage(
+        new JwkMemStore(),
+        new KeyIdMemStore(),
+    );
     let { document: issuerDocument, fragment: issuerFragment } = await createDid(
         client,
         issuerSecretManager,
@@ -55,8 +58,11 @@ export async function revokeVC() {
     );
 
     // Create an identity for the holder, in this case also the subject.
-    const aliceStorage: Storage = new Storage(new JwkMemStore(), new KeyIdMemStore());
-    let { document: aliceDocument, fragment: aliceFragment } = await createDid(
+    const aliceStorage: Storage = new Storage(
+        new JwkMemStore(),
+        new KeyIdMemStore(),
+    );
+    let { document: aliceDocument } = await createDid(
         client,
         issuerSecretManager,
         aliceStorage,
@@ -74,15 +80,23 @@ export async function revokeVC() {
     issuerDocument.insertService(service);
 
     // Resolve the latest output and update it with the given document.
-    let aliasOutput: IAliasOutput = await didClient.updateDidOutput(issuerDocument);
+    let aliasOutput: IAliasOutput = await didClient.updateDidOutput(
+        issuerDocument,
+    );
 
     // Because the size of the DID document increased, we have to increase the allocated storage deposit.
     // This increases the deposit amount to the new minimum.
     let rentStructure: IRent = await didClient.getRentStructure();
-    aliasOutput.amount = TransactionHelper.getStorageDeposit(aliasOutput, rentStructure).toString();
+    aliasOutput.amount = TransactionHelper.getStorageDeposit(
+        aliasOutput,
+        rentStructure,
+    ).toString();
 
     // Publish the document.
-    issuerDocument = await didClient.publishDidOutput(issuerSecretManager, aliasOutput);
+    issuerDocument = await didClient.publishDidOutput(
+        issuerSecretManager,
+        aliasOutput,
+    );
 
     // Create a credential subject indicating the degree earned by Alice, linked to their DID.
     const subject = {
@@ -137,8 +151,14 @@ export async function revokeVC() {
     // Publish the changes.
     aliasOutput = await didClient.updateDidOutput(issuerDocument);
     rentStructure = await didClient.getRentStructure();
-    aliasOutput.amount = TransactionHelper.getStorageDeposit(aliasOutput, rentStructure).toString();
-    const update2: IotaDocument = await didClient.publishDidOutput(issuerSecretManager, aliasOutput);
+    aliasOutput.amount = TransactionHelper.getStorageDeposit(
+        aliasOutput,
+        rentStructure,
+    ).toString();
+    const update2: IotaDocument = await didClient.publishDidOutput(
+        issuerSecretManager,
+        aliasOutput,
+    );
 
     // Credential verification now fails.
     try {
@@ -159,20 +179,30 @@ export async function revokeVC() {
 
     // By removing the verification method, that signed the credential, from the issuer's DID document,
     // we effectively revoke the credential, as it will no longer be possible to validate the signature.
-    let originalMethod = issuerDocument.resolveMethod(`#${issuerFragment}`) as VerificationMethod;
+    let originalMethod = issuerDocument.resolveMethod(
+        `#${issuerFragment}`,
+    ) as VerificationMethod;
     await issuerDocument.purgeMethod(issuerStorage, originalMethod.id());
 
     // Publish the changes.
     aliasOutput = await didClient.updateDidOutput(issuerDocument);
     rentStructure = await didClient.getRentStructure();
-    aliasOutput.amount = TransactionHelper.getStorageDeposit(aliasOutput, rentStructure).toString();
-    issuerDocument = await didClient.publishDidOutput(issuerSecretManager, aliasOutput);
+    aliasOutput.amount = TransactionHelper.getStorageDeposit(
+        aliasOutput,
+        rentStructure,
+    ).toString();
+    issuerDocument = await didClient.publishDidOutput(
+        issuerSecretManager,
+        aliasOutput,
+    );
 
     // We expect the verifiable credential to be revoked.
     const resolver = new Resolver({ client: didClient });
     try {
         // Resolve the issuer's updated DID Document to ensure the key was revoked successfully.
-        const resolvedIssuerDoc = await resolver.resolve(issuerDocument.id().toString());
+        const resolvedIssuerDoc = await resolver.resolve(
+            issuerDocument.id().toString(),
+        );
         jwtCredentialValidator.validate(
             credentialJwt,
             resolvedIssuerDoc,
diff --git a/bindings/wasm/src/credential/jwt_presentation/mod.rs b/bindings/wasm/src/credential/jwt_presentation/mod.rs
index 3f4bb3b90c..aa4af436ab 100644
--- a/bindings/wasm/src/credential/jwt_presentation/mod.rs
+++ b/bindings/wasm/src/credential/jwt_presentation/mod.rs
@@ -1,7 +1,8 @@
 // Copyright 2020-2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-mod jwt_presentation;
-mod jwt_presentation_builder;
+mod presentation;
+mod presentation_builder;
 
-pub use self::jwt_presentation::*;
+pub use self::presentation::*;
+pub use self::presentation_builder::*;
diff --git a/bindings/wasm/src/credential/jwt_presentation/jwt_presentation.rs b/bindings/wasm/src/credential/jwt_presentation/presentation.rs
similarity index 77%
rename from bindings/wasm/src/credential/jwt_presentation/jwt_presentation.rs
rename to bindings/wasm/src/credential/jwt_presentation/presentation.rs
index 73a1b54ed2..eabda25465 100644
--- a/bindings/wasm/src/credential/jwt_presentation/jwt_presentation.rs
+++ b/bindings/wasm/src/credential/jwt_presentation/presentation.rs
@@ -3,48 +3,48 @@
 
 use identity_iota::core::Context;
 use identity_iota::core::Object;
-use identity_iota::credential::JwtPresentation;
-use identity_iota::credential::JwtPresentationBuilder;
+use identity_iota::credential::Presentation;
+use identity_iota::credential::PresentationBuilder;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsCast;
 
 use crate::common::ArrayString;
 use crate::common::MapStringAny;
-use crate::credential::jwt_presentation::jwt_presentation_builder::IJwtPresentation;
 use crate::credential::ArrayContext;
 use crate::credential::ArrayPolicy;
 use crate::credential::ArrayRefreshService;
 use crate::credential::ArrayUnknownCredential;
+use crate::credential::IPresentation;
 use crate::credential::UnknownCredential;
 use crate::credential::WasmUnknownCredentialContainer;
 use crate::error::Result;
 use crate::error::WasmResult;
 
-#[wasm_bindgen(js_name = JwtPresentation, inspectable)]
-pub struct WasmJwtPresentation(pub(crate) JwtPresentation<UnknownCredential>);
+#[wasm_bindgen(js_name = Presentation, inspectable)]
+pub struct WasmPresentation(pub(crate) Presentation<UnknownCredential>);
 
-#[wasm_bindgen(js_class = JwtPresentation)]
-impl WasmJwtPresentation {
+#[wasm_bindgen(js_class = Presentation)]
+impl WasmPresentation {
   /// Returns the base JSON-LD context.
   #[wasm_bindgen(js_name = "BaseContext")]
   pub fn base_context() -> Result<String> {
-    match JwtPresentation::<Object>::base_context() {
+    match Presentation::<Object>::base_context() {
       Context::Url(url) => Ok(url.to_string()),
-      Context::Obj(_) => Err(JsError::new("JwtPresentation.BaseContext should be a single URL").into()),
+      Context::Obj(_) => Err(JsError::new("Presentation.BaseContext should be a single URL").into()),
     }
   }
 
   /// Returns the base type.
   #[wasm_bindgen(js_name = "BaseType")]
   pub fn base_type() -> String {
-    JwtPresentation::<Object>::base_type().to_owned()
+    Presentation::<Object>::base_type().to_owned()
   }
 
   /// Constructs a new presentation.
   #[wasm_bindgen(constructor)]
-  pub fn new(values: IJwtPresentation) -> Result<WasmJwtPresentation> {
-    let builder: JwtPresentationBuilder<UnknownCredential, Object> =
-      JwtPresentationBuilder::<UnknownCredential, Object>::try_from(values)?;
+  pub fn new(values: IPresentation) -> Result<WasmPresentation> {
+    let builder: PresentationBuilder<UnknownCredential, Object> =
+      PresentationBuilder::<UnknownCredential, Object>::try_from(values)?;
     builder.build().map(Self).wasm_result()
   }
 
@@ -139,11 +139,11 @@ impl WasmJwtPresentation {
   }
 }
 
-impl_wasm_json!(WasmJwtPresentation, JwtPresentation);
-impl_wasm_clone!(WasmJwtPresentation, JwtPresentation);
+impl_wasm_json!(WasmPresentation, Presentation);
+impl_wasm_clone!(WasmPresentation, Presentation);
 
-impl From<JwtPresentation<UnknownCredential>> for WasmJwtPresentation {
-  fn from(presentation: JwtPresentation<UnknownCredential>) -> WasmJwtPresentation {
+impl From<Presentation<UnknownCredential>> for WasmPresentation {
+  fn from(presentation: Presentation<UnknownCredential>) -> WasmPresentation {
     Self(presentation)
   }
 }
diff --git a/bindings/wasm/src/credential/jwt_presentation/jwt_presentation_builder.rs b/bindings/wasm/src/credential/jwt_presentation/presentation_builder.rs
similarity index 81%
rename from bindings/wasm/src/credential/jwt_presentation/jwt_presentation_builder.rs
rename to bindings/wasm/src/credential/jwt_presentation/presentation_builder.rs
index d800b1bf4a..c5ea298710 100644
--- a/bindings/wasm/src/credential/jwt_presentation/jwt_presentation_builder.rs
+++ b/bindings/wasm/src/credential/jwt_presentation/presentation_builder.rs
@@ -5,8 +5,8 @@ use identity_iota::core::Context;
 use identity_iota::core::Object;
 use identity_iota::core::OneOrMany;
 use identity_iota::core::Url;
-use identity_iota::credential::JwtPresentationBuilder;
 use identity_iota::credential::Policy;
+use identity_iota::credential::PresentationBuilder;
 use identity_iota::credential::RefreshService;
 use proc_typescript::typescript;
 use wasm_bindgen::prelude::*;
@@ -14,11 +14,11 @@ use wasm_bindgen::prelude::*;
 use crate::credential::UnknownCredential;
 use crate::error::WasmResult;
 
-impl TryFrom<IJwtPresentation> for JwtPresentationBuilder<UnknownCredential> {
+impl TryFrom<IPresentation> for PresentationBuilder<UnknownCredential> {
   type Error = JsValue;
 
-  fn try_from(values: IJwtPresentation) -> std::result::Result<Self, Self::Error> {
-    let IJwtPresentationHelper {
+  fn try_from(values: IPresentation) -> std::result::Result<Self, Self::Error> {
+    let IPresentationHelper {
       context,
       id,
       r#type,
@@ -27,10 +27,10 @@ impl TryFrom<IJwtPresentation> for JwtPresentationBuilder<UnknownCredential> {
       refresh_service,
       terms_of_use,
       properties,
-    } = values.into_serde::<IJwtPresentationHelper>().wasm_result()?;
+    } = values.into_serde::<IPresentationHelper>().wasm_result()?;
 
-    let mut builder: JwtPresentationBuilder<UnknownCredential> =
-      JwtPresentationBuilder::new(Url::parse(holder).wasm_result()?, properties);
+    let mut builder: PresentationBuilder<UnknownCredential> =
+      PresentationBuilder::new(Url::parse(holder).wasm_result()?, properties);
 
     if let Some(context) = context {
       for value in context.into_vec() {
@@ -65,15 +65,15 @@ impl TryFrom<IJwtPresentation> for JwtPresentationBuilder<UnknownCredential> {
 
 #[wasm_bindgen]
 extern "C" {
-  #[wasm_bindgen(typescript_type = "IJwtPresentation")]
-  pub type IJwtPresentation;
+  #[wasm_bindgen(typescript_type = "IPresentation")]
+  pub type IPresentation;
 }
 
-/// Fields for constructing a new {@link JwtPresentation}.
+/// Fields for constructing a new {@link Presentation}.
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
-#[typescript(name = "IJwtPresentation", readonly, optional)]
-struct IJwtPresentationHelper {
+#[typescript(name = "IPresentation", readonly, optional)]
+struct IPresentationHelper {
   /// The JSON-LD context(s) applicable to the presentation.
   #[typescript(type = "string | Record<string, any> | Array<string | Record<string, any>>")]
   context: Option<OneOrMany<Context>>,
diff --git a/bindings/wasm/src/credential/jwt_presentation_validation/decoded_jwt_presentation.rs b/bindings/wasm/src/credential/jwt_presentation_validation/decoded_jwt_presentation.rs
index 9019e61ea0..aa2447f22e 100644
--- a/bindings/wasm/src/credential/jwt_presentation_validation/decoded_jwt_presentation.rs
+++ b/bindings/wasm/src/credential/jwt_presentation_validation/decoded_jwt_presentation.rs
@@ -5,7 +5,7 @@ use identity_iota::credential::DecodedJwtPresentation;
 use wasm_bindgen::prelude::*;
 
 use crate::common::WasmTimestamp;
-use crate::credential::jwt_presentation::WasmJwtPresentation;
+use crate::credential::jwt_presentation::WasmPresentation;
 use crate::credential::UnknownCredential;
 use crate::jose::WasmJwsHeader;
 
@@ -19,8 +19,8 @@ pub struct WasmDecodedJwtPresentation(pub(crate) DecodedJwtPresentation<UnknownC
 #[wasm_bindgen(js_class = DecodedJwtPresentation)]
 impl WasmDecodedJwtPresentation {
   #[wasm_bindgen]
-  pub fn presentation(&self) -> WasmJwtPresentation {
-    WasmJwtPresentation(self.0.presentation.clone())
+  pub fn presentation(&self) -> WasmPresentation {
+    WasmPresentation(self.0.presentation.clone())
   }
 
   /// Returns a copy of the protected header parsed from the decoded JWS.
@@ -34,8 +34,8 @@ impl WasmDecodedJwtPresentation {
   /// ### Warning
   /// This destroys the `DecodedJwtPresentation` object.
   #[wasm_bindgen(js_name = intoPresentation)]
-  pub fn into_presentation(self) -> WasmJwtPresentation {
-    WasmJwtPresentation(self.0.presentation)
+  pub fn into_presentation(self) -> WasmPresentation {
+    WasmPresentation(self.0.presentation)
   }
 
   /// The expiration date parsed from the JWT claims.
diff --git a/bindings/wasm/src/credential/jwt_presentation_validation/jwt_presentation_validator.rs b/bindings/wasm/src/credential/jwt_presentation_validation/jwt_presentation_validator.rs
index 045b06d689..b1db11c3cb 100644
--- a/bindings/wasm/src/credential/jwt_presentation_validation/jwt_presentation_validator.rs
+++ b/bindings/wasm/src/credential/jwt_presentation_validation/jwt_presentation_validator.rs
@@ -4,7 +4,7 @@
 use super::decoded_jwt_presentation::WasmDecodedJwtPresentation;
 use super::options::WasmJwtPresentationValidationOptions;
 use crate::common::ImportedDocumentLock;
-use crate::credential::jwt_presentation::WasmJwtPresentation;
+use crate::credential::jwt_presentation::WasmPresentation;
 use crate::credential::WasmJwt;
 use crate::did::IToCoreDocument;
 use crate::did::WasmCoreDID;
@@ -73,7 +73,7 @@ impl WasmJwtPresentationValidator {
 
   /// Validates the semantic structure of the `JwtPresentation`.
   #[wasm_bindgen(js_name = checkStructure)]
-  pub fn check_structure(presentation: &WasmJwtPresentation) -> Result<()> {
+  pub fn check_structure(presentation: &WasmPresentation) -> Result<()> {
     JwtPresentationValidator::check_structure(&presentation.0).wasm_result()?;
     Ok(())
   }
diff --git a/bindings/wasm/src/did/wasm_core_document.rs b/bindings/wasm/src/did/wasm_core_document.rs
index a4ed615a75..43cefa603d 100644
--- a/bindings/wasm/src/did/wasm_core_document.rs
+++ b/bindings/wasm/src/did/wasm_core_document.rs
@@ -20,7 +20,7 @@ use crate::credential::UnknownCredential;
 use crate::credential::WasmCredential;
 use crate::credential::WasmJws;
 use crate::credential::WasmJwt;
-use crate::credential::WasmJwtPresentation;
+use crate::credential::WasmPresentation;
 use crate::did::service::WasmService;
 use crate::did::wasm_did_url::WasmDIDUrl;
 use crate::error::Result;
@@ -43,8 +43,8 @@ use identity_iota::core::OneOrSet;
 use identity_iota::core::OrderedSet;
 use identity_iota::core::Url;
 use identity_iota::credential::Credential;
-use identity_iota::credential::JwtPresentation;
 use identity_iota::credential::JwtPresentationOptions;
+use identity_iota::credential::Presentation;
 use identity_iota::credential::RevocationDocumentExt;
 use identity_iota::did::CoreDID;
 use identity_iota::did::DIDUrl;
@@ -706,14 +706,14 @@ impl WasmCoreDocument {
     &self,
     storage: &WasmStorage,
     fragment: String,
-    presentation: &WasmJwtPresentation,
+    presentation: &WasmPresentation,
     signature_options: &WasmJwsSignatureOptions,
     presentation_options: &WasmJwtPresentationOptions,
   ) -> Result<PromiseJwt> {
     let storage_clone: Rc<WasmStorageInner> = storage.0.clone();
     let options_clone: JwsSignatureOptions = signature_options.0.clone();
     let document_lock_clone: Rc<CoreDocumentLock> = self.0.clone();
-    let presentation_clone: JwtPresentation<UnknownCredential> = presentation.0.clone();
+    let presentation_clone: Presentation<UnknownCredential> = presentation.0.clone();
     let presentation_options_clone: JwtPresentationOptions = presentation_options.0.clone();
     let promise: Promise = future_to_promise(async move {
       document_lock_clone
diff --git a/bindings/wasm/src/iota/iota_document.rs b/bindings/wasm/src/iota/iota_document.rs
index 029be6b905..ec62e707e6 100644
--- a/bindings/wasm/src/iota/iota_document.rs
+++ b/bindings/wasm/src/iota/iota_document.rs
@@ -8,8 +8,8 @@ use identity_iota::core::OrderedSet;
 use identity_iota::core::Timestamp;
 use identity_iota::core::Url;
 use identity_iota::credential::Credential;
-use identity_iota::credential::JwtPresentation;
 use identity_iota::credential::JwtPresentationOptions;
+use identity_iota::credential::Presentation;
 use identity_iota::did::DIDUrl;
 use identity_iota::iota::block::output::dto::AliasOutputDto;
 use identity_iota::iota::block::output::AliasOutput;
@@ -45,7 +45,7 @@ use crate::credential::UnknownCredential;
 use crate::credential::WasmCredential;
 use crate::credential::WasmJws;
 use crate::credential::WasmJwt;
-use crate::credential::WasmJwtPresentation;
+use crate::credential::WasmPresentation;
 use crate::did::CoreDocumentLock;
 use crate::did::PromiseJws;
 use crate::did::PromiseJwt;
@@ -774,14 +774,14 @@ impl WasmIotaDocument {
     &self,
     storage: &WasmStorage,
     fragment: String,
-    presentation: &WasmJwtPresentation,
+    presentation: &WasmPresentation,
     signature_options: &WasmJwsSignatureOptions,
     presentation_options: &WasmJwtPresentationOptions,
   ) -> Result<PromiseJwt> {
     let storage_clone: Rc<WasmStorageInner> = storage.0.clone();
     let options_clone: JwsSignatureOptions = signature_options.0.clone();
     let document_lock_clone: Rc<IotaDocumentLock> = self.0.clone();
-    let presentation_clone: JwtPresentation<UnknownCredential> = presentation.0.clone();
+    let presentation_clone: Presentation<UnknownCredential> = presentation.0.clone();
     let presentation_options_clone: JwtPresentationOptions = presentation_options.0.clone();
     let promise: Promise = future_to_promise(async move {
       document_lock_clone
diff --git a/bindings/wasm/tests/credentials.ts b/bindings/wasm/tests/credentials.ts
index bd54a603d0..eae0562da8 100644
--- a/bindings/wasm/tests/credentials.ts
+++ b/bindings/wasm/tests/credentials.ts
@@ -5,12 +5,12 @@ import {
     JwkMemStore,
     JwsAlgorithm,
     JwsSignatureOptions,
-    JwtPresentation,
     JwtPresentationOptions,
     JwtPresentationValidationOptions,
     JwtPresentationValidator,
     KeyIdMemStore,
     MethodScope,
+    Presentation,
     Storage,
     Timestamp,
     UnknownCredential,
@@ -157,14 +157,14 @@ const presentationFields = {
 describe("Presentation", function() {
     describe("#new and field getters", function() {
         it("should work", async () => {
-            const presentation = new JwtPresentation(presentationFields);
+            const presentation = new Presentation(presentationFields);
             assert.deepStrictEqual(presentation.context(), [
-                JwtPresentation.BaseContext(),
+                Presentation.BaseContext(),
                 presentationFields.context,
             ]);
             assert.deepStrictEqual(presentation.id(), presentationFields.id);
             assert.deepStrictEqual(presentation.type(), [
-                JwtPresentation.BaseType(),
+                Presentation.BaseType(),
                 presentationFields.type,
             ]);
             assert.deepStrictEqual(
@@ -230,12 +230,12 @@ describe("Presentation", function() {
             );
 
             const otherCredential = {
-                "custom": "property",
-                "other": 5,
-                "isCredential": true,
+                custom: "property",
+                other: 5,
+                isCredential: true,
             };
 
-            const unsignedVp = new JwtPresentation({
+            const unsignedVp = new Presentation({
                 holder: doc.id(),
                 verifiableCredential: [credentialJwt, unsignedVc, otherCredential],
             });
@@ -257,10 +257,18 @@ describe("Presentation", function() {
                 new JwtPresentationValidationOptions(),
             );
 
-            const credentials: UnknownCredential[] = decodedPresentation.presentation().verifiableCredential();
+            const credentials: UnknownCredential[] = decodedPresentation
+                .presentation()
+                .verifiableCredential();
 
-            assert.deepStrictEqual(credentials[0].tryIntoJwt()?.toString(), credentialJwt.toString());
-            assert.deepStrictEqual(credentials[1].tryIntoCredential()?.toJSON(), unsignedVc.toJSON());
+            assert.deepStrictEqual(
+                credentials[0].tryIntoJwt()?.toString(),
+                credentialJwt.toString(),
+            );
+            assert.deepStrictEqual(
+                credentials[1].tryIntoCredential()?.toJSON(),
+                unsignedVc.toJSON(),
+            );
             assert.deepStrictEqual(credentials[2].tryIntoRaw()!, otherCredential);
         });
     });
diff --git a/bindings/wasm/tests/storage.ts b/bindings/wasm/tests/storage.ts
index 7800be592d..6efa266d78 100644
--- a/bindings/wasm/tests/storage.ts
+++ b/bindings/wasm/tests/storage.ts
@@ -15,13 +15,13 @@ import {
     Jwt,
     JwtCredentialValidationOptions,
     JwtCredentialValidator,
-    JwtPresentation,
     JwtPresentationOptions,
     JwtPresentationValidationOptions,
     JwtPresentationValidator,
     KeyIdMemStore,
     MethodDigest,
     MethodScope,
+    Presentation,
     Storage,
     Timestamp,
     VerificationMethod,
@@ -335,7 +335,7 @@ describe("#JwkStorageDocument", function() {
             new JwsSignatureOptions(),
         );
 
-        const presentation = new JwtPresentation({
+        const presentation = new Presentation({
             holder: holderDoc.id(),
             verifiableCredential: [
                 credentialJwt.toString(),
diff --git a/examples/0_basic/6_create_vp.rs b/examples/0_basic/6_create_vp.rs
index fd01c6617b..e934726220 100644
--- a/examples/0_basic/6_create_vp.rs
+++ b/examples/0_basic/6_create_vp.rs
@@ -16,11 +16,11 @@ use identity_iota::core::OneOrMany;
 use identity_iota::credential::DecodedJwtCredential;
 use identity_iota::credential::DecodedJwtPresentation;
 use identity_iota::credential::Jwt;
-use identity_iota::credential::JwtPresentation;
-use identity_iota::credential::JwtPresentationBuilder;
 use identity_iota::credential::JwtPresentationOptions;
 use identity_iota::credential::JwtPresentationValidationOptions;
 use identity_iota::credential::JwtPresentationValidator;
+use identity_iota::credential::Presentation;
+use identity_iota::credential::PresentationBuilder;
 use identity_iota::did::CoreDID;
 use identity_iota::document::verifiable::JwsVerificationOptions;
 use identity_iota::storage::JwkDocumentExt;
@@ -151,8 +151,8 @@ async fn main() -> anyhow::Result<()> {
   // ===========================================================================
 
   // Create an unsigned Presentation from the previously issued Verifiable Credential.
-  let presentation: JwtPresentation<Jwt> =
-    JwtPresentationBuilder::new(alice_document.id().to_url().into(), Default::default())
+  let presentation: Presentation<Jwt> =
+    PresentationBuilder::new(alice_document.id().to_url().into(), Default::default())
       .credential(credential_jwt)
       .build()?;
 
diff --git a/identity_credential/src/credential/credential.rs b/identity_credential/src/credential/credential.rs
index 89b3b89ac2..a6134065c7 100644
--- a/identity_credential/src/credential/credential.rs
+++ b/identity_credential/src/credential/credential.rs
@@ -70,7 +70,7 @@ pub struct Credential<T = Object> {
   #[serde(default, skip_serializing_if = "OneOrMany::is_empty")]
   pub evidence: OneOrMany<Evidence>,
   /// Indicates that the `Credential` must only be contained within a
-  /// [`Presentation`][crate::presentation::JwtPresentation] with a proof issued from the `Credential` subject.
+  /// [`Presentation`][crate::presentation::Presentation] with a proof issued from the `Credential` subject.
   #[serde(rename = "nonTransferable", skip_serializing_if = "Option::is_none")]
   pub non_transferable: Option<bool>,
   /// Miscellaneous properties.
diff --git a/identity_credential/src/credential/policy.rs b/identity_credential/src/credential/policy.rs
index 3d0c82f176..cd954ae81a 100644
--- a/identity_credential/src/credential/policy.rs
+++ b/identity_credential/src/credential/policy.rs
@@ -6,7 +6,7 @@ use identity_core::common::OneOrMany;
 use identity_core::common::Url;
 
 /// Information used to express obligations, prohibitions, and permissions about
-/// a [`Credential`][crate::credential::Credential] or [`Presentation`][crate::presentation::JwtPresentation].
+/// a [`Credential`][crate::credential::Credential] or [`Presentation`][crate::presentation::Presentation].
 ///
 /// [More Info](https://www.w3.org/TR/vc-data-model/#terms-of-use)
 #[derive(Clone, Debug, Default, PartialEq, Eq, Deserialize, Serialize)]
diff --git a/identity_credential/src/error.rs b/identity_credential/src/error.rs
index cb5fb656b1..eb01449ff5 100644
--- a/identity_credential/src/error.rs
+++ b/identity_credential/src/error.rs
@@ -44,7 +44,7 @@ pub enum Error {
   #[error("could not convert JWT to the VC data model: {0}")]
   InconsistentCredentialJwtClaims(&'static str),
 
-  /// Caused when attempting to convert a JWT to a `JwtPresentation` that has conflicting values
+  /// Caused when attempting to convert a JWT to a `Presentation` that has conflicting values
   /// between the registered claims and those in the `vp` object.
   #[error("could not convert JWT to the VP data model: {0}")]
   InconsistentPresentationJwtClaims(&'static str),
diff --git a/identity_credential/src/presentation/jwt_serialization.rs b/identity_credential/src/presentation/jwt_serialization.rs
index 894998e60d..53ac27b567 100644
--- a/identity_credential/src/presentation/jwt_serialization.rs
+++ b/identity_credential/src/presentation/jwt_serialization.rs
@@ -16,7 +16,7 @@ use crate::credential::IssuanceDateClaims;
 use crate::credential::Jwt;
 use crate::credential::Policy;
 use crate::credential::RefreshService;
-use crate::presentation::JwtPresentation;
+use crate::presentation::Presentation;
 #[cfg(feature = "validator")]
 use crate::Error;
 use crate::Result;
@@ -58,10 +58,10 @@ where
   CRED: ToOwned<Owned = CRED> + Serialize + DeserializeOwned + Clone,
 {
   pub(super) fn new(
-    presentation: &'presentation JwtPresentation<CRED, T>,
+    presentation: &'presentation Presentation<CRED, T>,
     options: &JwtPresentationOptions,
   ) -> Result<Self> {
-    let JwtPresentation {
+    let Presentation {
       context,
       id,
       types,
@@ -100,28 +100,28 @@ where
   T: ToOwned + Serialize,
   <T as ToOwned>::Owned: DeserializeOwned,
 {
-  /// The JSON-LD context(s) applicable to the `JwtPresentation`.
+  /// The JSON-LD context(s) applicable to the `Presentation`.
   #[serde(rename = "@context")]
   context: Cow<'presentation, OneOrMany<Context>>,
-  /// A unique `URI` that may be used to identify the `JwtPresentation`.
+  /// A unique `URI` that may be used to identify the `Presentation`.
   #[serde(skip_serializing_if = "Option::is_none")]
   id: Option<Url>,
-  /// One or more URIs defining the type of the `JwtPresentation`.
+  /// One or more URIs defining the type of the `Presentation`.
   #[serde(rename = "type")]
   types: Cow<'presentation, OneOrMany<String>>,
-  /// Credential(s) expressing the claims of the `JwtPresentation`.
+  /// Credential(s) expressing the claims of the `Presentation`.
   #[serde(default = "Default::default", rename = "verifiableCredential")]
   pub(crate) verifiable_credential: Cow<'presentation, OneOrMany<CRED>>,
-  /// Service(s) used to refresh an expired [`Credential`] in the `JwtPresentation`.
+  /// Service(s) used to refresh an expired [`Credential`] in the `Presentation`.
   #[serde(default, rename = "refreshService", skip_serializing_if = "OneOrMany::is_empty")]
   refresh_service: Cow<'presentation, OneOrMany<RefreshService>>,
-  /// Terms-of-use specified by the `JwtPresentation` holder.
+  /// Terms-of-use specified by the `Presentation` holder.
   #[serde(default, rename = "termsOfUse", skip_serializing_if = "OneOrMany::is_empty")]
   terms_of_use: Cow<'presentation, OneOrMany<Policy>>,
   /// Miscellaneous properties.
   #[serde(flatten)]
   properties: Cow<'presentation, T>,
-  /// Proof(s) used to verify a `JwtPresentation`
+  /// Proof(s) used to verify a `Presentation`
   #[serde(skip_serializing_if = "Option::is_none")]
   proof: Option<Cow<'presentation, Object>>,
 }
@@ -132,7 +132,7 @@ where
   CRED: ToOwned<Owned = CRED> + Serialize + DeserializeOwned + Clone,
   T: ToOwned<Owned = T> + Serialize + DeserializeOwned,
 {
-  pub(crate) fn try_into_presentation(self) -> Result<JwtPresentation<CRED, T>> {
+  pub(crate) fn try_into_presentation(self) -> Result<Presentation<CRED, T>> {
     self.check_consistency()?;
     let Self {
       exp: _,
@@ -153,7 +153,7 @@ where
       proof,
     } = vp;
 
-    let presentation = JwtPresentation {
+    let presentation = Presentation {
       context: context.into_owned(),
       id: jti.map(Cow::into_owned),
       types: types.into_owned(),
diff --git a/identity_credential/src/presentation/mod.rs b/identity_credential/src/presentation/mod.rs
index 528c7c73b1..c070ecaa6f 100644
--- a/identity_credential/src/presentation/mod.rs
+++ b/identity_credential/src/presentation/mod.rs
@@ -5,14 +5,14 @@
 
 #![allow(clippy::module_inception)]
 
-mod jwt_presentation;
-mod jwt_presentation_builder;
 mod jwt_presentation_options;
 mod jwt_serialization;
+mod presentation;
+mod presentation_builder;
 
-pub use self::jwt_presentation::JwtPresentation;
-pub use self::jwt_presentation_builder::JwtPresentationBuilder;
 pub use self::jwt_presentation_options::JwtPresentationOptions;
+pub use self::presentation::Presentation;
+pub use self::presentation_builder::PresentationBuilder;
 
 #[cfg(feature = "validator")]
 pub(crate) use self::jwt_serialization::PresentationJwtClaims;
diff --git a/identity_credential/src/presentation/jwt_presentation.rs b/identity_credential/src/presentation/presentation.rs
similarity index 83%
rename from identity_credential/src/presentation/jwt_presentation.rs
rename to identity_credential/src/presentation/presentation.rs
index be73baccf4..7519d5a246 100644
--- a/identity_credential/src/presentation/jwt_presentation.rs
+++ b/identity_credential/src/presentation/presentation.rs
@@ -20,12 +20,12 @@ use crate::error::Error;
 use crate::error::Result;
 
 use super::jwt_serialization::PresentationJwtClaims;
-use super::JwtPresentationBuilder;
 use super::JwtPresentationOptions;
+use super::PresentationBuilder;
 
 /// Represents a bundle of one or more [`Credential`]s.
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
-pub struct JwtPresentation<CRED, T = Object> {
+pub struct Presentation<CRED, T = Object> {
   /// The JSON-LD context(s) applicable to the `Presentation`.
   #[serde(rename = "@context")]
   pub context: OneOrMany<Context>,
@@ -54,26 +54,26 @@ pub struct JwtPresentation<CRED, T = Object> {
   pub proof: Option<Object>,
 }
 
-impl<CRED, T> JwtPresentation<CRED, T> {
-  /// Returns the base JSON-LD context for `JwtPresentation`s.
+impl<CRED, T> Presentation<CRED, T> {
+  /// Returns the base JSON-LD context for `Presentation`s.
   pub fn base_context() -> &'static Context {
     Credential::<Object>::base_context()
   }
 
-  /// Returns the base type for `JwtPresentation`s.
+  /// Returns the base type for `Presentation`s.
   pub const fn base_type() -> &'static str {
     "VerifiablePresentation"
   }
 
-  /// Creates a `JwtPresentationBuilder` to configure a new Presentation.
+  /// Creates a `PresentationBuilder` to configure a new Presentation.
   ///
-  /// This is the same as [JwtPresentationBuilder::new].
-  pub fn builder(holder: Url, properties: T) -> JwtPresentationBuilder<CRED, T> {
-    JwtPresentationBuilder::new(holder, properties)
+  /// This is the same as [PresentationBuilder::new].
+  pub fn builder(holder: Url, properties: T) -> PresentationBuilder<CRED, T> {
+    PresentationBuilder::new(holder, properties)
   }
 
-  /// Returns a new `JwtPresentation` based on the `JwtPresentationBuilder` configuration.
-  pub fn from_builder(builder: JwtPresentationBuilder<CRED, T>) -> Result<Self> {
+  /// Returns a new `Presentation` based on the `PresentationBuilder` configuration.
+  pub fn from_builder(builder: PresentationBuilder<CRED, T>) -> Result<Self> {
     let this: Self = Self {
       context: builder.context.into(),
       id: builder.id,
@@ -90,7 +90,7 @@ impl<CRED, T> JwtPresentation<CRED, T> {
     Ok(this)
   }
 
-  /// Validates the semantic structure of the `JwtPresentation`.
+  /// Validates the semantic structure of the `Presentation`.
   ///
   /// # Warning
   ///
@@ -110,7 +110,7 @@ impl<CRED, T> JwtPresentation<CRED, T> {
     Ok(())
   }
 
-  /// Serializes the [`JwtPresentation`] as a JWT claims set
+  /// Serializes the [`Presentation`] as a JWT claims set
   /// in accordance with [VC-JWT version 1.1.](https://w3c.github.io/vc-jwt/#version-1.1).
   ///
   /// The resulting string can be used as the payload of a JWS when issuing the credential.  
@@ -125,7 +125,7 @@ impl<CRED, T> JwtPresentation<CRED, T> {
       .map_err(|err| Error::JwtClaimsSetSerializationError(err.into()))
   }
 
-  /// Returns a reference to the `JwtPresentation` proof, if it exists.
+  /// Returns a reference to the `Presentation` proof, if it exists.
   ///
   /// Note that this is not the JWS or JWT of the presentation but a separate field that can be used to
   /// prove additional claims or include proofs not based on digital signatures like Proof-of-Work.
@@ -139,7 +139,7 @@ impl<CRED, T> JwtPresentation<CRED, T> {
   }
 }
 
-impl<T> Display for JwtPresentation<T>
+impl<T> Display for Presentation<T>
 where
   T: Serialize,
 {
diff --git a/identity_credential/src/presentation/jwt_presentation_builder.rs b/identity_credential/src/presentation/presentation_builder.rs
similarity index 78%
rename from identity_credential/src/presentation/jwt_presentation_builder.rs
rename to identity_credential/src/presentation/presentation_builder.rs
index 620988dd72..e6c750b42d 100644
--- a/identity_credential/src/presentation/jwt_presentation_builder.rs
+++ b/identity_credential/src/presentation/presentation_builder.rs
@@ -10,11 +10,11 @@ use crate::credential::Policy;
 use crate::credential::RefreshService;
 use crate::error::Result;
 
-use super::JwtPresentation;
+use super::Presentation;
 
-/// A `JwtPresentationBuilder` is used to create a customized [JwtPresentation].
+/// A `PresentationBuilder` is used to create a customized [Presentation].
 #[derive(Clone, Debug)]
-pub struct JwtPresentationBuilder<CRED, T = Object> {
+pub struct PresentationBuilder<CRED, T = Object> {
   pub(crate) context: Vec<Context>,
   pub(crate) id: Option<Url>,
   pub(crate) types: Vec<String>,
@@ -25,13 +25,13 @@ pub struct JwtPresentationBuilder<CRED, T = Object> {
   pub(crate) properties: T,
 }
 
-impl<CRED, T> JwtPresentationBuilder<CRED, T> {
-  /// Creates a new `JwtPresentationBuilder`.
+impl<CRED, T> PresentationBuilder<CRED, T> {
+  /// Creates a new `PresentationBuilder`.
   pub fn new(holder: Url, properties: T) -> Self {
     Self {
-      context: vec![JwtPresentation::<T>::base_context().clone()],
+      context: vec![Presentation::<T>::base_context().clone()],
       id: None,
-      types: vec![JwtPresentation::<T>::base_type().into()],
+      types: vec![Presentation::<T>::base_type().into()],
       credentials: Vec::new(),
       holder,
       refresh_service: Vec::new(),
@@ -83,12 +83,12 @@ impl<CRED, T> JwtPresentationBuilder<CRED, T> {
   }
 
   /// Returns a new `Presentation` based on the `PresentationBuilder` configuration.
-  pub fn build(self) -> Result<JwtPresentation<CRED, T>> {
-    JwtPresentation::from_builder(self)
+  pub fn build(self) -> Result<Presentation<CRED, T>> {
+    Presentation::from_builder(self)
   }
 }
 
-impl JwtPresentationBuilder<Object> {
+impl PresentationBuilder<Object> {
   /// Adds a new custom property.
   #[must_use]
   pub fn property<K, V>(mut self, key: K, value: V) -> Self
@@ -128,8 +128,8 @@ mod tests {
   use crate::credential::CredentialBuilder;
   use crate::credential::Jwt;
   use crate::credential::Subject;
-  use crate::presentation::JwtPresentation;
-  use crate::presentation::JwtPresentationBuilder;
+  use crate::presentation::Presentation;
+  use crate::presentation::PresentationBuilder;
 
   fn subject() -> Subject {
     let json: Value = json!({
@@ -158,23 +158,19 @@ mod tests {
 
     let credential_jwt = Jwt::new(credential.serialize_jwt().unwrap());
 
-    let presentation: JwtPresentation<Jwt> =
-      JwtPresentationBuilder::new(Url::parse("did:test:abc1").unwrap(), Object::new())
-        .type_("ExamplePresentation")
-        .credential(credential_jwt)
-        .build()
-        .unwrap();
+    let presentation: Presentation<Jwt> = PresentationBuilder::new(Url::parse("did:test:abc1").unwrap(), Object::new())
+      .type_("ExamplePresentation")
+      .credential(credential_jwt)
+      .build()
+      .unwrap();
 
     assert_eq!(presentation.context.len(), 1);
     assert_eq!(
       presentation.context.get(0).unwrap(),
-      JwtPresentation::<Object>::base_context()
+      Presentation::<Object>::base_context()
     );
     assert_eq!(presentation.types.len(), 2);
-    assert_eq!(
-      presentation.types.get(0).unwrap(),
-      JwtPresentation::<Object>::base_type()
-    );
+    assert_eq!(presentation.types.get(0).unwrap(), Presentation::<Object>::base_type());
     assert_eq!(presentation.types.get(1).unwrap(), "ExamplePresentation");
     assert_eq!(presentation.verifiable_credential.len(), 1);
   }
diff --git a/identity_credential/src/validator/vc_jwt_validation/error.rs b/identity_credential/src/validator/vc_jwt_validation/error.rs
index b293cbfacc..d98adf37bf 100644
--- a/identity_credential/src/validator/vc_jwt_validation/error.rs
+++ b/identity_credential/src/validator/vc_jwt_validation/error.rs
@@ -80,7 +80,7 @@ pub enum ValidationError {
   /// correct.
   #[error("the credential's structure is not semantically correct")]
   CredentialStructure(#[source] crate::Error),
-  /// Indicates that the structure of the [JwtPresentation](crate::presentation::JwtPresentation) is not
+  /// Indicates that the structure of the [Presentation](crate::presentation::Presentation) is not
   /// semantically correct.
   #[error("the presentation's structure is not semantically correct")]
   PresentationStructure(#[source] crate::Error),
diff --git a/identity_credential/src/validator/vp_jwt_validation/decoded_jwt_presentation.rs b/identity_credential/src/validator/vp_jwt_validation/decoded_jwt_presentation.rs
index 263a353049..027c62ae2d 100644
--- a/identity_credential/src/validator/vp_jwt_validation/decoded_jwt_presentation.rs
+++ b/identity_credential/src/validator/vp_jwt_validation/decoded_jwt_presentation.rs
@@ -6,9 +6,9 @@ use identity_core::common::Timestamp;
 use identity_core::common::Url;
 use identity_verification::jws::JwsHeader;
 
-use crate::presentation::JwtPresentation;
+use crate::presentation::Presentation;
 
-/// Decoded [`JwtPresentation`] from a cryptographically verified JWS.
+/// Decoded [`Presentation`] from a cryptographically verified JWS.
 ///
 /// Note that having an instance of this type only means the JWS it was constructed from was verified.
 /// It does not imply anything about a potentially present proof property on the presentation itself.
@@ -16,7 +16,7 @@ use crate::presentation::JwtPresentation;
 #[derive(Debug, Clone)]
 pub struct DecodedJwtPresentation<CRED, T = Object> {
   /// The decoded presentation parsed to the [Verifiable Credentials Data model](https://www.w3.org/TR/vc-data-model/).
-  pub presentation: JwtPresentation<CRED, T>,
+  pub presentation: Presentation<CRED, T>,
   /// The protected header parsed from the JWS.
   pub header: Box<JwsHeader>,
   /// The expiration date parsed from the JWT claims.
diff --git a/identity_credential/src/validator/vp_jwt_validation/error.rs b/identity_credential/src/validator/vp_jwt_validation/error.rs
index 9c8fb5088c..13ecb74154 100644
--- a/identity_credential/src/validator/vp_jwt_validation/error.rs
+++ b/identity_credential/src/validator/vp_jwt_validation/error.rs
@@ -9,7 +9,7 @@ use crate::validator::vc_jwt_validation::CompoundCredentialValidationError;
 use crate::validator::vc_jwt_validation::ValidationError;
 
 #[derive(Debug)]
-/// An error caused by a failure to validate a `JwtPresentation`.
+/// An error caused by a failure to validate a `Presentation`.
 pub struct CompoundJwtPresentationValidationError {
   /// Errors that occurred during validation of individual credentials, mapped by index of their
   /// order in the presentation.
diff --git a/identity_credential/src/validator/vp_jwt_validation/jwt_presentation_validation_options.rs b/identity_credential/src/validator/vp_jwt_validation/jwt_presentation_validation_options.rs
index dd6c4d07af..e8d8b5f5b2 100644
--- a/identity_credential/src/validator/vp_jwt_validation/jwt_presentation_validation_options.rs
+++ b/identity_credential/src/validator/vp_jwt_validation/jwt_presentation_validation_options.rs
@@ -4,7 +4,7 @@
 use identity_core::common::Timestamp;
 use identity_document::verifiable::JwsVerificationOptions;
 
-/// Criteria for validating a [`JwtPresentation`](crate::presentation::JwtPresentation).
+/// Criteria for validating a [`Presentation`](crate::presentation::Presentation).
 #[derive(Debug, Default, Clone, Serialize, Deserialize)]
 #[non_exhaustive]
 #[serde(rename_all = "camelCase")]
diff --git a/identity_credential/src/validator/vp_jwt_validation/jwt_presentation_validator.rs b/identity_credential/src/validator/vp_jwt_validation/jwt_presentation_validator.rs
index a52476d41d..b710b50bcc 100644
--- a/identity_credential/src/validator/vp_jwt_validation/jwt_presentation_validator.rs
+++ b/identity_credential/src/validator/vp_jwt_validation/jwt_presentation_validator.rs
@@ -15,7 +15,7 @@ use identity_verification::jws::JwsVerifier;
 use std::str::FromStr;
 
 use crate::credential::Jwt;
-use crate::presentation::JwtPresentation;
+use crate::presentation::Presentation;
 use crate::presentation::PresentationJwtClaims;
 use crate::validator::vc_jwt_validation::SignerContext;
 use crate::validator::vc_jwt_validation::ValidationError;
@@ -24,7 +24,7 @@ use super::CompoundJwtPresentationValidationError;
 use super::DecodedJwtPresentation;
 use super::JwtPresentationValidationOptions;
 
-/// Struct for validating [`JwtPresentation`].
+/// Struct for validating [`Presentation`].
 #[derive(Debug, Clone)]
 #[non_exhaustive]
 pub struct JwtPresentationValidator<V: JwsVerifier = EdDSAJwsVerifier>(V);
@@ -50,7 +50,7 @@ where
     Self(signature_verifier)
   }
 
-  /// Validates a [`JwtPresentation`].
+  /// Validates a [`Presentation`].
   ///
   /// The following properties are validated according to `options`:
   /// - the JWT can be decoded into a semantically valid presentation.
@@ -162,7 +162,7 @@ where
 
     let aud: Option<Url> = claims.aud.clone();
 
-    let presentation: JwtPresentation<CRED, T> = claims.try_into_presentation().map_err(|err| {
+    let presentation: Presentation<CRED, T> = claims.try_into_presentation().map_err(|err| {
       CompoundJwtPresentationValidationError::one_presentation_error(ValidationError::PresentationStructure(err))
     })?;
 
@@ -204,8 +204,8 @@ impl JwtPresentationValidator {
     Ok(holder)
   }
 
-  /// Validates the semantic structure of the `JwtPresentation`.
-  pub fn check_structure<U>(presentation: &JwtPresentation<U>) -> Result<(), ValidationError> {
+  /// Validates the semantic structure of the `Presentation`.
+  pub fn check_structure<U>(presentation: &Presentation<U>) -> Result<(), ValidationError> {
     presentation
       .check_structure()
       .map_err(ValidationError::PresentationStructure)
diff --git a/identity_storage/src/storage/jwk_document_ext.rs b/identity_storage/src/storage/jwk_document_ext.rs
index 0c39149238..fd719596a4 100644
--- a/identity_storage/src/storage/jwk_document_ext.rs
+++ b/identity_storage/src/storage/jwk_document_ext.rs
@@ -18,8 +18,8 @@ use async_trait::async_trait;
 use identity_credential::credential::Credential;
 use identity_credential::credential::Jws;
 use identity_credential::credential::Jwt;
-use identity_credential::presentation::JwtPresentation;
 use identity_credential::presentation::JwtPresentationOptions;
+use identity_credential::presentation::Presentation;
 use identity_did::DIDUrl;
 use identity_document::document::CoreDocument;
 use identity_verification::jose::jws::CompactJwsEncoder;
@@ -105,7 +105,7 @@ pub trait JwkDocumentExt: private::Sealed {
   /// produced by the corresponding private key backed by the `storage` in accordance with the passed `options`.
   async fn sign_presentation<K, I, CRED, T>(
     &self,
-    presentation: &JwtPresentation<CRED, T>,
+    presentation: &Presentation<CRED, T>,
     storage: &Storage<K, I>,
     fragment: &str,
     signature_options: &JwsSignatureOptions,
@@ -431,7 +431,7 @@ impl JwkDocumentExt for CoreDocument {
 
   async fn sign_presentation<K, I, CRED, T>(
     &self,
-    presentation: &JwtPresentation<CRED, T>,
+    presentation: &Presentation<CRED, T>,
     storage: &Storage<K, I>,
     fragment: &str,
     jws_options: &JwsSignatureOptions,
@@ -558,7 +558,7 @@ mod iota_document {
     }
     async fn sign_presentation<K, I, CRED, T>(
       &self,
-      presentation: &JwtPresentation<CRED, T>,
+      presentation: &Presentation<CRED, T>,
       storage: &Storage<K, I>,
       fragment: &str,
       options: &JwsSignatureOptions,
diff --git a/identity_storage/src/storage/tests/presentation_validation.rs b/identity_storage/src/storage/tests/presentation_validation.rs
index ae90f20af7..d0da672610 100644
--- a/identity_storage/src/storage/tests/presentation_validation.rs
+++ b/identity_storage/src/storage/tests/presentation_validation.rs
@@ -8,9 +8,9 @@ use identity_core::common::Url;
 use identity_core::convert::FromJson;
 use identity_credential::credential::Credential;
 use identity_credential::credential::Jwt;
-use identity_credential::presentation::JwtPresentation;
-use identity_credential::presentation::JwtPresentationBuilder;
 use identity_credential::presentation::JwtPresentationOptions;
+use identity_credential::presentation::Presentation;
+use identity_credential::presentation::PresentationBuilder;
 use identity_credential::validator::DecodedJwtPresentation;
 use identity_credential::validator::JwtPresentationValidationOptions;
 use identity_credential::validator::JwtPresentationValidator;
@@ -45,8 +45,8 @@ where
   let credential: CredentialSetup = generate_credential(&setup.issuer_doc, &[&setup.subject_doc], None, None);
   let jws = sign_credential(&setup, &credential.credential).await;
 
-  let presentation: JwtPresentation<Jwt> =
-    JwtPresentationBuilder::new(setup.subject_doc.as_ref().id().to_url().into(), Object::new())
+  let presentation: Presentation<Jwt> =
+    PresentationBuilder::new(setup.subject_doc.as_ref().id().to_url().into(), Object::new())
       .credential(jws)
       .build()
       .unwrap();
@@ -102,8 +102,8 @@ where
   let jws = sign_credential(&setup, &credential.credential).await;
   let jws_2 = sign_credential(&setup, &credential_2.credential).await;
 
-  let presentation: JwtPresentation<Jwt> =
-    JwtPresentationBuilder::new(setup.subject_doc.as_ref().id().to_url().into(), Object::new())
+  let presentation: Presentation<Jwt> =
+    PresentationBuilder::new(setup.subject_doc.as_ref().id().to_url().into(), Object::new())
       .credential(jws.clone())
       .credential(jws_2.clone())
       .build()
@@ -160,8 +160,8 @@ where
   let credential: CredentialSetup = generate_credential(&setup.issuer_doc, &[&setup.subject_doc], None, None);
   let jws = sign_credential(&setup, &credential.credential).await;
 
-  let presentation: JwtPresentation<Jwt> =
-    JwtPresentationBuilder::new(setup.subject_doc.as_ref().id().to_url().into(), Object::new())
+  let presentation: Presentation<Jwt> =
+    PresentationBuilder::new(setup.subject_doc.as_ref().id().to_url().into(), Object::new())
       .credential(jws)
       .build()
       .unwrap();
@@ -241,8 +241,8 @@ where
   let credential: CredentialSetup = generate_credential(&setup.issuer_doc, &[&setup.subject_doc], None, None);
   let jws = sign_credential(&setup, &credential.credential).await;
 
-  let presentation: JwtPresentation<Jwt> =
-    JwtPresentationBuilder::new(setup.subject_doc.as_ref().id().to_url().into(), Object::new())
+  let presentation: Presentation<Jwt> =
+    PresentationBuilder::new(setup.subject_doc.as_ref().id().to_url().into(), Object::new())
       .credential(jws)
       .build()
       .unwrap();
@@ -306,8 +306,8 @@ where
   let credential: CredentialSetup = generate_credential(&setup.issuer_doc, &[&setup.subject_doc], None, None);
   let jws = sign_credential(&setup, &credential.credential).await;
 
-  let presentation: JwtPresentation<Jwt> =
-    JwtPresentationBuilder::new(setup.subject_doc.as_ref().id().to_url().into(), Object::new())
+  let presentation: Presentation<Jwt> =
+    PresentationBuilder::new(setup.subject_doc.as_ref().id().to_url().into(), Object::new())
       .credential(jws)
       .build()
       .unwrap();
@@ -371,8 +371,8 @@ where
   let credential: CredentialSetup = generate_credential(&setup.issuer_doc, &[&setup.subject_doc], None, None);
   let jws = sign_credential(&setup, &credential.credential).await;
 
-  let presentation: JwtPresentation<Jwt> =
-    JwtPresentationBuilder::new(setup.subject_doc.as_ref().id().to_url().into(), Object::new())
+  let presentation: Presentation<Jwt> =
+    PresentationBuilder::new(setup.subject_doc.as_ref().id().to_url().into(), Object::new())
       .credential(jws)
       .build()
       .unwrap();