Merge pull request #1156 from 0xProject/feature/0x/npm-domain

Move package org from 0xproject to 0x

126 files changed, 1103 insertions, 231 deletions

diff --git a/packages/website/README.md b/packages/website/README.md
index 2edc17cd9..d82d045a6 100644
--- a/packages/website/README.md
+++ b/packages/website/README.md
@@ -33,13 +33,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/website yarn build
+PKG=@0x/website yarn build
 ```
 
 ### Run dev server
 
 ```bash
-PKG=@0xproject/website yarn watch
+PKG=@0x/website yarn watch
 ```
 
 Visit [0xproject.localhost:3572](http://0xproject.localhost:3572) in your browser.
diff --git a/packages/website/package.json b/packages/website/package.json
index 4af556b5f..2f3b338a8 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "@0xproject/website",
+    "name": "@0x/website",
     "version": "0.0.54",
     "engines": {
         "node": ">=6.12"
@@ -19,17 +19,16 @@
     "author": "Fabio Berger",
     "license": "Apache-2.0",
     "dependencies": {
-        "0x.js": "^0.38.6",
-        "@0xproject/contract-wrappers": "^2.0.2",
-        "@0xproject/json-schemas": "^1.0.7",
-        "@0xproject/order-utils": "^1.0.7",
-        "@0xproject/react-docs": "^1.0.13",
-        "@0xproject/react-shared": "^1.0.15",
-        "@0xproject/subproviders": "^2.0.7",
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/typescript-typings": "^3.0.2",
-        "@0xproject/utils": "^2.0.2",
-        "@0xproject/web3-wrapper": "^3.0.3",
+        "@0x/contract-wrappers": "^2.0.2",
+        "@0x/json-schemas": "^1.0.7",
+        "@0x/order-utils": "^1.0.7",
+        "@0x/react-docs": "^1.0.13",
+        "@0x/react-shared": "^1.0.15",
+        "@0x/subproviders": "^2.0.7",
+        "@0x/types": "^1.1.4",
+        "@0x/typescript-typings": "^3.0.2",
+        "@0x/utils": "^2.0.2",
+        "@0x/web3-wrapper": "^3.0.3",
         "accounting": "^0.4.1",
         "basscss": "^8.0.3",
         "blockies": "^0.0.2",
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 8955bbc30..efb5aef23 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -1,4 +1,3 @@
-import { ZeroEx } from '0x.js';
 import {
     BlockRange,
     ContractWrappers,
@@ -8,9 +7,9 @@ import {
     ExchangeEvents,
     ExchangeFillEventArgs,
     IndexedFilterValues,
-} from '@0xproject/contract-wrappers';
-import { assetDataUtils, orderHashUtils, signatureUtils } from '@0xproject/order-utils';
-import { EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
+} from '@0x/contract-wrappers';
+import { assetDataUtils, orderHashUtils, signatureUtils } from '@0x/order-utils';
+import { EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
 import {
     ledgerEthereumBrowserClientFactoryAsync,
     LedgerSubprovider,
@@ -19,10 +18,10 @@ import {
     RPCSubprovider,
     SignerSubprovider,
     Web3ProviderEngine,
-} from '@0xproject/subproviders';
-import { SignedOrder, Token as ZeroExToken } from '@0xproject/types';
-import { BigNumber, intervalUtils, logUtils, promisify } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+} from '@0x/subproviders';
+import { SignedOrder, Token as ZeroExToken } from '@0x/types';
+import { BigNumber, intervalUtils, logUtils, promisify } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import { BlockParam, LogWithDecodedArgs, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 import * as _ from 'lodash';
 import * as moment from 'moment';
@@ -53,6 +52,7 @@ import { backendClient } from 'ts/utils/backend_client';
 import { configs } from 'ts/utils/configs';
 import { constants } from 'ts/utils/constants';
 import { errorReporter } from 'ts/utils/error_reporter';
+import { fakeTokenRegistry } from 'ts/utils/fake_token_registry';
 import { tokenAddressOverrides } from 'ts/utils/token_address_overrides';
 import { utils } from 'ts/utils/utils';
 import FilterSubprovider = require('web3-provider-engine/subproviders/filters');
@@ -74,7 +74,6 @@ export class Blockchain {
     public networkId: number;
     public nodeVersion: string;
     private _contractWrappers: ContractWrappers;
-    private _zeroEx: ZeroEx;
     private readonly _dispatcher: Dispatcher;
     private _web3Wrapper?: Web3Wrapper;
     private _blockchainWatcher?: BlockchainWatcher;
@@ -228,8 +227,9 @@ export class Blockchain {
         }
     }
     public async isAddressInTokenRegistryAsync(tokenAddress: string): Promise<boolean> {
-        utils.assert(!_.isUndefined(this._zeroEx), 'ZeroEx must be instantiated.');
-        const tokenIfExists = await this._zeroEx.tokenRegistry.getTokenIfExistsAsync(tokenAddress);
+        const tokens = fakeTokenRegistry[this.networkId];
+        const tokenIfExists = _.find(tokens, { address: tokenAddress });
+
         // HACK: Override token addresses on testnets
         const tokenSymbolToAddressOverrides = tokenAddressOverrides[this.networkId];
         let isTokenAddressInOverrides = false;
@@ -768,8 +768,7 @@ export class Blockchain {
         if (this.networkId === constants.NETWORK_ID_MAINNET) {
             tokenRegistryTokens = await backendClient.getTokenInfosAsync();
         } else {
-            utils.assert(!_.isUndefined(this._zeroEx), 'ZeroEx must be instantiated.');
-            tokenRegistryTokens = await this._zeroEx.tokenRegistry.getTokensAsync();
+            tokenRegistryTokens = fakeTokenRegistry[this.networkId];
             const tokenSymbolToAddressOverrides = tokenAddressOverrides[this.networkId];
             if (!_.isUndefined(tokenAddressOverrides)) {
                 // HACK: Override token addresses on testnets
@@ -865,11 +864,6 @@ export class Blockchain {
             networkId,
         };
         this._contractWrappers = new ContractWrappers(provider, contractWrappersConfig);
-        if (!_.isUndefined(this._zeroEx)) {
-            this._zeroEx.setProvider(provider, networkId);
-        } else {
-            this._zeroEx = new ZeroEx(provider, { networkId });
-        }
         if (!_.isUndefined(this._blockchainWatcher)) {
             this._blockchainWatcher.destroy();
         }
diff --git a/packages/website/ts/blockchain_watcher.ts b/packages/website/ts/blockchain_watcher.ts
index 39ed8b08b..835932dcd 100644
--- a/packages/website/ts/blockchain_watcher.ts
+++ b/packages/website/ts/blockchain_watcher.ts
@@ -1,5 +1,5 @@
-import { BigNumber, intervalUtils, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { BigNumber, intervalUtils, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import { Dispatcher } from 'ts/redux/dispatcher';
 
diff --git a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
index 18c060991..a0114d898 100644
--- a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
+++ b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
@@ -1,4 +1,4 @@
-import { colors, Networks } from '@0xproject/react-shared';
+import { colors, Networks } from '@0x/react-shared';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
 import * as React from 'react';
diff --git a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
index f2cfb279a..9b9421f1a 100644
--- a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
+++ b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
@@ -1,5 +1,5 @@
-import { colors } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
+import { colors } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
diff --git a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
index fbc6c868b..a9f591150 100644
--- a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
+++ b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
@@ -1,6 +1,6 @@
-import { colors, constants as sharedConstants } from '@0xproject/react-shared';
-import { BigNumber, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { colors, constants as sharedConstants } from '@0x/react-shared';
+import { BigNumber, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
diff --git a/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx b/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
index ef295762b..326df2a8c 100644
--- a/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
+++ b/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
 import * as React from 'react';
diff --git a/packages/website/ts/components/dialogs/send_dialog.tsx b/packages/website/ts/components/dialogs/send_dialog.tsx
index 2754b153f..5f6927cef 100644
--- a/packages/website/ts/components/dialogs/send_dialog.tsx
+++ b/packages/website/ts/components/dialogs/send_dialog.tsx
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
diff --git a/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx b/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
index afbb30b82..bbec1d649 100644
--- a/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
+++ b/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
 import * as React from 'react';
diff --git a/packages/website/ts/components/documentation/docs_logo.tsx b/packages/website/ts/components/documentation/docs_logo.tsx
index b727fea36..2840d5960 100644
--- a/packages/website/ts/components/documentation/docs_logo.tsx
+++ b/packages/website/ts/components/documentation/docs_logo.tsx
@@ -1,4 +1,4 @@
-import { Link } from '@0xproject/react-shared';
+import { Link } from '@0x/react-shared';
 import * as React from 'react';
 import { WebsitePaths } from 'ts/types';
 
diff --git a/packages/website/ts/components/documentation/docs_top_bar.tsx b/packages/website/ts/components/documentation/docs_top_bar.tsx
index 9a9b9a616..2054d0860 100644
--- a/packages/website/ts/components/documentation/docs_top_bar.tsx
+++ b/packages/website/ts/components/documentation/docs_top_bar.tsx
@@ -1,4 +1,4 @@
-import { ALink, colors, Link } from '@0xproject/react-shared';
+import { ALink, colors, Link } from '@0x/react-shared';
 import * as _ from 'lodash';
 import Drawer from 'material-ui/Drawer';
 import * as React from 'react';
diff --git a/packages/website/ts/components/documentation/overview_content.tsx b/packages/website/ts/components/documentation/overview_content.tsx
index 6999e039a..caabaf874 100644
--- a/packages/website/ts/components/documentation/overview_content.tsx
+++ b/packages/website/ts/components/documentation/overview_content.tsx
@@ -1,5 +1,5 @@
-import { colors, Link, MarkdownLinkBlock, utils as sharedUtils } from '@0xproject/react-shared';
-import { ObjectMap } from '@0xproject/types';
+import { colors, Link, MarkdownLinkBlock, utils as sharedUtils } from '@0x/react-shared';
+import { ObjectMap } from '@0x/types';
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as ReactMarkdown from 'react-markdown';
diff --git a/packages/website/ts/components/documentation/sidebar_header.tsx b/packages/website/ts/components/documentation/sidebar_header.tsx
index ec0ada8bd..fece2704b 100644
--- a/packages/website/ts/components/documentation/sidebar_header.tsx
+++ b/packages/website/ts/components/documentation/sidebar_header.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { VersionDropDown } from 'ts/components/documentation/version_drop_down';
diff --git a/packages/website/ts/components/documentation/tutorial_button.tsx b/packages/website/ts/components/documentation/tutorial_button.tsx
index dc00bf743..b747ef598 100644
--- a/packages/website/ts/components/documentation/tutorial_button.tsx
+++ b/packages/website/ts/components/documentation/tutorial_button.tsx
@@ -1,4 +1,4 @@
-import { colors, Link } from '@0xproject/react-shared';
+import { colors, Link } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { Container } from 'ts/components/ui/container';
diff --git a/packages/website/ts/components/documentation/version_drop_down.tsx b/packages/website/ts/components/documentation/version_drop_down.tsx
index ec1c99f7b..a1c8b0547 100644
--- a/packages/website/ts/components/documentation/version_drop_down.tsx
+++ b/packages/website/ts/components/documentation/version_drop_down.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { Button } from 'ts/components/ui/button';
diff --git a/packages/website/ts/components/dropdowns/developers_drop_down.tsx b/packages/website/ts/components/dropdowns/developers_drop_down.tsx
index 1db1e89b8..f5d21535a 100644
--- a/packages/website/ts/components/dropdowns/developers_drop_down.tsx
+++ b/packages/website/ts/components/dropdowns/developers_drop_down.tsx
@@ -1,4 +1,4 @@
-import { ALink, colors, Link } from '@0xproject/react-shared';
+import { ALink, colors, Link } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { Container } from 'ts/components/ui/container';
diff --git a/packages/website/ts/components/dropdowns/network_drop_down.tsx b/packages/website/ts/components/dropdowns/network_drop_down.tsx
index 2fd2785d1..df2d72edc 100644
--- a/packages/website/ts/components/dropdowns/network_drop_down.tsx
+++ b/packages/website/ts/components/dropdowns/network_drop_down.tsx
@@ -1,4 +1,4 @@
-import { constants as sharedConstants } from '@0xproject/react-shared';
+import { constants as sharedConstants } from '@0x/react-shared';
 import * as _ from 'lodash';
 import DropDownMenu from 'material-ui/DropDownMenu';
 import MenuItem from 'material-ui/MenuItem';
diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx
index b0091a1c1..536ba924b 100644
--- a/packages/website/ts/components/eth_weth_conversion_button.tsx
+++ b/packages/website/ts/components/eth_weth_conversion_button.tsx
@@ -1,5 +1,5 @@
-import { BigNumber, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { BigNumber, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import RaisedButton from 'material-ui/RaisedButton';
 import * as React from 'react';
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index 0b282b2a1..2af4252bd 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -1,6 +1,6 @@
-import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import Divider from 'material-ui/Divider';
 import { Table, TableBody, TableHeader, TableHeaderColumn, TableRow, TableRowColumn } from 'material-ui/Table';
diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index c1bbadfde..ec73e4199 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -1,7 +1,7 @@
-import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils';
-import { colors, Link } from '@0xproject/react-shared';
-import { BigNumber, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
+import { colors, Link } from '@0x/react-shared';
+import { BigNumber, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as accounting from 'accounting';
 import * as _ from 'lodash';
 import { Card, CardHeader, CardText } from 'material-ui/Card';
diff --git a/packages/website/ts/components/fill_order_json.tsx b/packages/website/ts/components/fill_order_json.tsx
index 1ecc426bd..41413eac2 100644
--- a/packages/website/ts/components/fill_order_json.tsx
+++ b/packages/website/ts/components/fill_order_json.tsx
@@ -1,5 +1,5 @@
-import { generatePseudoRandomSalt } from '@0xproject/order-utils';
-import { BigNumber } from '@0xproject/utils';
+import { generatePseudoRandomSalt } from '@0x/order-utils';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import Paper from 'material-ui/Paper';
 import TextField from 'material-ui/TextField';
diff --git a/packages/website/ts/components/fill_warning_dialog.tsx b/packages/website/ts/components/fill_warning_dialog.tsx
index 4821aaabe..430abd013 100644
--- a/packages/website/ts/components/fill_warning_dialog.tsx
+++ b/packages/website/ts/components/fill_warning_dialog.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
 import * as React from 'react';
diff --git a/packages/website/ts/components/flash_messages/asset_send_completed.tsx b/packages/website/ts/components/flash_messages/asset_send_completed.tsx
index f76e05fe1..b895126dc 100644
--- a/packages/website/ts/components/flash_messages/asset_send_completed.tsx
+++ b/packages/website/ts/components/flash_messages/asset_send_completed.tsx
@@ -1,6 +1,6 @@
-import { colors } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { colors } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { utils } from 'ts/utils/utils';
diff --git a/packages/website/ts/components/flash_messages/transaction_submitted.tsx b/packages/website/ts/components/flash_messages/transaction_submitted.tsx
index 2a6d2a64b..b1d909baa 100644
--- a/packages/website/ts/components/flash_messages/transaction_submitted.tsx
+++ b/packages/website/ts/components/flash_messages/transaction_submitted.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx
index db4f57100..dfedcba55 100644
--- a/packages/website/ts/components/footer.tsx
+++ b/packages/website/ts/components/footer.tsx
@@ -1,5 +1,5 @@
-import { ALink, colors, Link } from '@0xproject/react-shared';
-import { ObjectMap } from '@0xproject/types';
+import { ALink, colors, Link } from '@0x/react-shared';
+import { ObjectMap } from '@0x/types';
 import * as _ from 'lodash';
 import DropDownMenu from 'material-ui/DropDownMenu';
 import MenuItem from 'material-ui/MenuItem';
diff --git a/packages/website/ts/components/forms/subscribe_form.tsx b/packages/website/ts/components/forms/subscribe_form.tsx
index 761db7517..f5560cfa7 100644
--- a/packages/website/ts/components/forms/subscribe_form.tsx
+++ b/packages/website/ts/components/forms/subscribe_form.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/generate_order/generate_order_form.tsx b/packages/website/ts/components/generate_order/generate_order_form.tsx
index ec153c005..8afbee977 100644
--- a/packages/website/ts/components/generate_order/generate_order_form.tsx
+++ b/packages/website/ts/components/generate_order/generate_order_form.tsx
@@ -1,7 +1,7 @@
-import { assetDataUtils, generatePseudoRandomSalt, orderHashUtils } from '@0xproject/order-utils';
-import { colors } from '@0xproject/react-shared';
-import { Order as ZeroExOrder } from '@0xproject/types';
-import { BigNumber, logUtils } from '@0xproject/utils';
+import { assetDataUtils, generatePseudoRandomSalt, orderHashUtils } from '@0x/order-utils';
+import { colors } from '@0x/react-shared';
+import { Order as ZeroExOrder } from '@0x/types';
+import { BigNumber, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import Divider from 'material-ui/Divider';
diff --git a/packages/website/ts/components/generate_order/new_token_form.tsx b/packages/website/ts/components/generate_order/new_token_form.tsx
index 3d7eda84c..b8cd88b18 100644
--- a/packages/website/ts/components/generate_order/new_token_form.tsx
+++ b/packages/website/ts/components/generate_order/new_token_form.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as _ from 'lodash';
 import TextField from 'material-ui/TextField';
 import * as moment from 'moment';
diff --git a/packages/website/ts/components/inputs/address_input.tsx b/packages/website/ts/components/inputs/address_input.tsx
index 39ec72f8a..1a71f8081 100644
--- a/packages/website/ts/components/inputs/address_input.tsx
+++ b/packages/website/ts/components/inputs/address_input.tsx
@@ -1,5 +1,5 @@
-import { colors } from '@0xproject/react-shared';
-import { addressUtils } from '@0xproject/utils';
+import { colors } from '@0x/react-shared';
+import { addressUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
diff --git a/packages/website/ts/components/inputs/allowance_state_toggle.tsx b/packages/website/ts/components/inputs/allowance_state_toggle.tsx
index 39d2e3030..fd7d3b174 100644
--- a/packages/website/ts/components/inputs/allowance_state_toggle.tsx
+++ b/packages/website/ts/components/inputs/allowance_state_toggle.tsx
@@ -1,5 +1,5 @@
-import { colors } from '@0xproject/react-shared';
-import { BigNumber, logUtils } from '@0xproject/utils';
+import { colors } from '@0x/react-shared';
+import { BigNumber, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
diff --git a/packages/website/ts/components/inputs/balance_bounded_input.tsx b/packages/website/ts/components/inputs/balance_bounded_input.tsx
index eb01e3ea6..83f263842 100644
--- a/packages/website/ts/components/inputs/balance_bounded_input.tsx
+++ b/packages/website/ts/components/inputs/balance_bounded_input.tsx
@@ -1,5 +1,5 @@
-import { colors } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
+import { colors } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
diff --git a/packages/website/ts/components/inputs/eth_amount_input.tsx b/packages/website/ts/components/inputs/eth_amount_input.tsx
index 3a7905442..6799e54bf 100644
--- a/packages/website/ts/components/inputs/eth_amount_input.tsx
+++ b/packages/website/ts/components/inputs/eth_amount_input.tsx
@@ -1,5 +1,5 @@
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { BalanceBoundedInput } from 'ts/components/inputs/balance_bounded_input';
diff --git a/packages/website/ts/components/inputs/expiration_input.tsx b/packages/website/ts/components/inputs/expiration_input.tsx
index 5417ce715..3e43c1c07 100644
--- a/packages/website/ts/components/inputs/expiration_input.tsx
+++ b/packages/website/ts/components/inputs/expiration_input.tsx
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import DatePicker from 'material-ui/DatePicker';
 import TimePicker from 'material-ui/TimePicker';
diff --git a/packages/website/ts/components/inputs/hash_input.tsx b/packages/website/ts/components/inputs/hash_input.tsx
index 5125ec4de..73b6615d4 100644
--- a/packages/website/ts/components/inputs/hash_input.tsx
+++ b/packages/website/ts/components/inputs/hash_input.tsx
@@ -1,6 +1,6 @@
-import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils';
-import { Styles } from '@0xproject/react-shared';
-import { Order } from '@0xproject/types';
+import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
+import { Styles } from '@0x/react-shared';
+import { Order } from '@0x/types';
 import * as _ from 'lodash';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
diff --git a/packages/website/ts/components/inputs/token_amount_input.tsx b/packages/website/ts/components/inputs/token_amount_input.tsx
index 134d1cc76..fded3a9dd 100644
--- a/packages/website/ts/components/inputs/token_amount_input.tsx
+++ b/packages/website/ts/components/inputs/token_amount_input.tsx
@@ -1,6 +1,6 @@
-import { colors, Link } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { colors, Link } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { Blockchain } from 'ts/blockchain';
diff --git a/packages/website/ts/components/inputs/token_input.tsx b/packages/website/ts/components/inputs/token_input.tsx
index 0bd36781e..c3c2d8b37 100644
--- a/packages/website/ts/components/inputs/token_input.tsx
+++ b/packages/website/ts/components/inputs/token_input.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import Paper from 'material-ui/Paper';
 import * as React from 'react';
 import { Blockchain } from 'ts/blockchain';
diff --git a/packages/website/ts/components/onboarding/add_eth_onboarding_step.tsx b/packages/website/ts/components/onboarding/add_eth_onboarding_step.tsx
index ca71fcd50..1d21e5a85 100644
--- a/packages/website/ts/components/onboarding/add_eth_onboarding_step.tsx
+++ b/packages/website/ts/components/onboarding/add_eth_onboarding_step.tsx
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as React from 'react';
 import { Balance } from 'ts/components/ui/balance';
 import { Container } from 'ts/components/ui/container';
diff --git a/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx b/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx
index 1035d4ad9..173ba9a97 100644
--- a/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx
+++ b/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { Container } from 'ts/components/ui/container';
 import { Image } from 'ts/components/ui/image';
diff --git a/packages/website/ts/components/onboarding/onboarding_card.tsx b/packages/website/ts/components/onboarding/onboarding_card.tsx
index e1b0f304b..384bf7154 100644
--- a/packages/website/ts/components/onboarding/onboarding_card.tsx
+++ b/packages/website/ts/components/onboarding/onboarding_card.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 
 import * as _ from 'lodash';
diff --git a/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx b/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
index 522687758..6adcec0b1 100644
--- a/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
+++ b/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 import * as React from 'react';
 import { RouteComponentProps, withRouter } from 'react-router';
 
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import { Blockchain } from 'ts/blockchain';
 import { AddEthOnboardingStep } from 'ts/components/onboarding/add_eth_onboarding_step';
 import { CongratsOnboardingStep } from 'ts/components/onboarding/congrats_onboarding_step';
diff --git a/packages/website/ts/components/onboarding/wrap_eth_onboarding_step.tsx b/packages/website/ts/components/onboarding/wrap_eth_onboarding_step.tsx
index e4332de75..37eef867b 100644
--- a/packages/website/ts/components/onboarding/wrap_eth_onboarding_step.tsx
+++ b/packages/website/ts/components/onboarding/wrap_eth_onboarding_step.tsx
@@ -1,5 +1,5 @@
-import { colors } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
+import { colors } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
 import * as React from 'react';
 import { Balance } from 'ts/components/ui/balance';
 import { Container } from 'ts/components/ui/container';
diff --git a/packages/website/ts/components/order_json.tsx b/packages/website/ts/components/order_json.tsx
index a2a53a523..f33681835 100644
--- a/packages/website/ts/components/order_json.tsx
+++ b/packages/website/ts/components/order_json.tsx
@@ -1,4 +1,4 @@
-import { BigNumber, fetchAsync, logUtils } from '@0xproject/utils';
+import { BigNumber, fetchAsync, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import Paper from 'material-ui/Paper';
 import TextField from 'material-ui/TextField';
diff --git a/packages/website/ts/components/portal/back_button.tsx b/packages/website/ts/components/portal/back_button.tsx
index 64a332e07..bea69bb95 100644
--- a/packages/website/ts/components/portal/back_button.tsx
+++ b/packages/website/ts/components/portal/back_button.tsx
@@ -1,4 +1,4 @@
-import { Link, Styles } from '@0xproject/react-shared';
+import { Link, Styles } from '@0x/react-shared';
 import * as React from 'react';
 import { Island } from 'ts/components/ui/island';
 import { colors } from 'ts/style/colors';
diff --git a/packages/website/ts/components/portal/drawer_menu.tsx b/packages/website/ts/components/portal/drawer_menu.tsx
index 3a8c69a70..7280a6102 100644
--- a/packages/website/ts/components/portal/drawer_menu.tsx
+++ b/packages/website/ts/components/portal/drawer_menu.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/portal/menu.tsx b/packages/website/ts/components/portal/menu.tsx
index a3352529c..d59101686 100644
--- a/packages/website/ts/components/portal/menu.tsx
+++ b/packages/website/ts/components/portal/menu.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { CustomMenuItem } from 'ts/components/ui/custom_menu_item';
diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx
index c58dc26bd..2299881c4 100644
--- a/packages/website/ts/components/portal/portal.tsx
+++ b/packages/website/ts/components/portal/portal.tsx
@@ -1,5 +1,5 @@
-import { colors, Link } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
+import { colors, Link } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
diff --git a/packages/website/ts/components/portal/text_header.tsx b/packages/website/ts/components/portal/text_header.tsx
index 853da3a29..b6045b832 100644
--- a/packages/website/ts/components/portal/text_header.tsx
+++ b/packages/website/ts/components/portal/text_header.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 
 import { Text } from 'ts/components/ui/text';
diff --git a/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx b/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx
index a81ab107a..7f1b4ebb4 100644
--- a/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx
+++ b/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import { GridTile as PlainGridTile } from 'material-ui/GridList';
 import * as React from 'react';
diff --git a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
index f3787bd27..558d99855 100644
--- a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
+++ b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
@@ -1,4 +1,4 @@
-import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
+import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/send_button.tsx b/packages/website/ts/components/send_button.tsx
index 107983dee..27438e5d5 100644
--- a/packages/website/ts/components/send_button.tsx
+++ b/packages/website/ts/components/send_button.tsx
@@ -1,4 +1,4 @@
-import { BigNumber, logUtils } from '@0xproject/utils';
+import { BigNumber, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import RaisedButton from 'material-ui/RaisedButton';
 import * as React from 'react';
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index 5965ad9bd..9ba2bad84 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -4,9 +4,9 @@ import {
     Networks,
     Styles,
     utils as sharedUtils,
-} from '@0xproject/react-shared';
-import { BigNumber, errorUtils, fetchAsync, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+} from '@0x/react-shared';
+import { BigNumber, errorUtils, fetchAsync, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import Divider from 'material-ui/Divider';
diff --git a/packages/website/ts/components/top_bar/provider_display.tsx b/packages/website/ts/components/top_bar/provider_display.tsx
index 806eaeea5..c88c29b8e 100644
--- a/packages/website/ts/components/top_bar/provider_display.tsx
+++ b/packages/website/ts/components/top_bar/provider_display.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import CircularProgress from 'material-ui/CircularProgress';
 import ActionAccountBalanceWallet from 'material-ui/svg-icons/action/account-balance-wallet';
diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx
index 7e7247c25..d5967cd1d 100644
--- a/packages/website/ts/components/top_bar/top_bar.tsx
+++ b/packages/website/ts/components/top_bar/top_bar.tsx
@@ -1,6 +1,6 @@
-import { DocsInfo } from '@0xproject/react-docs';
-import { ALink, colors, Link, Styles } from '@0xproject/react-shared';
-import { ObjectMap } from '@0xproject/types';
+import { DocsInfo } from '@0x/react-docs';
+import { ALink, colors, Link, Styles } from '@0x/react-shared';
+import { ObjectMap } from '@0x/types';
 import * as _ from 'lodash';
 import Drawer from 'material-ui/Drawer';
 import MenuItem from 'material-ui/MenuItem';
diff --git a/packages/website/ts/components/top_bar/top_bar_menu_item.tsx b/packages/website/ts/components/top_bar/top_bar_menu_item.tsx
index eff5ba66d..9f15cffbb 100644
--- a/packages/website/ts/components/top_bar/top_bar_menu_item.tsx
+++ b/packages/website/ts/components/top_bar/top_bar_menu_item.tsx
@@ -1,4 +1,4 @@
-import { colors, Link } from '@0xproject/react-shared';
+import { colors, Link } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/track_token_confirmation.tsx b/packages/website/ts/components/track_token_confirmation.tsx
index 294fb8590..e701686b0 100644
--- a/packages/website/ts/components/track_token_confirmation.tsx
+++ b/packages/website/ts/components/track_token_confirmation.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { Party } from 'ts/components/ui/party';
diff --git a/packages/website/ts/components/trade_history/trade_history_item.tsx b/packages/website/ts/components/trade_history/trade_history_item.tsx
index 321a8b0e1..667027dce 100644
--- a/packages/website/ts/components/trade_history/trade_history_item.tsx
+++ b/packages/website/ts/components/trade_history/trade_history_item.tsx
@@ -1,6 +1,6 @@
-import { colors, EtherscanLinkSuffixes } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { colors, EtherscanLinkSuffixes } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import Paper from 'material-ui/Paper';
 import * as moment from 'moment';
diff --git a/packages/website/ts/components/ui/alert.tsx b/packages/website/ts/components/ui/alert.tsx
index b571d8c1c..32e0f1be8 100644
--- a/packages/website/ts/components/ui/alert.tsx
+++ b/packages/website/ts/components/ui/alert.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { AlertTypes } from 'ts/types';
 
diff --git a/packages/website/ts/components/ui/allowance_state_view.tsx b/packages/website/ts/components/ui/allowance_state_view.tsx
index 93d6b0ebb..fc754421a 100644
--- a/packages/website/ts/components/ui/allowance_state_view.tsx
+++ b/packages/website/ts/components/ui/allowance_state_view.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { Container } from 'ts/components/ui/container';
 import { Spinner } from 'ts/components/ui/spinner';
diff --git a/packages/website/ts/components/ui/balance.tsx b/packages/website/ts/components/ui/balance.tsx
index 9e5a256b6..a1a8ff89b 100644
--- a/packages/website/ts/components/ui/balance.tsx
+++ b/packages/website/ts/components/ui/balance.tsx
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as React from 'react';
 import { Container } from 'ts/components/ui/container';
 import { Text } from 'ts/components/ui/text';
diff --git a/packages/website/ts/components/ui/button.tsx b/packages/website/ts/components/ui/button.tsx
index 2a6a1f477..92f927843 100644
--- a/packages/website/ts/components/ui/button.tsx
+++ b/packages/website/ts/components/ui/button.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import { darken, saturate } from 'polished';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
diff --git a/packages/website/ts/components/ui/copy_icon.tsx b/packages/website/ts/components/ui/copy_icon.tsx
index 0330d1843..59e398cb6 100644
--- a/packages/website/ts/components/ui/copy_icon.tsx
+++ b/packages/website/ts/components/ui/copy_icon.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
 import * as ReactDOM from 'react-dom';
diff --git a/packages/website/ts/components/ui/custom_menu_item.tsx b/packages/website/ts/components/ui/custom_menu_item.tsx
index c25da6be6..87ce32126 100644
--- a/packages/website/ts/components/ui/custom_menu_item.tsx
+++ b/packages/website/ts/components/ui/custom_menu_item.tsx
@@ -1,4 +1,4 @@
-import { Link } from '@0xproject/react-shared';
+import { Link } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/ui/ethereum_address.tsx b/packages/website/ts/components/ui/ethereum_address.tsx
index f449a8e75..71d98af56 100644
--- a/packages/website/ts/components/ui/ethereum_address.tsx
+++ b/packages/website/ts/components/ui/ethereum_address.tsx
@@ -1,4 +1,4 @@
-import { EtherscanLinkSuffixes } from '@0xproject/react-shared';
+import { EtherscanLinkSuffixes } from '@0x/react-shared';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
 import { EtherScanIcon } from 'ts/components/ui/etherscan_icon';
diff --git a/packages/website/ts/components/ui/etherscan_icon.tsx b/packages/website/ts/components/ui/etherscan_icon.tsx
index 0beb69123..57ab91ba2 100644
--- a/packages/website/ts/components/ui/etherscan_icon.tsx
+++ b/packages/website/ts/components/ui/etherscan_icon.tsx
@@ -1,4 +1,4 @@
-import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
+import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
diff --git a/packages/website/ts/components/ui/fake_text_field.tsx b/packages/website/ts/components/ui/fake_text_field.tsx
index ac3c30fec..7c3a482a4 100644
--- a/packages/website/ts/components/ui/fake_text_field.tsx
+++ b/packages/website/ts/components/ui/fake_text_field.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as React from 'react';
 import { InputLabel } from 'ts/components/ui/input_label';
 
diff --git a/packages/website/ts/components/ui/icon_button.tsx b/packages/website/ts/components/ui/icon_button.tsx
index 13cd239da..9f469ec69 100644
--- a/packages/website/ts/components/ui/icon_button.tsx
+++ b/packages/website/ts/components/ui/icon_button.tsx
@@ -1,4 +1,4 @@
-import { colors, Styles } from '@0xproject/react-shared';
+import { colors, Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/ui/input.tsx b/packages/website/ts/components/ui/input.tsx
index e01a71a53..e5f4f6c70 100644
--- a/packages/website/ts/components/ui/input.tsx
+++ b/packages/website/ts/components/ui/input.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
 
diff --git a/packages/website/ts/components/ui/input_label.tsx b/packages/website/ts/components/ui/input_label.tsx
index 8eda45a5d..e7afb5a17 100644
--- a/packages/website/ts/components/ui/input_label.tsx
+++ b/packages/website/ts/components/ui/input_label.tsx
@@ -1,4 +1,4 @@
-import { colors, Styles } from '@0xproject/react-shared';
+import { colors, Styles } from '@0x/react-shared';
 import * as React from 'react';
 
 export interface InputLabelProps {
diff --git a/packages/website/ts/components/ui/lifecycle_raised_button.tsx b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
index 0bb99b9d8..a8daf4102 100644
--- a/packages/website/ts/components/ui/lifecycle_raised_button.tsx
+++ b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
@@ -1,5 +1,5 @@
-import { colors } from '@0xproject/react-shared';
-import { errorUtils } from '@0xproject/utils';
+import { colors } from '@0x/react-shared';
+import { errorUtils } from '@0x/utils';
 import RaisedButton from 'material-ui/RaisedButton';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/ui/party.tsx b/packages/website/ts/components/ui/party.tsx
index a25550475..6c0572437 100644
--- a/packages/website/ts/components/ui/party.tsx
+++ b/packages/website/ts/components/ui/party.tsx
@@ -1,4 +1,4 @@
-import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
+import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
diff --git a/packages/website/ts/components/ui/pointer.tsx b/packages/website/ts/components/ui/pointer.tsx
index db0a4188d..c97b1e700 100644
--- a/packages/website/ts/components/ui/pointer.tsx
+++ b/packages/website/ts/components/ui/pointer.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
 
diff --git a/packages/website/ts/components/ui/required_label.tsx b/packages/website/ts/components/ui/required_label.tsx
index 0f96586ec..5080462fa 100644
--- a/packages/website/ts/components/ui/required_label.tsx
+++ b/packages/website/ts/components/ui/required_label.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 
 export interface RequiredLabelProps {
diff --git a/packages/website/ts/components/ui/simple_menu.tsx b/packages/website/ts/components/ui/simple_menu.tsx
index bdaf0701e..45ee752e3 100644
--- a/packages/website/ts/components/ui/simple_menu.tsx
+++ b/packages/website/ts/components/ui/simple_menu.tsx
@@ -1,4 +1,4 @@
-import { Link } from '@0xproject/react-shared';
+import { Link } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
diff --git a/packages/website/ts/components/ui/spinner.tsx b/packages/website/ts/components/ui/spinner.tsx
index e8670cc3e..dc73e74e3 100644
--- a/packages/website/ts/components/ui/spinner.tsx
+++ b/packages/website/ts/components/ui/spinner.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
 
diff --git a/packages/website/ts/components/ui/swap_icon.tsx b/packages/website/ts/components/ui/swap_icon.tsx
index f1d1ae7d4..406da8fe1 100644
--- a/packages/website/ts/components/ui/swap_icon.tsx
+++ b/packages/website/ts/components/ui/swap_icon.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 
 interface SwapIconProps {
diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx
index 4415962b1..c13e21913 100644
--- a/packages/website/ts/components/ui/text.tsx
+++ b/packages/website/ts/components/ui/text.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import { darken } from 'polished';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
diff --git a/packages/website/ts/components/visual_order.tsx b/packages/website/ts/components/visual_order.tsx
index a8d18006e..d723757d2 100644
--- a/packages/website/ts/components/visual_order.tsx
+++ b/packages/website/ts/components/visual_order.tsx
@@ -1,4 +1,4 @@
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { Party } from 'ts/components/ui/party';
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index 6abaa840b..326cd3cfa 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -1,5 +1,5 @@
-import { EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
-import { BigNumber, errorUtils } from '@0xproject/utils';
+import { EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
+import { BigNumber, errorUtils } from '@0x/utils';
 import * as _ from 'lodash';
 
 import ActionAccountBalanceWallet from 'material-ui/svg-icons/action/account-balance-wallet';
diff --git a/packages/website/ts/components/wallet/wrap_ether_item.tsx b/packages/website/ts/components/wallet/wrap_ether_item.tsx
index 54ace7ae2..7de3afbf8 100644
--- a/packages/website/ts/components/wallet/wrap_ether_item.tsx
+++ b/packages/website/ts/components/wallet/wrap_ether_item.tsx
@@ -1,6 +1,6 @@
-import { Styles } from '@0xproject/react-shared';
-import { BigNumber, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { Styles } from '@0x/react-shared';
+import { BigNumber, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import FlatButton from 'material-ui/FlatButton';
 import * as React from 'react';
diff --git a/packages/website/ts/containers/asset_buyer_documentation.ts b/packages/website/ts/containers/asset_buyer_documentation.ts
index 13a597ea3..c93b9332d 100644
--- a/packages/website/ts/containers/asset_buyer_documentation.ts
+++ b/packages/website/ts/containers/asset_buyer_documentation.ts
@@ -1,4 +1,4 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -22,7 +22,7 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.AssetBuyer,
-    packageName: '@0xproject/asset-buyer',
+    packageName: '@0x/asset-buyer',
     type: SupportedDocJson.TypeDoc,
     displayName: 'AssetBuyer',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
diff --git a/packages/website/ts/containers/connect_documentation.ts b/packages/website/ts/containers/connect_documentation.ts
index 7c86357c5..074839385 100644
--- a/packages/website/ts/containers/connect_documentation.ts
+++ b/packages/website/ts/containers/connect_documentation.ts
@@ -1,4 +1,4 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -21,7 +21,7 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.Connect,
-    packageName: '@0xproject/connect',
+    packageName: '@0x/connect',
     type: SupportedDocJson.TypeDoc,
     displayName: '0x Connect',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
diff --git a/packages/website/ts/containers/contract_wrappers_documentation.ts b/packages/website/ts/containers/contract_wrappers_documentation.ts
index f7e5f17eb..5bf2a4e1f 100644
--- a/packages/website/ts/containers/contract_wrappers_documentation.ts
+++ b/packages/website/ts/containers/contract_wrappers_documentation.ts
@@ -1,4 +1,4 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -20,7 +20,7 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.ContractWrappers,
-    packageName: '@0xproject/contract-wrappers',
+    packageName: '@0x/contract-wrappers',
     type: SupportedDocJson.TypeDoc,
     displayName: 'Contract Wrappers',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
diff --git a/packages/website/ts/containers/ethereum_types_documentation.ts b/packages/website/ts/containers/ethereum_types_documentation.ts
index 3cab885b4..9d1df1d1f 100644
--- a/packages/website/ts/containers/ethereum_types_documentation.ts
+++ b/packages/website/ts/containers/ethereum_types_documentation.ts
@@ -1,4 +1,4 @@
-import { constants as docConstants, DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { constants as docConstants, DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
diff --git a/packages/website/ts/containers/generate_order_form.ts b/packages/website/ts/containers/generate_order_form.ts
index bc9d6f524..98b2831ce 100644
--- a/packages/website/ts/containers/generate_order_form.ts
+++ b/packages/website/ts/containers/generate_order_form.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Blockchain } from 'ts/blockchain';
diff --git a/packages/website/ts/containers/inputs/eth_amount_input.ts b/packages/website/ts/containers/inputs/eth_amount_input.ts
index 9ef903b55..45d3ddebd 100644
--- a/packages/website/ts/containers/inputs/eth_amount_input.ts
+++ b/packages/website/ts/containers/inputs/eth_amount_input.ts
@@ -1,5 +1,5 @@
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { State } from 'ts/redux/reducer';
diff --git a/packages/website/ts/containers/json_schemas_documentation.ts b/packages/website/ts/containers/json_schemas_documentation.ts
index 4b3200203..38cdc909a 100644
--- a/packages/website/ts/containers/json_schemas_documentation.ts
+++ b/packages/website/ts/containers/json_schemas_documentation.ts
@@ -1,4 +1,4 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -25,7 +25,7 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.JSONSchemas,
-    packageName: '@0xproject/json-schemas',
+    packageName: '@0x/json-schemas',
     type: SupportedDocJson.TypeDoc,
     displayName: 'JSON Schemas',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
diff --git a/packages/website/ts/containers/order_utils_documentation.ts b/packages/website/ts/containers/order_utils_documentation.ts
index 77204b480..ea083e6a6 100644
--- a/packages/website/ts/containers/order_utils_documentation.ts
+++ b/packages/website/ts/containers/order_utils_documentation.ts
@@ -1,4 +1,4 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -20,7 +20,7 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.OrderUtils,
-    packageName: '@0xproject/order-utils',
+    packageName: '@0x/order-utils',
     type: SupportedDocJson.TypeDoc,
     displayName: 'Order utils',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
diff --git a/packages/website/ts/containers/order_watcher_documentation.ts b/packages/website/ts/containers/order_watcher_documentation.ts
index 1b0c1ec91..83caf29ed 100644
--- a/packages/website/ts/containers/order_watcher_documentation.ts
+++ b/packages/website/ts/containers/order_watcher_documentation.ts
@@ -1,4 +1,4 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -20,7 +20,7 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.OrderWatcher,
-    packageName: '@0xproject/order-watcher',
+    packageName: '@0x/order-watcher',
     type: SupportedDocJson.TypeDoc,
     displayName: 'OrderWatcher',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
diff --git a/packages/website/ts/containers/portal.ts b/packages/website/ts/containers/portal.ts
index 4d7ff2f55..5661e0a97 100644
--- a/packages/website/ts/containers/portal.ts
+++ b/packages/website/ts/containers/portal.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { connect } from 'react-redux';
diff --git a/packages/website/ts/containers/portal_onboarding_flow.ts b/packages/website/ts/containers/portal_onboarding_flow.ts
index a813205b1..66473733c 100644
--- a/packages/website/ts/containers/portal_onboarding_flow.ts
+++ b/packages/website/ts/containers/portal_onboarding_flow.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
diff --git a/packages/website/ts/containers/smart_contracts_documentation.ts b/packages/website/ts/containers/smart_contracts_documentation.ts
index 0989a7d0e..fc34b5f61 100644
--- a/packages/website/ts/containers/smart_contracts_documentation.ts
+++ b/packages/website/ts/containers/smart_contracts_documentation.ts
@@ -1,5 +1,5 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
-import { Networks } from '@0xproject/react-shared';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
+import { Networks } from '@0x/react-shared';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
diff --git a/packages/website/ts/containers/sol_compiler_documentation.ts b/packages/website/ts/containers/sol_compiler_documentation.ts
index b84974d69..03da8a25f 100644
--- a/packages/website/ts/containers/sol_compiler_documentation.ts
+++ b/packages/website/ts/containers/sol_compiler_documentation.ts
@@ -1,4 +1,4 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -22,7 +22,7 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.SolCompiler,
-    packageName: '@0xproject/sol-compiler',
+    packageName: '@0x/sol-compiler',
     type: SupportedDocJson.TypeDoc,
     displayName: 'Solidity Compiler',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
diff --git a/packages/website/ts/containers/sol_cov_documentation.ts b/packages/website/ts/containers/sol_cov_documentation.ts
index f9c428f8e..5943be009 100644
--- a/packages/website/ts/containers/sol_cov_documentation.ts
+++ b/packages/website/ts/containers/sol_cov_documentation.ts
@@ -1,4 +1,4 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -22,7 +22,7 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.SolCov,
-    packageName: '@0xproject/sol-cov',
+    packageName: '@0x/sol-cov',
     type: SupportedDocJson.TypeDoc,
     displayName: 'Sol-cov',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
diff --git a/packages/website/ts/containers/subproviders_documentation.ts b/packages/website/ts/containers/subproviders_documentation.ts
index 1588c7d46..b00551a79 100644
--- a/packages/website/ts/containers/subproviders_documentation.ts
+++ b/packages/website/ts/containers/subproviders_documentation.ts
@@ -1,4 +1,4 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -22,7 +22,7 @@ const docSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.Subproviders,
-    packageName: '@0xproject/subproviders',
+    packageName: '@0x/subproviders',
     type: SupportedDocJson.TypeDoc,
     displayName: 'Subproviders',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
diff --git a/packages/website/ts/containers/web3_wrapper_documentation.ts b/packages/website/ts/containers/web3_wrapper_documentation.ts
index 0154c05b9..f064a1567 100644
--- a/packages/website/ts/containers/web3_wrapper_documentation.ts
+++ b/packages/website/ts/containers/web3_wrapper_documentation.ts
@@ -1,4 +1,4 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -20,7 +20,7 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.Web3Wrapper,
-    packageName: '@0xproject/web3-wrapper',
+    packageName: '@0x/web3-wrapper',
     type: SupportedDocJson.TypeDoc,
     displayName: 'Web3Wrapper',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts
index 459d8390a..9c0de32a8 100644
--- a/packages/website/ts/containers/zero_ex_js_documentation.ts
+++ b/packages/website/ts/containers/zero_ex_js_documentation.ts
@@ -1,4 +1,4 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
diff --git a/packages/website/ts/local_storage/trade_history_storage.tsx b/packages/website/ts/local_storage/trade_history_storage.tsx
index a9b042820..91818b035 100644
--- a/packages/website/ts/local_storage/trade_history_storage.tsx
+++ b/packages/website/ts/local_storage/trade_history_storage.tsx
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import ethUtil = require('ethereumjs-util');
 import * as _ from 'lodash';
 import { localStorage } from 'ts/local_storage/local_storage';
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 4d346327b..dfe8926b0 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -1,4 +1,4 @@
-import { colors, Link, Styles } from '@0xproject/react-shared';
+import { colors, Link, Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
diff --git a/packages/website/ts/pages/about/profile.tsx b/packages/website/ts/pages/about/profile.tsx
index bcbeb0272..2361c6418 100644
--- a/packages/website/ts/pages/about/profile.tsx
+++ b/packages/website/ts/pages/about/profile.tsx
@@ -1,4 +1,4 @@
-import { colors, Styles } from '@0xproject/react-shared';
+import { colors, Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { ProfileInfo } from 'ts/types';
diff --git a/packages/website/ts/pages/documentation/developers_page.tsx b/packages/website/ts/pages/documentation/developers_page.tsx
index e35218a70..934a4cc36 100644
--- a/packages/website/ts/pages/documentation/developers_page.tsx
+++ b/packages/website/ts/pages/documentation/developers_page.tsx
@@ -1,4 +1,4 @@
-import { colors, constants as sharedConstants } from '@0xproject/react-shared';
+import { colors, constants as sharedConstants } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import DocumentTitle = require('react-document-title');
diff --git a/packages/website/ts/pages/documentation/doc_page.tsx b/packages/website/ts/pages/documentation/doc_page.tsx
index 40c728c24..7157abfc9 100644
--- a/packages/website/ts/pages/documentation/doc_page.tsx
+++ b/packages/website/ts/pages/documentation/doc_page.tsx
@@ -5,8 +5,8 @@ import {
     GeneratedDocJson,
     SupportedDocJson,
     TypeDocUtils,
-} from '@0xproject/react-docs';
-import { NestedSidebarMenu } from '@0xproject/react-shared';
+} from '@0x/react-docs';
+import { NestedSidebarMenu } from '@0x/react-shared';
 import findVersions = require('find-versions');
 import * as _ from 'lodash';
 import CircularProgress from 'material-ui/CircularProgress';
@@ -181,7 +181,7 @@ export class DocPage extends React.Component<DocPageProps, DocPageState> {
         let tagPrefix = pkg;
         const packagesWithNamespace = ['connect'];
         if (_.includes(packagesWithNamespace, pkg)) {
-            tagPrefix = `@0xproject/${pkg}`;
+            tagPrefix = `@0x/${pkg}`;
         }
         // HACK: The following three lines exist for backward compatibility reasons
         // Before exporting types from other packages as part of the 0x.js interface,
diff --git a/packages/website/ts/pages/documentation/docs_home.tsx b/packages/website/ts/pages/documentation/docs_home.tsx
index f0af78fc1..74fd0135c 100644
--- a/packages/website/ts/pages/documentation/docs_home.tsx
+++ b/packages/website/ts/pages/documentation/docs_home.tsx
@@ -1,5 +1,5 @@
-import { ALink, colors, Link, NestedSidebarMenu } from '@0xproject/react-shared';
-import { ObjectMap } from '@0xproject/types';
+import { ALink, colors, Link, NestedSidebarMenu } from '@0x/react-shared';
+import { ObjectMap } from '@0x/types';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { OverviewContent } from 'ts/components/documentation/overview_content';
@@ -68,7 +68,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = {
             description:
                 'An http & websocket client for interacting with relayers that have implemented the [Standard Relayer API](https://github.com/0xProject/standard-relayer-api)',
             link: {
-                title: '@0xproject/connect',
+                title: '@0x/connect',
                 to: WebsitePaths.Connect,
             },
         },
@@ -76,7 +76,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = {
             description:
                 'Typescript/Javascript wrappers of the 0x protocol Ethereum smart contracts. Use this library to call methods on the 0x smart contracts, subscribe to contract events and to fetch information stored in contracts.',
             link: {
-                title: '@0xproject/contract-wrappers',
+                title: '@0x/contract-wrappers',
                 to: WebsitePaths.ContractWrappers,
             },
         },
@@ -84,7 +84,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = {
             description:
                 'A collection of 0x-related JSON-schemas (incl. SRA request/response schemas, 0x order message format schema, etc...)',
             link: {
-                title: '@0xproject/json-schemas',
+                title: '@0x/json-schemas',
                 to: WebsitePaths.JSONSchemas,
             },
         },
@@ -92,7 +92,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = {
             description:
                 'A set of utils for working with 0x orders. It includes utilities for creating, signing, validating 0x orders, encoding/decoding assetData and much more.',
             link: {
-                title: '@0xproject/order-utils',
+                title: '@0x/order-utils',
                 to: WebsitePaths.OrderUtils,
             },
         },
@@ -100,7 +100,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = {
             description:
                 "A daemon that watches a set of 0x orders and emits events when an order's fillability has changed. Can be used by a relayer to prune their orderbook or by a trader to keep their view of the market up-to-date.",
             link: {
-                title: '@0xproject/order-watcher',
+                title: '@0x/order-watcher',
                 to: WebsitePaths.OrderWatcher,
             },
         },
@@ -108,7 +108,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = {
             description:
                 'Contains the Standard Relayer API OpenAPI Spec. The package distributes both a javascript object version and a json version.',
             link: {
-                title: '@0xproject/sra-spec',
+                title: '@0x/sra-spec',
                 to: 'https://github.com/0xProject/0x-monorepo/tree/development/packages/sra-spec',
                 shouldOpenInNewTab: true,
             },
@@ -117,7 +117,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = {
             description:
                 'Convenience package for buying assets represented on the Ethereum blockchain using 0x. In its simplest form, the package helps in the usage of the [0x forwarder contract](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/forwarder-specification.md), which allows users to execute [Wrapped Ether](https://weth.io/) based 0x orders without having to set allowances, wrap Ether or own ZRX, meaning they can buy tokens with Ether alone. Given some liquidity (0x signed orders), it helps estimate the Ether cost of buying a certain asset (giving a range) and then buying that asset.',
             link: {
-                title: '@0xproject/asset-buyer',
+                title: '@0x/asset-buyer',
                 to: WebsitePaths.AssetBuyer,
             },
         },
@@ -144,7 +144,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = {
             description:
                 'A wrapper around [solc-js](https://github.com/ethereum/solc-js) that adds smart re-compilation, ability to compile an entire project, Solidity version specific compilation, standard input description support and much more.',
             link: {
-                title: '@0xproject/sol-compiler',
+                title: '@0x/sol-compiler',
                 to: WebsitePaths.SolCompiler,
             },
         },
@@ -152,7 +152,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = {
             description:
                 'A Solidity code coverage tool. Sol-cov uses transaction traces to figure out which lines of your code has been covered by your tests.',
             link: {
-                title: '@0xproject/sol-cov',
+                title: '@0x/sol-cov',
                 to: WebsitePaths.SolCov,
             },
         },
@@ -160,7 +160,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = {
             description:
                 'A collection of subproviders to use with [web3-provider-engine](https://www.npmjs.com/package/web3-provider-engine) (e.g subproviders for interfacing with Ledger hardware wallet, Mnemonic wallet, private key wallet, etc...)',
             link: {
-                title: '@0xproject/subproviders',
+                title: '@0x/subproviders',
                 to: WebsitePaths.Subproviders,
             },
         },
@@ -168,7 +168,7 @@ const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = {
             description:
                 'A raw Ethereum JSON RPC client to simplify interfacing with Ethereum nodes. Also includes some convenience functions for awaiting transactions to be mined, converting between token units, etc...',
             link: {
-                title: '@0xproject/web3-wrapper',
+                title: '@0x/web3-wrapper',
                 to: WebsitePaths.Web3Wrapper,
             },
         },
diff --git a/packages/website/ts/pages/faq/faq.tsx b/packages/website/ts/pages/faq/faq.tsx
index c9295d806..10d91bae8 100644
--- a/packages/website/ts/pages/faq/faq.tsx
+++ b/packages/website/ts/pages/faq/faq.tsx
@@ -1,4 +1,4 @@
-import { colors, Styles } from '@0xproject/react-shared';
+import { colors, Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
diff --git a/packages/website/ts/pages/faq/question.tsx b/packages/website/ts/pages/faq/question.tsx
index f80985257..413ffb6ce 100644
--- a/packages/website/ts/pages/faq/question.tsx
+++ b/packages/website/ts/pages/faq/question.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import { Card, CardHeader, CardText } from 'material-ui/Card';
 import * as React from 'react';
 
diff --git a/packages/website/ts/pages/fullscreen_message.tsx b/packages/website/ts/pages/fullscreen_message.tsx
index 6fcf7b32c..675f27a01 100644
--- a/packages/website/ts/pages/fullscreen_message.tsx
+++ b/packages/website/ts/pages/fullscreen_message.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as React from 'react';
 
 export interface FullscreenMessageProps {
diff --git a/packages/website/ts/pages/jobs/jobs.tsx b/packages/website/ts/pages/jobs/jobs.tsx
index cc4b1f04b..728e17f9e 100644
--- a/packages/website/ts/pages/jobs/jobs.tsx
+++ b/packages/website/ts/pages/jobs/jobs.tsx
@@ -1,4 +1,4 @@
-import { colors, utils as sharedUtils } from '@0xproject/react-shared';
+import { colors, utils as sharedUtils } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
diff --git a/packages/website/ts/pages/jobs/join_0x.tsx b/packages/website/ts/pages/jobs/join_0x.tsx
index ec8afbd93..e869cd455 100644
--- a/packages/website/ts/pages/jobs/join_0x.tsx
+++ b/packages/website/ts/pages/jobs/join_0x.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 
 import * as React from 'react';
 
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index f7a6fe0ce..c56ed4ebe 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -1,4 +1,4 @@
-import { colors, Link } from '@0xproject/react-shared';
+import { colors, Link } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import DocumentTitle = require('react-document-title');
diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx
index 76d52c9bd..fdca61e39 100644
--- a/packages/website/ts/pages/wiki/wiki.tsx
+++ b/packages/website/ts/pages/wiki/wiki.tsx
@@ -7,8 +7,8 @@ import {
     MarkdownSection,
     NestedSidebarMenu,
     utils as sharedUtils,
-} from '@0xproject/react-shared';
-import { ObjectMap } from '@0xproject/types';
+} from '@0x/react-shared';
+import { ObjectMap } from '@0x/types';
 import * as _ from 'lodash';
 import CircularProgress from 'material-ui/CircularProgress';
 import * as React from 'react';
diff --git a/packages/website/ts/redux/dispatcher.ts b/packages/website/ts/redux/dispatcher.ts
index c418cab3f..e85afd3b1 100644
--- a/packages/website/ts/redux/dispatcher.ts
+++ b/packages/website/ts/redux/dispatcher.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import { Dispatch } from 'redux';
 import { State } from 'ts/redux/reducer';
 import {
diff --git a/packages/website/ts/redux/reducer.ts b/packages/website/ts/redux/reducer.ts
index f54801639..51c77ba47 100644
--- a/packages/website/ts/redux/reducer.ts
+++ b/packages/website/ts/redux/reducer.ts
@@ -1,5 +1,5 @@
-import { generatePseudoRandomSalt } from '@0xproject/order-utils';
-import { BigNumber } from '@0xproject/utils';
+import { generatePseudoRandomSalt } from '@0x/order-utils';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import * as moment from 'moment';
 import {
diff --git a/packages/website/ts/schemas/validator.ts b/packages/website/ts/schemas/validator.ts
index 3fd013002..128d943e1 100644
--- a/packages/website/ts/schemas/validator.ts
+++ b/packages/website/ts/schemas/validator.ts
@@ -1,4 +1,4 @@
-import { SchemaValidator } from '@0xproject/json-schemas';
+import { SchemaValidator } from '@0x/json-schemas';
 import { orderMetadataSchema } from 'ts/schemas/metadata_schema';
 import { portalOrderSchema } from 'ts/schemas/portal_order_schema';
 import { portalTokenMetadataSchema } from 'ts/schemas/portal_token_metadata';
diff --git a/packages/website/ts/style/colors.ts b/packages/website/ts/style/colors.ts
index 349845a09..0620bae0f 100644
--- a/packages/website/ts/style/colors.ts
+++ b/packages/website/ts/style/colors.ts
@@ -1,4 +1,4 @@
-import { colors as sharedColors } from '@0xproject/react-shared';
+import { colors as sharedColors } from '@0x/react-shared';
 
 const appColors = {
     walletBoxShadow: 'rgba(0, 0, 0, 0.05)',
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 84be4d3b0..f85317c7b 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -1,6 +1,6 @@
-import { ALink } from '@0xproject/react-shared';
-import { ObjectMap, SignedOrder } from '@0xproject/types';
-import { BigNumber } from '@0xproject/utils';
+import { ALink } from '@0x/react-shared';
+import { ObjectMap, SignedOrder } from '@0x/types';
+import { BigNumber } from '@0x/utils';
 import { Provider } from 'ethereum-types';
 import * as React from 'react';
 
diff --git a/packages/website/ts/utils/analytics.ts b/packages/website/ts/utils/analytics.ts
index 3aae317b0..e990b4fc7 100644
--- a/packages/website/ts/utils/analytics.ts
+++ b/packages/website/ts/utils/analytics.ts
@@ -1,5 +1,5 @@
-import { assetDataUtils } from '@0xproject/order-utils';
-import { ObjectMap } from '@0xproject/types';
+import { assetDataUtils } from '@0x/order-utils';
+import { ObjectMap } from '@0x/types';
 import * as _ from 'lodash';
 import { PortalOrder } from 'ts/types';
 import { utils } from 'ts/utils/utils';
diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts
index e76d40bd3..0a8a86c50 100644
--- a/packages/website/ts/utils/constants.ts
+++ b/packages/website/ts/utils/constants.ts
@@ -1,5 +1,5 @@
-import { ALink } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
+import { ALink } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
 import { Key, WebsitePaths } from 'ts/types';
 
 const URL_FORUM = 'https://forum.0xproject.com';
diff --git a/packages/website/ts/utils/doc_utils.ts b/packages/website/ts/utils/doc_utils.ts
index 0e1d9ea6e..e0b883ace 100644
--- a/packages/website/ts/utils/doc_utils.ts
+++ b/packages/website/ts/utils/doc_utils.ts
@@ -1,5 +1,5 @@
-import { DocAgnosticFormat, GeneratedDocJson } from '@0xproject/react-docs';
-import { fetchAsync, logUtils } from '@0xproject/utils';
+import { DocAgnosticFormat, GeneratedDocJson } from '@0x/react-docs';
+import { fetchAsync, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import { S3FileObject, VersionToFilePath } from 'ts/types';
 import convert = require('xml-js');
diff --git a/packages/website/ts/utils/error_reporter.ts b/packages/website/ts/utils/error_reporter.ts
index bec92e829..6fc1216c3 100644
--- a/packages/website/ts/utils/error_reporter.ts
+++ b/packages/website/ts/utils/error_reporter.ts
@@ -1,4 +1,4 @@
-import { logUtils } from '@0xproject/utils';
+import { logUtils } from '@0x/utils';
 import Rollbar = require('rollbar');
 import { configs } from 'ts/utils/configs';
 import { constants } from 'ts/utils/constants';
diff --git a/packages/website/ts/utils/fake_token_registry.ts b/packages/website/ts/utils/fake_token_registry.ts
new file mode 100644
index 000000000..607dd2553
--- /dev/null
+++ b/packages/website/ts/utils/fake_token_registry.ts
@@ -0,0 +1,879 @@
+export interface FakeTokenRegistryEntry {
+    address: string;
+    name: string;
+    symbol: string;
+    decimals: number;
+}
+
+export const fakeTokenRegistry: { [networkId: string]: FakeTokenRegistryEntry[] } = {
+    '1': [
+        {
+            address: '0xe41d2489571d322189246dafa5ebde1f4699f498',
+            name: '0x Protocol Token',
+            symbol: 'ZRX',
+            decimals: 18,
+        },
+        {
+            address: '0x4156d3342d5c385a87d264f90653733592000581',
+            name: 'Salt',
+            symbol: 'SALT',
+            decimals: 8,
+        },
+        {
+            address: '0x05f4a42e251f2d52b8ed15e9fedaacfcef1fad27',
+            name: 'Zilliqa',
+            symbol: 'ZIL',
+            decimals: 12,
+        },
+        {
+            address: '0xe0b7927c4af23765cb51314a0e0521a9645f0e2a',
+            name: 'Digix DAO Token',
+            symbol: 'DGD',
+            decimals: 9,
+        },
+        {
+            address: '0xfa05a73ffe78ef8f1a739473e462c54bae6567d9',
+            name: 'Lunyr',
+            symbol: 'LUN',
+            decimals: 18,
+        },
+        {
+            address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            name: 'Wrapped Ether',
+            symbol: 'WETH',
+            decimals: 18,
+        },
+        {
+            address: '0xbeb9ef514a379b997e0798fdcc901ee474b6d9a1',
+            name: 'Melon Token',
+            symbol: 'MLN',
+            decimals: 18,
+        },
+        {
+            address: '0x9a642d6b3368ddc662ca244badf32cda716005bc',
+            name: 'Qtum',
+            symbol: 'QTUM',
+            decimals: 18,
+        },
+        {
+            address: '0xd26114cd6ee289accf82350c8d8487fedb8a0c07',
+            name: 'OmiseGO',
+            symbol: 'OMG',
+            decimals: 18,
+        },
+        {
+            address: '0xb97048628db6b661d4c2aa833e95dbe1a905b280',
+            name: 'TenXPay',
+            symbol: 'PAY',
+            decimals: 18,
+        },
+        {
+            address: '0x86fa049857e0209aa7d9e616f7eb3b3b78ecfdb0',
+            name: 'Eos',
+            symbol: 'EOS',
+            decimals: 18,
+        },
+        {
+            address: '0x888666ca69e0f178ded6d75b5726cee99a87d698',
+            name: 'Iconomi',
+            symbol: 'ICN',
+            decimals: 18,
+        },
+        {
+            address: '0x744d70fdbe2ba4cf95131626614a1763df805b9e',
+            name: 'StatusNetwork',
+            symbol: 'SNT',
+            decimals: 18,
+        },
+        {
+            address: '0x6810e776880c02933d47db1b9fc05908e5386b96',
+            name: 'Gnosis',
+            symbol: 'GNO',
+            decimals: 18,
+        },
+        {
+            address: '0x0d8775f648430679a709e98d2b0cb6250d2887ef',
+            name: 'Basic Attention Token',
+            symbol: 'BAT',
+            decimals: 18,
+        },
+        {
+            address: '0xb64ef51c888972c908cfacf59b47c1afbc0ab8ac',
+            name: 'Storj',
+            symbol: 'STORJ',
+            decimals: 8,
+        },
+        {
+            address: '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c',
+            name: 'Bancor',
+            symbol: 'BNT',
+            decimals: 18,
+        },
+        {
+            address: '0x960b236a07cf122663c4303350609a66a7b288c0',
+            name: 'Aragon',
+            symbol: 'ANT',
+            decimals: 18,
+        },
+        {
+            address: '0x0abdace70d3790235af448c88547603b945604ea',
+            name: 'district0x',
+            symbol: 'DNT',
+            decimals: 18,
+        },
+        {
+            address: '0xaec2e87e0a235266d9c5adc9deb4b2e29b54d009',
+            name: 'SingularDTV',
+            symbol: 'SNGLS',
+            decimals: 0,
+        },
+        {
+            address: '0x419d0d8bdd9af5e606ae2232ed285aff190e711b',
+            name: 'FunFair',
+            symbol: 'FUN',
+            decimals: 8,
+        },
+        {
+            address: '0xaf30d2a7e90d7dc361c8c4585e9bb7d2f6f15bc7',
+            name: 'FirstBlood',
+            symbol: '1ST',
+            decimals: 18,
+        },
+        {
+            address: '0x08711d3b02c8758f2fb3ab4e80228418a7f8e39c',
+            name: 'Edgeless',
+            symbol: 'EDG',
+            decimals: 0,
+        },
+        {
+            address: '0x9992ec3cf6a55b00978cddf2b27bc6882d88d1ec',
+            name: 'Polymath',
+            symbol: 'POLY',
+            decimals: 18,
+        },
+        {
+            address: '0x607f4c5bb672230e8672085532f7e901544a7375',
+            name: 'iExec',
+            symbol: 'RLC',
+            decimals: 9,
+        },
+        {
+            address: '0x667088b212ce3d06a1b553a7221e1fd19000d9af',
+            name: 'Wings',
+            symbol: 'WINGS',
+            decimals: 18,
+        },
+        {
+            address: '0x41e5560054824ea6b0732e656e3ad64e20e94e45',
+            name: 'Civic',
+            symbol: 'CVC',
+            decimals: 8,
+        },
+        {
+            address: '0xb63b606ac810a52cca15e44bb630fd42d8d1d83d',
+            name: 'Monaco',
+            symbol: 'MCO',
+            decimals: 8,
+        },
+        {
+            address: '0xf433089366899d83a9f26a773d59ec7ecf30355e',
+            name: 'Metal',
+            symbol: 'MTL',
+            decimals: 8,
+        },
+        {
+            address: '0x12fef5e57bf45873cd9b62e9dbd7bfb99e32d73e',
+            name: 'Cofoundit',
+            symbol: 'CFI',
+            decimals: 18,
+        },
+        {
+            address: '0xaaaf91d9b90df800df4f55c205fd6989c977e73a',
+            name: 'Monolith TKN',
+            symbol: 'TKN',
+            decimals: 8,
+        },
+        {
+            address: '0xe7775a6e9bcf904eb39da2b68c5efb4f9360e08c',
+            name: 'Token-as-a-Service',
+            symbol: 'TAAS',
+            decimals: 6,
+        },
+        {
+            address: '0x2e071d2966aa7d8decb1005885ba1977d6038a65',
+            name: 'DICE',
+            symbol: 'ROL',
+            decimals: 16,
+        },
+        {
+            address: '0xcb94be6f13a1182e4a4b6140cb7bf2025d28e41b',
+            name: 'Trustcoin',
+            symbol: 'TRST',
+            decimals: 6,
+        },
+        {
+            address: '0x1776e1f26f98b1a5df9cd347953a26dd3cb46671',
+            name: 'Numeraire',
+            symbol: 'NMR',
+            decimals: 18,
+        },
+        {
+            address: '0x7c5a0ce9267ed19b22f8cae653f198e3e8daf098',
+            name: 'Santiment Network Token',
+            symbol: 'SAN',
+            decimals: 18,
+        },
+        {
+            address: '0xdd974d5c2e2928dea5f71b9825b8b646686bd200',
+            name: 'Kyber Network Crystal',
+            symbol: 'KNC',
+            decimals: 18,
+        },
+        {
+            address: '0xb7cb1c96db6b22b0d3d9536e0108d062bd488f74',
+            name: 'Walton',
+            symbol: 'WTC',
+            decimals: 18,
+        },
+        {
+            address: '0xd0d6d6c5fe4a677d343cc433536bb717bae167dd',
+            name: 'adToken',
+            symbol: 'ADT',
+            decimals: 9,
+        },
+        {
+            address: '0x42d6622dece394b54999fbd73d108123806f6a18',
+            name: 'SpankChain',
+            symbol: 'SPANK',
+            decimals: 18,
+        },
+        {
+            address: '0x701c244b988a513c945973defa05de933b23fe1d',
+            name: 'openANX',
+            symbol: 'OAX',
+            decimals: 18,
+        },
+        {
+            address: '0x514910771af9ca656af840dff83e8264ecf986ca',
+            name: 'ChainLink',
+            symbol: 'LINK',
+            decimals: 18,
+        },
+        {
+            address: '0x8f8221afbb33998d8584a2b05749ba73c37a938a',
+            name: 'Request Network',
+            symbol: 'REQ',
+            decimals: 18,
+        },
+        {
+            address: '0x27054b13b1b798b345b591a4d22e6562d47ea75a',
+            name: 'AirSwap',
+            symbol: 'AST',
+            decimals: 4,
+        },
+        {
+            address: '0xf0ee6b27b759c9893ce4f094b49ad28fd15a23e4',
+            name: 'Enigma',
+            symbol: 'ENG',
+            decimals: 8,
+        },
+        {
+            address: '0x818fc6c2ec5986bc6e2cbf00939d90556ab12ce5',
+            name: 'Kin',
+            symbol: 'KIN',
+            decimals: 18,
+        },
+        {
+            address: '0x27dce1ec4d3f72c3e457cc50354f1f975ddef488',
+            name: 'AirToken',
+            symbol: 'AIR',
+            decimals: 8,
+        },
+        {
+            address: '0x12480e24eb5bec1a9d4369cab6a80cad3c0a377a',
+            name: 'Substratum',
+            symbol: 'SUB',
+            decimals: 2,
+        },
+        {
+            address: '0x0e8d6b471e332f140e7d9dbb99e5e3822f728da6',
+            name: 'ABYSS',
+            symbol: 'ABYSS',
+            decimals: 18,
+        },
+        {
+            address: '0x4ceda7906a5ed2179785cd3a40a69ee8bc99c466',
+            name: 'AION',
+            symbol: 'AION',
+            decimals: 8,
+        },
+        {
+            address: '0xd8912c10681d8b21fd3742244f44658dba12264e',
+            name: 'Pluton',
+            symbol: 'PLU',
+            decimals: 18,
+        },
+        {
+            address: '0x1a7a8bd9106f2b8d977e08582dc7d24c723ab0db',
+            name: 'AppCoins',
+            symbol: 'APPC',
+            decimals: 18,
+        },
+        {
+            address: '0xba5f11b16b155792cf3b2e6880e8706859a8aeb6',
+            name: 'Aeron',
+            symbol: 'ARN',
+            decimals: 8,
+        },
+        {
+            address: '0xfec0cf7fe078a500abf15f1284958f22049c2c7e',
+            name: 'Maecenas ART Token',
+            symbol: 'ART',
+            decimals: 18,
+        },
+        {
+            address: '0x0f5d2fb29fb7d3cfee444a200298f468908cc942',
+            name: 'Decentraland',
+            symbol: 'MANA',
+            decimals: 18,
+        },
+        {
+            address: '0x1c4481750daa5ff521a2a7490d9981ed46465dbd',
+            name: 'BlockMason Credit Protocol Token',
+            symbol: 'BCPT',
+            decimals: 18,
+        },
+        {
+            address: '0x55296f69f40ea6d20e478533c15a6b08b654e758',
+            name: 'XY Oracle',
+            symbol: 'XYO',
+            decimals: 18,
+        },
+        {
+            address: '0xd7732e3783b0047aa251928960063f863ad022d8',
+            name: 'BrahmaOS',
+            symbol: 'BRM',
+            decimals: 18,
+        },
+        {
+            address: '0x7d4b8cce0591c9044a22ee543533b72e976e36c3',
+            name: 'Change Coin',
+            symbol: 'CAG',
+            decimals: 18,
+        },
+        {
+            address: '0x1d462414fe14cf489c7a21cac78509f4bf8cd7c0',
+            name: 'CanYaCoin',
+            symbol: 'CAN',
+            decimals: 6,
+        },
+        {
+            address: '0x1234567461d3f8db7496581774bd869c83d51c93',
+            name: 'BitClave',
+            symbol: 'CAT',
+            decimals: 18,
+        },
+        {
+            address: '0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359',
+            name: 'Dai Stablecoin v1.0',
+            symbol: 'DAI',
+            decimals: 18,
+        },
+        {
+            address: '0x0cf0ee63788a0849fe5297f3407f701e122cc023',
+            name: 'Streamr DATAcoin',
+            symbol: 'DATA',
+            decimals: 18,
+        },
+        {
+            address: '0x151202c9c18e495656f372281f493eb7698961d5',
+            name: 'DEBITUM',
+            symbol: 'DEB',
+            decimals: 18,
+        },
+        {
+            address: '0xba2184520a1cc49a6159c57e61e1844e085615b6',
+            name: 'HelloGold Token',
+            symbol: 'HGT',
+            decimals: 8,
+        },
+        {
+            address: '0x13f11c9905a08ca76e3e853be63d4f0944326c72',
+            name: 'Divi Exchange Token',
+            symbol: 'DIVX',
+            decimals: 18,
+        },
+        {
+            address: '0x5b26c5d0772e5bbac8b3182ae9a13f9bb2d03765',
+            name: 'EDU Token',
+            symbol: 'EDU',
+            decimals: 8,
+        },
+        {
+            address: '0xd49ff13661451313ca1553fd6954bd1d9b6e02b9',
+            name: 'ElectrifyAsia',
+            symbol: 'ELEC',
+            decimals: 18,
+        },
+        {
+            address: '0x95daaab98046846bf4b2853e23cba236fa394a31',
+            name: 'EtheremonToken',
+            symbol: 'EMONT',
+            decimals: 8,
+        },
+        {
+            address: '0x5bc7e5f0ab8b2e10d2d0a3f21739fce62459aef3',
+            name: 'Hut34 Entropy Token',
+            symbol: 'ENTR',
+            decimals: 18,
+        },
+        {
+            address: '0x923108a439c4e8c2315c4f6521e5ce95b44e9b4c',
+            name: 'Devery.io',
+            symbol: 'EVE',
+            decimals: 18,
+        },
+        {
+            address: '0xf8e386eda857484f5a12e4b5daa9984e06e73705',
+            name: 'Indorse Token',
+            symbol: 'IND',
+            decimals: 18,
+        },
+        {
+            address: '0x4f4f0db4de903b88f2b1a2847971e231d54f8fd3',
+            name: 'Geens Platform Token',
+            symbol: 'GEE',
+            decimals: 8,
+        },
+        {
+            address: '0x543ff227f64aa17ea132bf9886cab5db55dcaddf',
+            name: 'DAOstack',
+            symbol: 'GEN',
+            decimals: 18,
+        },
+        {
+            address: '0x8a854288a5976036a725879164ca3e91d30c6a1b',
+            name: 'Guaranteed Entrance Token',
+            symbol: 'GET',
+            decimals: 18,
+        },
+        {
+            address: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
+            name: 'Maker',
+            symbol: 'MKR',
+            decimals: 18,
+        },
+        {
+            address: '0x9af839687f6c94542ac5ece2e317daae355493a1',
+            name: 'Hydro Protocol Token',
+            symbol: 'HOT',
+            decimals: 18,
+        },
+        {
+            address: '0x0d262e5dc4a06a0f1c90ce79c7a60c09dfc884e4',
+            name: 'JET8 Token',
+            symbol: 'J8T',
+            decimals: 8,
+        },
+        {
+            address: '0x8727c112c712c4a03371ac87a74dd6ab104af768',
+            name: 'Jetcoin Institute Token',
+            symbol: 'JET',
+            decimals: 18,
+        },
+        {
+            address: '0xa4e8c3ec456107ea67d3075bf9e3df3a75823db0',
+            name: 'Loom Network Token',
+            symbol: 'LOOM',
+            decimals: 18,
+        },
+        {
+            address: '0x957c30ab0426e0c93cd8241e2c60392d08c6ac8e',
+            name: 'Modum Token',
+            symbol: 'MOD',
+            decimals: 0,
+        },
+        {
+            address: '0x2ef27bf41236bd859a95209e17a43fbd26851f92',
+            name: 'MORPH',
+            symbol: 'MORPH',
+            decimals: 4,
+        },
+        {
+            address: '0x263c618480dbe35c300d8d5ecda19bbb986acaed',
+            name: 'MOT',
+            symbol: 'MOT',
+            decimals: 18,
+        },
+        {
+            address: '0xffe02ee4c69edf1b340fcad64fbd6b37a7b9e265',
+            name: 'NANJCOIN',
+            symbol: 'NANJ',
+            decimals: 8,
+        },
+        {
+            address: '0xc15a399c4ea7815fe36857c9e290ee452a5d6b21',
+            name: 'BoatPilot Token',
+            symbol: 'NAVI',
+            decimals: 18,
+        },
+        {
+            address: '0x9e46a38f5daabe8683e10793b06749eef7d733d1',
+            name: 'PolySwarm Nectar',
+            symbol: 'NCT',
+            decimals: 18,
+        },
+        {
+            address: '0xa54ddc7b3cce7fc8b1e3fa0256d0db80d2c10970',
+            name: 'NEVERDIE Coin',
+            symbol: 'NDC',
+            decimals: 18,
+        },
+        {
+            address: '0xb62132e35a6c13ee1ee0f84dc5d40bad8d815206',
+            name: 'Nexo',
+            symbol: 'NEXO',
+            decimals: 18,
+        },
+        {
+            address: '0x0235fe624e044a05eed7a43e16e3083bc8a4287a',
+            name: 'Original Crypto Coin',
+            symbol: 'OCC',
+            decimals: 18,
+        },
+        {
+            address: '0xb5dbc6d3cf380079df3b27135664b6bcf45d1869',
+            name: 'Omix',
+            symbol: 'OMX',
+            decimals: 8,
+        },
+        {
+            address: '0xfedae5642668f8636a11987ff386bfd215f942ee',
+            name: 'PolicyPal Network Token',
+            symbol: 'PAL',
+            decimals: 18,
+        },
+        {
+            address: '0x2604fa406be957e542beb89e6754fcde6815e83f',
+            name: 'Playkey Token',
+            symbol: 'PKT',
+            decimals: 18,
+        },
+        {
+            address: '0xe477292f1b3268687a29376116b0ed27a9c76170',
+            name: 'Herocoin',
+            symbol: 'PLAY',
+            decimals: 18,
+        },
+        {
+            address: '0x1985365e9f78359a9b6ad760e32412f4a445e862',
+            name: 'Augur',
+            symbol: 'REP',
+            decimals: 18,
+        },
+        {
+            address: '0x408e41876cccdc0f92210600ef50372656052a38',
+            name: 'Republic Protocol',
+            symbol: 'REN',
+            decimals: 18,
+        },
+        {
+            address: '0xd0929d411954c47438dc1d871dd6081f5c5e149c',
+            name: 'Refereum',
+            symbol: 'RFR',
+            decimals: 4,
+        },
+        {
+            address: '0x3d1ba9be9f66b8ee101911bc36d3fb562eac2244',
+            name: 'Rivetz',
+            symbol: 'RVT',
+            decimals: 18,
+        },
+        {
+            address: '0x6888a16ea9792c15a4dcf2f6c623d055c8ede792',
+            name: 'Spectiv Signal Token',
+            symbol: 'SIG',
+            decimals: 18,
+        },
+        {
+            address: '0x20f7a3ddf244dc9299975b4da1c39f8d5d75f05a',
+            name: 'Sapien Network Token',
+            symbol: 'SPN',
+            decimals: 6,
+        },
+        {
+            address: '0xbbff862d906e348e9946bfb2132ecb157da3d4b4',
+            name: 'Sharder',
+            symbol: 'SS',
+            decimals: 18,
+        },
+        {
+            address: '0x12b306fa98f4cbb8d4457fdff3a0a0a56f07ccdf',
+            name: 'Spectre.ai D-Token',
+            symbol: 'SXDT',
+            decimals: 18,
+        },
+        {
+            address: '0xff3519eeeea3e76f1f699ccce5e23ee0bdda41ac',
+            name: 'Blockchain Capital',
+            symbol: 'BCAP',
+            decimals: 0,
+        },
+        {
+            address: '0xced1a8529125d1bd06b54a7b01210df357d00885',
+            name: 'Too Real Badge',
+            symbol: 'TRL',
+            decimals: 0,
+        },
+        {
+            address: '0xc86d054809623432210c107af2e3f619dcfbf652',
+            name: 'SENTINEL PROTOCOL',
+            symbol: 'UPP',
+            decimals: 18,
+        },
+        {
+            address: '0x27f610bf36eca0939093343ac28b1534a721dbb4',
+            name: 'Wand Token',
+            symbol: 'WAND',
+            decimals: 18,
+        },
+        {
+            address: '0x056017c55ae7ae32d12aef7c679df83a85ca75ff',
+            name: 'WyvernToken',
+            symbol: 'WYV',
+            decimals: 18,
+        },
+        {
+            address: '0x5ca9a71b1d01849c0a95490cc00559717fcf0d1d',
+            name: 'Aeternity',
+            symbol: 'AE',
+            decimals: 18,
+        },
+        {
+            address: '0xbc86727e770de68b1060c91f6bb6945c73e10388',
+            name: 'Ink Protocol',
+            symbol: 'XNK',
+            decimals: 18,
+        },
+        {
+            address: '0x0f513ffb4926ff82d7f60a05069047aca295c413',
+            name: 'CrowdstartCoin',
+            symbol: 'XSC',
+            decimals: 18,
+        },
+        {
+            address: '0xb9e7f8568e08d5659f5d29c4997173d84cdf2607',
+            name: 'Swarm City Token',
+            symbol: 'SWT',
+            decimals: 18,
+        },
+        {
+            address: '0x6531f133e6deebe7f2dce5a0441aa7ef330b4e53',
+            name: 'Chronobank TIME',
+            symbol: 'TIME',
+            decimals: 8,
+        },
+        {
+            address: '0xf230b790e05390fc8295f4d3f60332c93bed42e2',
+            name: 'Tronix',
+            symbol: 'TRX',
+            decimals: 6,
+        },
+        {
+            address: '0x5c543e7ae0a1104f78406c340e9c64fd9fce5170',
+            name: 'vSlice',
+            symbol: 'VSL',
+            decimals: 0,
+        },
+        {
+            address: '0x4df812f6064def1e5e029f1ca858777cc98d2d81',
+            name: 'Xaurum',
+            symbol: 'XAUR',
+            decimals: 8,
+        },
+    ],
+    '42': [
+        {
+            address: '0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570',
+            name: '0x Protocol Token',
+            symbol: 'ZRX',
+            decimals: 18,
+        },
+        {
+            address: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
+            name: 'Melon Token',
+            symbol: 'MLN',
+            decimals: 18,
+        },
+        {
+            address: '0x1dad4783cf3fe3085c1426157ab175a6119a04ba',
+            name: 'Maker DAO',
+            symbol: 'MKR',
+            decimals: 18,
+        },
+        {
+            address: '0xeee3870657e4716670f185df08652dd848fe8f7e',
+            name: 'Digix DAO Token',
+            symbol: 'DGD',
+            decimals: 18,
+        },
+        {
+            address: '0xb18845c260f680d5b9d84649638813e342e4f8c9',
+            name: 'Augur Reputation Token',
+            symbol: 'REP',
+            decimals: 18,
+        },
+        {
+            address: '0xef7fff64389b814a946f3e92105513705ca6b990',
+            name: 'Golem Network Token',
+            symbol: 'GNT',
+            decimals: 18,
+        },
+        {
+            address: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
+            name: 'Wrapped Ether',
+            symbol: 'WETH',
+            decimals: 18,
+        },
+    ],
+    '3': [
+        {
+            address: '0xdf18648f5b4357d6cc1e27f7699af4f77ff44558',
+            name: 'token0',
+            symbol: 'TKN0',
+            decimals: 0,
+        },
+        {
+            address: '0xd7cdcde4302a60c4d74a11eee21fbf455f476021',
+            name: 'token1',
+            symbol: 'TKN1',
+            decimals: 1,
+        },
+        {
+            address: '0xf080f68c2113d40ff6a8528863f431908680900a',
+            name: 'token2',
+            symbol: 'TKN2',
+            decimals: 2,
+        },
+        {
+            address: '0xe982b5c62434c98e27d15fed40447dda6b75c4eb',
+            name: 'token3',
+            symbol: 'TKN3',
+            decimals: 3,
+        },
+        {
+            address: '0x2427d136751c1ca70480d3b2091261d639090a50',
+            name: 'token4',
+            symbol: 'TKN4',
+            decimals: 4,
+        },
+        {
+            address: '0x7d3eca8ec55bb32bd0056edb9485b07a53d3fbfd',
+            name: 'token5',
+            symbol: 'TKN5',
+            decimals: 5,
+        },
+        {
+            address: '0xff3c22e0a9014e9b4b1cf7a54bf39ab3107f6123',
+            name: 'token6',
+            symbol: 'TKN6',
+            decimals: 6,
+        },
+        {
+            address: '0xdec283d9e188397c841ab59d9d9160fd47bc56f8',
+            name: 'token7',
+            symbol: 'TKN7',
+            decimals: 7,
+        },
+        {
+            address: '0xedf5fd2f60d8fefbfa8011f2769b39657c54c3fd',
+            name: 'token8',
+            symbol: 'TKN8',
+            decimals: 8,
+        },
+        {
+            address: '0xcd59fe7fa1a1a0ff536966a599b631d9cd5f2914',
+            name: 'token9',
+            symbol: 'TKN9',
+            decimals: 9,
+        },
+        {
+            address: '0xaece1ee1813d56a5897f19ad50164565203b459f',
+            name: 'token10',
+            symbol: 'TKN10',
+            decimals: 10,
+        },
+        {
+            address: '0xaab3f0619e529b1f1823be291daa7fcd38a15927',
+            name: 'token11',
+            symbol: 'TKN11',
+            decimals: 11,
+        },
+        {
+            address: '0x2c46ad0b19cb1c1f3e51ae90d80654a227b08d30',
+            name: 'token12',
+            symbol: 'TKN12',
+            decimals: 12,
+        },
+        {
+            address: '0x68977f3286a503f2b3930506f1b3a17dafbd9524',
+            name: 'token13',
+            symbol: 'TKN13',
+            decimals: 13,
+        },
+        {
+            address: '0xe5c400b9ee56b823c6193a662041389624609db6',
+            name: 'token14',
+            symbol: 'TKN14',
+            decimals: 14,
+        },
+        {
+            address: '0xf16ea9b23ddbeb6b16d253edf6b595da4009bb8b',
+            name: 'token16',
+            symbol: 'TKN16',
+            decimals: 16,
+        },
+        {
+            address: '0x739a83860971e900c4bbbb92be6cfb9d459ef94a',
+            name: 'token15',
+            symbol: 'TKN15',
+            decimals: 15,
+        },
+        {
+            address: '0x5eba21470cf683fe91b594afe7106039e38f3312',
+            name: 'token17',
+            symbol: 'TKN17',
+            decimals: 17,
+        },
+        {
+            address: '0xc0ddd5df448907bb3f50350f3fe7a1da3fb2a2ee',
+            name: 'token18',
+            symbol: 'TKN18',
+            decimals: 18,
+        },
+        {
+            address: '0x30fa25e53f8031014166fbd5e4bbeac0cd25df74',
+            name: 'token19',
+            symbol: 'TKN19',
+            decimals: 19,
+        },
+        {
+            address: '0xa8e9fa8f91e5ae138c74648c9c304f1c75003a8d',
+            name: '0x Protocol Token',
+            symbol: 'ZRX',
+            decimals: 18,
+        },
+        {
+            address: '0xc778417e063141139fce010982780140aa0cd5ab',
+            name: 'Ether Token',
+            symbol: 'WETH',
+            decimals: 18,
+        },
+        {
+            address: '0x14823db576c11e4a54ca9e01ca0b28b18d3d1187',
+            name: 'b0x Protocol Token',
+            symbol: 'B0X',
+            decimals: 18,
+        },
+    ],
+}; // tslint:disable:max-file-line-count
diff --git a/packages/website/ts/utils/fetch_utils.ts b/packages/website/ts/utils/fetch_utils.ts
index e9a88b6b3..9afc5904d 100644
--- a/packages/website/ts/utils/fetch_utils.ts
+++ b/packages/website/ts/utils/fetch_utils.ts
@@ -1,4 +1,4 @@
-import { fetchAsync, logUtils } from '@0xproject/utils';
+import { fetchAsync, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import * as queryString from 'query-string';
 
diff --git a/packages/website/ts/utils/mui_theme.ts b/packages/website/ts/utils/mui_theme.ts
index f677b4625..3f32254de 100644
--- a/packages/website/ts/utils/mui_theme.ts
+++ b/packages/website/ts/utils/mui_theme.ts
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import { getMuiTheme } from 'material-ui/styles';
 
 export const muiTheme = getMuiTheme({
diff --git a/packages/website/ts/utils/order_parser.ts b/packages/website/ts/utils/order_parser.ts
index 816200e3b..8938fbc53 100644
--- a/packages/website/ts/utils/order_parser.ts
+++ b/packages/website/ts/utils/order_parser.ts
@@ -1,5 +1,5 @@
-import { orderParsingUtils } from '@0xproject/order-utils';
-import { logUtils } from '@0xproject/utils';
+import { orderParsingUtils } from '@0x/order-utils';
+import { logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 
 import { portalOrderSchema } from 'ts/schemas/portal_order_schema';
diff --git a/packages/website/ts/utils/token_address_overrides.ts b/packages/website/ts/utils/token_address_overrides.ts
index e7e916273..5e7275964 100644
--- a/packages/website/ts/utils/token_address_overrides.ts
+++ b/packages/website/ts/utils/token_address_overrides.ts
@@ -1,4 +1,4 @@
-import { ObjectMap } from '@0xproject/types';
+import { ObjectMap } from '@0x/types';
 import { constants } from 'ts/utils/constants';
 
 // Map of networkId -> tokenSymbol -> tokenAddress
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index d1628bc52..d4ad5f611 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -1,9 +1,9 @@
-import { ContractWrappersError } from '@0xproject/contract-wrappers';
-import { assetDataUtils, OrderError } from '@0xproject/order-utils';
-import { constants as sharedConstants, Networks } from '@0xproject/react-shared';
-import { ExchangeContractErrs } from '@0xproject/types';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { ContractWrappersError } from '@0x/contract-wrappers';
+import { assetDataUtils, OrderError } from '@0x/order-utils';
+import { constants as sharedConstants, Networks } from '@0x/react-shared';
+import { ExchangeContractErrs } from '@0x/types';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as bowser from 'bowser';
 import deepEqual = require('deep-equal');
 import * as _ from 'lodash';
diff --git a/packages/website/tslint.json b/packages/website/tslint.json
index b55ffe90f..50f5be4f6 100644
--- a/packages/website/tslint.json
+++ b/packages/website/tslint.json
@@ -1,5 +1,5 @@
 {
-    "extends": ["@0xproject/tslint-config"],
+    "extends": ["@0x/tslint-config"],
     "rules": {
         "no-implicit-dependencies": false,
         "no-object-literal-type-assertion": false,