1 files changed, 18 insertions, 10 deletions

diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinTransactions.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinTransactions.sol
index f1332363c..d3d22d48f 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinTransactions.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinTransactions.sol
@@ -41,17 +41,17 @@ contract MixinTransactions is
     bytes32 constant EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH = keccak256(abi.encodePacked(
         "ZeroExTransaction(",
         "uint256 salt,",
-        "address signer,",
+        "address signerAddress,",
         "bytes data",
         ")"
     ));
 
     /// @dev Calculates EIP712 hash of the Transaction.
     /// @param salt Arbitrary number to ensure uniqueness of transaction hash.
-    /// @param signer Address of transaction signer.
+    /// @param signerAddress Address of transaction signer.
     /// @param data AbiV2 encoded calldata.
     /// @return EIP712 hash of the Transaction.
-    function hashZeroExTransaction(uint256 salt, address signer, bytes data)
+    function hashZeroExTransaction(uint256 salt, address signerAddress, bytes data)
         internal
         pure
         returns (bytes32)
@@ -59,19 +59,19 @@ contract MixinTransactions is
         return keccak256(abi.encode(
             EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH,
             salt,
-            signer,
+            signerAddress,
             keccak256(data)
         ));
     }
 
     /// @dev Executes an exchange method call in the context of signer.
     /// @param salt Arbitrary number to ensure uniqueness of transaction hash.
-    /// @param signer Address of transaction signer.
+    /// @param signerAddress Address of transaction signer.
     /// @param data AbiV2 encoded calldata.
     /// @param signature Proof of signer transaction by signer.
     function executeTransaction(
         uint256 salt,
-        address signer,
+        address signerAddress,
         bytes data,
         bytes signature
     )
@@ -83,7 +83,11 @@ contract MixinTransactions is
             REENTRANCY_ILLEGAL
         );
 
-        bytes32 transactionHash = hashEIP712Message(hashZeroExTransaction(salt, signer, data));
+        bytes32 transactionHash = hashEIP712Message(hashZeroExTransaction(
+            salt,
+            signerAddress,
+            data
+        ));
 
         // Validate transaction has not been executed
         require(
@@ -92,15 +96,19 @@ contract MixinTransactions is
         );
 
         // Transaction always valid if signer is sender of transaction
-        if (signer != msg.sender) {
+        if (signerAddress != msg.sender) {
             // Validate signature
             require(
-                isValidSignature(transactionHash, signer, signature),
+                isValidSignature(
+                    transactionHash,
+                    signerAddress,
+                    signature
+                ),
                 INVALID_TX_SIGNATURE
             );
 
             // Set the current transaction signer
-            currentContextAddress = signer;
+            currentContextAddress = signerAddress;
         }
 
         // Execute transaction