Merge pull request #822 from 0xProject/v2-contract-wrappers-WIP

V2 contract wrappers

14 files changed, 68 insertions, 66 deletions

diff --git a/packages/contracts/test/asset_proxy/proxies.ts b/packages/contracts/test/asset_proxy/proxies.ts
index bf9f9bc3e..e1167b156 100644
--- a/packages/contracts/test/asset_proxy/proxies.ts
+++ b/packages/contracts/test/asset_proxy/proxies.ts
@@ -7,14 +7,14 @@ import { LogWithDecodedArgs } from 'ethereum-types';
 import ethUtil = require('ethereumjs-util');
 import * as _ from 'lodash';
 
-import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c20_token';
+import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_erc20_token';
 import {
     DummyERC721ReceiverContract,
-    TokenReceivedContractEventArgs,
-} from '../../generated_contract_wrappers/dummy_e_r_c721_receiver';
-import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c721_token';
-import { ERC20ProxyContract } from '../../generated_contract_wrappers/e_r_c20_proxy';
-import { ERC721ProxyContract } from '../../generated_contract_wrappers/e_r_c721_proxy';
+    DummyERC721ReceiverTokenReceivedEventArgs,
+} from '../../generated_contract_wrappers/dummy_erc721_receiver';
+import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_erc721_token';
+import { ERC20ProxyContract } from '../../generated_contract_wrappers/erc20_proxy';
+import { ERC721ProxyContract } from '../../generated_contract_wrappers/erc721_proxy';
 import { IAssetProxyContract } from '../../generated_contract_wrappers/i_asset_proxy';
 import { artifacts } from '../utils/artifacts';
 import { expectTransactionFailedAsync } from '../utils/assertions';
@@ -277,7 +277,7 @@ describe('Asset Transfer Proxies', () => {
                 );
                 // Verify that no log was emitted by erc721 receiver
                 expect(tx.logs.length).to.be.equal(1);
-                const tokenReceivedLog = tx.logs[0] as LogWithDecodedArgs<TokenReceivedContractEventArgs>;
+                const tokenReceivedLog = tx.logs[0] as LogWithDecodedArgs<DummyERC721ReceiverTokenReceivedEventArgs>;
                 expect(tokenReceivedLog.args.from).to.be.equal(makerAddress);
                 expect(tokenReceivedLog.args.tokenId).to.be.bignumber.equal(erc721MakerTokenId);
                 expect(tokenReceivedLog.args.data).to.be.equal(constants.NULL_BYTES);
@@ -316,7 +316,7 @@ describe('Asset Transfer Proxies', () => {
                 );
                 // Validate log emitted by erc721 receiver
                 expect(tx.logs.length).to.be.equal(1);
-                const tokenReceivedLog = tx.logs[0] as LogWithDecodedArgs<TokenReceivedContractEventArgs>;
+                const tokenReceivedLog = tx.logs[0] as LogWithDecodedArgs<DummyERC721ReceiverTokenReceivedEventArgs>;
                 expect(tokenReceivedLog.args.from).to.be.equal(makerAddress);
                 expect(tokenReceivedLog.args.tokenId).to.be.bignumber.equal(erc721MakerTokenId);
                 expect(tokenReceivedLog.args.data).to.be.equal(receiverData);
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts
index 4e70893fc..d9f3851d1 100644
--- a/packages/contracts/test/exchange/core.ts
+++ b/packages/contracts/test/exchange/core.ts
@@ -8,11 +8,11 @@ import { LogWithDecodedArgs } from 'ethereum-types';
 import ethUtil = require('ethereumjs-util');
 import * as _ from 'lodash';
 
-import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c20_token';
-import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c721_token';
-import { ERC20ProxyContract } from '../../generated_contract_wrappers/e_r_c20_proxy';
-import { ERC721ProxyContract } from '../../generated_contract_wrappers/e_r_c721_proxy';
-import { CancelContractEventArgs, ExchangeContract } from '../../generated_contract_wrappers/exchange';
+import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_erc20_token';
+import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_erc721_token';
+import { ERC20ProxyContract } from '../../generated_contract_wrappers/erc20_proxy';
+import { ERC721ProxyContract } from '../../generated_contract_wrappers/erc721_proxy';
+import { ExchangeCancelEventArgs, ExchangeContract } from '../../generated_contract_wrappers/exchange';
 import { artifacts } from '../utils/artifacts';
 import { expectTransactionFailedAsync } from '../utils/assertions';
 import { chaiSetup } from '../utils/chai_setup';
@@ -209,7 +209,7 @@ describe('Exchange core', () => {
             const res = await exchangeWrapper.cancelOrderAsync(signedOrder, makerAddress);
             expect(res.logs).to.have.length(1);
 
-            const log = res.logs[0] as LogWithDecodedArgs<CancelContractEventArgs>;
+            const log = res.logs[0] as LogWithDecodedArgs<ExchangeCancelEventArgs>;
             const logArgs = log.args;
 
             expect(signedOrder.makerAddress).to.be.equal(logArgs.makerAddress);
diff --git a/packages/contracts/test/exchange/dispatcher.ts b/packages/contracts/test/exchange/dispatcher.ts
index 94ada1ef2..11f74d776 100644
--- a/packages/contracts/test/exchange/dispatcher.ts
+++ b/packages/contracts/test/exchange/dispatcher.ts
@@ -6,11 +6,11 @@ import * as chai from 'chai';
 import { LogWithDecodedArgs } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c20_token';
-import { ERC20ProxyContract } from '../../generated_contract_wrappers/e_r_c20_proxy';
-import { ERC721ProxyContract } from '../../generated_contract_wrappers/e_r_c721_proxy';
+import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_erc20_token';
+import { ERC20ProxyContract } from '../../generated_contract_wrappers/erc20_proxy';
+import { ERC721ProxyContract } from '../../generated_contract_wrappers/erc721_proxy';
 import {
-    AssetProxyRegisteredContractEventArgs,
+    TestAssetProxyDispatcherAssetProxyRegisteredEventArgs,
     TestAssetProxyDispatcherContract,
 } from '../../generated_contract_wrappers/test_asset_proxy_dispatcher';
 import { artifacts } from '../utils/artifacts';
@@ -150,7 +150,7 @@ describe('AssetProxyDispatcher', () => {
                 await assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(erc20Proxy.address, { from: owner }),
             );
             const logs = txReceipt.logs;
-            const log = logs[0] as LogWithDecodedArgs<AssetProxyRegisteredContractEventArgs>;
+            const log = logs[0] as LogWithDecodedArgs<TestAssetProxyDispatcherAssetProxyRegisteredEventArgs>;
             expect(log.args.id).to.equal(AssetProxyId.ERC20);
             expect(log.args.assetProxy).to.equal(erc20Proxy.address);
         });
diff --git a/packages/contracts/test/exchange/match_orders.ts b/packages/contracts/test/exchange/match_orders.ts
index 90406415f..16041e968 100644
--- a/packages/contracts/test/exchange/match_orders.ts
+++ b/packages/contracts/test/exchange/match_orders.ts
@@ -6,10 +6,10 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c20_token';
-import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c721_token';
-import { ERC20ProxyContract } from '../../generated_contract_wrappers/e_r_c20_proxy';
-import { ERC721ProxyContract } from '../../generated_contract_wrappers/e_r_c721_proxy';
+import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_erc20_token';
+import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_erc721_token';
+import { ERC20ProxyContract } from '../../generated_contract_wrappers/erc20_proxy';
+import { ERC721ProxyContract } from '../../generated_contract_wrappers/erc721_proxy';
 import { ExchangeContract } from '../../generated_contract_wrappers/exchange';
 import { artifacts } from '../utils/artifacts';
 import { expectTransactionFailedAsync } from '../utils/assertions';
diff --git a/packages/contracts/test/exchange/signature_validator.ts b/packages/contracts/test/exchange/signature_validator.ts
index c44d22479..8cd6409a5 100644
--- a/packages/contracts/test/exchange/signature_validator.ts
+++ b/packages/contracts/test/exchange/signature_validator.ts
@@ -6,8 +6,8 @@ import { LogWithDecodedArgs } from 'ethereum-types';
 import ethUtil = require('ethereumjs-util');
 
 import {
-    SignatureValidatorApprovalContractEventArgs,
     TestSignatureValidatorContract,
+    TestSignatureValidatorSignatureValidatorApprovalEventArgs,
 } from '../../generated_contract_wrappers/test_signature_validator';
 import { TestValidatorContract } from '../../generated_contract_wrappers/test_validator';
 import { TestWalletContract } from '../../generated_contract_wrappers/test_wallet';
@@ -477,7 +477,7 @@ describe('MixinSignatureValidator', () => {
                 ),
             );
             expect(res.logs.length).to.equal(1);
-            const log = res.logs[0] as LogWithDecodedArgs<SignatureValidatorApprovalContractEventArgs>;
+            const log = res.logs[0] as LogWithDecodedArgs<TestSignatureValidatorSignatureValidatorApprovalEventArgs>;
             const logArgs = log.args;
             expect(logArgs.signerAddress).to.equal(signerAddress);
             expect(logArgs.validatorAddress).to.equal(testValidator.address);
@@ -495,7 +495,7 @@ describe('MixinSignatureValidator', () => {
                 ),
             );
             expect(res.logs.length).to.equal(1);
-            const log = res.logs[0] as LogWithDecodedArgs<SignatureValidatorApprovalContractEventArgs>;
+            const log = res.logs[0] as LogWithDecodedArgs<TestSignatureValidatorSignatureValidatorApprovalEventArgs>;
             const logArgs = log.args;
             expect(logArgs.signerAddress).to.equal(signerAddress);
             expect(logArgs.validatorAddress).to.equal(testValidator.address);
diff --git a/packages/contracts/test/exchange/transactions.ts b/packages/contracts/test/exchange/transactions.ts
index 959d79517..0d66b11b8 100644
--- a/packages/contracts/test/exchange/transactions.ts
+++ b/packages/contracts/test/exchange/transactions.ts
@@ -5,8 +5,8 @@ import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c20_token';
-import { ERC20ProxyContract } from '../../generated_contract_wrappers/e_r_c20_proxy';
+import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_erc20_token';
+import { ERC20ProxyContract } from '../../generated_contract_wrappers/erc20_proxy';
 import { ExchangeContract } from '../../generated_contract_wrappers/exchange';
 import { ExchangeWrapperContract } from '../../generated_contract_wrappers/exchange_wrapper';
 import { WhitelistContract } from '../../generated_contract_wrappers/whitelist';
diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts
index 69f374e46..655d55b83 100644
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/packages/contracts/test/exchange/wrapper.ts
@@ -6,10 +6,10 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c20_token';
-import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c721_token';
-import { ERC20ProxyContract } from '../../generated_contract_wrappers/e_r_c20_proxy';
-import { ERC721ProxyContract } from '../../generated_contract_wrappers/e_r_c721_proxy';
+import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_erc20_token';
+import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_erc721_token';
+import { ERC20ProxyContract } from '../../generated_contract_wrappers/erc20_proxy';
+import { ERC721ProxyContract } from '../../generated_contract_wrappers/erc721_proxy';
 import { ExchangeContract } from '../../generated_contract_wrappers/exchange';
 import { artifacts } from '../utils/artifacts';
 import { expectTransactionFailedAsync } from '../utils/assertions';
diff --git a/packages/contracts/test/multisig/asset_proxy_owner.ts b/packages/contracts/test/multisig/asset_proxy_owner.ts
index 16231dfcb..10fed6815 100644
--- a/packages/contracts/test/multisig/asset_proxy_owner.ts
+++ b/packages/contracts/test/multisig/asset_proxy_owner.ts
@@ -4,11 +4,11 @@ import * as chai from 'chai';
 import { LogWithDecodedArgs } from 'ethereum-types';
 
 import {
+    AssetProxyOwnerAssetProxyRegistrationEventArgs,
     AssetProxyOwnerContract,
-    AssetProxyRegistrationContractEventArgs,
-    ExecutionContractEventArgs,
-    ExecutionFailureContractEventArgs,
-    SubmissionContractEventArgs,
+    AssetProxyOwnerExecutionEventArgs,
+    AssetProxyOwnerExecutionFailureEventArgs,
+    AssetProxyOwnerSubmissionEventArgs,
 } from '../../generated_contract_wrappers/asset_proxy_owner';
 import { MixinAuthorizableContract } from '../../generated_contract_wrappers/mixin_authorizable';
 import { TestAssetProxyOwnerContract } from '../../generated_contract_wrappers/test_asset_proxy_owner';
@@ -171,14 +171,16 @@ describe('AssetProxyOwner', () => {
                 owners[0],
             );
 
-            const log = submitTxRes.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+            const log = submitTxRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
             const txId = log.args.transactionId;
 
             await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
             await increaseTimeAndMineBlockAsync(SECONDS_TIME_LOCKED.toNumber());
 
             const executeTxRes = await multiSigWrapper.executeTransactionAsync(txId, owners[0]);
-            const registerLog = executeTxRes.logs[0] as LogWithDecodedArgs<AssetProxyRegistrationContractEventArgs>;
+            const registerLog = executeTxRes.logs[0] as LogWithDecodedArgs<
+                AssetProxyOwnerAssetProxyRegistrationEventArgs
+            >;
             expect(registerLog.args.assetProxyContract).to.equal(addressToRegister);
             expect(registerLog.args.isRegistered).to.equal(isRegistered);
 
@@ -200,14 +202,14 @@ describe('AssetProxyOwner', () => {
                 registerAssetProxyData,
                 owners[0],
             );
-            const log = submitTxRes.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+            const log = submitTxRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
             const txId = log.args.transactionId;
 
             await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
             await increaseTimeAndMineBlockAsync(SECONDS_TIME_LOCKED.toNumber());
 
             const executeTxRes = await multiSigWrapper.executeTransactionAsync(txId, owners[0]);
-            const failureLog = executeTxRes.logs[0] as LogWithDecodedArgs<ExecutionFailureContractEventArgs>;
+            const failureLog = executeTxRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerExecutionFailureEventArgs>;
             expect(failureLog.args.transactionId).to.be.bignumber.equal(txId);
 
             const isAssetProxyRegistered = await testAssetProxyOwner.isAssetProxyRegistered.callAsync(
@@ -234,7 +236,7 @@ describe('AssetProxyOwner', () => {
                 owners[0],
             );
             const registerAssetProxySubmitLog = registerAssetProxySubmitRes.logs[0] as LogWithDecodedArgs<
-                SubmissionContractEventArgs
+                AssetProxyOwnerSubmissionEventArgs
             >;
             const registerAssetProxyTxId = registerAssetProxySubmitLog.args.transactionId;
             await multiSigWrapper.confirmTransactionAsync(registerAssetProxyTxId, owners[1]);
@@ -251,10 +253,10 @@ describe('AssetProxyOwner', () => {
                 owners[0],
             );
             const erc20AddAuthorizedAddressSubmitLog = erc20AddAuthorizedAddressSubmitRes.logs[0] as LogWithDecodedArgs<
-                SubmissionContractEventArgs
+                AssetProxyOwnerSubmissionEventArgs
             >;
             const erc721AddAuthorizedAddressSubmitLog = erc721AddAuthorizedAddressSubmitRes
-                .logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+                .logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
             const erc20AddAuthorizedAddressTxId = erc20AddAuthorizedAddressSubmitLog.args.transactionId;
             const erc721AddAuthorizedAddressTxId = erc721AddAuthorizedAddressSubmitLog.args.transactionId;
 
@@ -276,7 +278,7 @@ describe('AssetProxyOwner', () => {
                     notRemoveAuthorizedAddressData,
                     owners[0],
                 );
-                const log = submitTxRes.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+                const log = submitTxRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
                 const txId = log.args.transactionId;
                 return expectContractCallFailedWithoutReasonAsync(
                     testAssetProxyOwner.testValidRemoveAuthorizedAddressAtIndexTx.callAsync(txId),
@@ -293,7 +295,7 @@ describe('AssetProxyOwner', () => {
                     removeAuthorizedAddressAtIndexData,
                     owners[0],
                 );
-                const log = submitTxRes.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+                const log = submitTxRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
                 const txId = log.args.transactionId;
                 const isValidRemoveAuthorizedAddressAtIndexTx = await testAssetProxyOwner.testValidRemoveAuthorizedAddressAtIndexTx.callAsync(
                     txId,
@@ -311,7 +313,7 @@ describe('AssetProxyOwner', () => {
                     removeAuthorizedAddressAtIndexData,
                     owners[0],
                 );
-                const log = submitTxRes.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+                const log = submitTxRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
                 const txId = log.args.transactionId;
                 return expectContractCallFailedWithoutReasonAsync(
                     testAssetProxyOwner.testValidRemoveAuthorizedAddressAtIndexTx.callAsync(txId),
@@ -330,7 +332,7 @@ describe('AssetProxyOwner', () => {
                     removeAuthorizedAddressAtIndexData,
                     owners[0],
                 );
-                const log = res.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+                const log = res.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
                 const txId = log.args.transactionId;
 
                 return expectTransactionFailedWithoutReasonAsync(
@@ -350,7 +352,7 @@ describe('AssetProxyOwner', () => {
                     removeAuthorizedAddressAtIndexData,
                     owners[0],
                 );
-                const log = res.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+                const log = res.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
                 const txId = log.args.transactionId;
 
                 await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
@@ -372,7 +374,7 @@ describe('AssetProxyOwner', () => {
                     addAuthorizedAddressData,
                     owners[0],
                 );
-                const log = res.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+                const log = res.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
                 const txId = log.args.transactionId;
 
                 await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
@@ -394,13 +396,13 @@ describe('AssetProxyOwner', () => {
                     removeAuthorizedAddressAtIndexData,
                     owners[0],
                 );
-                const submitLog = submitRes.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+                const submitLog = submitRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
                 const txId = submitLog.args.transactionId;
 
                 await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
 
                 const execRes = await multiSigWrapper.executeRemoveAuthorizedAddressAtIndexAsync(txId, owners[0]);
-                const execLog = execRes.logs[0] as LogWithDecodedArgs<ExecutionContractEventArgs>;
+                const execLog = execRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerExecutionEventArgs>;
                 expect(execLog.args.transactionId).to.be.bignumber.equal(txId);
 
                 const tx = await testAssetProxyOwner.transactions.callAsync(txId);
@@ -421,13 +423,13 @@ describe('AssetProxyOwner', () => {
                     removeAuthorizedAddressAtIndexData,
                     owners[0],
                 );
-                const submitLog = submitRes.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+                const submitLog = submitRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerSubmissionEventArgs>;
                 const txId = submitLog.args.transactionId;
 
                 await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
 
                 const execRes = await multiSigWrapper.executeRemoveAuthorizedAddressAtIndexAsync(txId, owners[0]);
-                const execLog = execRes.logs[0] as LogWithDecodedArgs<ExecutionContractEventArgs>;
+                const execLog = execRes.logs[0] as LogWithDecodedArgs<AssetProxyOwnerExecutionEventArgs>;
                 expect(execLog.args.transactionId).to.be.bignumber.equal(txId);
 
                 const tx = await testAssetProxyOwner.transactions.callAsync(txId);
diff --git a/packages/contracts/test/multisig/multi_sig_with_time_lock.ts b/packages/contracts/test/multisig/multi_sig_with_time_lock.ts
index a7b99d867..a8e9243a9 100644
--- a/packages/contracts/test/multisig/multi_sig_with_time_lock.ts
+++ b/packages/contracts/test/multisig/multi_sig_with_time_lock.ts
@@ -5,7 +5,7 @@ import { LogWithDecodedArgs } from 'ethereum-types';
 
 import {
     MultiSigWalletWithTimeLockContract,
-    SubmissionContractEventArgs,
+    MultiSigWalletWithTimeLockSubmissionEventArgs,
 } from '../../generated_contract_wrappers/multi_sig_wallet_with_time_lock';
 import { artifacts } from '../utils/artifacts';
 import { expectTransactionFailedWithoutReasonAsync } from '../utils/assertions';
@@ -76,7 +76,7 @@ describe('MultiSigWalletWithTimeLock', () => {
                 const destination = multiSig.address;
                 const changeTimeLockData = multiSig.changeTimeLock.getABIEncodedTransactionData(SECONDS_TIME_LOCKED);
                 const res = await multiSigWrapper.submitTransactionAsync(destination, changeTimeLockData, owners[0]);
-                const log = res.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+                const log = res.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockSubmissionEventArgs>;
                 const txId = log.args.transactionId;
                 return expectTransactionFailedWithoutReasonAsync(
                     multiSig.executeTransaction.sendTransactionAsync(txId, { from: owners[0] }),
@@ -87,7 +87,7 @@ describe('MultiSigWalletWithTimeLock', () => {
                 const destination = multiSig.address;
                 const changeTimeLockData = multiSig.changeTimeLock.getABIEncodedTransactionData(SECONDS_TIME_LOCKED);
                 const subRes = await multiSigWrapper.submitTransactionAsync(destination, changeTimeLockData, owners[0]);
-                const subLog = subRes.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+                const subLog = subRes.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockSubmissionEventArgs>;
                 const txId = subLog.args.transactionId;
 
                 const confirmRes = await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
@@ -105,7 +105,7 @@ describe('MultiSigWalletWithTimeLock', () => {
                 const destination = multiSig.address;
                 const changeTimeLockData = multiSig.changeTimeLock.getABIEncodedTransactionData(SECONDS_TIME_LOCKED);
                 const subRes = await multiSigWrapper.submitTransactionAsync(destination, changeTimeLockData, owners[0]);
-                const subLog = subRes.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+                const subLog = subRes.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockSubmissionEventArgs>;
                 const txId = subLog.args.transactionId;
 
                 await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
@@ -141,7 +141,7 @@ describe('MultiSigWalletWithTimeLock', () => {
                     changeTimeLockData,
                     owners[0],
                 );
-                const log = res.logs[0] as LogWithDecodedArgs<SubmissionContractEventArgs>;
+                const log = res.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockSubmissionEventArgs>;
                 txId = log.args.transactionId;
                 await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
             });
diff --git a/packages/contracts/test/tokens/unlimited_allowance_token.ts b/packages/contracts/test/tokens/unlimited_allowance_token.ts
index 8a3b20d0f..81d931fc5 100644
--- a/packages/contracts/test/tokens/unlimited_allowance_token.ts
+++ b/packages/contracts/test/tokens/unlimited_allowance_token.ts
@@ -3,7 +3,7 @@ import { RevertReason } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 
-import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c20_token';
+import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_erc20_token';
 import { artifacts } from '../utils/artifacts';
 import { expectContractCallFailed } from '../utils/assertions';
 import { chaiSetup } from '../utils/chai_setup';
diff --git a/packages/contracts/test/utils/core_combinatorial_utils.ts b/packages/contracts/test/utils/core_combinatorial_utils.ts
index 8c6c83014..7c16ef201 100644
--- a/packages/contracts/test/utils/core_combinatorial_utils.ts
+++ b/packages/contracts/test/utils/core_combinatorial_utils.ts
@@ -14,7 +14,7 @@ import { LogWithDecodedArgs, Provider, TxData } from 'ethereum-types';
 import * as _ from 'lodash';
 import 'make-promises-safe';
 
-import { ExchangeContract, FillContractEventArgs } from '../../generated_contract_wrappers/exchange';
+import { ExchangeContract, ExchangeFillEventArgs } from '../../generated_contract_wrappers/exchange';
 
 import { artifacts } from './artifacts';
 import { expectTransactionFailedAsync } from './assertions';
@@ -467,7 +467,7 @@ export class CoreCombinatorialUtils {
 
         expect(txReceipt.logs.length).to.be.equal(1, 'logs length');
         // tslint:disable-next-line:no-unnecessary-type-assertion
-        const log = txReceipt.logs[0] as LogWithDecodedArgs<FillContractEventArgs>;
+        const log = txReceipt.logs[0] as LogWithDecodedArgs<ExchangeFillEventArgs>;
         expect(log.args.makerAddress).to.be.equal(makerAddress, 'log.args.makerAddress');
         expect(log.args.takerAddress).to.be.equal(this.takerAddress, 'log.args.this.takerAddress');
         expect(log.args.feeRecipientAddress).to.be.equal(feeRecipient, 'log.args.feeRecipientAddress');
diff --git a/packages/contracts/test/utils/erc20_wrapper.ts b/packages/contracts/test/utils/erc20_wrapper.ts
index 9351b1e3d..cf1433791 100644
--- a/packages/contracts/test/utils/erc20_wrapper.ts
+++ b/packages/contracts/test/utils/erc20_wrapper.ts
@@ -4,8 +4,8 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { Provider } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c20_token';
-import { ERC20ProxyContract } from '../../generated_contract_wrappers/e_r_c20_proxy';
+import { DummyERC20TokenContract } from '../../generated_contract_wrappers/dummy_erc20_token';
+import { ERC20ProxyContract } from '../../generated_contract_wrappers/erc20_proxy';
 
 import { artifacts } from './artifacts';
 import { constants } from './constants';
diff --git a/packages/contracts/test/utils/erc721_wrapper.ts b/packages/contracts/test/utils/erc721_wrapper.ts
index 6347f56e7..a38dfb811 100644
--- a/packages/contracts/test/utils/erc721_wrapper.ts
+++ b/packages/contracts/test/utils/erc721_wrapper.ts
@@ -4,8 +4,8 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { Provider } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c721_token';
-import { ERC721ProxyContract } from '../../generated_contract_wrappers/e_r_c721_proxy';
+import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_erc721_token';
+import { ERC721ProxyContract } from '../../generated_contract_wrappers/erc721_proxy';
 
 import { artifacts } from './artifacts';
 import { constants } from './constants';
diff --git a/packages/contracts/test/utils/order_factory_from_scenario.ts b/packages/contracts/test/utils/order_factory_from_scenario.ts
index 9670c1a59..526505871 100644
--- a/packages/contracts/test/utils/order_factory_from_scenario.ts
+++ b/packages/contracts/test/utils/order_factory_from_scenario.ts
@@ -2,7 +2,7 @@ import { assetProxyUtils, generatePseudoRandomSalt } from '@0xproject/order-util
 import { Order } from '@0xproject/types';
 import { BigNumber, errorUtils } from '@0xproject/utils';
 
-import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_e_r_c721_token';
+import { DummyERC721TokenContract } from '../../generated_contract_wrappers/dummy_erc721_token';
 
 import { constants } from './constants';
 import {