diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier16/options.json b/packages/babel-generator/test/fixtures/types/ExportSpecifier16/options.json
index 51b838fb14..512160be9e 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier16/options.json
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier16/options.json
@@ -1 +1 @@
-{ "plugins": ["exportExtensions"] }
\ No newline at end of file
+{ "plugins": ["exportNamespaceFrom"] }
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier2/options.json b/packages/babel-generator/test/fixtures/types/ExportSpecifier2/options.json
index 51b838fb14..512160be9e 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier2/options.json
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier2/options.json
@@ -1 +1 @@
-{ "plugins": ["exportExtensions"] }
\ No newline at end of file
+{ "plugins": ["exportNamespaceFrom"] }
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier3/options.json b/packages/babel-generator/test/fixtures/types/ExportSpecifier3/options.json
index 51b838fb14..edb5cc5cac 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier3/options.json
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier3/options.json
@@ -1 +1 @@
-{ "plugins": ["exportExtensions"] }
\ No newline at end of file
+{ "plugins": ["exportDefaultFrom"] }
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier4/options.json b/packages/babel-generator/test/fixtures/types/ExportSpecifier4/options.json
index 51b838fb14..512160be9e 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier4/options.json
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier4/options.json
@@ -1 +1 @@
-{ "plugins": ["exportExtensions"] }
\ No newline at end of file
+{ "plugins": ["exportNamespaceFrom"] }
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier5/options.json b/packages/babel-generator/test/fixtures/types/ExportSpecifier5/options.json
index 51b838fb14..edb5cc5cac 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier5/options.json
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier5/options.json
@@ -1 +1 @@
-{ "plugins": ["exportExtensions"] }
\ No newline at end of file
+{ "plugins": ["exportDefaultFrom"] }
diff --git a/packages/babel-generator/test/fixtures/typescript/regression-is-default-export/options.json b/packages/babel-generator/test/fixtures/typescript/regression-is-default-export/options.json
index 789d6a6a8f..21e26c84a8 100644
--- a/packages/babel-generator/test/fixtures/typescript/regression-is-default-export/options.json
+++ b/packages/babel-generator/test/fixtures/typescript/regression-is-default-export/options.json
@@ -1,3 +1,3 @@
 {
-    "plugins": ["exportExtensions", "typescript"]
+    "plugins": ["exportDefaultFrom", "typescript"]
 }
diff --git a/packages/babel-plugin-proposal-export-default/.npmignore b/packages/babel-plugin-proposal-export-default-from/.npmignore
similarity index 100%
rename from packages/babel-plugin-proposal-export-default/.npmignore
rename to packages/babel-plugin-proposal-export-default-from/.npmignore
diff --git a/packages/babel-plugin-proposal-export-default/README.md b/packages/babel-plugin-proposal-export-default-from/README.md
similarity index 65%
rename from packages/babel-plugin-proposal-export-default/README.md
rename to packages/babel-plugin-proposal-export-default-from/README.md
index 22bc79a778..6670c14ee6 100644
--- a/packages/babel-plugin-proposal-export-default/README.md
+++ b/packages/babel-plugin-proposal-export-default-from/README.md
@@ -1,4 +1,4 @@
-# @babel/plugin-proposal-export-default
+# @babel/plugin-proposal-export-default-from
 
 > Compile export-default-from statements to ES2015
 
@@ -11,7 +11,7 @@ export v from 'mod';
 ## Installation
 
 ```sh
-npm install --save-dev @babel/plugin-proposal-export-default
+npm install --save-dev @babel/plugin-proposal-export-default-from
 ```
 
 ## Usage
@@ -22,21 +22,21 @@ npm install --save-dev @babel/plugin-proposal-export-default
 
 ```json
 {
-  "plugins": ["@babel/plugin-proposal-export-default"]
+  "plugins": ["@babel/plugin-proposal-export-default-from"]
 }
 ```
 
 ### Via CLI
 
 ```sh
-babel --plugins @babel/plugin-proposal-export-default script.js
+babel --plugins @babel/plugin-proposal-export-default-from script.js
 ```
 
 ### Via Node API
 
 ```javascript
 require("@babel/core").transform("code", {
-  plugins: ["@babel/plugin-proposal-export-default"]
+  plugins: ["@babel/plugin-proposal-export-default-from"]
 });
 ```
 ## References
diff --git a/packages/babel-plugin-proposal-export-default/package.json b/packages/babel-plugin-proposal-export-default-from/package.json
similarity index 72%
rename from packages/babel-plugin-proposal-export-default/package.json
rename to packages/babel-plugin-proposal-export-default-from/package.json
index 8249ac9ef3..31b5a3a232 100644
--- a/packages/babel-plugin-proposal-export-default/package.json
+++ b/packages/babel-plugin-proposal-export-default-from/package.json
@@ -1,15 +1,15 @@
 {
-  "name": "@babel/plugin-proposal-export-default",
+  "name": "@babel/plugin-proposal-export-default-from",
   "version": "7.0.0-beta.32",
   "description": "Compile export default to ES2015",
-  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-export-default",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-export-default-from",
   "license": "MIT",
   "main": "lib/index.js",
   "keywords": [
     "babel-plugin"
   ],
   "dependencies": {
-    "@babel/plugin-syntax-export-extensions": "7.0.0-beta.32"
+    "@babel/plugin-syntax-export-default-from": "7.0.0-beta.32"
   },
   "peerDependencies": {
     "@babel/core": "7.0.0-beta.32"
diff --git a/packages/babel-plugin-proposal-export-default/src/index.js b/packages/babel-plugin-proposal-export-default-from/src/index.js
similarity index 86%
rename from packages/babel-plugin-proposal-export-default/src/index.js
rename to packages/babel-plugin-proposal-export-default-from/src/index.js
index 67bdd730ad..4d0e6c5661 100644
--- a/packages/babel-plugin-proposal-export-default/src/index.js
+++ b/packages/babel-plugin-proposal-export-default-from/src/index.js
@@ -1,9 +1,9 @@
-import syntaxExportExtensions from "@babel/plugin-syntax-export-extensions";
+import syntaxExportDefaultFrom from "@babel/plugin-syntax-export-default-from";
 import { types as t } from "@babel/core";
 
 export default function() {
   return {
-    inherits: syntaxExportExtensions,
+    inherits: syntaxExportDefaultFrom,
 
     visitor: {
       ExportNamedDeclaration(path) {
diff --git a/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-compound-es6/actual.js b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-compound-es6/actual.js
similarity index 100%
rename from packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-compound-es6/actual.js
rename to packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-compound-es6/actual.js
diff --git a/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-compound-es6/expected.js b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-compound-es6/expected.js
similarity index 100%
rename from packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-compound-es6/expected.js
rename to packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-compound-es6/expected.js
diff --git a/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-es6/actual.js b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-es6/actual.js
similarity index 100%
rename from packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-es6/actual.js
rename to packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-es6/actual.js
diff --git a/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-es6/expected.js b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-es6/expected.js
similarity index 100%
rename from packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-es6/expected.js
rename to packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-es6/expected.js
diff --git a/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/options.json b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/options.json
new file mode 100644
index 0000000000..4eef72c161
--- /dev/null
+++ b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["external-helpers", "proposal-export-default-from"]
+}
diff --git a/packages/babel-plugin-proposal-export-default/test/index.js b/packages/babel-plugin-proposal-export-default-from/test/index.js
similarity index 100%
rename from packages/babel-plugin-proposal-export-default/test/index.js
rename to packages/babel-plugin-proposal-export-default-from/test/index.js
diff --git a/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-compound-namespace/actual.js b/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-compound-namespace/actual.js
deleted file mode 100644
index 8287306a07..0000000000
--- a/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-compound-namespace/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-export v, * as all from "mod";
diff --git a/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-compound-namespace/expected.js b/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-compound-namespace/expected.js
deleted file mode 100644
index bc377b5fc2..0000000000
--- a/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/default-compound-namespace/expected.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import _v from "mod";
-export { _v as v };
-export * as all from "mod";
diff --git a/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/namespace-es6/expected.js b/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/namespace-es6/expected.js
deleted file mode 100644
index d9d78f9ccd..0000000000
--- a/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/namespace-es6/expected.js
+++ /dev/null
@@ -1 +0,0 @@
-export * as foo from "bar";
diff --git a/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/options.json b/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/options.json
deleted file mode 100644
index 544d78a4e1..0000000000
--- a/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["external-helpers", "proposal-export-default"]
-}
diff --git a/packages/babel-plugin-proposal-export-namespace/.npmignore b/packages/babel-plugin-proposal-export-namespace-from/.npmignore
similarity index 100%
rename from packages/babel-plugin-proposal-export-namespace/.npmignore
rename to packages/babel-plugin-proposal-export-namespace-from/.npmignore
diff --git a/packages/babel-plugin-proposal-export-namespace/README.md b/packages/babel-plugin-proposal-export-namespace-from/README.md
similarity index 63%
rename from packages/babel-plugin-proposal-export-namespace/README.md
rename to packages/babel-plugin-proposal-export-namespace-from/README.md
index 83f60d7752..bb4ff7890e 100644
--- a/packages/babel-plugin-proposal-export-namespace/README.md
+++ b/packages/babel-plugin-proposal-export-namespace-from/README.md
@@ -1,4 +1,4 @@
-# @babel/plugin-proposal-export-namespace
+# @babel/plugin-proposal-export-namespace-from
 
 > Compile export-ns-from statements to ES2015
 
@@ -11,7 +11,7 @@ export * as ns from 'mod';
 ## Installation
 
 ```sh
-npm install --save-dev @babel/plugin-proposal-export-namespace
+npm install --save-dev @babel/plugin-proposal-export-namespace-from
 ```
 
 ## Usage
@@ -22,21 +22,21 @@ npm install --save-dev @babel/plugin-proposal-export-namespace
 
 ```json
 {
-  "plugins": ["@babel/plugin-proposal-export-namespace"]
+  "plugins": ["@babel/plugin-proposal-export-namespace-from"]
 }
 ```
 
 ### Via CLI
 
 ```sh
-babel --plugins @babel/plugin-proposal-export-namespace script.js
+babel --plugins @babel/plugin-proposal-export-namespace-from script.js
 ```
 
 ### Via Node API
 
 ```javascript
 require("@babel/core").transform("code", {
-  plugins: ["@babel/plugin-proposal-export-namespace"]
+  plugins: ["@babel/plugin-proposal-export-namespace-from"]
 });
 ```
 ## References
diff --git a/packages/babel-plugin-proposal-export-namespace/package.json b/packages/babel-plugin-proposal-export-namespace-from/package.json
similarity index 71%
rename from packages/babel-plugin-proposal-export-namespace/package.json
rename to packages/babel-plugin-proposal-export-namespace-from/package.json
index ecf500b65b..46728d975d 100644
--- a/packages/babel-plugin-proposal-export-namespace/package.json
+++ b/packages/babel-plugin-proposal-export-namespace-from/package.json
@@ -1,15 +1,15 @@
 {
-  "name": "@babel/plugin-proposal-export-namespace",
+  "name": "@babel/plugin-proposal-export-namespace-from",
   "version": "7.0.0-beta.32",
   "description": "Compile export namespace to ES2015",
-  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-export-namespace",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-export-namespace-from",
   "license": "MIT",
   "main": "lib/index.js",
   "keywords": [
     "babel-plugin"
   ],
   "dependencies": {
-    "@babel/plugin-syntax-export-extensions": "7.0.0-beta.32"
+    "@babel/plugin-syntax-export-namespace-from": "7.0.0-beta.32"
   },
   "peerDependencies": {
     "@babel/core": "7.0.0-beta.32"
diff --git a/packages/babel-plugin-proposal-export-namespace/src/index.js b/packages/babel-plugin-proposal-export-namespace-from/src/index.js
similarity index 89%
rename from packages/babel-plugin-proposal-export-namespace/src/index.js
rename to packages/babel-plugin-proposal-export-namespace-from/src/index.js
index 8b0c417fba..06b08c4afe 100644
--- a/packages/babel-plugin-proposal-export-namespace/src/index.js
+++ b/packages/babel-plugin-proposal-export-namespace-from/src/index.js
@@ -1,9 +1,9 @@
-import syntaxExportExtensions from "@babel/plugin-syntax-export-extensions";
+import syntaxExportNamespaceFrom from "@babel/plugin-syntax-export-namespace-from";
 import { types as t } from "@babel/core";
 
 export default function() {
   return {
-    inherits: syntaxExportExtensions,
+    inherits: syntaxExportNamespaceFrom,
 
     visitor: {
       ExportNamedDeclaration(path) {
diff --git a/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-compound-es6/actual.js b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-compound-es6/actual.js
new file mode 100644
index 0000000000..c2e55bbbc3
--- /dev/null
+++ b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-compound-es6/actual.js
@@ -0,0 +1 @@
+export * as foo, { bar } from "bar";
diff --git a/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-compound-es6/expected.js b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-compound-es6/expected.js
new file mode 100644
index 0000000000..dcec26a975
--- /dev/null
+++ b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-compound-es6/expected.js
@@ -0,0 +1,3 @@
+import * as _foo from "bar";
+export { _foo as foo };
+export { bar } from "bar";
diff --git a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-default/actual.js b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-default/actual.js
similarity index 100%
rename from packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-default/actual.js
rename to packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-default/actual.js
diff --git a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-default/expected.js b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-default/expected.js
similarity index 100%
rename from packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-default/expected.js
rename to packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-default/expected.js
diff --git a/packages/babel-plugin-proposal-export-default/test/fixtures/export-default/namespace-es6/actual.js b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-es6/actual.js
similarity index 100%
rename from packages/babel-plugin-proposal-export-default/test/fixtures/export-default/namespace-es6/actual.js
rename to packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-es6/actual.js
diff --git a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-es6/expected.js b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-es6/expected.js
similarity index 100%
rename from packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-es6/expected.js
rename to packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-es6/expected.js
diff --git a/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/options.json b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/options.json
new file mode 100644
index 0000000000..2c7ea3c8e6
--- /dev/null
+++ b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["external-helpers", "proposal-export-namespace-from"]
+}
diff --git a/packages/babel-plugin-proposal-export-namespace/test/index.js b/packages/babel-plugin-proposal-export-namespace-from/test/index.js
similarity index 100%
rename from packages/babel-plugin-proposal-export-namespace/test/index.js
rename to packages/babel-plugin-proposal-export-namespace-from/test/index.js
diff --git a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/default-es6/actual.js b/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/default-es6/actual.js
deleted file mode 100644
index 48783b0466..0000000000
--- a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/default-es6/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-export foo from "bar";
diff --git a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/default-es6/expected.js b/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/default-es6/expected.js
deleted file mode 100644
index 48783b0466..0000000000
--- a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/default-es6/expected.js
+++ /dev/null
@@ -1 +0,0 @@
-export foo from "bar";
diff --git a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-compound-es6/actual.js b/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-compound-es6/actual.js
deleted file mode 100644
index a7ea4eec36..0000000000
--- a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-compound-es6/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-export v, * as ns from "mod";
diff --git a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-compound-es6/expected.js b/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-compound-es6/expected.js
deleted file mode 100644
index d3fef4daae..0000000000
--- a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-compound-es6/expected.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export v from "mod";
-import * as _ns from "mod";
-export { _ns as ns };
diff --git a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-es6/actual.js b/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-es6/actual.js
deleted file mode 100644
index d9d78f9ccd..0000000000
--- a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/namespace-es6/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-export * as foo from "bar";
diff --git a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/options.json b/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/options.json
deleted file mode 100644
index 11a49abb92..0000000000
--- a/packages/babel-plugin-proposal-export-namespace/test/fixtures/export-namespace/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["external-helpers", "proposal-export-namespace"]
-}
diff --git a/packages/babel-plugin-syntax-export-extensions/.npmignore b/packages/babel-plugin-syntax-export-default-from/.npmignore
similarity index 100%
rename from packages/babel-plugin-syntax-export-extensions/.npmignore
rename to packages/babel-plugin-syntax-export-default-from/.npmignore
diff --git a/packages/babel-plugin-syntax-export-default-from/README.md b/packages/babel-plugin-syntax-export-default-from/README.md
new file mode 100644
index 0000000000..42c0bca8f6
--- /dev/null
+++ b/packages/babel-plugin-syntax-export-default-from/README.md
@@ -0,0 +1,35 @@
+# @babel/plugin-syntax-export-default-from
+
+> Allow parsing of `export default from`.
+
+## Installation
+
+```sh
+npm install --save-dev @babel/plugin-syntax-export-default-from
+```
+
+## Usage
+
+### Via `.babelrc` (Recommended)
+
+**.babelrc**
+
+```json
+{
+  "plugins": ["@babel/plugin-syntax-export-default-from"]
+}
+```
+
+### Via CLI
+
+```sh
+babel --plugins @babel/plugin-syntax-export-default-from script.js
+```
+
+### Via Node API
+
+```javascript
+require("@babel/core").transform("code", {
+  plugins: ["@babel/plugin-syntax-export-default-from"]
+});
+```
diff --git a/packages/babel-plugin-syntax-export-extensions/package.json b/packages/babel-plugin-syntax-export-default-from/package.json
similarity index 66%
rename from packages/babel-plugin-syntax-export-extensions/package.json
rename to packages/babel-plugin-syntax-export-default-from/package.json
index 2a068dae3c..bc98c722ac 100644
--- a/packages/babel-plugin-syntax-export-extensions/package.json
+++ b/packages/babel-plugin-syntax-export-default-from/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "@babel/plugin-syntax-export-extensions",
+  "name": "@babel/plugin-syntax-export-default-from",
   "version": "7.0.0-beta.32",
-  "description": "Allow parsing of export extensions",
-  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-export-extensions",
+  "description": "Allow parsing of export default from",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-export-default-from",
   "license": "MIT",
   "main": "lib/index.js",
   "keywords": [
diff --git a/packages/babel-plugin-syntax-export-extensions/src/index.js b/packages/babel-plugin-syntax-export-default-from/src/index.js
similarity index 64%
rename from packages/babel-plugin-syntax-export-extensions/src/index.js
rename to packages/babel-plugin-syntax-export-default-from/src/index.js
index cfacda7da1..6d7a78feea 100644
--- a/packages/babel-plugin-syntax-export-extensions/src/index.js
+++ b/packages/babel-plugin-syntax-export-default-from/src/index.js
@@ -1,7 +1,7 @@
 export default function() {
   return {
     manipulateOptions(opts, parserOpts) {
-      parserOpts.plugins.push("exportExtensions");
+      parserOpts.plugins.push("exportDefaultFrom");
     },
   };
 }
diff --git a/packages/babel-plugin-syntax-export-extensions/README.md b/packages/babel-plugin-syntax-export-extensions/README.md
deleted file mode 100644
index ecf746327f..0000000000
--- a/packages/babel-plugin-syntax-export-extensions/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# @babel/plugin-syntax-export-extensions
-
-> Allow parsing of export extensions.
-
-## Installation
-
-```sh
-npm install --save-dev @babel/plugin-syntax-export-extensions
-```
-
-## Usage
-
-### Via `.babelrc` (Recommended)
-
-**.babelrc**
-
-```json
-{
-  "plugins": ["@babel/plugin-syntax-export-extensions"]
-}
-```
-
-### Via CLI
-
-```sh
-babel --plugins @babel/plugin-syntax-export-extensions script.js
-```
-
-### Via Node API
-
-```javascript
-require("@babel/core").transform("code", {
-  plugins: ["@babel/plugin-syntax-export-extensions"]
-});
-```
diff --git a/packages/babel-plugin-syntax-export-namespace-from/.npmignore b/packages/babel-plugin-syntax-export-namespace-from/.npmignore
new file mode 100644
index 0000000000..f980694583
--- /dev/null
+++ b/packages/babel-plugin-syntax-export-namespace-from/.npmignore
@@ -0,0 +1,3 @@
+src
+test
+*.log
diff --git a/packages/babel-plugin-syntax-export-namespace-from/README.md b/packages/babel-plugin-syntax-export-namespace-from/README.md
new file mode 100644
index 0000000000..6e358a2e3d
--- /dev/null
+++ b/packages/babel-plugin-syntax-export-namespace-from/README.md
@@ -0,0 +1,35 @@
+# @babel/plugin-syntax-export-namespace-from
+
+> Allow parsing of `export * as namespace from`.
+
+## Installation
+
+```sh
+npm install --save-dev @babel/plugin-syntax-export-namespace-from
+```
+
+## Usage
+
+### Via `.babelrc` (Recommended)
+
+**.babelrc**
+
+```json
+{
+  "plugins": ["@babel/plugin-syntax-export-namespace-from"]
+}
+```
+
+### Via CLI
+
+```sh
+babel --plugins @babel/plugin-syntax-export-namespace-from script.js
+```
+
+### Via Node API
+
+```javascript
+require("@babel/core").transform("code", {
+  plugins: ["@babel/plugin-syntax-export-namespace-from"]
+});
+```
diff --git a/packages/babel-plugin-syntax-export-namespace-from/package.json b/packages/babel-plugin-syntax-export-namespace-from/package.json
new file mode 100644
index 0000000000..fed57559ca
--- /dev/null
+++ b/packages/babel-plugin-syntax-export-namespace-from/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@babel/plugin-syntax-export-namespace-from",
+  "version": "7.0.0-beta.32",
+  "description": "Allow parsing of export namespace from",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-export-namespace-from",
+  "license": "MIT",
+  "main": "lib/index.js",
+  "keywords": [
+    "babel-plugin"
+  ],
+  "peerDependencies": {
+    "@babel/core": "7.0.0-beta.32"
+  },
+  "devDependencies": {
+    "@babel/core": "7.0.0-beta.32"
+  }
+}
diff --git a/packages/babel-plugin-syntax-export-namespace-from/src/index.js b/packages/babel-plugin-syntax-export-namespace-from/src/index.js
new file mode 100644
index 0000000000..15dfac7d90
--- /dev/null
+++ b/packages/babel-plugin-syntax-export-namespace-from/src/index.js
@@ -0,0 +1,7 @@
+export default function() {
+  return {
+    manipulateOptions(opts, parserOpts) {
+      parserOpts.plugins.push("exportNamespaceFrom");
+    },
+  };
+}
diff --git a/packages/babel-standalone/package.json b/packages/babel-standalone/package.json
index 3fbbffcc7b..a7ccf15a6b 100644
--- a/packages/babel-standalone/package.json
+++ b/packages/babel-standalone/package.json
@@ -16,6 +16,8 @@
     "@babel/plugin-proposal-class-properties": "7.0.0-beta.32",
     "@babel/plugin-proposal-decorators": "7.0.0-beta.32",
     "@babel/plugin-proposal-do-expressions": "7.0.0-beta.32",
+    "@babel/plugin-proposal-export-default-from": "7.0.0-beta.32",
+    "@babel/plugin-proposal-export-namespace-from": "7.0.0-beta.32",
     "@babel/plugin-proposal-function-bind": "7.0.0-beta.32",
     "@babel/plugin-proposal-object-rest-spread": "7.0.0-beta.32",
     "@babel/plugin-proposal-optional-catch-binding": "7.0.0-beta.32",
@@ -25,7 +27,8 @@
     "@babel/plugin-syntax-decorators": "7.0.0-beta.32",
     "@babel/plugin-syntax-do-expressions": "7.0.0-beta.32",
     "@babel/plugin-syntax-dynamic-import": "7.0.0-beta.32",
-    "@babel/plugin-syntax-export-extensions": "7.0.0-beta.32",
+    "@babel/plugin-syntax-export-default-from": "7.0.0-beta.32",
+    "@babel/plugin-syntax-export-namespace-from": "7.0.0-beta.32",
     "@babel/plugin-syntax-flow": "7.0.0-beta.32",
     "@babel/plugin-syntax-function-bind": "7.0.0-beta.32",
     "@babel/plugin-syntax-function-sent": "7.0.0-beta.32",
diff --git a/packages/babel-standalone/src/index.js b/packages/babel-standalone/src/index.js
index 93de8e6a22..8692a1cb29 100644
--- a/packages/babel-standalone/src/index.js
+++ b/packages/babel-standalone/src/index.js
@@ -147,7 +147,8 @@ registerPlugins({
   "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-export-extensions": require("@babel/plugin-syntax-export-extensions"),
+  "syntax-export-default-from": require("@babel/plugin-syntax-export-default-from"),
+  "syntax-export-namespace-from": require("@babel/plugin-syntax-export-namespace-from"),
   "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"),
@@ -158,6 +159,8 @@ registerPlugins({
   "proposal-class-properties": require("@babel/plugin-proposal-class-properties"),
   "proposal-decorators": require("@babel/plugin-proposal-decorators"),
   "proposal-do-expressions": require("@babel/plugin-proposal-do-expressions"),
+  "proposal-export-default-from": require("@babel/plugin-proposal-export-default-from"),
+  "proposal-export-namespace-from": require("@babel/plugin-proposal-export-namespace-from"),
   "transform-arrow-functions": require("@babel/plugin-transform-arrow-functions"),
   "transform-block-scoped-functions": require("@babel/plugin-transform-block-scoped-functions"),
   "transform-block-scoping": require("@babel/plugin-transform-block-scoping"),
diff --git a/packages/babylon/src/parser/statement.js b/packages/babylon/src/parser/statement.js
index 40651b83d3..31d8155f0f 100644
--- a/packages/babylon/src/parser/statement.js
+++ b/packages/babylon/src/parser/statement.js
@@ -1310,12 +1310,10 @@ export default class StatementParser extends ExpressionParser {
   parseExport(node: N.Node): N.Node {
     // export * from '...'
     if (this.shouldParseExportStar()) {
-      this.parseExportStar(node, this.hasPlugin("exportExtensions"));
+      this.parseExportStar(node);
       if (node.type === "ExportAllDeclaration") return node;
-    } else if (
-      this.hasPlugin("exportExtensions") &&
-      this.isExportDefaultSpecifier()
-    ) {
+    } else if (this.isExportDefaultSpecifier()) {
+      this.expectPlugin("exportDefaultFrom");
       const specifier = this.startNode();
       specifier.exported = this.parseIdentifier(true);
       const specifiers = [this.finishNode(specifier, "ExportDefaultSpecifier")];
@@ -1426,27 +1424,35 @@ export default class StatementParser extends ExpressionParser {
     return this.match(tt.star);
   }
 
-  parseExportStar(node: N.ExportNamedDeclaration, allowNamed: boolean): void {
+  parseExportStar(node: N.ExportNamedDeclaration): void {
     this.expect(tt.star);
 
-    if (allowNamed && this.isContextual("as")) {
-      const specifier = this.startNodeAt(
-        this.state.lastTokStart,
-        this.state.lastTokStartLoc,
-      );
-      this.next();
-      specifier.exported = this.parseIdentifier(true);
-      node.specifiers = [
-        this.finishNode(specifier, "ExportNamespaceSpecifier"),
-      ];
-      this.parseExportSpecifiersMaybe(node);
-      this.parseExportFrom(node, true);
+    if (this.isContextual("as")) {
+      this.parseExportNamespace(node);
     } else {
       this.parseExportFrom(node, true);
       this.finishNode(node, "ExportAllDeclaration");
     }
   }
 
+  parseExportNamespace(node: N.ExportNamedDeclaration): void {
+    this.expectPlugin("exportNamespaceFrom");
+
+    const specifier = this.startNodeAt(
+      this.state.lastTokStart,
+      this.state.lastTokStartLoc,
+    );
+
+    this.next();
+
+    specifier.exported = this.parseIdentifier(true);
+
+    node.specifiers = [this.finishNode(specifier, "ExportNamespaceSpecifier")];
+
+    this.parseExportSpecifiersMaybe(node);
+    this.parseExportFrom(node, true);
+  }
+
   shouldParseExportDeclaration(): boolean {
     return (
       this.state.type.keyword === "var" ||
diff --git a/packages/babylon/src/plugins/flow.js b/packages/babylon/src/plugins/flow.js
index 69c48e981d..2a22df5bef 100644
--- a/packages/babylon/src/plugins/flow.js
+++ b/packages/babylon/src/plugins/flow.js
@@ -1585,13 +1585,20 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       );
     }
 
-    parseExportStar(node: N.ExportNamedDeclaration, allowNamed: boolean): void {
+    parseExportStar(node: N.ExportNamedDeclaration): void {
       if (this.eatContextual("type")) {
         node.exportKind = "type";
-        allowNamed = false;
       }
 
-      return super.parseExportStar(node, allowNamed);
+      return super.parseExportStar(node);
+    }
+
+    parseExportNamespace(node: N.ExportNamedDeclaration) {
+      if (node.exportKind === "type") {
+        this.unexpected();
+      }
+
+      return super.parseExportNamespace(node);
     }
 
     parseClassId(node: N.Class, isStatement: boolean, optionalId: ?boolean) {
diff --git a/packages/babylon/test/fixtures/esprima/es2015-export-declaration/invalid-export-default/options.json b/packages/babylon/test/fixtures/esprima/es2015-export-declaration/invalid-export-default/options.json
index d73f4a2bec..689ff73f73 100644
--- a/packages/babylon/test/fixtures/esprima/es2015-export-declaration/invalid-export-default/options.json
+++ b/packages/babylon/test/fixtures/esprima/es2015-export-declaration/invalid-export-default/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:20)"
-}
\ No newline at end of file
+  "throws": "This experimental syntax requires enabling the parser plugin: 'exportDefaultFrom' (1:7)"
+}
diff --git a/packages/babylon/test/fixtures/experimental/_no-plugin/.export-extensions/actual.js b/packages/babylon/test/fixtures/experimental/_no-plugin/export-default/actual.js
similarity index 100%
rename from packages/babylon/test/fixtures/experimental/_no-plugin/.export-extensions/actual.js
rename to packages/babylon/test/fixtures/experimental/_no-plugin/export-default/actual.js
diff --git a/packages/babylon/test/fixtures/experimental/_no-plugin/.export-extensions/options.json b/packages/babylon/test/fixtures/experimental/_no-plugin/export-default/options.json
similarity index 68%
rename from packages/babylon/test/fixtures/experimental/_no-plugin/.export-extensions/options.json
rename to packages/babylon/test/fixtures/experimental/_no-plugin/export-default/options.json
index 5c7b8e4dbf..e306a4f34c 100644
--- a/packages/babylon/test/fixtures/experimental/_no-plugin/.export-extensions/options.json
+++ b/packages/babylon/test/fixtures/experimental/_no-plugin/export-default/options.json
@@ -1,4 +1,4 @@
 {
-  "throws": "This experimental syntax requires enabling the parser plugin: 'exportExtensions' (1:1)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'exportDefaultFrom' (1:7)",
   "plugins": []
 }
diff --git a/packages/babylon/test/fixtures/experimental/_no-plugin/export-namespace/actual.js b/packages/babylon/test/fixtures/experimental/_no-plugin/export-namespace/actual.js
new file mode 100644
index 0000000000..27357f4758
--- /dev/null
+++ b/packages/babylon/test/fixtures/experimental/_no-plugin/export-namespace/actual.js
@@ -0,0 +1 @@
+export * as A from 'test';
diff --git a/packages/babylon/test/fixtures/experimental/_no-plugin/export-namespace/options.json b/packages/babylon/test/fixtures/experimental/_no-plugin/export-namespace/options.json
new file mode 100644
index 0000000000..b8b7c829da
--- /dev/null
+++ b/packages/babylon/test/fixtures/experimental/_no-plugin/export-namespace/options.json
@@ -0,0 +1,4 @@
+{
+  "throws": "This experimental syntax requires enabling the parser plugin: 'exportNamespaceFrom' (1:9)",
+  "plugins": []
+}
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/50/actual.js b/packages/babylon/test/fixtures/experimental/export-extensions/default-and-named/actual.js
similarity index 100%
rename from packages/babylon/test/fixtures/experimental/uncategorised/50/actual.js
rename to packages/babylon/test/fixtures/experimental/export-extensions/default-and-named/actual.js
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/50/expected.json b/packages/babylon/test/fixtures/experimental/export-extensions/default-and-named/expected.json
similarity index 100%
rename from packages/babylon/test/fixtures/experimental/uncategorised/50/expected.json
rename to packages/babylon/test/fixtures/experimental/export-extensions/default-and-named/expected.json
diff --git a/packages/babylon/test/fixtures/experimental/export-extensions/default-and-named/options.json b/packages/babylon/test/fixtures/experimental/export-extensions/default-and-named/options.json
new file mode 100644
index 0000000000..164d90422f
--- /dev/null
+++ b/packages/babylon/test/fixtures/experimental/export-extensions/default-and-named/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "plugins": ["exportDefaultFrom"]
+}
diff --git a/packages/babylon/test/fixtures/experimental/export-extensions/default-and-ns/options.json b/packages/babylon/test/fixtures/experimental/export-extensions/default-and-ns/options.json
new file mode 100644
index 0000000000..3bb54891b4
--- /dev/null
+++ b/packages/babylon/test/fixtures/experimental/export-extensions/default-and-ns/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["exportDefaultFrom", "exportNamespaceFrom"],
+  "sourceType": "module"
+}
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/53/actual.js b/packages/babylon/test/fixtures/experimental/export-extensions/default-default/actual.js
similarity index 100%
rename from packages/babylon/test/fixtures/experimental/uncategorised/53/actual.js
rename to packages/babylon/test/fixtures/experimental/export-extensions/default-default/actual.js
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/53/expected.json b/packages/babylon/test/fixtures/experimental/export-extensions/default-default/expected.json
similarity index 100%
rename from packages/babylon/test/fixtures/experimental/uncategorised/53/expected.json
rename to packages/babylon/test/fixtures/experimental/export-extensions/default-default/expected.json
diff --git a/packages/babylon/test/fixtures/experimental/export-extensions/default-default/options.json b/packages/babylon/test/fixtures/experimental/export-extensions/default-default/options.json
new file mode 100644
index 0000000000..164d90422f
--- /dev/null
+++ b/packages/babylon/test/fixtures/experimental/export-extensions/default-default/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "plugins": ["exportDefaultFrom"]
+}
diff --git a/packages/babylon/test/fixtures/experimental/export-extensions/default-type-with-flow/options.json b/packages/babylon/test/fixtures/experimental/export-extensions/default-type-with-flow/options.json
index 5b39a87bce..606c4bdce7 100644
--- a/packages/babylon/test/fixtures/experimental/export-extensions/default-type-with-flow/options.json
+++ b/packages/babylon/test/fixtures/experimental/export-extensions/default-type-with-flow/options.json
@@ -1,5 +1,5 @@
 {
-  "plugins": ["exportExtensions", "flow"],
+  "plugins": ["exportDefaultFrom", "flow"],
   "sourceType": "module",
   "throws": "Unexpected token, expected \"=\" (1:17)"
 }
diff --git a/packages/babylon/test/fixtures/experimental/export-extensions/default-type-without-flow/options.json b/packages/babylon/test/fixtures/experimental/export-extensions/default-type-without-flow/options.json
new file mode 100644
index 0000000000..fb17f33a28
--- /dev/null
+++ b/packages/babylon/test/fixtures/experimental/export-extensions/default-type-without-flow/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["exportDefaultFrom"],
+  "sourceType": "module"
+}
diff --git a/packages/babylon/test/fixtures/experimental/export-extensions/default/options.json b/packages/babylon/test/fixtures/experimental/export-extensions/default/options.json
new file mode 100644
index 0000000000..fb17f33a28
--- /dev/null
+++ b/packages/babylon/test/fixtures/experimental/export-extensions/default/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["exportDefaultFrom"],
+  "sourceType": "module"
+}
diff --git a/packages/babylon/test/fixtures/experimental/export-extensions/export-with-ts/options.json b/packages/babylon/test/fixtures/experimental/export-extensions/export-with-ts/options.json
index 504e180665..03c1d42899 100644
--- a/packages/babylon/test/fixtures/experimental/export-extensions/export-with-ts/options.json
+++ b/packages/babylon/test/fixtures/experimental/export-extensions/export-with-ts/options.json
@@ -1,4 +1,4 @@
 {
-  "plugins": ["exportExtensions", "typescript"],
+  "plugins": ["exportDefaultFrom", "typescript"],
   "sourceType": "module"
 }
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/51/actual.js b/packages/babylon/test/fixtures/experimental/export-extensions/ns-and-named/actual.js
similarity index 100%
rename from packages/babylon/test/fixtures/experimental/uncategorised/51/actual.js
rename to packages/babylon/test/fixtures/experimental/export-extensions/ns-and-named/actual.js
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/51/expected.json b/packages/babylon/test/fixtures/experimental/export-extensions/ns-and-named/expected.json
similarity index 100%
rename from packages/babylon/test/fixtures/experimental/uncategorised/51/expected.json
rename to packages/babylon/test/fixtures/experimental/export-extensions/ns-and-named/expected.json
diff --git a/packages/babylon/test/fixtures/experimental/export-extensions/ns-and-named/options.json b/packages/babylon/test/fixtures/experimental/export-extensions/ns-and-named/options.json
new file mode 100644
index 0000000000..efa6c457ad
--- /dev/null
+++ b/packages/babylon/test/fixtures/experimental/export-extensions/ns-and-named/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "plugins": ["exportNamespaceFrom"]
+}
diff --git a/packages/babylon/test/fixtures/experimental/export-extensions/ns-default/options.json b/packages/babylon/test/fixtures/experimental/export-extensions/ns-default/options.json
new file mode 100644
index 0000000000..e32f180239
--- /dev/null
+++ b/packages/babylon/test/fixtures/experimental/export-extensions/ns-default/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["exportNamespaceFrom"],
+  "sourceType": "module"
+}
diff --git a/packages/babylon/test/fixtures/experimental/export-extensions/ns/options.json b/packages/babylon/test/fixtures/experimental/export-extensions/ns/options.json
new file mode 100644
index 0000000000..e32f180239
--- /dev/null
+++ b/packages/babylon/test/fixtures/experimental/export-extensions/ns/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["exportNamespaceFrom"],
+  "sourceType": "module"
+}
diff --git a/packages/babylon/test/fixtures/experimental/export-extensions/options.json b/packages/babylon/test/fixtures/experimental/export-extensions/options.json
deleted file mode 100644
index 15b0cf1ea2..0000000000
--- a/packages/babylon/test/fixtures/experimental/export-extensions/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "plugins": ["exportExtensions"],
-  "sourceType": "module"
-}
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/50/options.json b/packages/babylon/test/fixtures/experimental/uncategorised/50/options.json
deleted file mode 100644
index 9ca434c7ad..0000000000
--- a/packages/babylon/test/fixtures/experimental/uncategorised/50/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "sourceType": "module",
-  "plugins": ["exportExtensions"]
-}
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/51/options.json b/packages/babylon/test/fixtures/experimental/uncategorised/51/options.json
deleted file mode 100644
index 9ca434c7ad..0000000000
--- a/packages/babylon/test/fixtures/experimental/uncategorised/51/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "sourceType": "module",
-  "plugins": ["exportExtensions"]
-}
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/52/actual.js b/packages/babylon/test/fixtures/experimental/uncategorised/52/actual.js
deleted file mode 100644
index 82e06ef4fe..0000000000
--- a/packages/babylon/test/fixtures/experimental/uncategorised/52/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-export foo from "bar";
\ No newline at end of file
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/52/expected.json b/packages/babylon/test/fixtures/experimental/uncategorised/52/expected.json
deleted file mode 100644
index fb3dbdc979..0000000000
--- a/packages/babylon/test/fixtures/experimental/uncategorised/52/expected.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 22,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 22
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 22,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 22
-      }
-    },
-    "sourceType": "module",
-    "body": [
-      {
-        "type": "ExportNamedDeclaration",
-        "start": 0,
-        "end": 22,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 22
-          }
-        },
-        "specifiers": [
-          {
-            "type": "ExportDefaultSpecifier",
-            "start": 7,
-            "end": 10,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 7
-              },
-              "end": {
-                "line": 1,
-                "column": 10
-              }
-            },
-            "exported": {
-              "type": "Identifier",
-              "start": 7,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 7
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "foo"
-              },
-              "name": "foo"
-            }
-          }
-        ],
-        "source": {
-          "type": "StringLiteral",
-          "start": 16,
-          "end": 21,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 16
-            },
-            "end": {
-              "line": 1,
-              "column": 21
-            }
-          },
-          "extra": {
-            "rawValue": "bar",
-            "raw": "\"bar\""
-          },
-          "value": "bar"
-        }
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/52/options.json b/packages/babylon/test/fixtures/experimental/uncategorised/52/options.json
deleted file mode 100644
index 9ca434c7ad..0000000000
--- a/packages/babylon/test/fixtures/experimental/uncategorised/52/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "sourceType": "module",
-  "plugins": ["exportExtensions"]
-}
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/53/options.json b/packages/babylon/test/fixtures/experimental/uncategorised/53/options.json
deleted file mode 100644
index 9ca434c7ad..0000000000
--- a/packages/babylon/test/fixtures/experimental/uncategorised/53/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "sourceType": "module",
-  "plugins": ["exportExtensions"]
-}
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/54/actual.js b/packages/babylon/test/fixtures/experimental/uncategorised/54/actual.js
deleted file mode 100644
index 0a52fa7a3e..0000000000
--- a/packages/babylon/test/fixtures/experimental/uncategorised/54/actual.js
+++ /dev/null
@@ -1 +0,0 @@
-export * as foo from "bar";
\ No newline at end of file
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/54/expected.json b/packages/babylon/test/fixtures/experimental/uncategorised/54/expected.json
deleted file mode 100644
index b92718dd1b..0000000000
--- a/packages/babylon/test/fixtures/experimental/uncategorised/54/expected.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 27,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 27
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 27,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 27
-      }
-    },
-    "sourceType": "module",
-    "body": [
-      {
-        "type": "ExportNamedDeclaration",
-        "start": 0,
-        "end": 27,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 27
-          }
-        },
-        "specifiers": [
-          {
-            "type": "ExportNamespaceSpecifier",
-            "start": 7,
-            "end": 15,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 7
-              },
-              "end": {
-                "line": 1,
-                "column": 15
-              }
-            },
-            "exported": {
-              "type": "Identifier",
-              "start": 12,
-              "end": 15,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 12
-                },
-                "end": {
-                  "line": 1,
-                  "column": 15
-                },
-                "identifierName": "foo"
-              },
-              "name": "foo"
-            }
-          }
-        ],
-        "source": {
-          "type": "StringLiteral",
-          "start": 21,
-          "end": 26,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 21
-            },
-            "end": {
-              "line": 1,
-              "column": 26
-            }
-          },
-          "extra": {
-            "rawValue": "bar",
-            "raw": "\"bar\""
-          },
-          "value": "bar"
-        }
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babylon/test/fixtures/experimental/uncategorised/54/options.json b/packages/babylon/test/fixtures/experimental/uncategorised/54/options.json
deleted file mode 100644
index 9ca434c7ad..0000000000
--- a/packages/babylon/test/fixtures/experimental/uncategorised/54/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "sourceType": "module",
-  "plugins": ["exportExtensions"]
-}
diff --git a/packages/babylon/test/fixtures/flow/declare-export/export-star-as/options.json b/packages/babylon/test/fixtures/flow/declare-export/export-star-as/options.json
index 1bbe20fe5f..acd5b34be4 100644
--- a/packages/babylon/test/fixtures/flow/declare-export/export-star-as/options.json
+++ b/packages/babylon/test/fixtures/flow/declare-export/export-star-as/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["jsx", "flow", "exportExtensions"]
+  "plugins": ["jsx", "flow", "exportNamespaceFrom"]
 }
diff --git a/packages/babylon/test/fixtures/flow/type-exports/star-as-from/options.json b/packages/babylon/test/fixtures/flow/type-exports/star-as-from/options.json
index fbdcfac11d..d482b18c6c 100644
--- a/packages/babylon/test/fixtures/flow/type-exports/star-as-from/options.json
+++ b/packages/babylon/test/fixtures/flow/type-exports/star-as-from/options.json
@@ -1,5 +1,5 @@
 {
   "sourceType": "module",
-  "plugins": ["flow","exportExtensions"],
+  "plugins": ["flow", "exportNamespaceFrom"],
   "throws": "Unexpected token (1:14)"
-}
\ No newline at end of file
+}
diff --git a/packages/babylon/test/fixtures/typescript/regression/is-default-export/options.json b/packages/babylon/test/fixtures/typescript/regression/is-default-export/options.json
index 789d6a6a8f..21e26c84a8 100644
--- a/packages/babylon/test/fixtures/typescript/regression/is-default-export/options.json
+++ b/packages/babylon/test/fixtures/typescript/regression/is-default-export/options.json
@@ -1,3 +1,3 @@
 {
-    "plugins": ["exportExtensions", "typescript"]
+    "plugins": ["exportDefaultFrom", "typescript"]
 }
diff --git a/scripts/tests/flow/run_babylon_flow_tests.js b/scripts/tests/flow/run_babylon_flow_tests.js
index bc75a1eab9..05dc65d57d 100644
--- a/scripts/tests/flow/run_babylon_flow_tests.js
+++ b/scripts/tests/flow/run_babylon_flow_tests.js
@@ -107,7 +107,7 @@ const options = {
 const flowOptionsMapping = {
   esproposal_class_instance_fields: "classProperties",
   esproposal_class_static_fields: "classProperties",
-  esproposal_export_star_as: "exportExtensions",
+  esproposal_export_star_as: "exportNamespaceFrom",
   esproposal_decorators: "decorators",
 };