diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js
index 50b4648e44aca30a7b58c10af7c650340b7df78b..70768839f0154e2a0e884d0aaf243a2cf600fd39 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (AsyncFunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js
index 44431fc5bfab8f52cf3db5aa76d3c3e79c206455..57e8439d8c75f277a0a1618ce7c09de5d5f18313 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (AsyncFunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js
index b9d883f5c8708e0a75c20b4af948aa35e977cd09..d6dfaf55f53bbe64ae404458b28b8c62849c9cc7 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (AsyncFunctionDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ async function f() {} class f {}; }
+{ async function f() {} class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js
index 059360f2ca282ed28617401423148c8721fc4f5e..81abd90ed14a500c900b7cc4b1dbc367c1c824ae 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (AsyncFunctionDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ async function f() {} const f = 0; }
+{ async function f() {} const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js
index c4d8f05392971db03d77a215e99f8249c5d1acc8..22a8bf0a69dcda5301178aa955be3fa005018c9f 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (AsyncFunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js
index 312af3f79458254879afc078db4401d11ee1dc07..454719b9418ce76a7ee78ce1f60a54721c3bd07c 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (AsyncFunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js
index 5ad2adc2971a9b63213523974299467b78900844..1e1a9c0c5a19207c06814e70154dacd4c1778d37 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (AsyncFunctionDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ async function f() {} let f; }
+{ async function f() {} let f }
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js
index d03c5cf34fb1b2b7616379c2e1658d6271ed0cdd..6d58d4fa01272bbc4f8673b8d6f499757af33820 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (AsyncFunctionDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ async function f() {} var f; }
+{ async function f() {} var f }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js
index 96928201993836ba7d252727b1a97a4d42d97d12..3f9be5f54acef8b08efbdc14212df902e66c5a9d 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (AsyncGeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js
index 7e71084a68a206ad2ab45f6fca14acefd31e9678..6ac3b9c43f3a5c2082f1be6a9c8d78bde3fdaaf6 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (AsyncGeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js
index 2c3d5d22496125571a4e042a4fc91817f796fdf5..7fbf6e2ac355bd3a622b5a156e53d6125c9441d8 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (AsyncGeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ async function* f() {} class f {}; }
+{ async function* f() {} class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js
index 0f7b46243becf8e6e5387afd76ccd9f0e9105b65..3a70e56917cc9936b1d8b25c02f350f3c6d23352 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (AsyncGeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ async function* f() {} const f = 0; }
+{ async function* f() {} const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js
index 3068f8581cf3967bc7921f7fa819089ed37629df..ae4a8d56261d7a2743446ee3d942c193c30f59ad 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (AsyncGeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js
index 296e17fb80940409cdd4ee89c1e184a4c7cac49a..198b7c5a764b912ca1646137e3683c209d625a5e 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (AsyncGeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js
index 7c680f92323bafc96e0160e336ddc97aa873a106..7378d81548b47ba1ec43f67b59593035b1de570e 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (AsyncGeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ async function* f() {} let f; }
+{ async function* f() {} let f }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js
index 055ae92b606d5bf29570d1b1882f9c9bad33bbe8..b52a4fe83c3248308284c6d82715bc0e6aba24e4 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (AsyncGeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ async function* f() {} var f; }
+{ async function* f() {} var f }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js
index 2908d5b6ad7ff57e759cd1a88970f831882c49d1..58a58a87a96e276e246db99302bfc6e3dd72ed79 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (ClassDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js
index a1844dbf0716cf107eec22c671b2168ab2d0f0c1..614460249fa9819d95bb5ac1b516accc087bed92 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (ClassDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js
index c16b14569b60016ded0929970c79bdeef34c5730..583ea3eadbacff1c70bb08bc7879490819861010 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (ClassDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ class f {} class f {}; }
+{ class f {} class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js
index a411858cb06616217fe71b73c643b6864a4fb5a2..d2aa0256f38b263d5200cdea65dbc23985642fc3 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (ClassDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ class f {} const f = 0; }
+{ class f {} const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js
index 099f6d9695dac88a6570e791902a1ca243cdd247..bba8cc353bf0a0d2af8dfee7c574fae07490f27a 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (ClassDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js
index 260c1b00d0ac6328912a3ec537752885db289321..f9ec3539014bfd255af36fc5940e255b723286fc 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (ClassDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js
index ce3d5d376f34e1dccd7643c1d1e59a9843a8acbf..f84d52260050b64c572078a98f044b0b7d947e65 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (ClassDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ class f {} let f; }
+{ class f {} let f }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js
index 4930ad2f2c78e4cafc51c131e6428e65dcc625fc..7de9c0fb87a08f3ce1313b8ca8becdfbf2ab3a8f 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (ClassDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ class f {} var f; }
+{ class f {} var f }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js
index 9e029ee1363953db095a5f89a5dae1aff4a9e35c..acafe8cc0edcd550217fbb1a6b06a387adf109c8 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (LexicalDeclaration (const) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js
index 7f4b7c9b806b3a5ed39f116047e8868c13728d66..c806aec01b8e170d9a420aa2e27158d2e3b70642 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (LexicalDeclaration (const) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js
index 108b912af9425bbb38f9bffc0ecda458e3f2f2b8..5ffef47d40bab09b5f583d65c03cda307cec8b0c 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (LexicalDeclaration (const) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ const f = 0; class f {}; }
+{ const f = 0; class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js
index bb05fc3e21c7352d42d1b8f4af6d684064e9849a..83b2f906e567a9da7d65018c538d21c4a2bf3200 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (LexicalDeclaration (const) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ const f = 0; const f = 0; }
+{ const f = 0; const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js
index 3a1e3aa126ceae4a60b1c69f8f834f133a1dc479..8d04baa454f80d2df129904ec1253a43f62138ab 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (LexicalDeclaration (const) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js
index 4bb6eb17236e4b7a6241a0e6855261c104334d50..d241d9fbc30edb8948d4b85d7c3752a42ca24089 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (LexicalDeclaration (const) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js
index 0c71133aa532f55148f260720063dae8bd64fcb1..ec9d3c314a52f01f838bf6748cdd4b6b90de6281 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (LexicalDeclaration (const) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ const f = 0; let f; }
+{ const f = 0; let f }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js
index f395e4ff9d6577aeb94e20e9714ec4d2110084b0..71d12c57143073f757c1a501c45917c19a9c35d4 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (LexicalDeclaration (const) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ const f = 0; var f; }
+{ const f = 0; var f }
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-function.js
index 2d3d86932f30a14c9e09a4a6ef255d71a5f5ac07..6dde22bb43f13ffed8b920909e3cebe41c5904dc 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/fn-block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (VariableDeclaration in BlockStatement inside a function)
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-generator.js
index 9a4548aefd30edf76c99442dd6ad844b4d008177..25f480d3ecf1b475bff80dfb18f538a026ff50aa 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/fn-block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (VariableDeclaration in BlockStatement inside a function)
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-class.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-class.js
index 7166809d0c2af3fc8660d409f88df8f97d4132ee..2a8a416eab87ea06dbf3e1ed039d3bf15e37ccbe 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/fn-block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (VariableDeclaration in BlockStatement inside a function)
@@ -20,5 +20,5 @@ info: |
 $DONOTEVALUATE();
 
 function x() {
-  { class f {};; var f; }
+  { class f {}; var f; }
 }
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-const.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-const.js
index 9421881282b37d8318bcfea00c494a9df072a54a..54dd9b63f5498737949a6edb9456cb7d118b1837 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/fn-block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (VariableDeclaration in BlockStatement inside a function)
@@ -20,5 +20,5 @@ info: |
 $DONOTEVALUATE();
 
 function x() {
-  { const f = 0;; var f; }
+  { const f = 0; var f; }
 }
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-function.js
index 36f267afd9f60d94260502f46b6e7e41a30277a9..6bf4898873847ecd71a3d3ab41049c9dc13ccd3d 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/fn-block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (VariableDeclaration in BlockStatement inside a function)
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-generator.js
index 171f77a727807e6f5f1dcb46c707f462ee9ceac7..0f3a5a1d4487f2a50b62692eb22c521e21312a1e 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/fn-block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (VariableDeclaration in BlockStatement inside a function)
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-let.js
similarity index 88%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-let.js
index 5abab8fe76dfa24340f60300505fcfa027577feb..bb8edb65b2e91ea36776ff52c32e400c6e212d3f 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/fn-block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (VariableDeclaration in BlockStatement inside a function)
@@ -20,5 +20,5 @@ info: |
 $DONOTEVALUATE();
 
 function x() {
-  { let f;; var f; }
+  { let f; var f; }
 }
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-var.js
index 02a8d0d73d5f2a603f8f64c013d5223b33485b3e..6d03148c1b9c70f65f7f387fd37306af78010612 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/fn-block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (VariableDeclaration in BlockStatement inside a function)
@@ -14,5 +14,5 @@ info: |
 
 
 function x() {
-  { var f; var f; }
+  { var f; var f }
 }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js
index f4590510d070208f5c4ac02055e0fc97d5b416fe..92e30355e059c69e2a535d9adcd8adf5f4fe411d 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (FunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js
index a08e9c90c38cbd7f4de23c91dcdce4359c917456..4ba5d9906e6072b93aab115e3cccc8c691c2c22c 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (FunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js
index 0bafed53906acd2f6b472a0e2447bdfd57b8d4a3..b597b892258b884328aa4c5ace01aea94499a271 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (FunctionDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ function f() {} class f {}; }
+{ function f() {} class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js
index e62c69975c7a912f6412d914b5bdf20e5d0dd690..cbcd8d8bf261fbed138e4a4eeb458f61e707d3f4 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (FunctionDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ function f() {} const f = 0; }
+{ function f() {} const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js
index dd26dfbd5a8a097b644d48ccb919b702cf02e65c..4f7d8a286e48845b974535159a434ca407f8889d 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (FunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js
index 3d68bdea5bb08a75b7f84855dc86fc3e961f8fee..674ecc75c95854478c0b6c1b13ed813c91c42097 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (FunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js
index ee1f8a78cf4b55500171fd023fd5c65fe9f60ce2..13d0913c86dc4c68cbd016b1b97a4ca9f5359a30 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (FunctionDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ function f() {} let f; }
+{ function f() {} let f }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js
index 2a2a1738f26b788b0cc78430f956c9fc12770ddd..1e2c1279e1d7d75ac3dab2c19b045f93b8f85853 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (FunctionDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ function f() {} var f; }
+{ function f() {} var f }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js
index 9929143735311df35559df5681de53e18646a052..723e5a625b358bbda0db5d062c4d5479a7c4b173 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (GeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js
index 4c19ed7d9e53ee88ad4ed786b9ed89baa7a20154..81b95f7ed0e8f85d7531dd74d5590c39618246d9 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (GeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js
index 1c48927aed2af0e4cc076212402098b1d1a8345b..6a6ba72d5b3da1cd8dd7dec3a2df15cbe622d30d 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (GeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ function* f() {} class f {}; }
+{ function* f() {} class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js
index 35b3a51e54810a7a70e4d7aff65e2743ea1b164a..508b0737e7df53f7bd1f1cf306f72d788156cc29 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (GeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ function* f() {} const f = 0; }
+{ function* f() {} const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js
index cf69c1852b55fb924a97e191bae9c8a5e40b2709..a675b8cf51a384ba57a7b6710a19a9c60683b24a 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (GeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js
index b6a58ed72fd8e065a26344ded9ca10d0e7b8495b..783dc3c44f92be3eda6c7328266193e6063351ef 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (GeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js
index 87d41926c46f8bf0f0eb7147ad135c47764679bc..f7959e3a40c501f1b33ad7d4be1f571323d3725a 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (GeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ function* f() {} let f; }
+{ function* f() {} let f }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js
index bb5569ae3c53e0094f7b3347639a94c30665eb73..52a377ab00dc6cd54b666ee490a7ade38dd0942a 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (GeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ function* f() {} var f; }
+{ function* f() {} var f }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-function.js
similarity index 93%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-function.js
index 3317b383247fde55aee7d7cf74c8d40dc2b08940..bd659d5b3c4b07955a596e0cb73f65acc889459c 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-generator.js
similarity index 93%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-generator.js
index 2b415d621cdc058f8bf773cc04306b6a738b0362..175658db53794212d90a245c9c124ff78f91e33b 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-class.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-class.js
index 4228a9fb601d8a664109644460cca3016427656c..5f93752ee4fe3ac05456ec10820c2e8a75b4ace2 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -35,4 +35,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ { var f; } class f {};; }
+{ { var f; } class f {}; }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-const.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-const.js
index 75ccab9d66a22a6d499eb206d49da5ae24093e2e..e490724236157fb7cc8c2ad917369e7f1ec92dca 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -35,4 +35,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ { var f; } const f = 0;; }
+{ { var f; } const f = 0; }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-function.js
similarity index 94%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-function.js
index 66944239aaf250a7af958b672c395e95feff6d0b..36eb41cbfda348bdc56f2ad116afcb5d2fc9dbb4 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-inner-block-var-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-generator.js
similarity index 94%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-generator.js
index e7d5a06bd66bd204cc20fac6d84659f42844571b..45f3de2143cf23081553b407a780c79ec7be2d93 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-let.js
similarity index 92%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-let.js
index 6ca093c2b3dad3d57aad49301f9a9e9a961a2fd0..13fe7e4f12aa3056ea80dcc9bc8e431f8b5e2fc8 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -35,4 +35,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ { var f; } let f;; }
+{ { var f; } let f; }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-var.js
similarity index 92%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-var.js
index 54f30facfdf1a2235bbc324b05eb861209cd823c..443dd5ff98e15f83c0e977f318c0d23e84ccef7c 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-inner-block-var-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -29,4 +29,4 @@ info: |
 ---*/
 
 
-{ { var f; } var f; }
+{ { var f; } var f }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-function.js
similarity index 93%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-function.js
index 6c02c629dd7f63299c22ea58618970097ee2f062..b36721b3d2c703c4d87b82e022e8b00b45cb16e2 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration-after.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-generator.js
similarity index 93%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-generator.js
index 77b7cb8c08d5099a581f9fc83dcb89fc5140c073..fb1d140ee490fb176c7e89e27b0431abacc3359b 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration-after.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-class.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-class.js
index 1c0981466a07bac63fe16e7e3e12637ac81bf6ed..7c5c179c1d3893b0a4fcd2be93047506e24882a5 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration-after.template
 /*---
 description: redeclaration with ClassDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -35,4 +35,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ class f {};; { var f; } }
+{ class f {}; { var f; } }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-const.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-const.js
index eb18aff1aee1f5303ab864b55ae00a483fd1b4a9..10ff104d2c6a5ee46453a14abfe5f6d48eb27d0b 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration-after.template
 /*---
 description: redeclaration with const-LexicalDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -35,4 +35,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ const f = 0;; { var f; } }
+{ const f = 0; { var f; } }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-function.js
similarity index 94%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-function.js
index 4420b7424d9a92e6bd6828880953c1c345851519..99c65d0eb0d4366515b801d66068b03c6eb60390 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-inner-block-var-declaration-after.template
 /*---
 description: redeclaration with FunctionDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-generator.js
similarity index 94%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-generator.js
index 1b259081e63a46c9056893675094a527eaa88d8b..2211f0ce2682720b905534663ceae3f6ea1851a4 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration-after.template
 /*---
 description: redeclaration with GeneratorDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-let.js
similarity index 92%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-let.js
index 117707dcd431557490e950e7d85dbe9452b41566..c0b537f2ef3cf3073679bdc4a7cbf7b0a08364a7 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration-after.template
 /*---
 description: redeclaration with let-LexicalDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -35,4 +35,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ let f;; { var f; } }
+{ let f; { var f; } }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js
index 53cc42b6013e0bcd30ef03c336778712b046a467..fcd29298f7ed3e31947d4f904a3e9b11b0a96273 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (LexicalDeclaration (let) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js
index be65ee63ae2b4957221af64c2e83709989ccf894..9fa4154321cbe9d671aa615b43a673f069f996f8 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (LexicalDeclaration (let) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js
index 91c6af10c76f0e911d749074404601ba06388d40..f44a789d5d07a6140ef14097c2eaab587ba20666 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (LexicalDeclaration (let) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ let f; class f {}; }
+{ let f; class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js
index 9a93b8f75654b2b6bd3997f3b134436a84aa95d6..737db517e2e22d28ef874649f80f72d3122eb8aa 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (LexicalDeclaration (let) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ let f; const f = 0; }
+{ let f; const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js
index dfed6fe1a1ef12c89c57c56a58e2fc5b14b92905..f226dbdac9732f3d5ccf57166759d13c52c8d1c1 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (LexicalDeclaration (let) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js
index 4e5946ae12db4521afc005f5080ac4bb83339c92..7a96390465894aa8d1d7dd02d52270da5f669491 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (LexicalDeclaration (let) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js
index c359f114948aa0964a943409dad108c466969268..a332e9cf23c72b206849a39191ae79fe0522728c 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (LexicalDeclaration (let) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ let f; let f; }
+{ let f; let f }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js
similarity index 88%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js
index 5c0ac1da15cb1c6bb71c01b487e5d1b8f5445105..7ab6a776cd077ddb7b6881f2916092414fd3f29b 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (LexicalDeclaration (let) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ let f; var f; }
+{ let f; var f }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js
index d8b22505faf82fddf18d60143a46a07402b653ba..23e4499f1d25e62342cea45985f2635d99fed945 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js
index 1ca82eb119d0ee314bd6427823f17bc5772294ff..df9d2efdfad6307635f50d376b940fb0bd961580 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js
index b191619e95594a1d72f7a826005cdba6a0986560..3b80ef422e0c4d760e35ff2e997b54ee237f2ee9 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (VariableDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ var f; class f {}; }
+{ var f; class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js
index a0f8dda0cc3f3248b3b723a9f8fa7577438b13ce..f9758ba3c22340528d9ac5071520df38d6429368 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (VariableDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ var f; const f = 0; }
+{ var f; const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js
index 5cf22183205c864823183e4299e99ef305daa439..7e324b4034a33bd313bda96bc025f9a3058cb3a5 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js
index 27183853ff0a7c29e0cbd70ca0c716ee2d3882f3..1db5e83a5a64e8ac3c83fdf30083305fe3cecb53 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js
similarity index 88%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js
index f115d5895db22d0714f31c0e2ddcb89c918ecfbe..63f3cb6fe45cd0eac35640cf3ac9141ec04aa387 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (VariableDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ var f; let f; }
+{ var f; let f }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-var.js
index 9212e344144e6604a0667535f634085d7bff2701..5f7303e809181b0f15803bff9b1affa5fbc131ee 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (VariableDeclaration in BlockStatement)
@@ -13,4 +13,4 @@ info: |
 ---*/
 
 
-{ var f; var f; }
+{ var f; var f }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-function.js
index 18c2724200135742a4f61f3a1564bb8daff9666a..c287697796326daa4bfe898e2670b211cd4731be 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration-after.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-generator.js
index 1a52d72b69142c5e7441a5d4e570c24e778c0963..c56398ba3202095c716aa915d9c6bc4869c7b8e0 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration-after.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-class.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-class.js
index 39815f4cc98f69078899ac247006d113e8933673..b2a77d26c88c5d06526962f753a8bc51356552b5 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration-after.template
 /*---
 description: redeclaration with ClassDeclaration (VariableDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ class f {};; var f; }
+{ class f {}; var f; }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-const.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-const.js
index db02e9604b5fc8d29d0714d06fe8095ced5c9330..696cea7a6d6995ab6756668ad87008eeb9e1a808 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration-after.template
 /*---
 description: redeclaration with const-LexicalDeclaration (VariableDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ const f = 0;; var f; }
+{ const f = 0; var f; }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-function.js
index 2251147f296297b1de9bb05127aa3051fbac0299..6bd084d2e407b547c0595b0205b3a4633409eec3 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-var-declaration-after.template
 /*---
 description: redeclaration with FunctionDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-generator.js
index 0ef11aebe26aca049657574d2e9d6d879cf9c4b8..4bf5382d871ceceef058feb2f8d375ffc836c0b5 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration-after.template
 /*---
 description: redeclaration with GeneratorDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-let.js
similarity index 88%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-let.js
index 21882bdbc20992d1d907d97ed62eca3f975ca0f1..91ea879222c0c35782c22f0ce1b609d845a3276f 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration-after.template
 /*---
 description: redeclaration with let-LexicalDeclaration (VariableDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-{ let f;; var f; }
+{ let f; var f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js
index bd8e77ef6bf5e538789898ab32959d4b4e57b438..cd80fcaa695c0a0bb227b0e5d33dded59adf9f0e 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (AsyncFunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js
index 6098287ba527d3af7269e251ba122baef04243b1..962b672bc87fb29557d67bc2a000b0d575aacb85 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (AsyncFunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js
similarity index 82%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js
index da33064208a49663ca519fe9fabbc819ac97ff15..15400ec6d9202c6c61b18926ba92956e6ad29592 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (AsyncFunctionDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: async function f() {} default: class f {}; }
+switch (0) { case 1: async function f() {} default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js
similarity index 82%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js
index 836892ea22be68e59f46a95f8799f7e39e24bc26..d95f93b0fd16609d782e75bf9bf21b3ca494fa75 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (AsyncFunctionDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: async function f() {} default: const f = 0; }
+switch (0) { case 1: async function f() {} default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js
index c9b8546845146b2df1bc8360ba3c6bf07bd51968..a29009b78d8a06f904cc4fa2ab23dd7427b47103 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (AsyncFunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js
index 083f8d363e3d9a8feaacdaa95ef26ef0e7deb50b..b421c2820f467a9f43651b1089e4d1c9447f5fd1 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (AsyncFunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js
index 9ef2ba2e2a3f888573a185def6c75b83a4013f2b..e289955d56a53e4a2c33a454eda45be5956ebe23 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (AsyncFunctionDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: async function f() {} default: let f; }
+switch (0) { case 1: async function f() {} default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js
index 73fe7bd0bc10ce51f37f09bb9e0311b6ac7c4223..95b9c6acbfbed044b2853995dbb8ad05d0206013 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-async-function-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (AsyncFunctionDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: async function f() {} default: var f; }
+switch (0) { case 1: async function f() {} default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js
index 55be8d639fbbdc0c38fdd8528efcc0ee585523b0..b9d093c626756b7417890e18ed574dff5f5c663f 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js
index 3a634f1190bcf2bd12602fce97f29d48c02405f3..babf87e4cc87842638b51b62b4368376d610125e 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js
similarity index 82%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js
index 35694ef3d437b6e6edaf5bbb4954e146e5f4b4ef..ee5fb1c346896df4d44603dcd47822834f272d9f 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: async function* f() {} default: class f {}; }
+switch (0) { case 1: async function* f() {} default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js
index 32415daa6ebf9dcb78e09dcade16a25c019515e7..01127a251f927ee367217135a440c456ff422b5b 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: async function* f() {} default: const f = 0; }
+switch (0) { case 1: async function* f() {} default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js
index ed563f0196c545623164259facb29669f4bb0296..06f3230dfb56537b8ec9ffb867d48dd3c4b2f964 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js
index 725dcf1d0e2cd98c8230551aa8478883ed81b0d8..fd96990ed184f5f002466b09d598cfd2395a9e7e 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js
index 28c8184f4e139ece0671ad5c0859551b847cd601..17ee4813388952ee6d3d736f04d8388833822500 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: async function* f() {} default: let f; }
+switch (0) { case 1: async function* f() {} default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js
index 0281f3cddc43a5023f6d44ed21970f8dab81e49f..8fbdd529a23281e862de1de501ab021513454ee1 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-async-generator-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: async function* f() {} default: var f; }
+switch (0) { case 1: async function* f() {} default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js
index 5178f3edba59f1d019f7d6f7de5d3cbef5024e6f..b25b3dca99ec7168b2cc61b61b7b16fda768db9f 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (ClassDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js
index 4db0ed845c95946bd2616792c8e12588c2259b6e..84ff4cc8ff36761367aa67b7b81a74da24833273 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (ClassDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js
index 50aa4cdd5e36947a971b10f9bf25a7f9cee6b935..ee0a3b95dcdc6d8bd9df80646b15bf60a1d983e9 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (ClassDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: class f {} default: class f {}; }
+switch (0) { case 1: class f {} default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js
index dcca5fa4e0af89cee8efcb992a92e976c8f3ffed..3ebac7318729bec096e7e562e98fff607198a216 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (ClassDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: class f {} default: const f = 0; }
+switch (0) { case 1: class f {} default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js
index 6f6ea32f17625c9229d069959d59f8c906a4995a..31abdea42e79a399b8c6ab2470e36ad834851b45 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (ClassDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js
index 5d035983da843383fa3f6a1bf8b196ae30dc3800..ed786cfd9d41118a428a66f92d05c89f4536765c 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (ClassDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js
index 00552af97c1fd49ed3ddf002d1dc4409e5e71c67..65128a851cc447b161c71b72a237c53307cde13a 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (ClassDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: class f {} default: let f; }
+switch (0) { case 1: class f {} default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js
index dd35a925cc47f189a3ec84a3ebde05064666a68b..9749bd52dd03945b67f925dca2bb7a2d52ed0729 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-class-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (ClassDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: class f {} default: var f; }
+switch (0) { case 1: class f {} default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js
index 1a84de956e51b8d179c3aec7013888be0269e4cf..0d73fff0324b7ce410e39ec9a8941d4377d89a2c 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (LexicalDeclaration (const) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js
index c1d6b37b139065078576708e0116085a4dee2461..2b4b02968ead0f4707174b981789e5eaaf1a9e29 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (LexicalDeclaration (const) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js
index 55c492f1930000dddabe0fdb07d94eae4fd28428..d4e7c0b8c559cc163e0e9996763e02c67418d1c1 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (LexicalDeclaration (const) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: const f = 0; default: class f {}; }
+switch (0) { case 1: const f = 0; default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js
index 1c35408a9571024a0e4ca2681d27012466a8e198..692968d57a47cc834181f945719cd8718edf3c26 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (LexicalDeclaration (const) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: const f = 0; default: const f = 0; }
+switch (0) { case 1: const f = 0; default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js
index c5c16513f49a7873a92fe8795fdc6ea802adb03a..bb406471eddb68286da4b07e019920395964f7c9 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (LexicalDeclaration (const) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js
index bf706938027c654bb7fb0b18f507e9fd10c9762a..03c3b96d4b44c1245f4a114122fcc22324992b43 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (LexicalDeclaration (const) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js
index cab2d7ba83f192d62cb256dc7b8e26d393c72816..78c4e00efd863a74f7546ffe4400246c8d0b344b 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (LexicalDeclaration (const) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: const f = 0; default: let f; }
+switch (0) { case 1: const f = 0; default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js
index 9aa3667c6268f48640dc9d7a243271a02d773060..27490110009dd59dc4dbd627b4844c8e72914010 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-const-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (LexicalDeclaration (const) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: const f = 0; default: var f; }
+switch (0) { case 1: const f = 0; default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js
index cb5c6de83733773aee691d0a23d6a3ed022441b2..b4aa30f1bf9850fce6688169a430c245ae739d0c 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (FunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js
index 6cae1a9f81f099db2adb1a4515a4fdcaabcaba6e..7d8c75fc7badd3b4f063a742336c23c4af0213cf 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (FunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js
similarity index 82%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js
index 48eb323a3bbda3890e5671e87c12243e9000084f..62fc2c5741011794d88115b3b4dc0c67d2b4ccdc 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (FunctionDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: function f() {} default: class f {}; }
+switch (0) { case 1: function f() {} default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js
similarity index 82%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js
index 84bf72fba4677f044e72d0c44181dd5e7b8ba830..52dd04ffdf9062a32c66548879bafa7d4c52de42 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (FunctionDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: function f() {} default: const f = 0; }
+switch (0) { case 1: function f() {} default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js
index 75c43a0137d8eb1dbfc3d9931b40d303f7797e42..e019b85cf415649cd6bcd9fc6b97fc4c63ffd509 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (FunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js
index da46e8bcd0478d0a6d86007a879d033baebde126..10fab82acd4aaeaa5aa3e4ec51f3d35946ac70ec 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (FunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js
index 4ca757f0df00aa8e1c735de7226dc9d92c3d5878..c6c7a16c47ab4aa0420172f174f8d6e2beca717d 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (FunctionDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: function f() {} default: let f; }
+switch (0) { case 1: function f() {} default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js
index efa90415f82ec37dba34f59099d8e50300f668a7..a3154d1cf3ec5c5f007802c62af594087b18c8fa 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-function-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (FunctionDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: function f() {} default: var f; }
+switch (0) { case 1: function f() {} default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js
index d87b260f69f94d9487618076700d6bebbd1db601..3787fdb62694195a98d06018302eeb303490b83d 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (GeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js
index 4b70e514b9431467f742b43942959dfccbcbd6c5..65947ae3856e8ea666d51c649e4ee68c73ecb15e 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (GeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js
index 393c2343a2a602b468c3d04f528def4f466d6e67..4a8086b6ac53418d7c6c1c9229fe216d44e9c38f 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (GeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: function* f() {} default: class f {}; }
+switch (0) { case 1: function* f() {} default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js
index 52b8147df73adda340ad325eb4aa461eae8cc8b8..3fe5fbf4356b897d15d9cc9c947dbad40840245c 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (GeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: function* f() {} default: const f = 0; }
+switch (0) { case 1: function* f() {} default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js
index 72a68f82761b6ac3f608dbd6828e7ef1b4cfad84..ba5d94b93f513f03f56dc2597dee9d0c075ac0d0 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (GeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js
index 9119f0994fd6c7c8dade0ad78e682a3b22619acc..53d173bf4822d029b871ae8c7aea18c25a4037e5 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (GeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js
index 2149cff06669b4ed709ba1ab860e8cc8332b611e..f741189002d1257eb5ed0a1f7945229c209cf94f 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (GeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: function* f() {} default: let f; }
+switch (0) { case 1: function* f() {} default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js
index 0fe4925156684ea399e3360ccef9f13ab5812a27..438d933bed00c9511235309d1222a461f4e336c3 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-generator-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (GeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: function* f() {} default: var f; }
+switch (0) { case 1: function* f() {} default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js
index a1408a5d053149e6169828a40969855c60a218e3..2ff0738a7310d922eb8e9ae0331023d2e2ae536e 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (LexicalDeclaration (let) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js
index b8f667a00ff6e82ba86aab2cb961dd03616a2a4e..35ae7c5457f35768710ea9e756b766fe4384c13a 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (LexicalDeclaration (let) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js
index e09b73cf016eb23f0f4970ac807ed460b3afe322..e5eab50dbfa283c727ce1e138aba41108d6261b0 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (LexicalDeclaration (let) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: let f; default: class f {}; }
+switch (0) { case 1: let f; default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js
index 85b658b2a2a4cc10e669ea168e23f14559fbc58c..91669791a35dfc014d054398e0276aedf6f7e5a3 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (LexicalDeclaration (let) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: let f; default: const f = 0; }
+switch (0) { case 1: let f; default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js
index 9186b43cb44083aad1d5315709570f6abd809f30..be5068f5242c1fe5c473769fa7123dcb99c2640c 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (LexicalDeclaration (let) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js
index 3536efc5e1c95d04322ac53745126561732683a8..4c7d448de11228c3dc4b61fbc288c87e373de1c6 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (LexicalDeclaration (let) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js
index 56a9f055ad180197bb20e6f39877329d00957d9e..967f9249fc1f606fb0f2901239b152784490b2e2 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (LexicalDeclaration (let) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: let f; default: let f; }
+switch (0) { case 1: let f; default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js
similarity index 85%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js
index 646d2f36ca5a67a992010bf0e413eecde18ccfe7..da46c7ca48351976f45b4c5bbcd5c8264b431e29 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-let-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (LexicalDeclaration (let) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: let f; default: var f; }
+switch (0) { case 1: let f; default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js
index ab27b6fa453357d94f6512e7b7c826742d6d2ac3..7b9d9111a0008b7057b2af74f75eb960249e5488 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with AsyncFunctionDeclaration (VariableDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js
index 52971bb3ee9bbe15330f96cc9aa8988d6223aecf..b1b9e1ca00a8afceab88e2b7edb1a7224b583962 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with AsyncGeneratorDeclaration (VariableDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js
index e457e72148e2eef294f37e9bcbe094aef30c2b9b..17fb0f085be67d21a4fb96b414ec607c42d2a97f 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with ClassDeclaration (VariableDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: var f; default: class f {}; }
+switch (0) { case 1: var f; default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js
index 426f9708dbbee57d971845201aeb4de41fd8186d..6f1f85f9d6ddc6b15d3ea34707fbcca713872c5c 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with const-LexicalDeclaration (VariableDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: var f; default: const f = 0; }
+switch (0) { case 1: var f; default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js
index 86b3f9e75c1101371e686c6fcb8d042d3204b3ef..6b415943b95046afec9cdd8eb39585084f83ce57 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
 // - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with FunctionDeclaration (VariableDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js
index 640a12a7987fde4a07833b3c84c477e46d088599..68aab21e3feccf67afef665c30a95e0f1a349d2f 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with GeneratorDeclaration (VariableDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js
similarity index 85%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js
index 91d4c3b0885ff90be104f3980963b26cb9f0ca19..13002c45c4725bb0ac887465c421b8b07e657a18 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
 // - src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with let-LexicalDeclaration (VariableDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
 
 $DONOTEVALUATE();
 
-switch (0) { case 1: var f; default: let f; }
+switch (0) { case 1: var f; default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-var.js
index 7fa10706a30f6968ad17340d53e4790100e08520..d4d646569ef1b96b969503fffd0561cce8fc1d8f 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
 // This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
 // - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-var-declaration.template
 /*---
 description: redeclaration with VariableDeclaration (VariableDeclaration in SwitchStatement)
@@ -13,4 +13,4 @@ info: |
 ---*/
 
 
-switch (0) { case 1: var f; default: var f; }
+switch (0) { case 1: var f; default: var f }