diff --git a/packages/subgraph-service/contracts/DisputeManager.sol b/packages/subgraph-service/contracts/DisputeManager.sol
index a0019edfd..25b37e41b 100644
--- a/packages/subgraph-service/contracts/DisputeManager.sol
+++ b/packages/subgraph-service/contracts/DisputeManager.sol
@@ -104,18 +104,18 @@ contract DisputeManager is
     /// @inheritdoc IDisputeManager
     function initialize(
         address owner,
-        address arbitrator,
-        uint64 disputePeriod,
-        uint256 disputeDeposit,
+        address arbitrator_,
+        uint64 disputePeriod_,
+        uint256 disputeDeposit_,
         uint32 fishermanRewardCut_,
         uint32 maxSlashingCut_
     ) external override initializer {
         __Ownable_init(owner);
         __AttestationManager_init();
 
-        _setArbitrator(arbitrator);
-        _setDisputePeriod(disputePeriod);
-        _setDisputeDeposit(disputeDeposit);
+        _setArbitrator(arbitrator_);
+        _setDisputePeriod(disputePeriod_);
+        _setDisputeDeposit(disputeDeposit_);
         _setFishermanRewardCut(fishermanRewardCut_);
         _setMaxSlashingCut(maxSlashingCut_);
     }
@@ -320,8 +320,8 @@ contract DisputeManager is
     }
 
     /// @inheritdoc IDisputeManager
-    function setSubgraphService(address subgraphService) external override onlyOwner {
-        _setSubgraphService(subgraphService);
+    function setSubgraphService(address subgraphService_) external override onlyOwner {
+        _setSubgraphService(subgraphService_);
     }
 
     /// @inheritdoc IDisputeManager
diff --git a/packages/subgraph-service/contracts/SubgraphService.sol b/packages/subgraph-service/contracts/SubgraphService.sol
index 80f5102b1..f6cee7d7e 100644
--- a/packages/subgraph-service/contracts/SubgraphService.sol
+++ b/packages/subgraph-service/contracts/SubgraphService.sol
@@ -77,7 +77,7 @@ contract SubgraphService is
         address owner,
         uint256 minimumProvisionTokens,
         uint32 maximumDelegationRatio,
-        uint256 stakeToFeesRatio
+        uint256 stakeToFeesRatio_
     ) external initializer {
         __Ownable_init(owner);
         __Multicall_init();
@@ -87,7 +87,7 @@ contract SubgraphService is
 
         _setProvisionTokensRange(minimumProvisionTokens, type(uint256).max);
         _setDelegationRatio(maximumDelegationRatio);
-        _setStakeToFeesRatio(stakeToFeesRatio);
+        _setStakeToFeesRatio(stakeToFeesRatio_);
     }
 
     /**
@@ -113,7 +113,7 @@ contract SubgraphService is
         address indexer,
         bytes calldata data
     ) external override onlyAuthorizedForProvision(indexer) onlyValidProvision(indexer) whenNotPaused {
-        (string memory url, string memory geohash, address rewardsDestination) = abi.decode(
+        (string memory url, string memory geohash, address rewardsDestination_) = abi.decode(
             data,
             (string, string, address)
         );
@@ -124,8 +124,8 @@ contract SubgraphService is
 
         // Register the indexer
         indexers[indexer] = Indexer({ registeredAt: block.timestamp, url: url, geoHash: geohash });
-        if (rewardsDestination != address(0)) {
-            _setRewardsDestination(indexer, rewardsDestination);
+        if (rewardsDestination_ != address(0)) {
+            _setRewardsDestination(indexer, rewardsDestination_);
         }
 
         emit ServiceProviderRegistered(indexer, data);
@@ -345,8 +345,8 @@ contract SubgraphService is
     }
 
     /// @inheritdoc ISubgraphService
-    function setRewardsDestination(address rewardsDestination) external override {
-        _setRewardsDestination(msg.sender, rewardsDestination);
+    function setRewardsDestination(address rewardsDestination_) external override {
+        _setRewardsDestination(msg.sender, rewardsDestination_);
     }
 
     /// @inheritdoc ISubgraphService
@@ -365,8 +365,8 @@ contract SubgraphService is
     }
 
     /// @inheritdoc ISubgraphService
-    function setMaxPOIStaleness(uint256 maxPOIStaleness) external override onlyOwner {
-        _setMaxPOIStaleness(maxPOIStaleness);
+    function setMaxPOIStaleness(uint256 maxPOIStaleness_) external override onlyOwner {
+        _setMaxPOIStaleness(maxPOIStaleness_);
     }
 
     /// @inheritdoc ISubgraphService