@0x:contracts-staking Addressed review comments

contracts/staking/contracts/src/Staking.sol

@@ -383,6 +383,14 @@ contract Staking is
                 slot,
                 offset
             )
+            slot := add(slot, 0x1)
+
+            assertSlotAndOffset(
+                _wethReservedForPoolRewards_slot,
+                _wethReservedForPoolRewards_offset,
+                slot,
+                offset
+            )
 
             // This assembly function will assert that the actual values for `_slot` and `_offset` are
             // correct and will revert with a rich error if they are different than the expected values.

contracts/staking/contracts/src/interfaces/IZrxVault.sol

@@ -31,7 +31,7 @@ interface IZrxVault {
     /// @dev Emitted when Zrx Tokens are deposited into the vault.
     /// @param owner of Zrx Tokens.
     /// @param amount of Zrx Tokens deposited.
-    event ZrxDepositedIntoVault(
+    event Deposit(
         address indexed owner,
         uint256 amount
     );
@@ -39,7 +39,7 @@ interface IZrxVault {
     /// @dev Emitted when Zrx Tokens are withdrawn from the vault.
     /// @param owner of Zrx Tokens.
     /// @param amount of Zrx Tokens withdrawn.
-    event ZrxWithdrawnFromVault(
+    event Withdraw(
         address indexed owner,
         uint256 amount
     );

contracts/staking/contracts/src/vaults/ZrxVault.sol

@@ -96,7 +96,7 @@ contract ZrxVault is
         _balances[owner] = _balances[owner].safeAdd(amount);
 
         // notify
-        emit ZrxDepositedIntoVault(owner, amount);
+        emit Deposit(owner, amount);
 
         // deposit ZRX from owner
         zrxAssetProxy.transferFrom(
@@ -158,7 +158,7 @@ contract ZrxVault is
         _balances[owner] = _balances[owner].safeSub(amount);
 
         // notify
-        emit ZrxWithdrawnFromVault(owner, amount);
+        emit Withdraw(owner, amount);
 
         // withdraw ZRX to owner
         _zrxToken.transfer(