diff --git a/test/language/expressions/arrow-function/params-dflt-abrupt.js b/test/language/expressions/arrow-function/params-dflt-abrupt.js
index 04b7c2f95419df78ef8601cde870bd38de233dd5..85f1e86216760c9a8259aab1b78e559f5c52395e 100644
--- a/test/language/expressions/arrow-function/params-dflt-abrupt.js
+++ b/test/language/expressions/arrow-function/params-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/arrow-function.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/arrow-function.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (arrow function expression)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/arrow-function/params-dflt-arg-val-not-undefined.js b/test/language/expressions/arrow-function/params-dflt-arg-val-not-undefined.js
index 317600ccecc40aef12bccb2b9e80010974c99a6a..6bbd530386036234a74a135ff5fb4dd4f494cdf8 100644
--- a/test/language/expressions/arrow-function/params-dflt-arg-val-not-undefined.js
+++ b/test/language/expressions/arrow-function/params-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/arrow-function.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/arrow-function.template
 /*---
 description: Use of intializer when argument value is not `undefined` (arrow function expression)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/arrow-function/params-dflt-arg-val-undefined.js b/test/language/expressions/arrow-function/params-dflt-arg-val-undefined.js
index 300537d3b23156f437e43111dab18a9767a8c819..d3c55e91b010295576ec3b7c14d81b7cdc0d63b1 100644
--- a/test/language/expressions/arrow-function/params-dflt-arg-val-undefined.js
+++ b/test/language/expressions/arrow-function/params-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/arrow-function.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/arrow-function.template
 /*---
 description: Use of intializer when argument value is `undefined` (arrow function expression)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/arrow-function/params-dflt-duplicates.js b/test/language/expressions/arrow-function/params-dflt-duplicates.js
index ce0db0a383538a448e9005f7db1ff8eb99260dbc..06c7c45d7ae827d8483b123877a0a71a3f4c1cfa 100644
--- a/test/language/expressions/arrow-function/params-dflt-duplicates.js
+++ b/test/language/expressions/arrow-function/params-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/arrow-function.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/arrow-function.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (arrow function expression)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/arrow-function/params-dflt-ref-later.js b/test/language/expressions/arrow-function/params-dflt-ref-later.js
index 96789cbf65b66b96ad66aa35ccb005d682de61e2..38d136e803a228a12ad31c03bf8d061b3eb0c24a 100644
--- a/test/language/expressions/arrow-function/params-dflt-ref-later.js
+++ b/test/language/expressions/arrow-function/params-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/arrow-function.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/arrow-function.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (arrow function expression)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/arrow-function/params-dflt-ref-prior.js b/test/language/expressions/arrow-function/params-dflt-ref-prior.js
index b34679a1043396a826c4d4faa5a4d556496b9b98..41111ad7406be63232851b9b294eaffc3d61712d 100644
--- a/test/language/expressions/arrow-function/params-dflt-ref-prior.js
+++ b/test/language/expressions/arrow-function/params-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/arrow-function.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/arrow-function.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (arrow function expression)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/arrow-function/params-dflt-ref-self.js b/test/language/expressions/arrow-function/params-dflt-ref-self.js
index 8f45c38968adb9c55016da6d5ac61b55a8f214df..6d44188dacce242960a7319c98c8054ee494d971 100644
--- a/test/language/expressions/arrow-function/params-dflt-ref-self.js
+++ b/test/language/expressions/arrow-function/params-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/arrow-function.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/arrow-function.template
 /*---
 description: Referencing a parameter from within its own initializer (arrow function expression)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/arrow-function/params-dflt-rest.js b/test/language/expressions/arrow-function/params-dflt-rest.js
index 3841c85a897136a964072499e14ffbb0e419df06..d686041b2f7f34817876ab38242949ba4d16f784 100644
--- a/test/language/expressions/arrow-function/params-dflt-rest.js
+++ b/test/language/expressions/arrow-function/params-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/arrow-function.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/arrow-function.template
 /*---
 description: RestParameter does not support an initializer (arrow function expression)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-abrupt.js b/test/language/expressions/class/params-gen-meth-dflt-abrupt.js
similarity index 97%
rename from test/language/expressions/class/params-dflt-gen-meth-abrupt.js
rename to test/language/expressions/class/params-gen-meth-dflt-abrupt.js
index 889bd23139e9330509fb5c55188dff031b127cbb..af01dd704b211efbb32266ef7c0bc68cc895a7ba 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-abrupt.js
+++ b/test/language/expressions/class/params-gen-meth-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/cls-expr-gen-meth.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/cls-expr-gen-meth.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-arg-val-not-undefined.js b/test/language/expressions/class/params-gen-meth-dflt-arg-val-not-undefined.js
similarity index 97%
rename from test/language/expressions/class/params-dflt-gen-meth-arg-val-not-undefined.js
rename to test/language/expressions/class/params-gen-meth-dflt-arg-val-not-undefined.js
index 68e84f15519bf4cff3a2f5c72dc76dc0dfa6fed1..1eca63f8200e3d337275473901d73fcaf8a9735f 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-arg-val-not-undefined.js
+++ b/test/language/expressions/class/params-gen-meth-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/cls-expr-gen-meth.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/cls-expr-gen-meth.template
 /*---
 description: Use of intializer when argument value is not `undefined` (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-arg-val-undefined.js b/test/language/expressions/class/params-gen-meth-dflt-arg-val-undefined.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-gen-meth-arg-val-undefined.js
rename to test/language/expressions/class/params-gen-meth-dflt-arg-val-undefined.js
index 5a412e0b52b7a60f6528b814fae78d2c1d3e2399..45383979e50250862f879ee5f61cebdef302ef1c 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-arg-val-undefined.js
+++ b/test/language/expressions/class/params-gen-meth-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/cls-expr-gen-meth.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/cls-expr-gen-meth.template
 /*---
 description: Use of intializer when argument value is `undefined` (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-duplicates.js b/test/language/expressions/class/params-gen-meth-dflt-duplicates.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-gen-meth-duplicates.js
rename to test/language/expressions/class/params-gen-meth-dflt-duplicates.js
index 2dd2f8db6ad1ddcfdd4c3aabcdc3b921f75bbc8e..3f6664df798c8c9cad256976bb79edf1313fd42b 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-duplicates.js
+++ b/test/language/expressions/class/params-gen-meth-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/cls-expr-gen-meth.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/cls-expr-gen-meth.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-ref-later.js b/test/language/expressions/class/params-gen-meth-dflt-ref-later.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-gen-meth-ref-later.js
rename to test/language/expressions/class/params-gen-meth-dflt-ref-later.js
index 8187aab07a124d4996d044be428cc306e1bdec46..e5ffea00890e00728e847e920bcab0a6cab3d226 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-ref-later.js
+++ b/test/language/expressions/class/params-gen-meth-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/cls-expr-gen-meth.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/cls-expr-gen-meth.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-ref-prior.js b/test/language/expressions/class/params-gen-meth-dflt-ref-prior.js
similarity index 97%
rename from test/language/expressions/class/params-dflt-gen-meth-ref-prior.js
rename to test/language/expressions/class/params-gen-meth-dflt-ref-prior.js
index e5a098a17a17552fce180c10297cd93d00e216ca..08cab97dd2c2efdebb57e64251143c8be9e7c0a1 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-ref-prior.js
+++ b/test/language/expressions/class/params-gen-meth-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/cls-expr-gen-meth.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/cls-expr-gen-meth.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-ref-self.js b/test/language/expressions/class/params-gen-meth-dflt-ref-self.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-gen-meth-ref-self.js
rename to test/language/expressions/class/params-gen-meth-dflt-ref-self.js
index 35ee467af12a48afed74aff4662d6e289c9203a1..e638ba4f088356696daf500cc67581ef1559f258 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-ref-self.js
+++ b/test/language/expressions/class/params-gen-meth-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/cls-expr-gen-meth.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/cls-expr-gen-meth.template
 /*---
 description: Referencing a parameter from within its own initializer (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-rest.js b/test/language/expressions/class/params-gen-meth-dflt-rest.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-gen-meth-rest.js
rename to test/language/expressions/class/params-gen-meth-dflt-rest.js
index 4c9c3cb934068d67a4719297e3f3560354f42898..a21fe609c257b5b4dbb28707d80332c4f869090b 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-rest.js
+++ b/test/language/expressions/class/params-gen-meth-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/cls-expr-gen-meth.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/cls-expr-gen-meth.template
 /*---
 description: RestParameter does not support an initializer (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-static-abrupt.js b/test/language/expressions/class/params-gen-meth-static-dflt-abrupt.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-gen-meth-static-abrupt.js
rename to test/language/expressions/class/params-gen-meth-static-dflt-abrupt.js
index c0ec1c62b9b4cd431bbe0fb1728e0ec4100197a4..9b4dc8cd22f54cd0c6e98f324d10418135344986 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-static-abrupt.js
+++ b/test/language/expressions/class/params-gen-meth-static-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/cls-expr-gen-meth-static.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/cls-expr-gen-meth-static.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-static-arg-val-not-undefined.js b/test/language/expressions/class/params-gen-meth-static-dflt-arg-val-not-undefined.js
similarity index 97%
rename from test/language/expressions/class/params-dflt-gen-meth-static-arg-val-not-undefined.js
rename to test/language/expressions/class/params-gen-meth-static-dflt-arg-val-not-undefined.js
index 5908b88cb9d63c6ba14a339112cc47019e196b99..023fccf96d0e84fe32760e3b02f8330b7ef51637 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-static-arg-val-not-undefined.js
+++ b/test/language/expressions/class/params-gen-meth-static-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/cls-expr-gen-meth-static.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/cls-expr-gen-meth-static.template
 /*---
 description: Use of intializer when argument value is not `undefined` (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-static-arg-val-undefined.js b/test/language/expressions/class/params-gen-meth-static-dflt-arg-val-undefined.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-gen-meth-static-arg-val-undefined.js
rename to test/language/expressions/class/params-gen-meth-static-dflt-arg-val-undefined.js
index c5312c7bdfd037f7ad11d11f7a3a3eb02fa349d8..f3c329ed9914261ee0e2ba81e74314c04d009193 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-static-arg-val-undefined.js
+++ b/test/language/expressions/class/params-gen-meth-static-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/cls-expr-gen-meth-static.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/cls-expr-gen-meth-static.template
 /*---
 description: Use of intializer when argument value is `undefined` (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-static-duplicates.js b/test/language/expressions/class/params-gen-meth-static-dflt-duplicates.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-gen-meth-static-duplicates.js
rename to test/language/expressions/class/params-gen-meth-static-dflt-duplicates.js
index e155b13920f35f149e293cf8c43ebeb2f80df1c3..cf11bc933a855c507d872df1b80efb8c0e66d2d4 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-static-duplicates.js
+++ b/test/language/expressions/class/params-gen-meth-static-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/cls-expr-gen-meth-static.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/cls-expr-gen-meth-static.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-static-ref-later.js b/test/language/expressions/class/params-gen-meth-static-dflt-ref-later.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-gen-meth-static-ref-later.js
rename to test/language/expressions/class/params-gen-meth-static-dflt-ref-later.js
index 41da2d30d5729edc45403f63db117ce2a62d892a..fea2918cd4c80da429727ba113d2919963daac65 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-static-ref-later.js
+++ b/test/language/expressions/class/params-gen-meth-static-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/cls-expr-gen-meth-static.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/cls-expr-gen-meth-static.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-static-ref-prior.js b/test/language/expressions/class/params-gen-meth-static-dflt-ref-prior.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-gen-meth-static-ref-prior.js
rename to test/language/expressions/class/params-gen-meth-static-dflt-ref-prior.js
index 993d308096b3d8028c5ef67b71f87a6866bbd43e..75ae6e0dae84542dbbd461c8152232dcbe4e0704 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-static-ref-prior.js
+++ b/test/language/expressions/class/params-gen-meth-static-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/cls-expr-gen-meth-static.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/cls-expr-gen-meth-static.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-static-ref-self.js b/test/language/expressions/class/params-gen-meth-static-dflt-ref-self.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-gen-meth-static-ref-self.js
rename to test/language/expressions/class/params-gen-meth-static-dflt-ref-self.js
index 2d5c619c3724805496a345fec9a9281b2cd34f7d..8e298c8469b5105a1639d9ee3f5c381806faa049 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-static-ref-self.js
+++ b/test/language/expressions/class/params-gen-meth-static-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/cls-expr-gen-meth-static.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/cls-expr-gen-meth-static.template
 /*---
 description: Referencing a parameter from within its own initializer (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-gen-meth-static-rest.js b/test/language/expressions/class/params-gen-meth-static-dflt-rest.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-gen-meth-static-rest.js
rename to test/language/expressions/class/params-gen-meth-static-dflt-rest.js
index 17eb3972ae6e6e77ca98b5903c7831febc743eef..877455d97c948a28d85f6b2a392799cad2ab6eec 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-static-rest.js
+++ b/test/language/expressions/class/params-gen-meth-static-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/cls-expr-gen-meth-static.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/cls-expr-gen-meth-static.template
 /*---
 description: RestParameter does not support an initializer (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-abrupt.js b/test/language/expressions/class/params-meth-dflt-abrupt.js
similarity index 97%
rename from test/language/expressions/class/params-dflt-meth-abrupt.js
rename to test/language/expressions/class/params-meth-dflt-abrupt.js
index 7e0d921f7ea93300c2fdb2e374237a9a4f94a4ed..27a9c31b3547e2bedb65f475963ef16c9c7e58e4 100644
--- a/test/language/expressions/class/params-dflt-meth-abrupt.js
+++ b/test/language/expressions/class/params-meth-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/cls-expr-meth.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/cls-expr-meth.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-arg-val-not-undefined.js b/test/language/expressions/class/params-meth-dflt-arg-val-not-undefined.js
similarity index 97%
rename from test/language/expressions/class/params-dflt-meth-arg-val-not-undefined.js
rename to test/language/expressions/class/params-meth-dflt-arg-val-not-undefined.js
index 792198b41275c3684c19430b06a431c4e8d2eb85..a882098ce35f15336e199452ae8f94342ab2adae 100644
--- a/test/language/expressions/class/params-dflt-meth-arg-val-not-undefined.js
+++ b/test/language/expressions/class/params-meth-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/cls-expr-meth.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/cls-expr-meth.template
 /*---
 description: Use of intializer when argument value is not `undefined` (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-arg-val-undefined.js b/test/language/expressions/class/params-meth-dflt-arg-val-undefined.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-meth-arg-val-undefined.js
rename to test/language/expressions/class/params-meth-dflt-arg-val-undefined.js
index e9a40bd67719761b07553dadc49f7670816e23e2..ec748421f37581461704d6360b421829bc052c22 100644
--- a/test/language/expressions/class/params-dflt-meth-arg-val-undefined.js
+++ b/test/language/expressions/class/params-meth-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/cls-expr-meth.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/cls-expr-meth.template
 /*---
 description: Use of intializer when argument value is `undefined` (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-duplicates.js b/test/language/expressions/class/params-meth-dflt-duplicates.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-meth-duplicates.js
rename to test/language/expressions/class/params-meth-dflt-duplicates.js
index 244127346995c0d400915b9ee68baa45573aa8d1..f3a5d7c491cc75b0c60bb2cb05cf4a247fb332b8 100644
--- a/test/language/expressions/class/params-dflt-meth-duplicates.js
+++ b/test/language/expressions/class/params-meth-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/cls-expr-meth.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/cls-expr-meth.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-ref-later.js b/test/language/expressions/class/params-meth-dflt-ref-later.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-meth-ref-later.js
rename to test/language/expressions/class/params-meth-dflt-ref-later.js
index ca04f536dc86f5bf3240e57b70b37027b51bce71..2b23a4fd59dec589cb64f4b7036c024d35aa673d 100644
--- a/test/language/expressions/class/params-dflt-meth-ref-later.js
+++ b/test/language/expressions/class/params-meth-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/cls-expr-meth.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/cls-expr-meth.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-ref-prior.js b/test/language/expressions/class/params-meth-dflt-ref-prior.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-meth-ref-prior.js
rename to test/language/expressions/class/params-meth-dflt-ref-prior.js
index eceb7cd01c7b4de16381a7f09bcb9f0e9653dc3e..7a650a08d5249226fa574fd6b6878a91adc5c067 100644
--- a/test/language/expressions/class/params-dflt-meth-ref-prior.js
+++ b/test/language/expressions/class/params-meth-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/cls-expr-meth.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/cls-expr-meth.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-ref-self.js b/test/language/expressions/class/params-meth-dflt-ref-self.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-meth-ref-self.js
rename to test/language/expressions/class/params-meth-dflt-ref-self.js
index 7ec1a9bb96e90962eeed7021d59a1ca49736ac7f..961ea82687a4213d1f92b51892b22b115b069e4d 100644
--- a/test/language/expressions/class/params-dflt-meth-ref-self.js
+++ b/test/language/expressions/class/params-meth-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/cls-expr-meth.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/cls-expr-meth.template
 /*---
 description: Referencing a parameter from within its own initializer (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-rest.js b/test/language/expressions/class/params-meth-dflt-rest.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-meth-rest.js
rename to test/language/expressions/class/params-meth-dflt-rest.js
index 0fd41bf30ec4fdad14fa435f2956942d4a1a8388..0d84b4f036e1baa96cdcb753994150fa391fc847 100644
--- a/test/language/expressions/class/params-dflt-meth-rest.js
+++ b/test/language/expressions/class/params-meth-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/cls-expr-meth.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/cls-expr-meth.template
 /*---
 description: RestParameter does not support an initializer (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-static-abrupt.js b/test/language/expressions/class/params-meth-static-dflt-abrupt.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-meth-static-abrupt.js
rename to test/language/expressions/class/params-meth-static-dflt-abrupt.js
index 4c7724491f80cf194972bbfef00c06577f6f55f8..81f068302b9476a8ca568f2fbfa22dbab60a11a5 100644
--- a/test/language/expressions/class/params-dflt-meth-static-abrupt.js
+++ b/test/language/expressions/class/params-meth-static-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/cls-expr-meth-static.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/cls-expr-meth-static.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (static class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-static-arg-val-not-undefined.js b/test/language/expressions/class/params-meth-static-dflt-arg-val-not-undefined.js
similarity index 97%
rename from test/language/expressions/class/params-dflt-meth-static-arg-val-not-undefined.js
rename to test/language/expressions/class/params-meth-static-dflt-arg-val-not-undefined.js
index 5a0a0c52d62c843ef1730700e7c38da7d0f59842..113d9e75a8b12de947a0b30d8a964b6a09fb138a 100644
--- a/test/language/expressions/class/params-dflt-meth-static-arg-val-not-undefined.js
+++ b/test/language/expressions/class/params-meth-static-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/cls-expr-meth-static.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/cls-expr-meth-static.template
 /*---
 description: Use of intializer when argument value is not `undefined` (static class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-static-arg-val-undefined.js b/test/language/expressions/class/params-meth-static-dflt-arg-val-undefined.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-meth-static-arg-val-undefined.js
rename to test/language/expressions/class/params-meth-static-dflt-arg-val-undefined.js
index 13ac0287fe2877c6b9b435fad6a69deca0ce4e1f..6355c328afeb01ec41a23d0102d592c89c094fc4 100644
--- a/test/language/expressions/class/params-dflt-meth-static-arg-val-undefined.js
+++ b/test/language/expressions/class/params-meth-static-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/cls-expr-meth-static.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/cls-expr-meth-static.template
 /*---
 description: Use of intializer when argument value is `undefined` (static class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-static-duplicates.js b/test/language/expressions/class/params-meth-static-dflt-duplicates.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-meth-static-duplicates.js
rename to test/language/expressions/class/params-meth-static-dflt-duplicates.js
index a5038f7b1f3709bf18e22f7fbedd0c786e6c50e1..35c6e0bec24193b1cde8e996c09b47f491c585df 100644
--- a/test/language/expressions/class/params-dflt-meth-static-duplicates.js
+++ b/test/language/expressions/class/params-meth-static-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/cls-expr-meth-static.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/cls-expr-meth-static.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (static class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-static-ref-later.js b/test/language/expressions/class/params-meth-static-dflt-ref-later.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-meth-static-ref-later.js
rename to test/language/expressions/class/params-meth-static-dflt-ref-later.js
index a28ef9f80920da74d1b8e6fe2fa3e7bbfcc52071..cad6407ec89a6f925a0b0689c8b8f567e323da21 100644
--- a/test/language/expressions/class/params-dflt-meth-static-ref-later.js
+++ b/test/language/expressions/class/params-meth-static-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/cls-expr-meth-static.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/cls-expr-meth-static.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (static class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-static-ref-prior.js b/test/language/expressions/class/params-meth-static-dflt-ref-prior.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-meth-static-ref-prior.js
rename to test/language/expressions/class/params-meth-static-dflt-ref-prior.js
index cf8be79437ffec5fb5dec490850785660d7bf937..4d9702c610e937ae6ff95a39209229e13731cd97 100644
--- a/test/language/expressions/class/params-dflt-meth-static-ref-prior.js
+++ b/test/language/expressions/class/params-meth-static-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/cls-expr-meth-static.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/cls-expr-meth-static.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (static class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-static-ref-self.js b/test/language/expressions/class/params-meth-static-dflt-ref-self.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-meth-static-ref-self.js
rename to test/language/expressions/class/params-meth-static-dflt-ref-self.js
index 93a1ad3252b546920172f352d4c0e22ecc300fb8..b6a31481253ada96812954909bbf13fd94e1ac4a 100644
--- a/test/language/expressions/class/params-dflt-meth-static-ref-self.js
+++ b/test/language/expressions/class/params-meth-static-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/cls-expr-meth-static.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/cls-expr-meth-static.template
 /*---
 description: Referencing a parameter from within its own initializer (static class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-dflt-meth-static-rest.js b/test/language/expressions/class/params-meth-static-dflt-rest.js
similarity index 96%
rename from test/language/expressions/class/params-dflt-meth-static-rest.js
rename to test/language/expressions/class/params-meth-static-dflt-rest.js
index 5102cbc83a108d83be87cddcf57c52030c078a3b..45e7818fb9b2e11be55d1ca708be9cdc02e6f98b 100644
--- a/test/language/expressions/class/params-dflt-meth-static-rest.js
+++ b/test/language/expressions/class/params-meth-static-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/cls-expr-meth-static.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/cls-expr-meth-static.template
 /*---
 description: RestParameter does not support an initializer (static class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/function/params-dflt-abrupt.js b/test/language/expressions/function/params-dflt-abrupt.js
index 8fbc1c7fd6ce3680cb58c78ad31a06966a024ca1..0d19214080f9b84852a994fdf6356e71d2c11b97 100644
--- a/test/language/expressions/function/params-dflt-abrupt.js
+++ b/test/language/expressions/function/params-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/func-expr.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/func-expr.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (function expression)
 esid: sec-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/function/params-dflt-arg-val-not-undefined.js b/test/language/expressions/function/params-dflt-arg-val-not-undefined.js
index 3a1604d8b3956670ed5e194dece83b1166731f7e..d66bd39081b81d05832d5f521c7e721483c1215a 100644
--- a/test/language/expressions/function/params-dflt-arg-val-not-undefined.js
+++ b/test/language/expressions/function/params-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/func-expr.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/func-expr.template
 /*---
 description: Use of intializer when argument value is not `undefined` (function expression)
 esid: sec-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/function/params-dflt-arg-val-undefined.js b/test/language/expressions/function/params-dflt-arg-val-undefined.js
index cec9fa0a135de335073ed8b7048028dafa85aed8..0f05d78629219249be646c3dcddc47f70c171ee5 100644
--- a/test/language/expressions/function/params-dflt-arg-val-undefined.js
+++ b/test/language/expressions/function/params-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/func-expr.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/func-expr.template
 /*---
 description: Use of intializer when argument value is `undefined` (function expression)
 esid: sec-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/function/params-dflt-duplicates.js b/test/language/expressions/function/params-dflt-duplicates.js
index e2666ef2626da4a14d888d5c556ec77930a7cff7..4599ed7160bc3907104037e287f1d5addcaec3ff 100644
--- a/test/language/expressions/function/params-dflt-duplicates.js
+++ b/test/language/expressions/function/params-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/func-expr.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/func-expr.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (function expression)
 esid: sec-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/function/params-dflt-ref-later.js b/test/language/expressions/function/params-dflt-ref-later.js
index 0e1122a5642e27d68c948a20bda93dc173dac773..478a729c704360819617a2a09a5ec194d35dfea2 100644
--- a/test/language/expressions/function/params-dflt-ref-later.js
+++ b/test/language/expressions/function/params-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/func-expr.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/func-expr.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (function expression)
 esid: sec-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/function/params-dflt-ref-prior.js b/test/language/expressions/function/params-dflt-ref-prior.js
index 0d6619d5caf0bb613cece152d32cd32c2b77a5a0..2e9601fa7e477b77d0a424b0abbb88b379bb16d0 100644
--- a/test/language/expressions/function/params-dflt-ref-prior.js
+++ b/test/language/expressions/function/params-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/func-expr.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/func-expr.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (function expression)
 esid: sec-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/function/params-dflt-ref-self.js b/test/language/expressions/function/params-dflt-ref-self.js
index 0e1f974f279fdb8b0129a9d198727115460db5f8..19a0c82f030edc0c253d95bf5e1f90588eaa1b8b 100644
--- a/test/language/expressions/function/params-dflt-ref-self.js
+++ b/test/language/expressions/function/params-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/func-expr.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/func-expr.template
 /*---
 description: Referencing a parameter from within its own initializer (function expression)
 esid: sec-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/function/params-dflt-rest.js b/test/language/expressions/function/params-dflt-rest.js
index 85d80a6243afe5326c4fa61f112b234b187da143..006f3db18ecff2d7db9aae7108f8fa2a2bdccb3a 100644
--- a/test/language/expressions/function/params-dflt-rest.js
+++ b/test/language/expressions/function/params-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/func-expr.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/func-expr.template
 /*---
 description: RestParameter does not support an initializer (function expression)
 esid: sec-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/generators/params-dflt-abrupt.js b/test/language/expressions/generators/params-dflt-abrupt.js
index ed1b7d61913c5bb4de5a6849ad1fab1a94448045..53dc8f8659c4b9d0a210622ff6b52fd163e883af 100644
--- a/test/language/expressions/generators/params-dflt-abrupt.js
+++ b/test/language/expressions/generators/params-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/gen-func-expr.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/gen-func-expr.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (generator function expression)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/generators/params-dflt-arg-val-not-undefined.js b/test/language/expressions/generators/params-dflt-arg-val-not-undefined.js
index 7761519475bce8093b5ff7a82829789075049e46..f20a26357bf9392032c246752db380b23531b4ab 100644
--- a/test/language/expressions/generators/params-dflt-arg-val-not-undefined.js
+++ b/test/language/expressions/generators/params-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/gen-func-expr.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/gen-func-expr.template
 /*---
 description: Use of intializer when argument value is not `undefined` (generator function expression)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/generators/params-dflt-arg-val-undefined.js b/test/language/expressions/generators/params-dflt-arg-val-undefined.js
index 9c1802394d8ed79d401322004806dcf53e3fca04..a31c11965e29d74862038c9ff2f6b1fab41347ed 100644
--- a/test/language/expressions/generators/params-dflt-arg-val-undefined.js
+++ b/test/language/expressions/generators/params-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/gen-func-expr.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/gen-func-expr.template
 /*---
 description: Use of intializer when argument value is `undefined` (generator function expression)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/generators/params-dflt-duplicates.js b/test/language/expressions/generators/params-dflt-duplicates.js
index ec59c68f5dd3441f00b819aad45adc3a4755fcf9..7a7ad6ccca415c93c0c35bea40b7130522f8406f 100644
--- a/test/language/expressions/generators/params-dflt-duplicates.js
+++ b/test/language/expressions/generators/params-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/gen-func-expr.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/gen-func-expr.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (generator function expression)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/generators/params-dflt-ref-later.js b/test/language/expressions/generators/params-dflt-ref-later.js
index 14d668116ecf49057cf7beb2d2042cbe5468b839..fadfb5a3983fd1c7965ecbe810202f27e3f181d9 100644
--- a/test/language/expressions/generators/params-dflt-ref-later.js
+++ b/test/language/expressions/generators/params-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/gen-func-expr.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/gen-func-expr.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (generator function expression)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/generators/params-dflt-ref-prior.js b/test/language/expressions/generators/params-dflt-ref-prior.js
index af750a8dcb5e6f4626e27350bbb391c3d215fe29..f0cb6d6cb7093531a1ecdbc443fab129430cf0c9 100644
--- a/test/language/expressions/generators/params-dflt-ref-prior.js
+++ b/test/language/expressions/generators/params-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/gen-func-expr.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/gen-func-expr.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (generator function expression)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/generators/params-dflt-ref-self.js b/test/language/expressions/generators/params-dflt-ref-self.js
index 8cf2c9461ccd9f826503a0b392e4fa64373617c3..863548d27f98abb2212eb58b2914f304bd88a473 100644
--- a/test/language/expressions/generators/params-dflt-ref-self.js
+++ b/test/language/expressions/generators/params-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/gen-func-expr.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/gen-func-expr.template
 /*---
 description: Referencing a parameter from within its own initializer (generator function expression)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/generators/params-dflt-rest.js b/test/language/expressions/generators/params-dflt-rest.js
index e428dc2252ac654104ea6df8632111dc9e5f40da..908da104fa89407640895ab3807442ec61c2bf06 100644
--- a/test/language/expressions/generators/params-dflt-rest.js
+++ b/test/language/expressions/generators/params-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/gen-func-expr.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/gen-func-expr.template
 /*---
 description: RestParameter does not support an initializer (generator function expression)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/object/method-definition/params-dflt-gen-meth-abrupt.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-abrupt.js
similarity index 96%
rename from test/language/expressions/object/method-definition/params-dflt-gen-meth-abrupt.js
rename to test/language/expressions/object/method-definition/params-gen-meth-dflt-abrupt.js
index 47af7414795d704c38f70d2fb5f6c39df27a6a1d..4614590ab2d4afef6ad3e6ad3ec62e743120bddb 100644
--- a/test/language/expressions/object/method-definition/params-dflt-gen-meth-abrupt.js
+++ b/test/language/expressions/object/method-definition/params-gen-meth-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/gen-meth.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/gen-meth.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-dflt-gen-meth-arg-val-not-undefined.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-arg-val-not-undefined.js
similarity index 96%
rename from test/language/expressions/object/method-definition/params-dflt-gen-meth-arg-val-not-undefined.js
rename to test/language/expressions/object/method-definition/params-gen-meth-dflt-arg-val-not-undefined.js
index 469ff9fb434ec2939733af314a9dfa8c52559319..42954aa25faf905ec36f7c5fc423f90ec3684cfc 100644
--- a/test/language/expressions/object/method-definition/params-dflt-gen-meth-arg-val-not-undefined.js
+++ b/test/language/expressions/object/method-definition/params-gen-meth-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/gen-meth.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/gen-meth.template
 /*---
 description: Use of intializer when argument value is not `undefined` (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-dflt-gen-meth-arg-val-undefined.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-arg-val-undefined.js
similarity index 96%
rename from test/language/expressions/object/method-definition/params-dflt-gen-meth-arg-val-undefined.js
rename to test/language/expressions/object/method-definition/params-gen-meth-dflt-arg-val-undefined.js
index 6ad5e3af255899cb10135243d6bae58fbc3686a7..f8dae01ee1214fdb3fcb5f2b90f85f3bc7bb5d50 100644
--- a/test/language/expressions/object/method-definition/params-dflt-gen-meth-arg-val-undefined.js
+++ b/test/language/expressions/object/method-definition/params-gen-meth-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/gen-meth.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/gen-meth.template
 /*---
 description: Use of intializer when argument value is `undefined` (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-dflt-gen-meth-duplicates.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-duplicates.js
similarity index 96%
rename from test/language/expressions/object/method-definition/params-dflt-gen-meth-duplicates.js
rename to test/language/expressions/object/method-definition/params-gen-meth-dflt-duplicates.js
index 13d821d23e331eb3e565c1563529366d370a7bc0..846ffcabc28f6864dfb881fb46425efcc0de5234 100644
--- a/test/language/expressions/object/method-definition/params-dflt-gen-meth-duplicates.js
+++ b/test/language/expressions/object/method-definition/params-gen-meth-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/gen-meth.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/gen-meth.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-dflt-gen-meth-ref-later.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-ref-later.js
similarity index 96%
rename from test/language/expressions/object/method-definition/params-dflt-gen-meth-ref-later.js
rename to test/language/expressions/object/method-definition/params-gen-meth-dflt-ref-later.js
index d729ae01b1cdc8d0217b203d5888030e44bed85d..013fc360300ad968cc7950ef68526f3dd3c62402 100644
--- a/test/language/expressions/object/method-definition/params-dflt-gen-meth-ref-later.js
+++ b/test/language/expressions/object/method-definition/params-gen-meth-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/gen-meth.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/gen-meth.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-dflt-gen-meth-ref-prior.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-ref-prior.js
similarity index 96%
rename from test/language/expressions/object/method-definition/params-dflt-gen-meth-ref-prior.js
rename to test/language/expressions/object/method-definition/params-gen-meth-dflt-ref-prior.js
index c0b3ded9da9f31708e7c2057daf4e8a1393b4dbf..91c3f8e27c727eb9e0a1bab58088ed83a2420956 100644
--- a/test/language/expressions/object/method-definition/params-dflt-gen-meth-ref-prior.js
+++ b/test/language/expressions/object/method-definition/params-gen-meth-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/gen-meth.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/gen-meth.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-dflt-gen-meth-ref-self.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-ref-self.js
similarity index 96%
rename from test/language/expressions/object/method-definition/params-dflt-gen-meth-ref-self.js
rename to test/language/expressions/object/method-definition/params-gen-meth-dflt-ref-self.js
index 2c0e653635e74fea89e47411e6b0233378c2f3a0..dc36535e2ae1c3a1a16b46128982b39b66d22be1 100644
--- a/test/language/expressions/object/method-definition/params-dflt-gen-meth-ref-self.js
+++ b/test/language/expressions/object/method-definition/params-gen-meth-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/gen-meth.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/gen-meth.template
 /*---
 description: Referencing a parameter from within its own initializer (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-dflt-gen-meth-rest.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-rest.js
similarity index 96%
rename from test/language/expressions/object/method-definition/params-dflt-gen-meth-rest.js
rename to test/language/expressions/object/method-definition/params-gen-meth-dflt-rest.js
index f08a5258e76b7bc656458ac44e86b6221bbadf5d..fc84acbf20e0478bbcc6f889b8b2ad7242362857 100644
--- a/test/language/expressions/object/method-definition/params-dflt-gen-meth-rest.js
+++ b/test/language/expressions/object/method-definition/params-gen-meth-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/gen-meth.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/gen-meth.template
 /*---
 description: RestParameter does not support an initializer (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-dflt-meth-abrupt.js b/test/language/expressions/object/method-definition/params-meth-dflt-abrupt.js
similarity index 96%
rename from test/language/expressions/object/method-definition/params-dflt-meth-abrupt.js
rename to test/language/expressions/object/method-definition/params-meth-dflt-abrupt.js
index ceea6067b72e309a51da905a6c78e25599147e1b..0a84749c4bb629e92f56ead57bcb250d14a2bb3d 100644
--- a/test/language/expressions/object/method-definition/params-dflt-meth-abrupt.js
+++ b/test/language/expressions/object/method-definition/params-meth-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/meth.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/meth.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (method)
 esid: sec-runtime-semantics-definemethod
diff --git a/test/language/expressions/object/method-definition/params-dflt-meth-arg-val-not-undefined.js b/test/language/expressions/object/method-definition/params-meth-dflt-arg-val-not-undefined.js
similarity index 96%
rename from test/language/expressions/object/method-definition/params-dflt-meth-arg-val-not-undefined.js
rename to test/language/expressions/object/method-definition/params-meth-dflt-arg-val-not-undefined.js
index 4d8f4f3af764a3b9de4ddb925063419f84fe3c68..edbdc988e7960f0ae213310c73414eacb4973cd6 100644
--- a/test/language/expressions/object/method-definition/params-dflt-meth-arg-val-not-undefined.js
+++ b/test/language/expressions/object/method-definition/params-meth-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/meth.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/meth.template
 /*---
 description: Use of intializer when argument value is not `undefined` (method)
 esid: sec-runtime-semantics-definemethod
diff --git a/test/language/expressions/object/method-definition/params-dflt-meth-arg-val-undefined.js b/test/language/expressions/object/method-definition/params-meth-dflt-arg-val-undefined.js
similarity index 95%
rename from test/language/expressions/object/method-definition/params-dflt-meth-arg-val-undefined.js
rename to test/language/expressions/object/method-definition/params-meth-dflt-arg-val-undefined.js
index c95f192e47f06a82ba01abe3c5ac732515e5a385..70a8538f8f1cc5b9be544badcb06b92355a1bc7b 100644
--- a/test/language/expressions/object/method-definition/params-dflt-meth-arg-val-undefined.js
+++ b/test/language/expressions/object/method-definition/params-meth-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/meth.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/meth.template
 /*---
 description: Use of intializer when argument value is `undefined` (method)
 esid: sec-runtime-semantics-definemethod
diff --git a/test/language/expressions/object/method-definition/params-dflt-meth-duplicates.js b/test/language/expressions/object/method-definition/params-meth-dflt-duplicates.js
similarity index 95%
rename from test/language/expressions/object/method-definition/params-dflt-meth-duplicates.js
rename to test/language/expressions/object/method-definition/params-meth-dflt-duplicates.js
index 49a569030a2ea9bdec668d6aa4abe3af6cc7bcdb..26b24f7446b70f0e433f42780b9adde11be6fd2d 100644
--- a/test/language/expressions/object/method-definition/params-dflt-meth-duplicates.js
+++ b/test/language/expressions/object/method-definition/params-meth-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/meth.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/meth.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (method)
 esid: sec-runtime-semantics-definemethod
diff --git a/test/language/expressions/object/method-definition/params-dflt-meth-ref-later.js b/test/language/expressions/object/method-definition/params-meth-dflt-ref-later.js
similarity index 96%
rename from test/language/expressions/object/method-definition/params-dflt-meth-ref-later.js
rename to test/language/expressions/object/method-definition/params-meth-dflt-ref-later.js
index e1fb94fbfdd0fdcda572719229ac3b50f400ba84..d738c24241adf345cc5cde60dfea83b558802c60 100644
--- a/test/language/expressions/object/method-definition/params-dflt-meth-ref-later.js
+++ b/test/language/expressions/object/method-definition/params-meth-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/meth.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/meth.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (method)
 esid: sec-runtime-semantics-definemethod
diff --git a/test/language/expressions/object/method-definition/params-dflt-meth-ref-prior.js b/test/language/expressions/object/method-definition/params-meth-dflt-ref-prior.js
similarity index 96%
rename from test/language/expressions/object/method-definition/params-dflt-meth-ref-prior.js
rename to test/language/expressions/object/method-definition/params-meth-dflt-ref-prior.js
index 7b221b18d4e73b0a8f91c7f08f62176c2ce08c0e..7ae927f3df606505cd77879575480e7a5e159dac 100644
--- a/test/language/expressions/object/method-definition/params-dflt-meth-ref-prior.js
+++ b/test/language/expressions/object/method-definition/params-meth-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/meth.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/meth.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (method)
 esid: sec-runtime-semantics-definemethod
diff --git a/test/language/expressions/object/method-definition/params-dflt-meth-ref-self.js b/test/language/expressions/object/method-definition/params-meth-dflt-ref-self.js
similarity index 96%
rename from test/language/expressions/object/method-definition/params-dflt-meth-ref-self.js
rename to test/language/expressions/object/method-definition/params-meth-dflt-ref-self.js
index a260573c96bc64368e24ab5c331f284aeac08a22..8a369630968b5cfc201f0c42e6cc31ba7e0a30c3 100644
--- a/test/language/expressions/object/method-definition/params-dflt-meth-ref-self.js
+++ b/test/language/expressions/object/method-definition/params-meth-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/meth.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/meth.template
 /*---
 description: Referencing a parameter from within its own initializer (method)
 esid: sec-runtime-semantics-definemethod
diff --git a/test/language/expressions/object/method-definition/params-dflt-meth-rest.js b/test/language/expressions/object/method-definition/params-meth-dflt-rest.js
similarity index 95%
rename from test/language/expressions/object/method-definition/params-dflt-meth-rest.js
rename to test/language/expressions/object/method-definition/params-meth-dflt-rest.js
index 0fbbe6aa73f3f0b2a6fec9624b7cbd688846d358..602bd8194a7e18e52c9cccfb6d08d89a9a895f36 100644
--- a/test/language/expressions/object/method-definition/params-dflt-meth-rest.js
+++ b/test/language/expressions/object/method-definition/params-meth-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/meth.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/meth.template
 /*---
 description: RestParameter does not support an initializer (method)
 esid: sec-runtime-semantics-definemethod
diff --git a/test/language/statements/class/params-dflt-gen-meth-abrupt.js b/test/language/statements/class/params-gen-meth-dflt-abrupt.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-abrupt.js
rename to test/language/statements/class/params-gen-meth-dflt-abrupt.js
index e13f949a65e5810dafd3e658a4b43466e27dc689..cc78028800b2c8d3ef87de822fc93f6a1492e16a 100644
--- a/test/language/statements/class/params-dflt-gen-meth-abrupt.js
+++ b/test/language/statements/class/params-gen-meth-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/cls-decl-gen-meth.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/cls-decl-gen-meth.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-arg-val-not-undefined.js b/test/language/statements/class/params-gen-meth-dflt-arg-val-not-undefined.js
similarity index 97%
rename from test/language/statements/class/params-dflt-gen-meth-arg-val-not-undefined.js
rename to test/language/statements/class/params-gen-meth-dflt-arg-val-not-undefined.js
index 34cca4966c85fd9cb2e7aee8877f831394f170c6..532a0325dfafc5527ae4c52a6bda77ea32578fdf 100644
--- a/test/language/statements/class/params-dflt-gen-meth-arg-val-not-undefined.js
+++ b/test/language/statements/class/params-gen-meth-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/cls-decl-gen-meth.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/cls-decl-gen-meth.template
 /*---
 description: Use of intializer when argument value is not `undefined` (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-arg-val-undefined.js b/test/language/statements/class/params-gen-meth-dflt-arg-val-undefined.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-arg-val-undefined.js
rename to test/language/statements/class/params-gen-meth-dflt-arg-val-undefined.js
index c37777c1630e3dcb55114927d86b05224e548507..fb1556a27ff3a387e4a384edbc709446c6a32b0e 100644
--- a/test/language/statements/class/params-dflt-gen-meth-arg-val-undefined.js
+++ b/test/language/statements/class/params-gen-meth-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/cls-decl-gen-meth.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/cls-decl-gen-meth.template
 /*---
 description: Use of intializer when argument value is `undefined` (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-duplicates.js b/test/language/statements/class/params-gen-meth-dflt-duplicates.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-duplicates.js
rename to test/language/statements/class/params-gen-meth-dflt-duplicates.js
index 10878fa42bdca3c13c628e778add245b9cf0cfe6..b108a281ec569be00e856aaeb14d2a93dc579f34 100644
--- a/test/language/statements/class/params-dflt-gen-meth-duplicates.js
+++ b/test/language/statements/class/params-gen-meth-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/cls-decl-gen-meth.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/cls-decl-gen-meth.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-ref-later.js b/test/language/statements/class/params-gen-meth-dflt-ref-later.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-ref-later.js
rename to test/language/statements/class/params-gen-meth-dflt-ref-later.js
index 9135d8693d5b337179d98c66d560f40ad0454798..f52a570f855294d07ffa24e74ffd711415df13db 100644
--- a/test/language/statements/class/params-dflt-gen-meth-ref-later.js
+++ b/test/language/statements/class/params-gen-meth-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/cls-decl-gen-meth.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/cls-decl-gen-meth.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-ref-prior.js b/test/language/statements/class/params-gen-meth-dflt-ref-prior.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-ref-prior.js
rename to test/language/statements/class/params-gen-meth-dflt-ref-prior.js
index 669e36b06ea9890d2e51e52c0de7214bd58dcadf..6215260734f715cf83809988d6a1eedbb0c0ece7 100644
--- a/test/language/statements/class/params-dflt-gen-meth-ref-prior.js
+++ b/test/language/statements/class/params-gen-meth-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/cls-decl-gen-meth.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/cls-decl-gen-meth.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-ref-self.js b/test/language/statements/class/params-gen-meth-dflt-ref-self.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-ref-self.js
rename to test/language/statements/class/params-gen-meth-dflt-ref-self.js
index d222690a9fc015ee01ef7cc17cd6a19614e85d6b..bfa0635ab0af099f815ddd66e58b006e53d3866d 100644
--- a/test/language/statements/class/params-dflt-gen-meth-ref-self.js
+++ b/test/language/statements/class/params-gen-meth-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/cls-decl-gen-meth.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/cls-decl-gen-meth.template
 /*---
 description: Referencing a parameter from within its own initializer (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-rest.js b/test/language/statements/class/params-gen-meth-dflt-rest.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-rest.js
rename to test/language/statements/class/params-gen-meth-dflt-rest.js
index 4f1277a6b4d076e6a098dd626471565309227d30..df1ac1937af2553db4ba4ea2563a7c5753e47e24 100644
--- a/test/language/statements/class/params-dflt-gen-meth-rest.js
+++ b/test/language/statements/class/params-gen-meth-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/cls-decl-gen-meth.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/cls-decl-gen-meth.template
 /*---
 description: RestParameter does not support an initializer (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-static-abrupt.js b/test/language/statements/class/params-gen-meth-static-dflt-abrupt.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-static-abrupt.js
rename to test/language/statements/class/params-gen-meth-static-dflt-abrupt.js
index 509c791b3c293ecf15f8bae2f5e72b9574c0a854..58f7abfb81739e1a4c11fedd06583c4e0e4442b6 100644
--- a/test/language/statements/class/params-dflt-gen-meth-static-abrupt.js
+++ b/test/language/statements/class/params-gen-meth-static-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/cls-decl-gen-meth-static.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/cls-decl-gen-meth-static.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-static-arg-val-not-undefined.js b/test/language/statements/class/params-gen-meth-static-dflt-arg-val-not-undefined.js
similarity index 97%
rename from test/language/statements/class/params-dflt-gen-meth-static-arg-val-not-undefined.js
rename to test/language/statements/class/params-gen-meth-static-dflt-arg-val-not-undefined.js
index b90ad27f4bab61d3d5528384e7182d5a57cec935..2663e0c26e2d6e07461ad97db20cb219d61a12f5 100644
--- a/test/language/statements/class/params-dflt-gen-meth-static-arg-val-not-undefined.js
+++ b/test/language/statements/class/params-gen-meth-static-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/cls-decl-gen-meth-static.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/cls-decl-gen-meth-static.template
 /*---
 description: Use of intializer when argument value is not `undefined` (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-static-arg-val-undefined.js b/test/language/statements/class/params-gen-meth-static-dflt-arg-val-undefined.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-static-arg-val-undefined.js
rename to test/language/statements/class/params-gen-meth-static-dflt-arg-val-undefined.js
index a1f02fb2473dc51e36a9e9e0125983ec6fb2e44b..e9d90bd5c2fcd3e9254444700897e7288ed413a0 100644
--- a/test/language/statements/class/params-dflt-gen-meth-static-arg-val-undefined.js
+++ b/test/language/statements/class/params-gen-meth-static-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/cls-decl-gen-meth-static.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/cls-decl-gen-meth-static.template
 /*---
 description: Use of intializer when argument value is `undefined` (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-static-duplicates.js b/test/language/statements/class/params-gen-meth-static-dflt-duplicates.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-static-duplicates.js
rename to test/language/statements/class/params-gen-meth-static-dflt-duplicates.js
index ce0137feedb119bc3904db7bccf5dcc0fd0f9937..da8cdd689d8a931049be39980a41667221ecc08c 100644
--- a/test/language/statements/class/params-dflt-gen-meth-static-duplicates.js
+++ b/test/language/statements/class/params-gen-meth-static-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/cls-decl-gen-meth-static.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/cls-decl-gen-meth-static.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-static-ref-later.js b/test/language/statements/class/params-gen-meth-static-dflt-ref-later.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-static-ref-later.js
rename to test/language/statements/class/params-gen-meth-static-dflt-ref-later.js
index 54e345bd8f0e0b6c6e7729a40220ac8e9c9956a2..a1a2252f53430b98388b9c516bebcd6568d64c38 100644
--- a/test/language/statements/class/params-dflt-gen-meth-static-ref-later.js
+++ b/test/language/statements/class/params-gen-meth-static-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/cls-decl-gen-meth-static.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/cls-decl-gen-meth-static.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-static-ref-prior.js b/test/language/statements/class/params-gen-meth-static-dflt-ref-prior.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-static-ref-prior.js
rename to test/language/statements/class/params-gen-meth-static-dflt-ref-prior.js
index 2eb401b3f2b18090ec59b12f1dec9daf72383ef0..84912b3060925ada571313f0cf60e8f067ddc594 100644
--- a/test/language/statements/class/params-dflt-gen-meth-static-ref-prior.js
+++ b/test/language/statements/class/params-gen-meth-static-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/cls-decl-gen-meth-static.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/cls-decl-gen-meth-static.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-static-ref-self.js b/test/language/statements/class/params-gen-meth-static-dflt-ref-self.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-static-ref-self.js
rename to test/language/statements/class/params-gen-meth-static-dflt-ref-self.js
index 0832563011c562a071d09c8188472c19b0faefa1..ffbf09cff3a29fb5e0e224eb02c2c2e1659563a8 100644
--- a/test/language/statements/class/params-dflt-gen-meth-static-ref-self.js
+++ b/test/language/statements/class/params-gen-meth-static-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/cls-decl-gen-meth-static.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/cls-decl-gen-meth-static.template
 /*---
 description: Referencing a parameter from within its own initializer (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-gen-meth-static-rest.js b/test/language/statements/class/params-gen-meth-static-dflt-rest.js
similarity index 96%
rename from test/language/statements/class/params-dflt-gen-meth-static-rest.js
rename to test/language/statements/class/params-gen-meth-static-dflt-rest.js
index 4e0d22162758dd4bf9fff94e6639d5e3e02d1f3f..f75683a5f21d16ffc87ecb69b1a15051db4fe19a 100644
--- a/test/language/statements/class/params-dflt-gen-meth-static-rest.js
+++ b/test/language/statements/class/params-gen-meth-static-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/cls-decl-gen-meth-static.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/cls-decl-gen-meth-static.template
 /*---
 description: RestParameter does not support an initializer (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-abrupt.js b/test/language/statements/class/params-meth-dflt-abrupt.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-abrupt.js
rename to test/language/statements/class/params-meth-dflt-abrupt.js
index a05ce4108e8a5d37c9f482f84d9da8bb1a203318..08d441d8b3580023ea66ea492af8d5df905114e6 100644
--- a/test/language/statements/class/params-dflt-meth-abrupt.js
+++ b/test/language/statements/class/params-meth-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/cls-decl-meth.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/cls-decl-meth.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-arg-val-not-undefined.js b/test/language/statements/class/params-meth-dflt-arg-val-not-undefined.js
similarity index 97%
rename from test/language/statements/class/params-dflt-meth-arg-val-not-undefined.js
rename to test/language/statements/class/params-meth-dflt-arg-val-not-undefined.js
index 49ee8633640c629780f851d9a9bb9204ec29101c..54abd9ccc169dcdddfe7a5a30f84d5c641e7ed41 100644
--- a/test/language/statements/class/params-dflt-meth-arg-val-not-undefined.js
+++ b/test/language/statements/class/params-meth-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/cls-decl-meth.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/cls-decl-meth.template
 /*---
 description: Use of intializer when argument value is not `undefined` (class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-arg-val-undefined.js b/test/language/statements/class/params-meth-dflt-arg-val-undefined.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-arg-val-undefined.js
rename to test/language/statements/class/params-meth-dflt-arg-val-undefined.js
index f290c6f245b68b7fa1e0620a30974beeb9af7e40..58125897765eadf66a0c6c96d393753f1e88e38b 100644
--- a/test/language/statements/class/params-dflt-meth-arg-val-undefined.js
+++ b/test/language/statements/class/params-meth-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/cls-decl-meth.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/cls-decl-meth.template
 /*---
 description: Use of intializer when argument value is `undefined` (class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-duplicates.js b/test/language/statements/class/params-meth-dflt-duplicates.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-duplicates.js
rename to test/language/statements/class/params-meth-dflt-duplicates.js
index df9d05b233e7375e3b73907020bc750ad2a50d74..b2b9a5d52030635e3bc53e1248da89b1f137cf18 100644
--- a/test/language/statements/class/params-dflt-meth-duplicates.js
+++ b/test/language/statements/class/params-meth-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/cls-decl-meth.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/cls-decl-meth.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-ref-later.js b/test/language/statements/class/params-meth-dflt-ref-later.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-ref-later.js
rename to test/language/statements/class/params-meth-dflt-ref-later.js
index f097abbbdf120b010a71b72b6f1df0b4c3debc3b..8d36e5af64926b822dce73e57c4e309537dc9130 100644
--- a/test/language/statements/class/params-dflt-meth-ref-later.js
+++ b/test/language/statements/class/params-meth-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/cls-decl-meth.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/cls-decl-meth.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-ref-prior.js b/test/language/statements/class/params-meth-dflt-ref-prior.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-ref-prior.js
rename to test/language/statements/class/params-meth-dflt-ref-prior.js
index 82f9ef21f39230c0b4eab92f41dda6d4032e761c..ab52842d5643490f44ee0c6b4f8c35d1080a3889 100644
--- a/test/language/statements/class/params-dflt-meth-ref-prior.js
+++ b/test/language/statements/class/params-meth-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/cls-decl-meth.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/cls-decl-meth.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-ref-self.js b/test/language/statements/class/params-meth-dflt-ref-self.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-ref-self.js
rename to test/language/statements/class/params-meth-dflt-ref-self.js
index cf5282510e35051d098fdd182022a400e1d9f8e3..32baf19dfc1bc5b3f5b716f4b15f18b18a969a30 100644
--- a/test/language/statements/class/params-dflt-meth-ref-self.js
+++ b/test/language/statements/class/params-meth-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/cls-decl-meth.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/cls-decl-meth.template
 /*---
 description: Referencing a parameter from within its own initializer (class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-rest.js b/test/language/statements/class/params-meth-dflt-rest.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-rest.js
rename to test/language/statements/class/params-meth-dflt-rest.js
index 5c58315916b0d5bea4cdda8065cff2cfec739d69..c2985d245148561f1ea928bbfb944afa154aa505 100644
--- a/test/language/statements/class/params-dflt-meth-rest.js
+++ b/test/language/statements/class/params-meth-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/cls-decl-meth.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/cls-decl-meth.template
 /*---
 description: RestParameter does not support an initializer (class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-static-abrupt.js b/test/language/statements/class/params-meth-static-dflt-abrupt.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-static-abrupt.js
rename to test/language/statements/class/params-meth-static-dflt-abrupt.js
index f9b8319dc3a1ca72ad4f99589412e1e019711291..04c81a8b7242814aea6ee81a3ed92abd1e1e1c78 100644
--- a/test/language/statements/class/params-dflt-meth-static-abrupt.js
+++ b/test/language/statements/class/params-meth-static-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/cls-decl-meth-static.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/cls-decl-meth-static.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (static class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-static-arg-val-not-undefined.js b/test/language/statements/class/params-meth-static-dflt-arg-val-not-undefined.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-static-arg-val-not-undefined.js
rename to test/language/statements/class/params-meth-static-dflt-arg-val-not-undefined.js
index fe2d8391dbf1908bac1e4583b0ced806105c51ed..b15ade83544442dae06fbac6ba8abe359f522c9b 100644
--- a/test/language/statements/class/params-dflt-meth-static-arg-val-not-undefined.js
+++ b/test/language/statements/class/params-meth-static-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/cls-decl-meth-static.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/cls-decl-meth-static.template
 /*---
 description: Use of intializer when argument value is not `undefined` (static class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-static-arg-val-undefined.js b/test/language/statements/class/params-meth-static-dflt-arg-val-undefined.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-static-arg-val-undefined.js
rename to test/language/statements/class/params-meth-static-dflt-arg-val-undefined.js
index df22ab4032c364c330eb49929aefc935c219aaa2..1be4da47e671ed893a40914e37a13c819d1d508e 100644
--- a/test/language/statements/class/params-dflt-meth-static-arg-val-undefined.js
+++ b/test/language/statements/class/params-meth-static-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/cls-decl-meth-static.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/cls-decl-meth-static.template
 /*---
 description: Use of intializer when argument value is `undefined` (static class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-static-duplicates.js b/test/language/statements/class/params-meth-static-dflt-duplicates.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-static-duplicates.js
rename to test/language/statements/class/params-meth-static-dflt-duplicates.js
index 55db3e3f21ea16a42e0903bcb9e0cf1fc52f47e2..7f8dfac08a2e0c1ddbad6fbe011366657ff282b6 100644
--- a/test/language/statements/class/params-dflt-meth-static-duplicates.js
+++ b/test/language/statements/class/params-meth-static-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/cls-decl-meth-static.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/cls-decl-meth-static.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (static class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-static-ref-later.js b/test/language/statements/class/params-meth-static-dflt-ref-later.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-static-ref-later.js
rename to test/language/statements/class/params-meth-static-dflt-ref-later.js
index 5ba90a1fb87b957ca9a54988ff5215efdaa04ef0..331b48c73b0eedb9cc4e823804a363977df0370c 100644
--- a/test/language/statements/class/params-dflt-meth-static-ref-later.js
+++ b/test/language/statements/class/params-meth-static-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/cls-decl-meth-static.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/cls-decl-meth-static.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (static class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-static-ref-prior.js b/test/language/statements/class/params-meth-static-dflt-ref-prior.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-static-ref-prior.js
rename to test/language/statements/class/params-meth-static-dflt-ref-prior.js
index 633f02f3b0d52bd03e6f494ce71c5b5d1068013e..2f827d3e387418693cc4755b9c264543612e46c6 100644
--- a/test/language/statements/class/params-dflt-meth-static-ref-prior.js
+++ b/test/language/statements/class/params-meth-static-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/cls-decl-meth-static.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/cls-decl-meth-static.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (static class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-static-ref-self.js b/test/language/statements/class/params-meth-static-dflt-ref-self.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-static-ref-self.js
rename to test/language/statements/class/params-meth-static-dflt-ref-self.js
index 47e295d5f195d627f7d7c84c55beff1276c0c2b2..5ef1ef2f505fdc2c0ccb9bfeb99bc827ed035e4c 100644
--- a/test/language/statements/class/params-dflt-meth-static-ref-self.js
+++ b/test/language/statements/class/params-meth-static-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/cls-decl-meth-static.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/cls-decl-meth-static.template
 /*---
 description: Referencing a parameter from within its own initializer (static class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-dflt-meth-static-rest.js b/test/language/statements/class/params-meth-static-dflt-rest.js
similarity index 96%
rename from test/language/statements/class/params-dflt-meth-static-rest.js
rename to test/language/statements/class/params-meth-static-dflt-rest.js
index 15033729439b3a9d4959bd8f80e75ac32851d3d0..0050b3869b98c1a6f0abc90f6cdbb4590beccad1 100644
--- a/test/language/statements/class/params-dflt-meth-static-rest.js
+++ b/test/language/statements/class/params-meth-static-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/cls-decl-meth-static.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/cls-decl-meth-static.template
 /*---
 description: RestParameter does not support an initializer (static class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/function/params-dflt-abrupt.js b/test/language/statements/function/params-dflt-abrupt.js
index 7de9d77e556f362eea2553b5714fb11add93b4a5..86a109838b49256962945b7e1d5ffdaf915965b2 100644
--- a/test/language/statements/function/params-dflt-abrupt.js
+++ b/test/language/statements/function/params-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/func-decl.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/func-decl.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (function declaration)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/function/params-dflt-arg-val-not-undefined.js b/test/language/statements/function/params-dflt-arg-val-not-undefined.js
index cd8937f37c1a1832e969cc7bde914580445de1d6..7b5244dfdf13ace5a4daace59e2638093ce6ce18 100644
--- a/test/language/statements/function/params-dflt-arg-val-not-undefined.js
+++ b/test/language/statements/function/params-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/func-decl.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/func-decl.template
 /*---
 description: Use of intializer when argument value is not `undefined` (function declaration)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/function/params-dflt-arg-val-undefined.js b/test/language/statements/function/params-dflt-arg-val-undefined.js
index 5aebf35be03545e0a1343e2a0bfea0819916d777..0486e5ae74c9b2be6393c308e10aa75a3641cab6 100644
--- a/test/language/statements/function/params-dflt-arg-val-undefined.js
+++ b/test/language/statements/function/params-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/func-decl.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/func-decl.template
 /*---
 description: Use of intializer when argument value is `undefined` (function declaration)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/function/params-dflt-duplicates.js b/test/language/statements/function/params-dflt-duplicates.js
index 2c604ff2ab095c08bccdc5db6590548d275f6d36..2e55da13e908ac6e8e59d5c9b49f0591382bcc8f 100644
--- a/test/language/statements/function/params-dflt-duplicates.js
+++ b/test/language/statements/function/params-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/func-decl.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/func-decl.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (function declaration)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/function/params-dflt-ref-later.js b/test/language/statements/function/params-dflt-ref-later.js
index 9bcd3e93884c5c405210d4dc54501dd58d1bc2ff..c4d2aa23883f0b5b9f10277ecfd6d3e22244c913 100644
--- a/test/language/statements/function/params-dflt-ref-later.js
+++ b/test/language/statements/function/params-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/func-decl.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/func-decl.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (function declaration)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/function/params-dflt-ref-prior.js b/test/language/statements/function/params-dflt-ref-prior.js
index 972551976d8a6c5f94a8f30eaa7438eaaee7a420..597692de3d7a89311f7d5b4ef63bdb2070713d38 100644
--- a/test/language/statements/function/params-dflt-ref-prior.js
+++ b/test/language/statements/function/params-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/func-decl.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/func-decl.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (function declaration)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/function/params-dflt-ref-self.js b/test/language/statements/function/params-dflt-ref-self.js
index de76d715848bc27c76b382aa6456980bb0a9cce8..3e225ec26efa1fb41ca4033540efd03a009a390d 100644
--- a/test/language/statements/function/params-dflt-ref-self.js
+++ b/test/language/statements/function/params-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/func-decl.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/func-decl.template
 /*---
 description: Referencing a parameter from within its own initializer (function declaration)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/function/params-dflt-rest.js b/test/language/statements/function/params-dflt-rest.js
index 81fb0fc82365acd04e46b9d2fae1948c0bb5f991..b10552b23cf9d308432ef96cecb2daed60491f78 100644
--- a/test/language/statements/function/params-dflt-rest.js
+++ b/test/language/statements/function/params-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/func-decl.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/func-decl.template
 /*---
 description: RestParameter does not support an initializer (function declaration)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/generators/params-dflt-abrupt.js b/test/language/statements/generators/params-dflt-abrupt.js
index 88aacc649cf323c845fc6a45dd29618e1b4834e9..e65ad9f6a23affcc777b1682ddef9e935e16323b 100644
--- a/test/language/statements/generators/params-dflt-abrupt.js
+++ b/test/language/statements/generators/params-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/abrupt.case
-// - src/dflt-params/error/gen-func-decl.template
+// - src/params/dflt-abrupt.case
+// - src/params/error/gen-func-decl.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (generator function declaration)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/generators/params-dflt-arg-val-not-undefined.js b/test/language/statements/generators/params-dflt-arg-val-not-undefined.js
index a4b38ac36adb221c520365860cff3ea6083292ed..1208267a2e7065c18ca87ad08f4bfe0170eb9c61 100644
--- a/test/language/statements/generators/params-dflt-arg-val-not-undefined.js
+++ b/test/language/statements/generators/params-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-not-undefined.case
-// - src/dflt-params/default/gen-func-decl.template
+// - src/params/dflt-arg-val-not-undefined.case
+// - src/params/default/gen-func-decl.template
 /*---
 description: Use of intializer when argument value is not `undefined` (generator function declaration)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/generators/params-dflt-arg-val-undefined.js b/test/language/statements/generators/params-dflt-arg-val-undefined.js
index e675be80df098100916aec257dbf702d40c5523e..19623e5fb816a2a9a3eb102aeeaa460f81daef21 100644
--- a/test/language/statements/generators/params-dflt-arg-val-undefined.js
+++ b/test/language/statements/generators/params-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/arg-val-undefined.case
-// - src/dflt-params/default/gen-func-decl.template
+// - src/params/dflt-arg-val-undefined.case
+// - src/params/default/gen-func-decl.template
 /*---
 description: Use of intializer when argument value is `undefined` (generator function declaration)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/generators/params-dflt-duplicates.js b/test/language/statements/generators/params-dflt-duplicates.js
index 4595958258f911f0b7e1bb4ffc039e141256cace..4a0f8f301e5879b0fad210a0a389d4c1e3b743b4 100644
--- a/test/language/statements/generators/params-dflt-duplicates.js
+++ b/test/language/statements/generators/params-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/duplicates.case
-// - src/dflt-params/syntax/gen-func-decl.template
+// - src/params/dflt-duplicates.case
+// - src/params/syntax/gen-func-decl.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (generator function declaration)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/generators/params-dflt-ref-later.js b/test/language/statements/generators/params-dflt-ref-later.js
index 6b988e5d184388b6271160c3783ed53180bd041c..473bcb0b26e24afc00a080b8200a79fddecf1cec 100644
--- a/test/language/statements/generators/params-dflt-ref-later.js
+++ b/test/language/statements/generators/params-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-later.case
-// - src/dflt-params/error/gen-func-decl.template
+// - src/params/dflt-ref-later.case
+// - src/params/error/gen-func-decl.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (generator function declaration)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/generators/params-dflt-ref-prior.js b/test/language/statements/generators/params-dflt-ref-prior.js
index 42a4e20cb6cde9545283b9d38858ef012b4a0af4..687741166db7be0c513208033726335142066020 100644
--- a/test/language/statements/generators/params-dflt-ref-prior.js
+++ b/test/language/statements/generators/params-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-prior.case
-// - src/dflt-params/default/gen-func-decl.template
+// - src/params/dflt-ref-prior.case
+// - src/params/default/gen-func-decl.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (generator function declaration)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/generators/params-dflt-ref-self.js b/test/language/statements/generators/params-dflt-ref-self.js
index 71c29e010eccc51971e3820eac7f135ad209eda0..ccaa8666902e12f707c6a6b2bd7a1003d0e53c29 100644
--- a/test/language/statements/generators/params-dflt-ref-self.js
+++ b/test/language/statements/generators/params-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/ref-self.case
-// - src/dflt-params/error/gen-func-decl.template
+// - src/params/dflt-ref-self.case
+// - src/params/error/gen-func-decl.template
 /*---
 description: Referencing a parameter from within its own initializer (generator function declaration)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/generators/params-dflt-rest.js b/test/language/statements/generators/params-dflt-rest.js
index 95e1cff50130ac438f128d814384360298fb9f9f..e8f04b84661d9a81e7fb01efeaefdb7e86b4e977 100644
--- a/test/language/statements/generators/params-dflt-rest.js
+++ b/test/language/statements/generators/params-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/dflt-params/rest.case
-// - src/dflt-params/syntax/gen-func-decl.template
+// - src/params/dflt-rest.case
+// - src/params/syntax/gen-func-decl.template
 /*---
 description: RestParameter does not support an initializer (generator function declaration)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject