diff --git a/contracts/protocol/switchboard/EVMxSwitchboard.sol b/contracts/protocol/switchboard/EVMxSwitchboard.sol
index f9e4cfc6..506fb0da 100644
--- a/contracts/protocol/switchboard/EVMxSwitchboard.sol
+++ b/contracts/protocol/switchboard/EVMxSwitchboard.sol
@@ -16,7 +16,7 @@ contract EVMxSwitchboard is SwitchboardBase {
     uint32 public immutable evmxChainSlug;
 
     /// @notice EVMX watcher set ID for payload verification
-    uint32 public immutable watcherSetId;
+    uint32 public immutable evmxWatcherSetId;
 
     /// @notice Transmitter address for payload execution
     address public transmitter;
@@ -54,7 +54,7 @@ contract EVMxSwitchboard is SwitchboardBase {
     event PlugConfigUpdated(address indexed plug, bytes32 appGatewayId);
 
     /// @notice Event emitted when EVMX config is set
-    event EvmxConfigSet(uint32 evmxChainSlug, uint32 watcherSetId);
+    event EvmxConfigSet(uint32 evmxChainSlug, uint32 evmxWatcherSetId);
 
     /// @notice Event emitted when payload is requested
     event PayloadRequested(
@@ -73,11 +73,11 @@ contract EVMxSwitchboard is SwitchboardBase {
         address owner_,
         address transmitter_,
         uint32 evmxChainSlug_,
-        uint32 watcherSetId_
+        uint32 evmxWatcherSetId_
     ) SwitchboardBase(chainSlug_, socket_, owner_) {
         transmitter = transmitter_;
         evmxChainSlug = evmxChainSlug_;
-        watcherSetId = watcherSetId_;
+        evmxWatcherSetId = evmxWatcherSetId_;
     }
 
     // --- External Functions ---
@@ -151,7 +151,7 @@ contract EVMxSwitchboard is SwitchboardBase {
             chainSlug,
             switchboardId,
             evmxChainSlug,
-            watcherSetId,
+            evmxWatcherSetId,
             payloadCounter++
         );
         DigestParams memory digestParams = DigestParams({