diff --git a/solidity/contracts/Oracle.sol b/solidity/contracts/Oracle.sol
index 9283cb9..b761a4e 100644
--- a/solidity/contracts/Oracle.sol
+++ b/solidity/contracts/Oracle.sol
@@ -20,13 +20,13 @@ contract Oracle is IOracle, OracleAccessController {
   mapping(bytes32 _requestId => uint256 _finalizedAt) public finalizedAt;
 
   /// @inheritdoc IOracle
-  mapping(bytes32 _id => uint256 _requestCreatedAt) public requestCreatedAt;
+  mapping(bytes32 _requestId => uint256 _requestCreatedAt) public requestCreatedAt;
 
   /// @inheritdoc IOracle
-  mapping(bytes32 _id => uint256 _responseCreatedAt) public responseCreatedAt;
+  mapping(bytes32 _responseId => uint256 _responseCreatedAt) public responseCreatedAt;
 
   /// @inheritdoc IOracle
-  mapping(bytes32 _id => uint256 _disputeCreatedAt) public disputeCreatedAt;
+  mapping(bytes32 _disputeId => uint256 _disputeCreatedAt) public disputeCreatedAt;
 
   /// @inheritdoc IOracle
   mapping(bytes32 _responseId => bytes32 _disputeId) public disputeOf;
@@ -35,7 +35,7 @@ contract Oracle is IOracle, OracleAccessController {
   mapping(bytes32 _disputeId => DisputeStatus _status) public disputeStatus;
 
   /// @inheritdoc IOracle
-  mapping(uint256 _requestNumber => bytes32 _id) public nonceToRequestId;
+  mapping(uint256 _nonce => bytes32 _requestId) public nonceToRequestId;
 
   /// @inheritdoc IOracle
   mapping(bytes32 _requestId => bytes32 _finalizedResponseId) public finalizedResponseId;