3 files changed, 22 insertions, 22 deletions
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts
index 1277a88f3..004f9d53f 100644
--- a/packages/contracts/test/exchange/core.ts
+++ b/packages/contracts/test/exchange/core.ts
@@ -10,9 +10,9 @@ import * as Web3 from 'web3';
 import { AssetProxyDispatcherContract } from '../../src/contract_wrappers/generated/asset_proxy_dispatcher';
 import { DummyERC721TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c721_token';
 import { DummyTokenContract } from '../../src/contract_wrappers/generated/dummy_token';
-import { ERC20TransferProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_transfer_proxy';
-import { ERC721TransferProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_transfer_proxy';
-import { ERC20TransferProxy_v1Contract } from '../../src/contract_wrappers/generated/erc20transferproxy_v1';
+import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_transfer_proxy';
+import { ERC721ProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_transfer_proxy';
+import { ERC20Proxy_v1Contract } from '../../src/contract_wrappers/generated/erc20transferproxy_v1';
 import {
     CancelContractEventArgs,
     ExchangeContract,
@@ -64,9 +64,9 @@ describe('Exchange', () => {
     let exchange: ExchangeContract;
     let tokenTransferProxy: TokenTransferProxyContract;
     let assetProxyDispatcher: AssetProxyDispatcherContract;
-    let erc20TransferProxyV1: ERC20TransferProxy_v1Contract;
-    let erc20TransferProxy: ERC20TransferProxyContract;
-    let erc721TransferProxy: ERC721TransferProxyContract;
+    let erc20TransferProxyV1: ERC20Proxy_v1Contract;
+    let erc20TransferProxy: ERC20ProxyContract;
+    let erc721TransferProxy: ERC721ProxyContract;
 
     let signedOrder: SignedOrder;
     let balances: BalancesByOwner;
@@ -101,24 +101,24 @@ describe('Exchange', () => {
             provider,
         );
 
-        const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20TransferProxy_V1, [
+        const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20Proxy_V1, [
             tokenTransferProxy.address,
         ]);
-        erc20TransferProxyV1 = new ERC20TransferProxy_v1Contract(
+        erc20TransferProxyV1 = new ERC20Proxy_v1Contract(
             erc20TransferProxyV1Instance.abi,
             erc20TransferProxyV1Instance.address,
             provider,
         );
 
-        const erc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20TransferProxy);
-        erc20TransferProxy = new ERC20TransferProxyContract(
+        const erc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20Proxy);
+        erc20TransferProxy = new ERC20ProxyContract(
             erc20TransferProxyInstance.abi,
             erc20TransferProxyInstance.address,
             provider,
         );
 
-        erc721TransferProxyInstance = await deployer.deployAsync(ContractName.ERC721TransferProxy);
-        erc721TransferProxy = new ERC721TransferProxyContract(
+        erc721TransferProxyInstance = await deployer.deployAsync(ContractName.ERC721Proxy);
+        erc721TransferProxy = new ERC721ProxyContract(
             erc721TransferProxyInstance.abi,
             erc721TransferProxyInstance.address,
             provider,
diff --git a/packages/contracts/test/exchange/helpers.ts b/packages/contracts/test/exchange/helpers.ts
index 37e53630e..32e06e988 100644
--- a/packages/contracts/test/exchange/helpers.ts
+++ b/packages/contracts/test/exchange/helpers.ts
@@ -40,10 +40,10 @@ describe('Exchange', () => {
         const tokenRegistry = await deployer.deployAsync(ContractName.TokenRegistry);
         const tokenTransferProxy = await deployer.deployAsync(ContractName.TokenTransferProxy);
         const assetProxyDispatcher = await deployer.deployAsync(ContractName.AssetProxyDispatcher);
-        const erc20TransferProxyV1 = await deployer.deployAsync(ContractName.ERC20TransferProxy_V1, [
+        const erc20TransferProxyV1 = await deployer.deployAsync(ContractName.ERC20Proxy_V1, [
             tokenTransferProxy.address,
         ]);
-        const erc20TransferProxy = await deployer.deployAsync(ContractName.ERC20TransferProxy);
+        const erc20TransferProxy = await deployer.deployAsync(ContractName.ERC20Proxy);
         const [rep, dgd, zrx] = await Promise.all([
             deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS),
             deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS),
diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts
index a58568adb..168c50f2a 100644
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/packages/contracts/test/exchange/wrapper.ts
@@ -8,8 +8,8 @@ import * as Web3 from 'web3';
 
 import { AssetProxyDispatcherContract } from '../../src/contract_wrappers/generated/asset_proxy_dispatcher';
 import { DummyTokenContract } from '../../src/contract_wrappers/generated/dummy_token';
-import { ERC20TransferProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_transfer_proxy';
-import { ERC20TransferProxy_v1Contract } from '../../src/contract_wrappers/generated/erc20transferproxy_v1';
+import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_transfer_proxy';
+import { ERC20Proxy_v1Contract } from '../../src/contract_wrappers/generated/erc20transferproxy_v1';
 import { ExchangeContract } from '../../src/contract_wrappers/generated/exchange';
 import { TokenRegistryContract } from '../../src/contract_wrappers/generated/token_registry';
 import { TokenTransferProxyContract } from '../../src/contract_wrappers/generated/token_transfer_proxy';
@@ -48,8 +48,8 @@ describe('Exchange', () => {
     let tokenRegistry: TokenRegistryContract;
     let tokenTransferProxy: TokenTransferProxyContract;
     let assetProxyDispatcher: AssetProxyDispatcherContract;
-    let erc20TransferProxyV1: ERC20TransferProxy_v1Contract;
-    let erc20TransferProxy: ERC20TransferProxyContract;
+    let erc20TransferProxyV1: ERC20Proxy_v1Contract;
+    let erc20TransferProxy: ERC20ProxyContract;
 
     let balances: BalancesByOwner;
 
@@ -77,16 +77,16 @@ describe('Exchange', () => {
             tokenTransferProxyInstance.address,
             provider,
         );
-        const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20TransferProxy_V1, [
+        const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20Proxy_V1, [
             tokenTransferProxy.address,
         ]);
-        erc20TransferProxyV1 = new ERC20TransferProxy_v1Contract(
+        erc20TransferProxyV1 = new ERC20Proxy_v1Contract(
             erc20TransferProxyV1Instance.abi,
             erc20TransferProxyV1Instance.address,
             provider,
         );
-        const erc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20TransferProxy);
-        erc20TransferProxy = new ERC20TransferProxyContract(
+        const erc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20Proxy);
+        erc20TransferProxy = new ERC20ProxyContract(
             erc20TransferProxyInstance.abi,
             erc20TransferProxyInstance.address,
             provider,