diff --git a/v2/test/GatewayEVM.t.sol b/v2/test/GatewayEVM.t.sol
index fa15df2b..cbd20e04 100644
--- a/v2/test/GatewayEVM.t.sol
+++ b/v2/test/GatewayEVM.t.sol
@@ -596,7 +596,7 @@ contract GatewayEVMInboundTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IR
         token.approve(address(gateway), amount);
 
         vm.expectEmit(true, true, true, true, address(gateway));
-        emit Deposited(owner, destination, amount, address(token), payload, revertOptions);
+        emit DepositedAndCalled(owner, destination, amount, address(token), payload, revertOptions);
         gateway.depositAndCall(destination, amount, address(token), payload, revertOptions);
 
         uint256 custodyBalanceAfter = token.balanceOf(address(custody));
@@ -630,7 +630,7 @@ contract GatewayEVMInboundTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IR
         bytes memory payload = abi.encodeWithSignature("hello(address)", destination);
 
         vm.expectEmit(true, true, true, true, address(gateway));
-        emit Deposited(owner, destination, amount, address(0), payload, revertOptions);
+        emit DepositedAndCalled(owner, destination, amount, address(0), payload, revertOptions);
         gateway.depositAndCall{ value: amount }(destination, payload, revertOptions);
 
         uint256 tssBalanceAfter = tssAddress.balance;
diff --git a/v2/test/GatewayEVMZEVM.t.sol b/v2/test/GatewayEVMZEVM.t.sol
index f8950f65..bcad00f7 100644
--- a/v2/test/GatewayEVMZEVM.t.sol
+++ b/v2/test/GatewayEVMZEVM.t.sol
@@ -209,7 +209,7 @@ contract GatewayEVMZEVMTest is
         bytes memory message = abi.encodeWithSelector(receiverEVM.receivePayable.selector, str, num, flag);
         uint256 expectedGasFee = 1;
         vm.expectEmit(true, true, true, true, address(gatewayZEVM));
-        emit Withdrawn(
+        emit WithdrawnAndCalled(
             ownerZEVM,
             0,
             abi.encodePacked(receiverEVM),
diff --git a/v2/test/GatewayZEVM.t.sol b/v2/test/GatewayZEVM.t.sol
index 171b6fc8..30be7ab5 100644
--- a/v2/test/GatewayZEVM.t.sol
+++ b/v2/test/GatewayZEVM.t.sol
@@ -253,7 +253,7 @@ contract GatewayZEVMInboundTest is Test, IGatewayZEVMEvents, IGatewayZEVMErrors
         uint256 expectedGasFee = 1;
         uint256 gasLimit = 1;
         vm.expectEmit(true, true, true, true, address(gateway));
-        emit Withdrawn(
+        emit WithdrawnAndCalled(
             owner,
             0,
             abi.encodePacked(addr1),
@@ -329,7 +329,7 @@ contract GatewayZEVMInboundTest is Test, IGatewayZEVMEvents, IGatewayZEVMErrors
         uint256 expectedGasFee = 1;
         uint256 gasLimit = 1;
         vm.expectEmit(true, true, true, true, address(gateway));
-        emit Withdrawn(
+        emit WithdrawnAndCalled(
             owner,
             0,
             abi.encodePacked(addr1),