diff --git a/onchain/src/social/deposit.cairo b/onchain/src/social/deposit.cairo
index 3bdb9846..69f95120 100644
--- a/onchain/src/social/deposit.cairo
+++ b/onchain/src/social/deposit.cairo
@@ -84,7 +84,7 @@ pub mod DepositEscrow {
         #[key]
         sender: ContractAddress,
         #[key]
-        recipient: NostrPublicKey,
+        nostr_recipient: NostrPublicKey,
         #[key]
         starknet_recipient: ContractAddress,
         amount: u256,
@@ -98,7 +98,7 @@ pub mod DepositEscrow {
         #[key]
         sender: ContractAddress,
         #[key]
-        recipient: NostrPublicKey,
+        nostr_recipient: NostrPublicKey,
         amount: u256,
         token_address: ContractAddress,
     }
@@ -110,9 +110,7 @@ pub mod DepositEscrow {
         #[key]
         sender: ContractAddress,
         #[key]
-        recipient: NostrPublicKey,
-        #[key]
-        starknet_recipient: ContractAddress,
+        nostr_recipient: NostrPublicKey,
         amount: u256,
         token_address: ContractAddress,
     }
@@ -197,7 +195,7 @@ pub mod DepositEscrow {
                     DepositEvent {
                         deposit_id,
                         sender: get_caller_address(),
-                        recipient: nostr_recipient,
+                        nostr_recipient,
                         amount: amount,
                         token_address: token_address
                     }
@@ -223,9 +221,8 @@ pub mod DepositEscrow {
                     CancelEvent {
                         deposit_id,
                         sender: get_caller_address(),
-                        recipient: deposit.recipient,
+                        nostr_recipient: deposit.recipient,
                         amount: deposit.amount,
-                        starknet_recipient: get_caller_address(),
                         token_address: deposit.token_address
                     }
                 );
@@ -248,7 +245,7 @@ pub mod DepositEscrow {
                     ClaimEvent {
                         deposit_id,
                         sender: get_caller_address(),
-                        recipient: request.public_key,
+                        nostr_recipient: request.public_key,
                         amount: deposit.amount,
                         starknet_recipient: get_caller_address(),
                         token_address: deposit.token_address