diff --git a/packages/asset-buyer/coverage/.gitkeep b/packages/asset-buyer/coverage/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/asset-buyer/.npmignore b/packages/asset-swapper/.npmignore
similarity index 100%
rename from packages/asset-buyer/.npmignore
rename to packages/asset-swapper/.npmignore
diff --git a/packages/asset-buyer/CHANGELOG.json b/packages/asset-swapper/CHANGELOG.json
similarity index 100%
rename from packages/asset-buyer/CHANGELOG.json
rename to packages/asset-swapper/CHANGELOG.json
diff --git a/packages/asset-buyer/CHANGELOG.md b/packages/asset-swapper/CHANGELOG.md
similarity index 100%
rename from packages/asset-buyer/CHANGELOG.md
rename to packages/asset-swapper/CHANGELOG.md
diff --git a/packages/asset-buyer/README.md b/packages/asset-swapper/README.md
similarity index 100%
rename from packages/asset-buyer/README.md
rename to packages/asset-swapper/README.md
diff --git a/packages/asset-buyer/package.json b/packages/asset-swapper/package.json
similarity index 98%
rename from packages/asset-buyer/package.json
rename to packages/asset-swapper/package.json
index 5801f89959..b1fd13aec2 100644
--- a/packages/asset-buyer/package.json
+++ b/packages/asset-swapper/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "@0x/asset-buyer",
+    "name": "@0x/asset-swapper",
     "version": "6.1.5",
     "engines": {
         "node": ">=6.12"
diff --git a/packages/asset-buyer/src/constants.ts b/packages/asset-swapper/src/constants.ts
similarity index 100%
rename from packages/asset-buyer/src/constants.ts
rename to packages/asset-swapper/src/constants.ts
diff --git a/packages/asset-buyer/src/errors.ts b/packages/asset-swapper/src/errors.ts
similarity index 100%
rename from packages/asset-buyer/src/errors.ts
rename to packages/asset-swapper/src/errors.ts
diff --git a/packages/asset-buyer/src/globals.d.ts b/packages/asset-swapper/src/globals.d.ts
similarity index 100%
rename from packages/asset-buyer/src/globals.d.ts
rename to packages/asset-swapper/src/globals.d.ts
diff --git a/packages/asset-buyer/src/index.ts b/packages/asset-swapper/src/index.ts
similarity index 100%
rename from packages/asset-buyer/src/index.ts
rename to packages/asset-swapper/src/index.ts
diff --git a/packages/asset-buyer/src/order_providers/basic_order_provider.ts b/packages/asset-swapper/src/order_providers/basic_order_provider.ts
similarity index 100%
rename from packages/asset-buyer/src/order_providers/basic_order_provider.ts
rename to packages/asset-swapper/src/order_providers/basic_order_provider.ts
diff --git a/packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts b/packages/asset-swapper/src/order_providers/standard_relayer_api_order_provider.ts
similarity index 100%
rename from packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts
rename to packages/asset-swapper/src/order_providers/standard_relayer_api_order_provider.ts
diff --git a/packages/asset-buyer/src/quote_consumers/exchange_swap_quote_consumer.ts b/packages/asset-swapper/src/quote_consumers/exchange_swap_quote_consumer.ts
similarity index 100%
rename from packages/asset-buyer/src/quote_consumers/exchange_swap_quote_consumer.ts
rename to packages/asset-swapper/src/quote_consumers/exchange_swap_quote_consumer.ts
diff --git a/packages/asset-buyer/src/quote_consumers/forwarder_swap_quote_consumer.ts b/packages/asset-swapper/src/quote_consumers/forwarder_swap_quote_consumer.ts
similarity index 100%
rename from packages/asset-buyer/src/quote_consumers/forwarder_swap_quote_consumer.ts
rename to packages/asset-swapper/src/quote_consumers/forwarder_swap_quote_consumer.ts
diff --git a/packages/asset-buyer/src/quote_consumers/swap_quote_consumer.ts b/packages/asset-swapper/src/quote_consumers/swap_quote_consumer.ts
similarity index 100%
rename from packages/asset-buyer/src/quote_consumers/swap_quote_consumer.ts
rename to packages/asset-swapper/src/quote_consumers/swap_quote_consumer.ts
diff --git a/packages/asset-buyer/src/swap_quoter.ts b/packages/asset-swapper/src/swap_quoter.ts
similarity index 100%
rename from packages/asset-buyer/src/swap_quoter.ts
rename to packages/asset-swapper/src/swap_quoter.ts
diff --git a/packages/asset-buyer/src/types.ts b/packages/asset-swapper/src/types.ts
similarity index 100%
rename from packages/asset-buyer/src/types.ts
rename to packages/asset-swapper/src/types.ts
diff --git a/packages/asset-buyer/src/utils/affiliate_fee_utils.ts b/packages/asset-swapper/src/utils/affiliate_fee_utils.ts
similarity index 100%
rename from packages/asset-buyer/src/utils/affiliate_fee_utils.ts
rename to packages/asset-swapper/src/utils/affiliate_fee_utils.ts
diff --git a/packages/asset-buyer/src/utils/assert.ts b/packages/asset-swapper/src/utils/assert.ts
similarity index 100%
rename from packages/asset-buyer/src/utils/assert.ts
rename to packages/asset-swapper/src/utils/assert.ts
diff --git a/packages/asset-buyer/src/utils/asset_data_utils.ts b/packages/asset-swapper/src/utils/asset_data_utils.ts
similarity index 100%
rename from packages/asset-buyer/src/utils/asset_data_utils.ts
rename to packages/asset-swapper/src/utils/asset_data_utils.ts
diff --git a/packages/asset-buyer/src/utils/calculate_liquidity.ts b/packages/asset-swapper/src/utils/calculate_liquidity.ts
similarity index 100%
rename from packages/asset-buyer/src/utils/calculate_liquidity.ts
rename to packages/asset-swapper/src/utils/calculate_liquidity.ts
diff --git a/packages/asset-buyer/src/utils/order_provider_response_processor.ts b/packages/asset-swapper/src/utils/order_provider_response_processor.ts
similarity index 100%
rename from packages/asset-buyer/src/utils/order_provider_response_processor.ts
rename to packages/asset-swapper/src/utils/order_provider_response_processor.ts
diff --git a/packages/asset-buyer/src/utils/swap_quote_calculator.ts b/packages/asset-swapper/src/utils/swap_quote_calculator.ts
similarity index 100%
rename from packages/asset-buyer/src/utils/swap_quote_calculator.ts
rename to packages/asset-swapper/src/utils/swap_quote_calculator.ts
diff --git a/packages/asset-buyer/src/utils/swap_quote_consumer_utils.ts b/packages/asset-swapper/src/utils/swap_quote_consumer_utils.ts
similarity index 100%
rename from packages/asset-buyer/src/utils/swap_quote_consumer_utils.ts
rename to packages/asset-swapper/src/utils/swap_quote_consumer_utils.ts
diff --git a/packages/asset-buyer/src/utils/utils.ts b/packages/asset-swapper/src/utils/utils.ts
similarity index 100%
rename from packages/asset-buyer/src/utils/utils.ts
rename to packages/asset-swapper/src/utils/utils.ts
diff --git a/packages/asset-buyer/test/forwarder_swap_quote_consumer_test.ts b/packages/asset-swapper/test/forwarder_swap_quote_consumer_test.ts
similarity index 100%
rename from packages/asset-buyer/test/forwarder_swap_quote_consumer_test.ts
rename to packages/asset-swapper/test/forwarder_swap_quote_consumer_test.ts
diff --git a/packages/asset-buyer/test/global_hooks.ts b/packages/asset-swapper/test/global_hooks.ts
similarity index 100%
rename from packages/asset-buyer/test/global_hooks.ts
rename to packages/asset-swapper/test/global_hooks.ts
diff --git a/packages/asset-buyer/test/swap_quote_calculator_test.ts b/packages/asset-swapper/test/swap_quote_calculator_test.ts
similarity index 100%
rename from packages/asset-buyer/test/swap_quote_calculator_test.ts
rename to packages/asset-swapper/test/swap_quote_calculator_test.ts
diff --git a/packages/asset-buyer/test/swap_quoter_test.ts b/packages/asset-swapper/test/swap_quoter_test.ts
similarity index 100%
rename from packages/asset-buyer/test/swap_quoter_test.ts
rename to packages/asset-swapper/test/swap_quoter_test.ts
diff --git a/packages/asset-buyer/test/utils/chai_setup.ts b/packages/asset-swapper/test/utils/chai_setup.ts
similarity index 100%
rename from packages/asset-buyer/test/utils/chai_setup.ts
rename to packages/asset-swapper/test/utils/chai_setup.ts
diff --git a/packages/asset-buyer/test/utils/migrate.ts b/packages/asset-swapper/test/utils/migrate.ts
similarity index 100%
rename from packages/asset-buyer/test/utils/migrate.ts
rename to packages/asset-swapper/test/utils/migrate.ts
diff --git a/packages/asset-buyer/test/utils/mocks.ts b/packages/asset-swapper/test/utils/mocks.ts
similarity index 100%
rename from packages/asset-buyer/test/utils/mocks.ts
rename to packages/asset-swapper/test/utils/mocks.ts
diff --git a/packages/asset-buyer/test/utils/swap_quote.ts b/packages/asset-swapper/test/utils/swap_quote.ts
similarity index 100%
rename from packages/asset-buyer/test/utils/swap_quote.ts
rename to packages/asset-swapper/test/utils/swap_quote.ts
diff --git a/packages/asset-buyer/test/utils/test_helpers.ts b/packages/asset-swapper/test/utils/test_helpers.ts
similarity index 100%
rename from packages/asset-buyer/test/utils/test_helpers.ts
rename to packages/asset-swapper/test/utils/test_helpers.ts
diff --git a/packages/asset-buyer/test/utils/web3_wrapper.ts b/packages/asset-swapper/test/utils/web3_wrapper.ts
similarity index 100%
rename from packages/asset-buyer/test/utils/web3_wrapper.ts
rename to packages/asset-swapper/test/utils/web3_wrapper.ts
diff --git a/packages/asset-buyer/tsconfig.json b/packages/asset-swapper/tsconfig.json
similarity index 100%
rename from packages/asset-buyer/tsconfig.json
rename to packages/asset-swapper/tsconfig.json
diff --git a/packages/asset-buyer/tslint.json b/packages/asset-swapper/tslint.json
similarity index 100%
rename from packages/asset-buyer/tslint.json
rename to packages/asset-swapper/tslint.json
diff --git a/packages/asset-buyer/typedoc-tsconfig.json b/packages/asset-swapper/typedoc-tsconfig.json
similarity index 100%
rename from packages/asset-buyer/typedoc-tsconfig.json
rename to packages/asset-swapper/typedoc-tsconfig.json