diff --git a/package-lock.json b/package-lock.json
index d5bc01a2..8702b364 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@0xpolygonid/js-sdk",
-  "version": "1.16.1",
+  "version": "1.17.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@0xpolygonid/js-sdk",
-      "version": "1.16.1",
+      "version": "1.17.0",
       "license": "MIT or Apache-2.0",
       "dependencies": {
         "@noble/curves": "^1.4.0",
diff --git a/package.json b/package.json
index 4a36d3d0..31ec152b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0xpolygonid/js-sdk",
-  "version": "1.16.1",
+  "version": "1.17.0",
   "description": "SDK to work with Polygon ID",
   "main": "dist/node/cjs/index.js",
   "module": "dist/node/esm/index.js",
diff --git a/src/iden3comm/handlers/message-handler.ts b/src/iden3comm/handlers/message-handler.ts
index 0a608841..69ab8ce1 100644
--- a/src/iden3comm/handlers/message-handler.ts
+++ b/src/iden3comm/handlers/message-handler.ts
@@ -123,7 +123,7 @@ export class MessageHandler {
       | RevocationStatusMessageHandlerOptions
       | PaymentRequestMessageHandlerOptions
       | PaymentHandlerOptions
-      | { senderDID?: DID; [key: string]: unknown }
+      | { senderDid?: DID; [key: string]: unknown }
   ): Promise<Uint8Array | null> {
     const { unpackedMediaType, unpackedMessage: message } =
       await this._params.packageManager.unpack(bytes);
@@ -139,10 +139,10 @@ export class MessageHandler {
     }
 
     let packerParams = {};
-    const senderDID = (context as { senderDID?: DID })?.senderDID;
-    if (unpackedMediaType === MediaType.ZKPMessage && senderDID) {
+    const senderDid = (context as { senderDid?: DID })?.senderDid;
+    if (unpackedMediaType === MediaType.ZKPMessage && senderDid) {
       packerParams = {
-        senderDID,
+        senderDID: senderDid,
         provingMethodAlg: proving.provingMethodGroth16AuthV2Instance.methodAlg
       };
       return this._params.packageManager.packMessage(unpackedMediaType, response, packerParams);
diff --git a/src/iden3comm/handlers/revocation-status.ts b/src/iden3comm/handlers/revocation-status.ts
index 69fb15a0..c1c40402 100644
--- a/src/iden3comm/handlers/revocation-status.ts
+++ b/src/iden3comm/handlers/revocation-status.ts
@@ -19,13 +19,13 @@ import { AbstractMessageHandler, IProtocolMessageHandler } from './message-handl
 
 /**
  * Defines the options for a RevocationStatusMessageHandler.
- * @property did - The DID (Decentralized Identifier) to be used.
+ * @property senderDid - The DID (Decentralized Identifier) to be used.
  * @property mediaType - The media type to be used.
  * @property packerOptions - Optional parameters for the JWS packer.
  * @property treeState - Optional tree state to be used.
  */
 export type RevocationStatusMessageHandlerOptions = {
-  did: DID;
+  senderDid: DID;
   mediaType: MediaType;
   packerOptions?: JWSPackerParams;
   treeState?: TreeState;
@@ -94,7 +94,7 @@ export class RevocationStatusHandler
     message: BasicMessage,
     context: RevocationStatusMessageHandlerOptions
   ): Promise<BasicMessage | null> {
-    if (!context.did) {
+    if (!context.senderDid) {
       throw new Error('DID is required');
     }
 
@@ -155,7 +155,7 @@ export class RevocationStatusHandler
       type: PROTOCOL_MESSAGE_TYPE.REVOCATION_STATUS_RESPONSE_MESSAGE_TYPE,
       thid: rsRequest.thid ?? guid,
       body: revStatus,
-      from: context.did.string(),
+      from: context.senderDid.string(),
       to: rsRequest.from
     };
 
@@ -195,7 +195,7 @@ export class RevocationStatusHandler
     const rsRequest = await this.parseRevocationStatusRequest(request);
 
     const response = await this.handleRevocationStatusRequestMessage(rsRequest, {
-      did,
+      senderDid: did,
       mediaType: opts.mediaType,
       packerOptions: opts.packerOptions,
       treeState: opts.treeState