diff --git a/src/parser/expression.js b/src/parser/expression.js
index c6626b1338..9a3ea211cc 100644
--- a/src/parser/expression.js
+++ b/src/parser/expression.js
@@ -866,7 +866,7 @@ export default class ExpressionParser extends LValParser {
         this.expectPlugin("importMeta");
       } else if (!this.hasPlugin("importMeta")) {
         this.raise(
-          null,
+          id.start,
           `Dynamic imports require a parameter: import('a.js').then`,
         );
       }
diff --git a/src/parser/statement.js b/src/parser/statement.js
index 610095105a..074f8b9177 100644
--- a/src/parser/statement.js
+++ b/src/parser/statement.js
@@ -1151,17 +1151,14 @@ export default class StatementParser extends ExpressionParser {
   }
 
   parseClassProperty(node: N.ClassProperty): N.ClassProperty {
-    const noPluginMsg =
-      "You can only use Class Properties when the 'classProperties' plugin is enabled.";
-    if (!node.typeAnnotation && !this.hasPlugin("classProperties")) {
-      this.raise(node.start, noPluginMsg);
+    if (!node.typeAnnotation) {
+      this.expectOnePlugin(["classProperties"]);
     }
 
     this.state.inClassProperty = true;
 
     if (this.match(tt.eq)) {
-      if (!this.hasPlugin("classProperties"))
-        this.raise(this.state.start, noPluginMsg);
+      this.expectOnePlugin(["classProperties"]);
       this.next();
       node.value = this.parseMaybeAssign();
     } else {
diff --git a/src/parser/util.js b/src/parser/util.js
index c2fb78674a..52587e3322 100644
--- a/src/parser/util.js
+++ b/src/parser/util.js
@@ -124,7 +124,7 @@ export default class UtilParser extends Tokenizer {
     if (!names.some(n => this.hasPlugin(n))) {
       throw this.raise(
         this.state.start,
-        `This experimental syntax requires enabling the parser plugin(s): '${names.join(
+        `This experimental syntax requires enabling one of the following parser plugin(s): '${names.join(
           ", ",
         )}'`,
         names,
diff --git a/test/fixtures/es2017/async-functions/no-method-asi/options.json b/test/fixtures/es2017/async-functions/no-method-asi/options.json
index af38bd1530..5a0c1ff7f5 100644
--- a/test/fixtures/es2017/async-functions/no-method-asi/options.json
+++ b/test/fixtures/es2017/async-functions/no-method-asi/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "You can only use Class Properties when the 'classProperties' plugin is enabled. (2:2)"
+  "throws": "This experimental syntax requires enabling one of the following parser plugin(s): 'classProperties, typescript' (3:2)"
 }
diff --git a/test/fixtures/experimental/async-functions/object-default-params/actual.js b/test/fixtures/es2017/async-functions/object-default-params/actual.js
similarity index 100%
rename from test/fixtures/experimental/async-functions/object-default-params/actual.js
rename to test/fixtures/es2017/async-functions/object-default-params/actual.js
diff --git a/test/fixtures/experimental/async-functions/object-default-params/expected.json b/test/fixtures/es2017/async-functions/object-default-params/expected.json
similarity index 100%
rename from test/fixtures/experimental/async-functions/object-default-params/expected.json
rename to test/fixtures/es2017/async-functions/object-default-params/expected.json
diff --git a/test/fixtures/experimental/_no-plugin/.bigint/actual.js b/test/fixtures/experimental/_no-plugin/.bigint/actual.js
new file mode 100644
index 0000000000..7a5a058e16
--- /dev/null
+++ b/test/fixtures/experimental/_no-plugin/.bigint/actual.js
@@ -0,0 +1 @@
+1n
diff --git a/test/fixtures/experimental/no-decorators/error-without-plugin/options.json b/test/fixtures/experimental/_no-plugin/.bigint/options.json
similarity index 63%
rename from test/fixtures/experimental/no-decorators/error-without-plugin/options.json
rename to test/fixtures/experimental/_no-plugin/.bigint/options.json
index 33a94ed1eb..8e44fabed2 100644
--- a/test/fixtures/experimental/no-decorators/error-without-plugin/options.json
+++ b/test/fixtures/experimental/_no-plugin/.bigint/options.json
@@ -1,4 +1,4 @@
 {
-  "throws": "This experimental syntax requires enabling the parser plugin(s): 'decorators, decorators2' (1:0)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'bigInt' (1:1)",
   "plugins": []
 }
diff --git a/test/fixtures/experimental/_no-plugin/.class-private-properties/actual.js b/test/fixtures/experimental/_no-plugin/.class-private-properties/actual.js
new file mode 100644
index 0000000000..07fa01ba84
--- /dev/null
+++ b/test/fixtures/experimental/_no-plugin/.class-private-properties/actual.js
@@ -0,0 +1,4 @@
+class Point {
+  #x = 1;
+  #y = 2;
+}
diff --git a/test/fixtures/experimental/_no-plugin/.class-private-properties/options.json b/test/fixtures/experimental/_no-plugin/.class-private-properties/options.json
new file mode 100644
index 0000000000..85d7fee65f
--- /dev/null
+++ b/test/fixtures/experimental/_no-plugin/.class-private-properties/options.json
@@ -0,0 +1,4 @@
+{
+  "throws": "This experimental syntax requires enabling the parser plugin: 'classPrivateProperties' (2:3)",
+  "plugins": []
+}
diff --git a/test/fixtures/experimental/_no-plugin/.export-extensions/actual.js b/test/fixtures/experimental/_no-plugin/.export-extensions/actual.js
new file mode 100644
index 0000000000..8493ca5743
--- /dev/null
+++ b/test/fixtures/experimental/_no-plugin/.export-extensions/actual.js
@@ -0,0 +1 @@
+export A from 'test';
diff --git a/test/fixtures/experimental/_no-plugin/.export-extensions/options.json b/test/fixtures/experimental/_no-plugin/.export-extensions/options.json
new file mode 100644
index 0000000000..5c7b8e4dbf
--- /dev/null
+++ b/test/fixtures/experimental/_no-plugin/.export-extensions/options.json
@@ -0,0 +1,4 @@
+{
+  "throws": "This experimental syntax requires enabling the parser plugin: 'exportExtensions' (1:1)",
+  "plugins": []
+}
diff --git a/test/fixtures/experimental/_no-plugin/.numeric-separator/actual.js b/test/fixtures/experimental/_no-plugin/.numeric-separator/actual.js
new file mode 100644
index 0000000000..ee01ab4260
--- /dev/null
+++ b/test/fixtures/experimental/_no-plugin/.numeric-separator/actual.js
@@ -0,0 +1 @@
+1_0
diff --git a/test/fixtures/experimental/_no-plugin/.numeric-separator/options.json b/test/fixtures/experimental/_no-plugin/.numeric-separator/options.json
new file mode 100644
index 0000000000..6996ba6f15
--- /dev/null
+++ b/test/fixtures/experimental/_no-plugin/.numeric-separator/options.json
@@ -0,0 +1,4 @@
+{
+  "throws": "This experimental syntax requires enabling the parser plugin: 'numericSeparator' (1:17)",
+  "plugins": []
+}
diff --git a/test/fixtures/experimental/no-async-generators/error-without-plugin/actual.js b/test/fixtures/experimental/_no-plugin/async-generators/actual.js
similarity index 100%
rename from test/fixtures/experimental/no-async-generators/error-without-plugin/actual.js
rename to test/fixtures/experimental/_no-plugin/async-generators/actual.js
diff --git a/test/fixtures/experimental/no-async-generators/error-without-plugin/options.json b/test/fixtures/experimental/_no-plugin/async-generators/options.json
similarity index 100%
rename from test/fixtures/experimental/no-async-generators/error-without-plugin/options.json
rename to test/fixtures/experimental/_no-plugin/async-generators/options.json
diff --git a/test/fixtures/experimental/class-properties/with-initializer-and-type-no-plugin/actual.js b/test/fixtures/experimental/_no-plugin/class-properties-with-initializer-and-type/actual.js
similarity index 100%
rename from test/fixtures/experimental/class-properties/with-initializer-and-type-no-plugin/actual.js
rename to test/fixtures/experimental/_no-plugin/class-properties-with-initializer-and-type/actual.js
diff --git a/test/fixtures/experimental/_no-plugin/class-properties-with-initializer-and-type/options.json b/test/fixtures/experimental/_no-plugin/class-properties-with-initializer-and-type/options.json
new file mode 100644
index 0000000000..bb0837f99c
--- /dev/null
+++ b/test/fixtures/experimental/_no-plugin/class-properties-with-initializer-and-type/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["flow"],
+  "throws": "This experimental syntax requires enabling one of the following parser plugin(s): 'classProperties, typescript' (2:14)"
+}
diff --git a/test/fixtures/experimental/class-properties/with-initializer-missing-plugin/actual.js b/test/fixtures/experimental/_no-plugin/class-properties-with-initializer/actual.js
similarity index 100%
rename from test/fixtures/experimental/class-properties/with-initializer-missing-plugin/actual.js
rename to test/fixtures/experimental/_no-plugin/class-properties-with-initializer/actual.js
diff --git a/test/fixtures/experimental/_no-plugin/class-properties-with-initializer/options.json b/test/fixtures/experimental/_no-plugin/class-properties-with-initializer/options.json
new file mode 100644
index 0000000000..ab84fa6cc8
--- /dev/null
+++ b/test/fixtures/experimental/_no-plugin/class-properties-with-initializer/options.json
@@ -0,0 +1,4 @@
+{
+  "throws": "This experimental syntax requires enabling one of the following parser plugin(s): 'classProperties, typescript' (2:6)",
+  "plugins": []
+}
diff --git a/test/fixtures/experimental/class-properties/without-initializer-missing-plugin/actual.js b/test/fixtures/experimental/_no-plugin/class-properties-without-initializer/actual.js
similarity index 100%
rename from test/fixtures/experimental/class-properties/without-initializer-missing-plugin/actual.js
rename to test/fixtures/experimental/_no-plugin/class-properties-without-initializer/actual.js
diff --git a/test/fixtures/experimental/_no-plugin/class-properties-without-initializer/options.json b/test/fixtures/experimental/_no-plugin/class-properties-without-initializer/options.json
new file mode 100644
index 0000000000..787eab7a69
--- /dev/null
+++ b/test/fixtures/experimental/_no-plugin/class-properties-without-initializer/options.json
@@ -0,0 +1,4 @@
+{
+  "throws": "This experimental syntax requires enabling one of the following parser plugin(s): 'classProperties, typescript' (2:5)",
+  "plugins": []
+}
diff --git a/test/fixtures/experimental/no-decorators/error-without-plugin/actual.js b/test/fixtures/experimental/_no-plugin/decorators/actual.js
similarity index 100%
rename from test/fixtures/experimental/no-decorators/error-without-plugin/actual.js
rename to test/fixtures/experimental/_no-plugin/decorators/actual.js
diff --git a/test/fixtures/experimental/_no-plugin/decorators/options.json b/test/fixtures/experimental/_no-plugin/decorators/options.json
new file mode 100644
index 0000000000..d7fe449b7a
--- /dev/null
+++ b/test/fixtures/experimental/_no-plugin/decorators/options.json
@@ -0,0 +1,4 @@
+{
+  "throws": "This experimental syntax requires enabling one of the following parser plugin(s): 'decorators, decorators2' (1:0)",
+  "plugins": []
+}
diff --git a/test/fixtures/experimental/no-do-expressions/error-without-plugin/actual.js b/test/fixtures/experimental/_no-plugin/do-expressions/actual.js
similarity index 100%
rename from test/fixtures/experimental/no-do-expressions/error-without-plugin/actual.js
rename to test/fixtures/experimental/_no-plugin/do-expressions/actual.js
diff --git a/test/fixtures/experimental/no-do-expressions/error-without-plugin/options.json b/test/fixtures/experimental/_no-plugin/do-expressions/options.json
similarity index 100%
rename from test/fixtures/experimental/no-do-expressions/error-without-plugin/options.json
rename to test/fixtures/experimental/_no-plugin/do-expressions/options.json
diff --git a/test/fixtures/experimental/no-dynamic-import/error-without-plugin/actual.js b/test/fixtures/experimental/_no-plugin/dynamic-import/actual.js
similarity index 100%
rename from test/fixtures/experimental/no-dynamic-import/error-without-plugin/actual.js
rename to test/fixtures/experimental/_no-plugin/dynamic-import/actual.js
diff --git a/test/fixtures/experimental/no-dynamic-import/error-without-plugin/options.json b/test/fixtures/experimental/_no-plugin/dynamic-import/options.json
similarity index 100%
rename from test/fixtures/experimental/no-dynamic-import/error-without-plugin/options.json
rename to test/fixtures/experimental/_no-plugin/dynamic-import/options.json
diff --git a/test/fixtures/experimental/no-import-meta/error-without-plugin/actual.js b/test/fixtures/experimental/_no-plugin/import-meta/actual.js
similarity index 100%
rename from test/fixtures/experimental/no-import-meta/error-without-plugin/actual.js
rename to test/fixtures/experimental/_no-plugin/import-meta/actual.js
diff --git a/test/fixtures/experimental/no-import-meta/error-without-plugin/options.json b/test/fixtures/experimental/_no-plugin/import-meta/options.json
similarity index 100%
rename from test/fixtures/experimental/no-import-meta/error-without-plugin/options.json
rename to test/fixtures/experimental/_no-plugin/import-meta/options.json
diff --git a/test/fixtures/experimental/no-object-rest-spread/error-without-plugin/actual.js b/test/fixtures/experimental/_no-plugin/object-rest-spread/actual.js
similarity index 100%
rename from test/fixtures/experimental/no-object-rest-spread/error-without-plugin/actual.js
rename to test/fixtures/experimental/_no-plugin/object-rest-spread/actual.js
diff --git a/test/fixtures/experimental/no-object-rest-spread/error-without-plugin/options.json b/test/fixtures/experimental/_no-plugin/object-rest-spread/options.json
similarity index 100%
rename from test/fixtures/experimental/no-object-rest-spread/error-without-plugin/options.json
rename to test/fixtures/experimental/_no-plugin/object-rest-spread/options.json
diff --git a/test/fixtures/experimental/optional-chaining/missing-plugin/actual.js b/test/fixtures/experimental/_no-plugin/optional-chaining/actual.js
similarity index 100%
rename from test/fixtures/experimental/optional-chaining/missing-plugin/actual.js
rename to test/fixtures/experimental/_no-plugin/optional-chaining/actual.js
diff --git a/test/fixtures/experimental/optional-chaining/missing-plugin/options.json b/test/fixtures/experimental/_no-plugin/optional-chaining/options.json
similarity index 100%
rename from test/fixtures/experimental/optional-chaining/missing-plugin/options.json
rename to test/fixtures/experimental/_no-plugin/optional-chaining/options.json
diff --git a/test/fixtures/experimental/async-generators/class-method-no-asi/options.json b/test/fixtures/experimental/async-generators/class-method-no-asi/options.json
index af38bd1530..5a0c1ff7f5 100644
--- a/test/fixtures/experimental/async-generators/class-method-no-asi/options.json
+++ b/test/fixtures/experimental/async-generators/class-method-no-asi/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "You can only use Class Properties when the 'classProperties' plugin is enabled. (2:2)"
+  "throws": "This experimental syntax requires enabling one of the following parser plugin(s): 'classProperties, typescript' (3:2)"
 }
diff --git a/test/fixtures/experimental/class-properties/with-initializer-and-type-no-plugin/options.json b/test/fixtures/experimental/class-properties/with-initializer-and-type-no-plugin/options.json
deleted file mode 100644
index e185feb80a..0000000000
--- a/test/fixtures/experimental/class-properties/with-initializer-and-type-no-plugin/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "plugins": ["flow"],
-  "throws": "You can only use Class Properties when the 'classProperties' plugin is enabled. (2:14)"
-}
diff --git a/test/fixtures/experimental/class-properties/with-initializer-missing-plugin/options.json b/test/fixtures/experimental/class-properties/with-initializer-missing-plugin/options.json
deleted file mode 100644
index af38bd1530..0000000000
--- a/test/fixtures/experimental/class-properties/with-initializer-missing-plugin/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "You can only use Class Properties when the 'classProperties' plugin is enabled. (2:2)"
-}
diff --git a/test/fixtures/experimental/class-properties/without-initializer-missing-plugin/options.json b/test/fixtures/experimental/class-properties/without-initializer-missing-plugin/options.json
deleted file mode 100644
index af38bd1530..0000000000
--- a/test/fixtures/experimental/class-properties/without-initializer-missing-plugin/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "You can only use Class Properties when the 'classProperties' plugin is enabled. (2:2)"
-}
diff --git a/test/fixtures/experimental/dynamic-import/direct-calls-only/options.json b/test/fixtures/experimental/dynamic-import/direct-calls-only/options.json
index 4bb0327514..468132c26a 100644
--- a/test/fixtures/experimental/dynamic-import/direct-calls-only/options.json
+++ b/test/fixtures/experimental/dynamic-import/direct-calls-only/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Dynamic imports require a parameter: import('a.js').then (1:0)"
+  "throws": "Dynamic imports require a parameter: import('a.js').then (2:9)"
 }
diff --git a/test/fixtures/experimental/numeric-literal-separator/identifier-start-0/actual.js b/test/fixtures/experimental/numeric-separator/identifier-start-0/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/identifier-start-0/actual.js
rename to test/fixtures/experimental/numeric-separator/identifier-start-0/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/identifier-start-0/expected.json b/test/fixtures/experimental/numeric-separator/identifier-start-0/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/identifier-start-0/expected.json
rename to test/fixtures/experimental/numeric-separator/identifier-start-0/expected.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-0/actual.js b/test/fixtures/experimental/numeric-separator/invalid-0/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-0/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-0/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-0/options.json b/test/fixtures/experimental/numeric-separator/invalid-0/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-0/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-0/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-1/actual.js b/test/fixtures/experimental/numeric-separator/invalid-1/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-1/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-1/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-1/options.json b/test/fixtures/experimental/numeric-separator/invalid-1/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-1/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-1/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-10/actual.js b/test/fixtures/experimental/numeric-separator/invalid-10/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-10/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-10/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-10/options.json b/test/fixtures/experimental/numeric-separator/invalid-10/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-10/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-10/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-11/actual.js b/test/fixtures/experimental/numeric-separator/invalid-11/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-11/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-11/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-11/options.json b/test/fixtures/experimental/numeric-separator/invalid-11/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-11/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-11/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-12/actual.js b/test/fixtures/experimental/numeric-separator/invalid-12/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-12/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-12/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-12/options.json b/test/fixtures/experimental/numeric-separator/invalid-12/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-12/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-12/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-13/actual.js b/test/fixtures/experimental/numeric-separator/invalid-13/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-13/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-13/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-13/options.json b/test/fixtures/experimental/numeric-separator/invalid-13/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-13/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-13/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-14/actual.js b/test/fixtures/experimental/numeric-separator/invalid-14/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-14/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-14/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-14/options.json b/test/fixtures/experimental/numeric-separator/invalid-14/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-14/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-14/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-15/actual.js b/test/fixtures/experimental/numeric-separator/invalid-15/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-15/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-15/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-15/options.json b/test/fixtures/experimental/numeric-separator/invalid-15/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-15/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-15/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-16/actual.js b/test/fixtures/experimental/numeric-separator/invalid-16/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-16/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-16/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-16/options.json b/test/fixtures/experimental/numeric-separator/invalid-16/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-16/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-16/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-17/actual.js b/test/fixtures/experimental/numeric-separator/invalid-17/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-17/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-17/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-17/options.json b/test/fixtures/experimental/numeric-separator/invalid-17/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-17/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-17/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-18/actual.js b/test/fixtures/experimental/numeric-separator/invalid-18/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-18/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-18/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-18/options.json b/test/fixtures/experimental/numeric-separator/invalid-18/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-18/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-18/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-19/actual.js b/test/fixtures/experimental/numeric-separator/invalid-19/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-19/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-19/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-19/options.json b/test/fixtures/experimental/numeric-separator/invalid-19/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-19/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-19/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-2/actual.js b/test/fixtures/experimental/numeric-separator/invalid-2/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-2/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-2/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-2/options.json b/test/fixtures/experimental/numeric-separator/invalid-2/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-2/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-2/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-20/actual.js b/test/fixtures/experimental/numeric-separator/invalid-20/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-20/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-20/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-20/options.json b/test/fixtures/experimental/numeric-separator/invalid-20/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-20/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-20/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-21/actual.js b/test/fixtures/experimental/numeric-separator/invalid-21/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-21/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-21/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-21/options.json b/test/fixtures/experimental/numeric-separator/invalid-21/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-21/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-21/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-22/actual.js b/test/fixtures/experimental/numeric-separator/invalid-22/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-22/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-22/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-22/options.json b/test/fixtures/experimental/numeric-separator/invalid-22/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-22/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-22/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-23/actual.js b/test/fixtures/experimental/numeric-separator/invalid-23/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-23/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-23/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-23/options.json b/test/fixtures/experimental/numeric-separator/invalid-23/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-23/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-23/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-24/actual.js b/test/fixtures/experimental/numeric-separator/invalid-24/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-24/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-24/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-24/options.json b/test/fixtures/experimental/numeric-separator/invalid-24/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-24/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-24/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-25/actual.js b/test/fixtures/experimental/numeric-separator/invalid-25/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-25/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-25/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-25/options.json b/test/fixtures/experimental/numeric-separator/invalid-25/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-25/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-25/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-26/actual.js b/test/fixtures/experimental/numeric-separator/invalid-26/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-26/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-26/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-26/options.json b/test/fixtures/experimental/numeric-separator/invalid-26/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-26/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-26/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-27/actual.js b/test/fixtures/experimental/numeric-separator/invalid-27/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-27/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-27/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-27/options.json b/test/fixtures/experimental/numeric-separator/invalid-27/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-27/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-27/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-3/actual.js b/test/fixtures/experimental/numeric-separator/invalid-3/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-3/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-3/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-3/options.json b/test/fixtures/experimental/numeric-separator/invalid-3/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-3/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-3/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-4/actual.js b/test/fixtures/experimental/numeric-separator/invalid-4/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-4/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-4/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-4/options.json b/test/fixtures/experimental/numeric-separator/invalid-4/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-4/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-4/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-5/actual.js b/test/fixtures/experimental/numeric-separator/invalid-5/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-5/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-5/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-5/options.json b/test/fixtures/experimental/numeric-separator/invalid-5/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-5/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-5/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-6/actual.js b/test/fixtures/experimental/numeric-separator/invalid-6/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-6/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-6/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-6/options.json b/test/fixtures/experimental/numeric-separator/invalid-6/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-6/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-6/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-7/actual.js b/test/fixtures/experimental/numeric-separator/invalid-7/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-7/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-7/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-7/options.json b/test/fixtures/experimental/numeric-separator/invalid-7/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-7/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-7/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-8/actual.js b/test/fixtures/experimental/numeric-separator/invalid-8/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-8/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-8/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-8/options.json b/test/fixtures/experimental/numeric-separator/invalid-8/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-8/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-8/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-9/actual.js b/test/fixtures/experimental/numeric-separator/invalid-9/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-9/actual.js
rename to test/fixtures/experimental/numeric-separator/invalid-9/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/invalid-9/options.json b/test/fixtures/experimental/numeric-separator/invalid-9/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/invalid-9/options.json
rename to test/fixtures/experimental/numeric-separator/invalid-9/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/options.json b/test/fixtures/experimental/numeric-separator/options.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/options.json
rename to test/fixtures/experimental/numeric-separator/options.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-0/actual.js b/test/fixtures/experimental/numeric-separator/valid-0/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-0/actual.js
rename to test/fixtures/experimental/numeric-separator/valid-0/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-0/expected.json b/test/fixtures/experimental/numeric-separator/valid-0/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-0/expected.json
rename to test/fixtures/experimental/numeric-separator/valid-0/expected.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-1/actual.js b/test/fixtures/experimental/numeric-separator/valid-1/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-1/actual.js
rename to test/fixtures/experimental/numeric-separator/valid-1/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-1/expected.json b/test/fixtures/experimental/numeric-separator/valid-1/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-1/expected.json
rename to test/fixtures/experimental/numeric-separator/valid-1/expected.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-10/actual.js b/test/fixtures/experimental/numeric-separator/valid-10/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-10/actual.js
rename to test/fixtures/experimental/numeric-separator/valid-10/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-10/expected.json b/test/fixtures/experimental/numeric-separator/valid-10/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-10/expected.json
rename to test/fixtures/experimental/numeric-separator/valid-10/expected.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-11/actual.js b/test/fixtures/experimental/numeric-separator/valid-11/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-11/actual.js
rename to test/fixtures/experimental/numeric-separator/valid-11/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-11/expected.json b/test/fixtures/experimental/numeric-separator/valid-11/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-11/expected.json
rename to test/fixtures/experimental/numeric-separator/valid-11/expected.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-12/actual.js b/test/fixtures/experimental/numeric-separator/valid-12/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-12/actual.js
rename to test/fixtures/experimental/numeric-separator/valid-12/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-12/expected.json b/test/fixtures/experimental/numeric-separator/valid-12/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-12/expected.json
rename to test/fixtures/experimental/numeric-separator/valid-12/expected.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-2/actual.js b/test/fixtures/experimental/numeric-separator/valid-2/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-2/actual.js
rename to test/fixtures/experimental/numeric-separator/valid-2/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-2/expected.json b/test/fixtures/experimental/numeric-separator/valid-2/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-2/expected.json
rename to test/fixtures/experimental/numeric-separator/valid-2/expected.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-3/actual.js b/test/fixtures/experimental/numeric-separator/valid-3/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-3/actual.js
rename to test/fixtures/experimental/numeric-separator/valid-3/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-3/expected.json b/test/fixtures/experimental/numeric-separator/valid-3/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-3/expected.json
rename to test/fixtures/experimental/numeric-separator/valid-3/expected.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-4/actual.js b/test/fixtures/experimental/numeric-separator/valid-4/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-4/actual.js
rename to test/fixtures/experimental/numeric-separator/valid-4/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-4/expected.json b/test/fixtures/experimental/numeric-separator/valid-4/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-4/expected.json
rename to test/fixtures/experimental/numeric-separator/valid-4/expected.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-5/actual.js b/test/fixtures/experimental/numeric-separator/valid-5/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-5/actual.js
rename to test/fixtures/experimental/numeric-separator/valid-5/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-5/expected.json b/test/fixtures/experimental/numeric-separator/valid-5/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-5/expected.json
rename to test/fixtures/experimental/numeric-separator/valid-5/expected.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-6/actual.js b/test/fixtures/experimental/numeric-separator/valid-6/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-6/actual.js
rename to test/fixtures/experimental/numeric-separator/valid-6/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-6/expected.json b/test/fixtures/experimental/numeric-separator/valid-6/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-6/expected.json
rename to test/fixtures/experimental/numeric-separator/valid-6/expected.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-7/actual.js b/test/fixtures/experimental/numeric-separator/valid-7/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-7/actual.js
rename to test/fixtures/experimental/numeric-separator/valid-7/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-7/expected.json b/test/fixtures/experimental/numeric-separator/valid-7/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-7/expected.json
rename to test/fixtures/experimental/numeric-separator/valid-7/expected.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-8/actual.js b/test/fixtures/experimental/numeric-separator/valid-8/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-8/actual.js
rename to test/fixtures/experimental/numeric-separator/valid-8/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-8/expected.json b/test/fixtures/experimental/numeric-separator/valid-8/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-8/expected.json
rename to test/fixtures/experimental/numeric-separator/valid-8/expected.json
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-9/actual.js b/test/fixtures/experimental/numeric-separator/valid-9/actual.js
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-9/actual.js
rename to test/fixtures/experimental/numeric-separator/valid-9/actual.js
diff --git a/test/fixtures/experimental/numeric-literal-separator/valid-9/expected.json b/test/fixtures/experimental/numeric-separator/valid-9/expected.json
similarity index 100%
rename from test/fixtures/experimental/numeric-literal-separator/valid-9/expected.json
rename to test/fixtures/experimental/numeric-separator/valid-9/expected.json