diff --git a/packages/babel-cli/test/index.js b/packages/babel-cli/test/index.js
index 66f243aaab..d43d89671c 100644
--- a/packages/babel-cli/test/index.js
+++ b/packages/babel-cli/test/index.js
@@ -1,6 +1,6 @@
 const includes = require("lodash/includes");
 const readdir = require("fs-readdir-recursive");
-const helper = require("babel-helper-fixtures");
+const helper = require("@babel/helper-fixtures");
 const assert = require("assert");
 const rimraf = require("rimraf");
 const outputFileSync = require("output-file-sync");
diff --git a/packages/babel-code-frame/test/index.js b/packages/babel-code-frame/test/index.js
index 92c76ab21e..89a6001057 100644
--- a/packages/babel-code-frame/test/index.js
+++ b/packages/babel-code-frame/test/index.js
@@ -3,7 +3,7 @@ import chalk from "chalk";
 import stripAnsi from "strip-ansi";
 import codeFrame, { codeFrameColumns } from "..";
 
-describe("babel-code-frame", function() {
+describe("@babel/code-frame", function() {
   it("basic usage", function() {
     const rawLines = ["class Foo {", "  constructor()", "};"].join("\n");
     assert.equal(
diff --git a/packages/babel-core/register.js b/packages/babel-core/register.js
index 2f32d9baaf..906b80398c 100644
--- a/packages/babel-core/register.js
+++ b/packages/babel-core/register.js
@@ -1 +1 @@
-throw new Error("`babel-core/register` has been moved to `babel-register`.");
+throw new Error("`@babel/core/register` has been moved to `@babel/register`.");
diff --git a/packages/babel-core/test/browserify.js b/packages/babel-core/test/browserify.js
index 6f91c3f3fc..df00903443 100644
--- a/packages/babel-core/test/browserify.js
+++ b/packages/babel-core/test/browserify.js
@@ -4,7 +4,7 @@ import path from "path";
 import vm from "vm";
 
 describe("browserify", function() {
-  it("babel/register may be used without breaking browserify", function(done) {
+  it("@babel/register may be used without breaking browserify", function(done) {
     const bundler = browserify(
       path.join(__dirname, "fixtures/browserify/register.js"),
     );
diff --git a/packages/babel-core/test/config-loading.js b/packages/babel-core/test/config-loading.js
index 6eb06e938f..2f09e6dbc5 100644
--- a/packages/babel-core/test/config-loading.js
+++ b/packages/babel-core/test/config-loading.js
@@ -2,7 +2,7 @@ import loadConfig from "../lib/config";
 import path from "path";
 import { expect } from "chai";
 
-describe("babel-core config loading", () => {
+describe("@babel/core config loading", () => {
   const FILEPATH = path.join(
     __dirname,
     "fixtures",
diff --git a/packages/babel-core/test/fixtures/browserify/register.js b/packages/babel-core/test/fixtures/browserify/register.js
index d8f99e94a6..8f08ef49e0 100644
--- a/packages/babel-core/test/fixtures/browserify/register.js
+++ b/packages/babel-core/test/fixtures/browserify/register.js
@@ -1,3 +1,3 @@
-require("babel-register").default({
+require("@babel/register").default({
   ignore: false
 });
diff --git a/packages/babel-helper-module-imports/test/index.js b/packages/babel-helper-module-imports/test/index.js
index 7f2f303788..63db550839 100644
--- a/packages/babel-helper-module-imports/test/index.js
+++ b/packages/babel-helper-module-imports/test/index.js
@@ -40,7 +40,7 @@ function test(sourceType, opts, initializer, expectedCode) {
 const testScript = test.bind(undefined, "script");
 const testModule = test.bind(undefined, "module");
 
-describe("babel-helper-module-imports", () => {
+describe("@babel/helper-module-imports", () => {
   describe("namespace import", () => {
     const addNamespace = opts => m => m.addNamespace("source", opts);
 
diff --git a/packages/babel-helper-transform-fixture-test-runner/src/index.js b/packages/babel-helper-transform-fixture-test-runner/src/index.js
index 595c438f26..8a873a9937 100644
--- a/packages/babel-helper-transform-fixture-test-runner/src/index.js
+++ b/packages/babel-helper-transform-fixture-test-runner/src/index.js
@@ -38,7 +38,7 @@ vm.runInContext(
 
 // Initialize the test context with the polyfill, and then freeze the global to prevent implicit
 // global creation in tests, which could cause things to bleed between tests.
-runModuleInTestContext("babel-polyfill", __filename);
+runModuleInTestContext("@babel/polyfill", __filename);
 
 // Populate the "babelHelpers" global with Babel's helper utilities.
 runCodeInTestContext(buildExternalHelpers());
diff --git a/packages/babel-node/src/_babel-node.js b/packages/babel-node/src/_babel-node.js
index 51f7155135..742b83d3f4 100644
--- a/packages/babel-node/src/_babel-node.js
+++ b/packages/babel-node/src/_babel-node.js
@@ -5,7 +5,7 @@ import path from "path";
 import repl from "repl";
 import * as babel from "@babel/core";
 import vm from "vm";
-import "babel-polyfill";
+import "@babel/polyfill";
 import register from "@babel/register";
 
 import pkg from "../package.json";
diff --git a/packages/babel-node/test/index.js b/packages/babel-node/test/index.js
index 47ed8b1a3a..0947dd2776 100644
--- a/packages/babel-node/test/index.js
+++ b/packages/babel-node/test/index.js
@@ -1,6 +1,6 @@
 const includes = require("lodash/includes");
 const readdir = require("fs-readdir-recursive");
-const helper = require("babel-helper-fixtures");
+const helper = require("@babel/helper-fixtures");
 const assert = require("assert");
 const rimraf = require("rimraf");
 const outputFileSync = require("output-file-sync");
diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/copied-nodes.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/copied-nodes.js
index 8fb72e3db8..4bdcaa8953 100644
--- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/copied-nodes.js
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/copied-nodes.js
@@ -1,5 +1,5 @@
 const assert = require("assert");
-const babel = require("babel-core");
+const babel = require("@babel/core");
 
 test("Doesn't use the same object for two different nodes in the AST", function() {
   const code = 'import Foo from "bar"; Foo; Foo;';
diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/esmodule-flag.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/esmodule-flag.js
index 52072fa43a..06f9f75850 100644
--- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/esmodule-flag.js
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/esmodule-flag.js
@@ -1,5 +1,5 @@
 const assert = require("assert");
-const babel = require("babel-core");
+const babel = require("@babel/core");
 const vm = require("vm");
 
 test("Re-export doesn't overwrite __esModule flag", function() {
diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-hoisting/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-hoisting/expected.js
index 1c74a7f257..f88741ee45 100644
--- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-hoisting/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-hoisting/expected.js
@@ -1,4 +1,4 @@
-var _taggedTemplateLiteral = require("babel-runtime/helpers/taggedTemplateLiteral");
+var _taggedTemplateLiteral = require("@babel/runtime/helpers/taggedTemplateLiteral");
 
 var _templateObject = /*#__PURE__*/ _taggedTemplateLiteral(["foo"], ["foo"]);
 
diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/multi-load/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/multi-load/expected.js
index 9a77982e45..9930c38eb4 100644
--- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/multi-load/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/multi-load/expected.js
@@ -1,7 +1,7 @@
 "use strict";
 
-var _interopRequireDefault3 = require("babel-runtime/helpers/interopRequireDefault");
+var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _interopRequireDefault2 = _interopRequireDefault3(require("babel-runtime/helpers/interopRequireDefault"));
+var _interopRequireDefault2 = _interopRequireDefault3(require("@babel/runtime/helpers/interopRequireDefault"));
 
 console.log(_interopRequireDefault2.default);
diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/actual.js b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/actual.js
index 3d0a8255a4..27ecb3010f 100644
--- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/actual.js
+++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/actual.js
@@ -1 +1 @@
-import "babel-template";
+import "@babel/template";
diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/expected.js b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/expected.js
index 3ef498cd26..4f9182f8c5 100644
--- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/expected.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
-    define(["babel-template"], factory);
+    define(["@babel/template"], factory);
   } else if (typeof exports !== "undefined") {
-    factory(require("babel-template"));
+    factory(require("@babel/template"));
   } else {
     var mod = {
       exports: {}
diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/options.json b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/options.json
index 2a7db4bc1a..b8a91f8f8a 100644
--- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/options.json
+++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/options.json
@@ -3,7 +3,7 @@
     "external-helpers",
     ["transform-es2015-modules-umd", {
       "globals": {
-          "babel-template": "baz"
+          "@babel/template": "baz"
         }
     }]
   ]
diff --git a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/expected.js b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/expected.js
index ca7c85f631..d122e2c481 100644
--- a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/expected.js
+++ b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/expected.js
@@ -1,6 +1,6 @@
-var _regeneratorRuntime = require("babel-runtime/regenerator");
+var _regeneratorRuntime = require("@babel/runtime/regenerator");
 
-var _Object$keys = require("babel-runtime/core-js/object/keys");
+var _Object$keys = require("@babel/runtime/core-js/object/keys");
 
 var _marked =
 /*#__PURE__*/
diff --git a/packages/babel-plugin-transform-runtime/README.md b/packages/babel-plugin-transform-runtime/README.md
index bcc7626c09..edfe88a6ff 100644
--- a/packages/babel-plugin-transform-runtime/README.md
+++ b/packages/babel-plugin-transform-runtime/README.md
@@ -57,7 +57,7 @@ With options:
       "helpers": false,
       "polyfill": false,
       "regenerator": true,
-      "moduleName": "babel-runtime"
+      "moduleName": "@babel/runtime"
     }]
   ]
 }
diff --git a/packages/babel-plugin-transform-runtime/src/index.js b/packages/babel-plugin-transform-runtime/src/index.js
index eb2a43ce52..0dbe801d8e 100644
--- a/packages/babel-plugin-transform-runtime/src/index.js
+++ b/packages/babel-plugin-transform-runtime/src/index.js
@@ -5,7 +5,7 @@ import definitions from "./definitions";
 export default function({ types: t }, options) {
   const {
     helpers,
-    moduleName = "babel-runtime",
+    moduleName = "@babel/runtime",
     polyfill,
     regenerator,
     useBuiltIns,
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/aliased-constructors/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/aliased-constructors/expected.js
index d8b89dcd68..a7cfe5735c 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/aliased-constructors/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/aliased-constructors/expected.js
@@ -1,8 +1,8 @@
-var _Map = require("babel-runtime/core-js/map");
+var _Map = require("@babel/runtime/core-js/map");
 
-var _Symbol = require("babel-runtime/core-js/symbol");
+var _Symbol = require("@babel/runtime/core-js/symbol");
 
-var _Promise = require("babel-runtime/core-js/promise");
+var _Promise = require("@babel/runtime/core-js/promise");
 
 obj.constructor === Object;
 obj.constructor === _Promise;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/catch-all/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/catch-all/expected.js
index df0e29ed23..c3a34c2503 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/catch-all/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/catch-all/expected.js
@@ -1,3 +1,3 @@
-var _Promise = require("babel-runtime/core-js/promise");
+var _Promise = require("@babel/runtime/core-js/promise");
 
 _Promise.resolve;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/expected.js
index f9d5e22905..a273aa1824 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/expected.js
@@ -1,4 +1,4 @@
-var _classCallCheck = require("babel-runtime/helpers/classCallCheck");
+var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 
 let Foo = function Foo() {
   _classCallCheck(this, Foo);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/es6-for-of/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/es6-for-of/expected.js
index df86703577..0087e226c0 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/es6-for-of/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/es6-for-of/expected.js
@@ -1,4 +1,4 @@
-var _getIterator = require("babel-runtime/core-js/get-iterator");
+var _getIterator = require("@babel/runtime/core-js/get-iterator");
 
 var _iteratorNormalCompletion = true;
 var _didIteratorError = false;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/expected.js
index a49ec5c3fb..7a95ad78e4 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/expected.js
@@ -1,10 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("babel-runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _classCallCheck2 = _interopRequireDefault(require("babel-runtime/helpers/classCallCheck"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
-var _createClass2 = _interopRequireDefault(require("babel-runtime/helpers/createClass"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
 var _foo = _interopRequireDefault(require("foo"));
 
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/expected.js
index 76f4b638cc..3bfab64ad9 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/expected.js
@@ -1,10 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("babel-runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _Object$defineProperty = require("babel-runtime/core-js/object/define-property");
+var _Object$defineProperty = require("@babel/runtime/core-js/object/define-property");
 
-var _Object$keys = require("babel-runtime/core-js/object/keys");
+var _Object$keys = require("@babel/runtime/core-js/object/keys");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/regenerator-runtime/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/regenerator-runtime/expected.js
index 7a950eeb9e..8aeb9a7d50 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/regenerator-runtime/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/regenerator-runtime/expected.js
@@ -1,4 +1,4 @@
-var _regeneratorRuntime = require("babel-runtime/regenerator");
+var _regeneratorRuntime = require("@babel/runtime/regenerator");
 
 void
 /*#__PURE__*/
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator-in/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator-in/expected.js
index 3f88e54f37..e4e3264bb5 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator-in/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator-in/expected.js
@@ -1,3 +1,3 @@
-var _isIterable = require("babel-runtime/core-js/is-iterable");
+var _isIterable = require("@babel/runtime/core-js/is-iterable");
 
 _isIterable(Object(arr));
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator/expected.js
index 938c68f556..22731130e8 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator/expected.js
@@ -1,3 +1,3 @@
-var _Symbol$iterator = require("babel-runtime/core-js/symbol/iterator");
+var _Symbol$iterator = require("@babel/runtime/core-js/symbol/iterator");
 
 _Symbol$iterator;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns-useESModules/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns-useESModules/expected.js
index b36e987aaf..25dba1a3a6 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns-useESModules/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns-useESModules/expected.js
@@ -1,8 +1,8 @@
-var _classCallCheck = require("babel-runtime/helpers/builtin/es6/classCallCheck");
+var _classCallCheck = require("@babel/runtime/helpers/builtin/es6/classCallCheck");
 
-var _possibleConstructorReturn = require("babel-runtime/helpers/builtin/es6/possibleConstructorReturn");
+var _possibleConstructorReturn = require("@babel/runtime/helpers/builtin/es6/possibleConstructorReturn");
 
-var _inherits = require("babel-runtime/helpers/builtin/es6/inherits");
+var _inherits = require("@babel/runtime/helpers/builtin/es6/inherits");
 
 let Foo =
 /*#__PURE__*/
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns/expected.js
index b8667cfcb5..4fde1fa8a8 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns/expected.js
@@ -1,8 +1,8 @@
-var _classCallCheck = require("babel-runtime/helpers/builtin/classCallCheck");
+var _classCallCheck = require("@babel/runtime/helpers/builtin/classCallCheck");
 
-var _possibleConstructorReturn = require("babel-runtime/helpers/builtin/possibleConstructorReturn");
+var _possibleConstructorReturn = require("@babel/runtime/helpers/builtin/possibleConstructorReturn");
 
-var _inherits = require("babel-runtime/helpers/builtin/inherits");
+var _inherits = require("@babel/runtime/helpers/builtin/inherits");
 
 let Foo =
 /*#__PURE__*/
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules/expected.js
index b12682a0e3..f278df2a5c 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules/expected.js
@@ -1,10 +1,10 @@
-var _Object$getPrototypeOf = require("babel-runtime/core-js/object/get-prototype-of");
+var _Object$getPrototypeOf = require("@babel/runtime/core-js/object/get-prototype-of");
 
-var _classCallCheck = require("babel-runtime/helpers/es6/classCallCheck");
+var _classCallCheck = require("@babel/runtime/helpers/es6/classCallCheck");
 
-var _possibleConstructorReturn = require("babel-runtime/helpers/es6/possibleConstructorReturn");
+var _possibleConstructorReturn = require("@babel/runtime/helpers/es6/possibleConstructorReturn");
 
-var _inherits = require("babel-runtime/helpers/es6/inherits");
+var _inherits = require("@babel/runtime/helpers/es6/inherits");
 
 let Foo =
 /*#__PURE__*/
diff --git a/packages/babel-polyfill/scripts/make-separate-polyfill-files.js b/packages/babel-polyfill/scripts/make-separate-polyfill-files.js
index ac2277a6f1..1fe2610c36 100644
--- a/packages/babel-polyfill/scripts/make-separate-polyfill-files.js
+++ b/packages/babel-polyfill/scripts/make-separate-polyfill-files.js
@@ -7,7 +7,7 @@ function relative(loc) {
   return path.join(__dirname, "..", loc);
 }
 
-const builtIns = require("babel-preset-env/data/built-ins.json");
+const builtIns = require("@babel/preset-env/data/built-ins.json");
 const polyfills = Object.keys(builtIns);
 
 polyfills
diff --git a/packages/babel-register/src/cache.js b/packages/babel-register/src/cache.js
index 23bbda8f28..e2494e0248 100644
--- a/packages/babel-register/src/cache.js
+++ b/packages/babel-register/src/cache.js
@@ -5,7 +5,8 @@ import homeOrTmp from "home-or-tmp";
 import * as babel from "@babel/core";
 import findCacheDir from "find-cache-dir";
 
-const DEFAULT_CACHE_DIR = findCacheDir({ name: "babel-register" }) || homeOrTmp;
+const DEFAULT_CACHE_DIR =
+  findCacheDir({ name: "@babel/register" }) || homeOrTmp;
 const DEFAULT_FILENAME = path.join(
   DEFAULT_CACHE_DIR,
   `.babel.${babel.version}.${babel.getEnv()}.json`,
diff --git a/packages/babel-register/test/cache.js b/packages/babel-register/test/cache.js
index 5ab177785e..6c150758b9 100644
--- a/packages/babel-register/test/cache.js
+++ b/packages/babel-register/test/cache.js
@@ -29,7 +29,7 @@ function resetCache() {
   process.env.BABEL_DISABLE_CACHE = oldBabelDisableCacheValue;
 }
 
-describe("babel register", () => {
+describe("@babel/register - caching", () => {
   describe("cache", () => {
     let load, get, save;
 
diff --git a/packages/babel-register/test/index.js b/packages/babel-register/test/index.js
index 2ba7ace225..0c365f1d02 100644
--- a/packages/babel-register/test/index.js
+++ b/packages/babel-register/test/index.js
@@ -2,7 +2,7 @@ import chai from "chai";
 
 const DATA_ES2015 = require.resolve("./__data__/es2015");
 
-describe("babel-register", function() {
+describe("@babel/register", function() {
   let babelRegister;
   let oldCompiler;
 
diff --git a/packages/babel-runtime/scripts/build-dist.js b/packages/babel-runtime/scripts/build-dist.js
index a46f9d6cc2..51553b749f 100644
--- a/packages/babel-runtime/scripts/build-dist.js
+++ b/packages/babel-runtime/scripts/build-dist.js
@@ -1,8 +1,8 @@
 "use strict";
 
 const outputFile = require("output-file-sync");
-const coreDefinitions = require("babel-plugin-transform-runtime").definitions;
-const helpers = require("babel-helpers");
+const coreDefinitions = require("@babel/plugin-transform-runtime").definitions;
+const helpers = require("@babel/helpers");
 const babel = require("../../babel-core");
 const t = require("../../babel-types");
 
@@ -38,7 +38,6 @@ function defaultify(name) {
 
 function writeRootFile(filename, content) {
   filename = relative(filename);
-  //console.log(filename);
   outputFile(filename, content);
 }
 
diff --git a/packages/babel-standalone/package.json b/packages/babel-standalone/package.json
index 3f6af59e64..8908463f46 100644
--- a/packages/babel-standalone/package.json
+++ b/packages/babel-standalone/package.json
@@ -85,7 +85,7 @@
     "@babel/plugin-transform-runtime": "7.0.0-beta.3",
     "@babel/plugin-transform-strict-mode": "7.0.0-beta.3",
     "babel-plugin-transform-unicode-property-regex": "^2.0.5",
-    "babel-preset-env": "2.0.0-alpha.19",
+    "@babel/preset-env": "2.0.0-alpha.19",
     "@babel/preset-es2015": "7.0.0-beta.3",
     "@babel/preset-es2016": "7.0.0-beta.3",
     "@babel/preset-es2017": "7.0.0-beta.3",
diff --git a/packages/babel-standalone/src/index.js b/packages/babel-standalone/src/index.js
index 5078b6cbbc..7fb92eea30 100644
--- a/packages/babel-standalone/src/index.js
+++ b/packages/babel-standalone/src/index.js
@@ -138,100 +138,100 @@ export function registerPresets(newPresets) {
 
 // All the plugins we should bundle
 registerPlugins({
-  "check-es2015-constants": require("babel-plugin-check-es2015-constants"),
-  "external-helpers": require("babel-plugin-external-helpers"),
-  "syntax-async-functions": require("babel-plugin-syntax-async-functions"),
-  "syntax-async-generators": require("babel-plugin-syntax-async-generators"),
-  "syntax-class-properties": require("babel-plugin-syntax-class-properties"),
-  "syntax-decorators": require("babel-plugin-syntax-decorators"),
-  "syntax-do-expressions": require("babel-plugin-syntax-do-expressions"),
-  "syntax-dynamic-import": require("babel-plugin-syntax-dynamic-import"),
-  "syntax-exponentiation-operator": require("babel-plugin-syntax-exponentiation-operator"),
-  "syntax-export-extensions": require("babel-plugin-syntax-export-extensions"),
-  "syntax-flow": require("babel-plugin-syntax-flow"),
-  "syntax-function-bind": require("babel-plugin-syntax-function-bind"),
-  "syntax-function-sent": require("babel-plugin-syntax-function-sent"),
-  "syntax-jsx": require("babel-plugin-syntax-jsx"),
-  "syntax-object-rest-spread": require("babel-plugin-syntax-object-rest-spread"),
-  "syntax-optional-catch-binding": require("babel-plugin-syntax-optional-catch-binding"),
-  "syntax-trailing-function-commas": require("babel-plugin-syntax-trailing-function-commas"),
-  "transform-async-functions": require("babel-plugin-transform-async-functions"),
-  "transform-async-to-generator": require("babel-plugin-transform-async-to-generator"),
-  "transform-async-to-module-method": require("babel-plugin-transform-async-to-module-method"),
-  "transform-class-properties": require("babel-plugin-transform-class-properties"),
-  "transform-decorators": require("babel-plugin-transform-decorators"),
-  "transform-do-expressions": require("babel-plugin-transform-do-expressions"),
-  "transform-es2015-arrow-functions": require("babel-plugin-transform-es2015-arrow-functions"),
-  "transform-es2015-block-scoped-functions": require("babel-plugin-transform-es2015-block-scoped-functions"),
-  "transform-es2015-block-scoping": require("babel-plugin-transform-es2015-block-scoping"),
-  "transform-es2015-classes": require("babel-plugin-transform-es2015-classes"),
-  "transform-es2015-computed-properties": require("babel-plugin-transform-es2015-computed-properties"),
-  "transform-es2015-destructuring": require("babel-plugin-transform-es2015-destructuring"),
-  "transform-es2015-duplicate-keys": require("babel-plugin-transform-es2015-duplicate-keys"),
-  "transform-es2015-for-of": require("babel-plugin-transform-es2015-for-of"),
-  "transform-es2015-function-name": require("babel-plugin-transform-es2015-function-name"),
-  "transform-es2015-instanceof": require("babel-plugin-transform-es2015-instanceof"),
-  "transform-es2015-literals": require("babel-plugin-transform-es2015-literals"),
-  "transform-es2015-modules-amd": require("babel-plugin-transform-es2015-modules-amd"),
-  "transform-es2015-modules-commonjs": require("babel-plugin-transform-es2015-modules-commonjs"),
-  "transform-es2015-modules-systemjs": require("babel-plugin-transform-es2015-modules-systemjs"),
-  "transform-es2015-modules-umd": require("babel-plugin-transform-es2015-modules-umd"),
-  "transform-es2015-object-super": require("babel-plugin-transform-es2015-object-super"),
-  "transform-es2015-parameters": require("babel-plugin-transform-es2015-parameters"),
-  "transform-es2015-shorthand-properties": require("babel-plugin-transform-es2015-shorthand-properties"),
-  "transform-es2015-spread": require("babel-plugin-transform-es2015-spread"),
-  "transform-es2015-sticky-regex": require("babel-plugin-transform-es2015-sticky-regex"),
-  "transform-es2015-template-literals": require("babel-plugin-transform-es2015-template-literals"),
-  "transform-es2015-typeof-symbol": require("babel-plugin-transform-es2015-typeof-symbol"),
-  "transform-es2015-unicode-regex": require("babel-plugin-transform-es2015-unicode-regex"),
-  "transform-es3-member-expression-literals": require("babel-plugin-transform-es3-member-expression-literals"),
-  "transform-es3-property-literals": require("babel-plugin-transform-es3-property-literals"),
-  "transform-es5-property-mutators": require("babel-plugin-transform-es5-property-mutators"),
-  "transform-eval": require("babel-plugin-transform-eval"),
-  "transform-exponentiation-operator": require("babel-plugin-transform-exponentiation-operator"),
-  "transform-export-extensions": require("babel-plugin-transform-export-extensions"),
-  "transform-flow-comments": require("babel-plugin-transform-flow-comments"),
-  "transform-flow-strip-types": require("babel-plugin-transform-flow-strip-types"),
-  "transform-function-bind": require("babel-plugin-transform-function-bind"),
-  "transform-jscript": require("babel-plugin-transform-jscript"),
-  "transform-new-target": require("babel-plugin-transform-new-target"),
-  "transform-object-assign": require("babel-plugin-transform-object-assign"),
-  "transform-object-rest-spread": require("babel-plugin-transform-object-rest-spread"),
-  "transform-object-set-prototype-of-to-assign": require("babel-plugin-transform-object-set-prototype-of-to-assign"),
-  "transform-optional-catch-binding": require("babel-plugin-transform-optional-catch-binding"),
-  "transform-proto-to-assign": require("babel-plugin-transform-proto-to-assign"),
-  "transform-react-constant-elements": require("babel-plugin-transform-react-constant-elements"),
-  "transform-react-display-name": require("babel-plugin-transform-react-display-name"),
-  "transform-react-inline-elements": require("babel-plugin-transform-react-inline-elements"),
-  "transform-react-jsx": require("babel-plugin-transform-react-jsx"),
-  "transform-react-jsx-compat": require("babel-plugin-transform-react-jsx-compat"),
-  "transform-react-jsx-self": require("babel-plugin-transform-react-jsx-self"),
-  "transform-react-jsx-source": require("babel-plugin-transform-react-jsx-source"),
-  "transform-regenerator": require("babel-plugin-transform-regenerator"),
-  "transform-runtime": require("babel-plugin-transform-runtime"),
-  "transform-strict-mode": require("babel-plugin-transform-strict-mode"),
-  "transform-unicode-property-regex": require("babel-plugin-transform-unicode-property-regex"),
+  "check-es2015-constants": require("@babel/plugin-check-es2015-constants"),
+  "external-helpers": require("@babel/plugin-external-helpers"),
+  "syntax-async-functions": require("@babel/plugin-syntax-async-functions"),
+  "syntax-async-generators": require("@babel/plugin-syntax-async-generators"),
+  "syntax-class-properties": require("@babel/plugin-syntax-class-properties"),
+  "syntax-decorators": require("@babel/plugin-syntax-decorators"),
+  "syntax-do-expressions": require("@babel/plugin-syntax-do-expressions"),
+  "syntax-dynamic-import": require("@babel/plugin-syntax-dynamic-import"),
+  "syntax-exponentiation-operator": require("@babel/plugin-syntax-exponentiation-operator"),
+  "syntax-export-extensions": require("@babel/plugin-syntax-export-extensions"),
+  "syntax-flow": require("@babel/plugin-syntax-flow"),
+  "syntax-function-bind": require("@babel/plugin-syntax-function-bind"),
+  "syntax-function-sent": require("@babel/plugin-syntax-function-sent"),
+  "syntax-jsx": require("@babel/plugin-syntax-jsx"),
+  "syntax-object-rest-spread": require("@babel/plugin-syntax-object-rest-spread"),
+  "syntax-optional-catch-binding": require("@babel/plugin-syntax-optional-catch-binding"),
+  "syntax-trailing-function-commas": require("@babel/plugin-syntax-trailing-function-commas"),
+  "transform-async-functions": require("@babel/plugin-transform-async-functions"),
+  "transform-async-to-generator": require("@babel/plugin-transform-async-to-generator"),
+  "transform-async-to-module-method": require("@babel/plugin-transform-async-to-module-method"),
+  "transform-class-properties": require("@babel/plugin-transform-class-properties"),
+  "transform-decorators": require("@babel/plugin-transform-decorators"),
+  "transform-do-expressions": require("@babel/plugin-transform-do-expressions"),
+  "transform-es2015-arrow-functions": require("@babel/plugin-transform-es2015-arrow-functions"),
+  "transform-es2015-block-scoped-functions": require("@babel/plugin-transform-es2015-block-scoped-functions"),
+  "transform-es2015-block-scoping": require("@babel/plugin-transform-es2015-block-scoping"),
+  "transform-es2015-classes": require("@babel/plugin-transform-es2015-classes"),
+  "transform-es2015-computed-properties": require("@babel/plugin-transform-es2015-computed-properties"),
+  "transform-es2015-destructuring": require("@babel/plugin-transform-es2015-destructuring"),
+  "transform-es2015-duplicate-keys": require("@babel/plugin-transform-es2015-duplicate-keys"),
+  "transform-es2015-for-of": require("@babel/plugin-transform-es2015-for-of"),
+  "transform-es2015-function-name": require("@babel/plugin-transform-es2015-function-name"),
+  "transform-es2015-instanceof": require("@babel/plugin-transform-es2015-instanceof"),
+  "transform-es2015-literals": require("@babel/plugin-transform-es2015-literals"),
+  "transform-es2015-modules-amd": require("@babel/plugin-transform-es2015-modules-amd"),
+  "transform-es2015-modules-commonjs": require("@babel/plugin-transform-es2015-modules-commonjs"),
+  "transform-es2015-modules-systemjs": require("@babel/plugin-transform-es2015-modules-systemjs"),
+  "transform-es2015-modules-umd": require("@babel/plugin-transform-es2015-modules-umd"),
+  "transform-es2015-object-super": require("@babel/plugin-transform-es2015-object-super"),
+  "transform-es2015-parameters": require("@babel/plugin-transform-es2015-parameters"),
+  "transform-es2015-shorthand-properties": require("@babel/plugin-transform-es2015-shorthand-properties"),
+  "transform-es2015-spread": require("@babel/plugin-transform-es2015-spread"),
+  "transform-es2015-sticky-regex": require("@babel/plugin-transform-es2015-sticky-regex"),
+  "transform-es2015-template-literals": require("@babel/plugin-transform-es2015-template-literals"),
+  "transform-es2015-typeof-symbol": require("@babel/plugin-transform-es2015-typeof-symbol"),
+  "transform-es2015-unicode-regex": require("@babel/plugin-transform-es2015-unicode-regex"),
+  "transform-es3-member-expression-literals": require("@babel/plugin-transform-es3-member-expression-literals"),
+  "transform-es3-property-literals": require("@babel/plugin-transform-es3-property-literals"),
+  "transform-es5-property-mutators": require("@babel/plugin-transform-es5-property-mutators"),
+  "transform-eval": require("@babel/plugin-transform-eval"),
+  "transform-exponentiation-operator": require("@babel/plugin-transform-exponentiation-operator"),
+  "transform-export-extensions": require("@babel/plugin-transform-export-extensions"),
+  "transform-flow-comments": require("@babel/plugin-transform-flow-comments"),
+  "transform-flow-strip-types": require("@babel/plugin-transform-flow-strip-types"),
+  "transform-function-bind": require("@babel/plugin-transform-function-bind"),
+  "transform-jscript": require("@babel/plugin-transform-jscript"),
+  "transform-new-target": require("@babel/plugin-transform-new-target"),
+  "transform-object-assign": require("@babel/plugin-transform-object-assign"),
+  "transform-object-rest-spread": require("@babel/plugin-transform-object-rest-spread"),
+  "transform-object-set-prototype-of-to-assign": require("@babel/plugin-transform-object-set-prototype-of-to-assign"),
+  "transform-optional-catch-binding": require("@babel/plugin-transform-optional-catch-binding"),
+  "transform-proto-to-assign": require("@babel/plugin-transform-proto-to-assign"),
+  "transform-react-constant-elements": require("@babel/plugin-transform-react-constant-elements"),
+  "transform-react-display-name": require("@babel/plugin-transform-react-display-name"),
+  "transform-react-inline-elements": require("@babel/plugin-transform-react-inline-elements"),
+  "transform-react-jsx": require("@babel/plugin-transform-react-jsx"),
+  "transform-react-jsx-compat": require("@babel/plugin-transform-react-jsx-compat"),
+  "transform-react-jsx-self": require("@babel/plugin-transform-react-jsx-self"),
+  "transform-react-jsx-source": require("@babel/plugin-transform-react-jsx-source"),
+  "transform-regenerator": require("@babel/plugin-transform-regenerator"),
+  "transform-runtime": require("@babel/plugin-transform-runtime"),
+  "transform-strict-mode": require("@babel/plugin-transform-strict-mode"),
+  "transform-unicode-property-regex": require("@babel/plugin-transform-unicode-property-regex"),
 });
 
 // All the presets we should bundle
 registerPresets({
-  es2015: require("babel-preset-es2015"),
-  es2016: require("babel-preset-es2016"),
-  es2017: require("babel-preset-es2017"),
-  react: require("babel-preset-react"),
-  "stage-0": require("babel-preset-stage-0"),
-  "stage-1": require("babel-preset-stage-1"),
-  "stage-2": require("babel-preset-stage-2"),
-  "stage-3": require("babel-preset-stage-3"),
+  es2015: require("@babel/preset-es2015"),
+  es2016: require("@babel/preset-es2016"),
+  es2017: require("@babel/preset-es2017"),
+  react: require("@babel/preset-react"),
+  "stage-0": require("@babel/preset-stage-0"),
+  "stage-1": require("@babel/preset-stage-1"),
+  "stage-2": require("@babel/preset-stage-2"),
+  "stage-3": require("@babel/preset-stage-3"),
   "es2015-loose": {
-    presets: [[require("babel-preset-es2015"), { loose: true }]],
+    presets: [[require("@babel/preset-es2015"), { loose: true }]],
   },
   // ES2015 preset with es2015-modules-commonjs removed
   "es2015-no-commonjs": {
-    presets: [[require("babel-preset-es2015"), { modules: false }]],
+    presets: [[require("@babel/preset-es2015"), { modules: false }]],
   },
-  typescript: require("babel-preset-typescript"),
-  flow: require("babel-preset-flow"),
+  typescript: require("@babel/preset-typescript"),
+  flow: require("@babel/preset-flow"),
 });
 
 export const version = VERSION;
diff --git a/packages/babel-standalone/test/babel.js b/packages/babel-standalone/test/babel.js
index cb5337a9c7..4d8911fc93 100644
--- a/packages/babel-standalone/test/babel.js
+++ b/packages/babel-standalone/test/babel.js
@@ -2,7 +2,7 @@ const assert = require("assert");
 const Babel = require("../babel");
 
 // Basic smoke tests for babel-standalone
-describe("babel-standalone", () => {
+describe("@babel/standalone", () => {
   it("handles the es2015-no-commonjs preset", () => {
     const output = Babel.transform('const getMessage = () => "Hello World"', {
       presets: ["es2015-no-commonjs"],