diff --git a/protocol-contracts/staking/contracts/OperatorRewarder.sol b/protocol-contracts/staking/contracts/OperatorRewarder.sol
index 7fc9d1df19..99bbb97bbf 100644
--- a/protocol-contracts/staking/contracts/OperatorRewarder.sol
+++ b/protocol-contracts/staking/contracts/OperatorRewarder.sol
@@ -32,8 +32,8 @@ contract OperatorRewarder {
     uint256 private _lastClaimTotalAssetsPlusPaidRewards;
     uint256 private _totalRewardsPaid;
     int256 private _totalVirtualRewardsPaid;
-    mapping(address => int256) private _rewardsPaid;
-    mapping(address => address) private _authorizedClaimers;
+    mapping(address account => int256 rewardsPaid) private _rewardsPaid;
+    mapping(address receiver => address claimer) private _authorizedClaimers;
 
     /// @notice Emitted when the beneficiary is transferred.
     event BeneficiaryTransferred(address oldBeneficiary, address newBeneficiary);
diff --git a/protocol-contracts/staking/contracts/OperatorStaking.sol b/protocol-contracts/staking/contracts/OperatorStaking.sol
index 2f047261d3..227414e55c 100644
--- a/protocol-contracts/staking/contracts/OperatorStaking.sol
+++ b/protocol-contracts/staking/contracts/OperatorStaking.sol
@@ -38,9 +38,9 @@ contract OperatorStaking is ERC1363Upgradeable, ReentrancyGuardTransient, UUPSUp
         IERC20 _asset;
         address _rewarder;
         uint256 _totalSharesInRedemption;
-        mapping(address => uint256) _sharesReleased;
-        mapping(address => Checkpoints.Trace208) _redeemRequests;
-        mapping(address => mapping(address => bool)) _operator;
+        mapping(address controller => uint256 sharesReleased) _sharesReleased;
+        mapping(address controller => Checkpoints.Trace208 redeemRequests) _redeemRequests;
+        mapping(address controller => mapping(address operator => bool approved)) _operator;
     }
 
     // keccak256(abi.encode(uint256(keccak256("fhevm_protocol.storage.OperatorStaking")) - 1)) & ~bytes32(uint256(0xff))