diff --git a/contracts/src/core/MachServiceManager.sol b/contracts/src/core/MachServiceManager.sol
index e1e1a58..8cf20f7 100644
--- a/contracts/src/core/MachServiceManager.sol
+++ b/contracts/src/core/MachServiceManager.sol
@@ -62,11 +62,11 @@ contract MachServiceManager is
         IAVSDirectory __avsDirectory,
         IRegistryCoordinator __registryCoordinator,
         IStakeRegistry __stakeRegistry,
-        uint256 __chainId
+        uint256 __rollupChainId
     )
         BLSSignatureChecker(__registryCoordinator)
         ServiceManagerBase(__avsDirectory, __registryCoordinator, __stakeRegistry)
-        MachServiceManagerStorage(__chainId)
+        MachServiceManagerStorage(__rollupChainId)
     {
         _disableInitializers();
     }
diff --git a/contracts/src/core/MachServiceManagerStorage.sol b/contracts/src/core/MachServiceManagerStorage.sol
index 5f657f9..c1a2da5 100644
--- a/contracts/src/core/MachServiceManagerStorage.sol
+++ b/contracts/src/core/MachServiceManagerStorage.sol
@@ -15,7 +15,7 @@ abstract contract MachServiceManagerStorage {
     uint256 public constant THRESHOLD_DENOMINATOR = 100;
 
     /// @notice Rollup chain id, it is different from block.chainid
-    uint256 public immutable chainId;
+    uint256 public immutable rollupChainId;
 
     EnumerableSet.Bytes32Set internal _messageHashes;
 
@@ -38,7 +38,7 @@ abstract contract MachServiceManagerStorage {
     // slither-disable-next-line shadowing-state
     uint256[46] private __GAP;
 
-    constructor(uint256 _chainId) {
-        chainId = _chainId;
+    constructor(uint256 _rollupChainId) {
+        rollupChainId = _rollupChainId;
     }
 }