diff --git a/src/params/default/arrow-function.template b/src/function-forms/default/arrow-function.template
similarity index 100%
rename from src/params/default/arrow-function.template
rename to src/function-forms/default/arrow-function.template
diff --git a/src/params/default/async-gen-func-decl.template b/src/function-forms/default/async-gen-func-decl.template
similarity index 100%
rename from src/params/default/async-gen-func-decl.template
rename to src/function-forms/default/async-gen-func-decl.template
diff --git a/src/params/default/async-gen-func-expr.template b/src/function-forms/default/async-gen-func-expr.template
similarity index 100%
rename from src/params/default/async-gen-func-expr.template
rename to src/function-forms/default/async-gen-func-expr.template
diff --git a/src/params/default/async-gen-meth.template b/src/function-forms/default/async-gen-meth.template
similarity index 100%
rename from src/params/default/async-gen-meth.template
rename to src/function-forms/default/async-gen-meth.template
diff --git a/src/params/default/async-gen-named-func-expr.template b/src/function-forms/default/async-gen-named-func-expr.template
similarity index 100%
rename from src/params/default/async-gen-named-func-expr.template
rename to src/function-forms/default/async-gen-named-func-expr.template
diff --git a/src/params/default/cls-decl-async-gen-meth-static.template b/src/function-forms/default/cls-decl-async-gen-meth-static.template
similarity index 100%
rename from src/params/default/cls-decl-async-gen-meth-static.template
rename to src/function-forms/default/cls-decl-async-gen-meth-static.template
diff --git a/src/params/default/cls-decl-async-gen-meth.template b/src/function-forms/default/cls-decl-async-gen-meth.template
similarity index 100%
rename from src/params/default/cls-decl-async-gen-meth.template
rename to src/function-forms/default/cls-decl-async-gen-meth.template
diff --git a/src/params/default/cls-decl-gen-meth-static.template b/src/function-forms/default/cls-decl-gen-meth-static.template
similarity index 100%
rename from src/params/default/cls-decl-gen-meth-static.template
rename to src/function-forms/default/cls-decl-gen-meth-static.template
diff --git a/src/params/default/cls-decl-gen-meth.template b/src/function-forms/default/cls-decl-gen-meth.template
similarity index 100%
rename from src/params/default/cls-decl-gen-meth.template
rename to src/function-forms/default/cls-decl-gen-meth.template
diff --git a/src/params/default/cls-decl-meth-static.template b/src/function-forms/default/cls-decl-meth-static.template
similarity index 100%
rename from src/params/default/cls-decl-meth-static.template
rename to src/function-forms/default/cls-decl-meth-static.template
diff --git a/src/params/default/cls-decl-meth.template b/src/function-forms/default/cls-decl-meth.template
similarity index 100%
rename from src/params/default/cls-decl-meth.template
rename to src/function-forms/default/cls-decl-meth.template
diff --git a/src/params/default/cls-expr-async-gen-meth-static.template b/src/function-forms/default/cls-expr-async-gen-meth-static.template
similarity index 100%
rename from src/params/default/cls-expr-async-gen-meth-static.template
rename to src/function-forms/default/cls-expr-async-gen-meth-static.template
diff --git a/src/params/default/cls-expr-async-gen-meth.template b/src/function-forms/default/cls-expr-async-gen-meth.template
similarity index 100%
rename from src/params/default/cls-expr-async-gen-meth.template
rename to src/function-forms/default/cls-expr-async-gen-meth.template
diff --git a/src/params/default/cls-expr-gen-meth-static.template b/src/function-forms/default/cls-expr-gen-meth-static.template
similarity index 100%
rename from src/params/default/cls-expr-gen-meth-static.template
rename to src/function-forms/default/cls-expr-gen-meth-static.template
diff --git a/src/params/default/cls-expr-gen-meth.template b/src/function-forms/default/cls-expr-gen-meth.template
similarity index 100%
rename from src/params/default/cls-expr-gen-meth.template
rename to src/function-forms/default/cls-expr-gen-meth.template
diff --git a/src/params/default/cls-expr-meth-static.template b/src/function-forms/default/cls-expr-meth-static.template
similarity index 100%
rename from src/params/default/cls-expr-meth-static.template
rename to src/function-forms/default/cls-expr-meth-static.template
diff --git a/src/params/default/cls-expr-meth.template b/src/function-forms/default/cls-expr-meth.template
similarity index 100%
rename from src/params/default/cls-expr-meth.template
rename to src/function-forms/default/cls-expr-meth.template
diff --git a/src/params/default/func-decl.template b/src/function-forms/default/func-decl.template
similarity index 100%
rename from src/params/default/func-decl.template
rename to src/function-forms/default/func-decl.template
diff --git a/src/params/default/func-expr.template b/src/function-forms/default/func-expr.template
similarity index 100%
rename from src/params/default/func-expr.template
rename to src/function-forms/default/func-expr.template
diff --git a/src/params/default/gen-func-decl.template b/src/function-forms/default/gen-func-decl.template
similarity index 100%
rename from src/params/default/gen-func-decl.template
rename to src/function-forms/default/gen-func-decl.template
diff --git a/src/params/default/gen-func-expr.template b/src/function-forms/default/gen-func-expr.template
similarity index 100%
rename from src/params/default/gen-func-expr.template
rename to src/function-forms/default/gen-func-expr.template
diff --git a/src/params/default/gen-meth.template b/src/function-forms/default/gen-meth.template
similarity index 100%
rename from src/params/default/gen-meth.template
rename to src/function-forms/default/gen-meth.template
diff --git a/src/params/default/meth.template b/src/function-forms/default/meth.template
similarity index 100%
rename from src/params/default/meth.template
rename to src/function-forms/default/meth.template
diff --git a/src/params/dflt-abrupt.case b/src/function-forms/dflt-abrupt.case
similarity index 100%
rename from src/params/dflt-abrupt.case
rename to src/function-forms/dflt-abrupt.case
diff --git a/src/params/dflt-arg-val-not-undefined.case b/src/function-forms/dflt-arg-val-not-undefined.case
similarity index 100%
rename from src/params/dflt-arg-val-not-undefined.case
rename to src/function-forms/dflt-arg-val-not-undefined.case
diff --git a/src/params/dflt-arg-val-undefined.case b/src/function-forms/dflt-arg-val-undefined.case
similarity index 100%
rename from src/params/dflt-arg-val-undefined.case
rename to src/function-forms/dflt-arg-val-undefined.case
diff --git a/src/params/dflt-duplicates.case b/src/function-forms/dflt-duplicates.case
similarity index 100%
rename from src/params/dflt-duplicates.case
rename to src/function-forms/dflt-duplicates.case
diff --git a/src/params/dflt-ref-later.case b/src/function-forms/dflt-ref-later.case
similarity index 100%
rename from src/params/dflt-ref-later.case
rename to src/function-forms/dflt-ref-later.case
diff --git a/src/params/dflt-ref-prior.case b/src/function-forms/dflt-ref-prior.case
similarity index 100%
rename from src/params/dflt-ref-prior.case
rename to src/function-forms/dflt-ref-prior.case
diff --git a/src/params/dflt-ref-self.case b/src/function-forms/dflt-ref-self.case
similarity index 100%
rename from src/params/dflt-ref-self.case
rename to src/function-forms/dflt-ref-self.case
diff --git a/src/params/dflt-rest.case b/src/function-forms/dflt-rest.case
similarity index 100%
rename from src/params/dflt-rest.case
rename to src/function-forms/dflt-rest.case
diff --git a/src/params/error/arrow-function.template b/src/function-forms/error/arrow-function.template
similarity index 100%
rename from src/params/error/arrow-function.template
rename to src/function-forms/error/arrow-function.template
diff --git a/src/params/error/async-gen-func-decl.template b/src/function-forms/error/async-gen-func-decl.template
similarity index 100%
rename from src/params/error/async-gen-func-decl.template
rename to src/function-forms/error/async-gen-func-decl.template
diff --git a/src/params/error/async-gen-func-expr.template b/src/function-forms/error/async-gen-func-expr.template
similarity index 100%
rename from src/params/error/async-gen-func-expr.template
rename to src/function-forms/error/async-gen-func-expr.template
diff --git a/src/params/error/async-gen-meth.template b/src/function-forms/error/async-gen-meth.template
similarity index 100%
rename from src/params/error/async-gen-meth.template
rename to src/function-forms/error/async-gen-meth.template
diff --git a/src/params/error/async-gen-named-func-expr.template b/src/function-forms/error/async-gen-named-func-expr.template
similarity index 100%
rename from src/params/error/async-gen-named-func-expr.template
rename to src/function-forms/error/async-gen-named-func-expr.template
diff --git a/src/params/error/cls-decl-async-gen-meth-static.template b/src/function-forms/error/cls-decl-async-gen-meth-static.template
similarity index 100%
rename from src/params/error/cls-decl-async-gen-meth-static.template
rename to src/function-forms/error/cls-decl-async-gen-meth-static.template
diff --git a/src/params/error/cls-decl-async-gen-meth.template b/src/function-forms/error/cls-decl-async-gen-meth.template
similarity index 100%
rename from src/params/error/cls-decl-async-gen-meth.template
rename to src/function-forms/error/cls-decl-async-gen-meth.template
diff --git a/src/params/error/cls-decl-gen-meth-static.template b/src/function-forms/error/cls-decl-gen-meth-static.template
similarity index 100%
rename from src/params/error/cls-decl-gen-meth-static.template
rename to src/function-forms/error/cls-decl-gen-meth-static.template
diff --git a/src/params/error/cls-decl-gen-meth.template b/src/function-forms/error/cls-decl-gen-meth.template
similarity index 100%
rename from src/params/error/cls-decl-gen-meth.template
rename to src/function-forms/error/cls-decl-gen-meth.template
diff --git a/src/params/error/cls-decl-meth-static.template b/src/function-forms/error/cls-decl-meth-static.template
similarity index 100%
rename from src/params/error/cls-decl-meth-static.template
rename to src/function-forms/error/cls-decl-meth-static.template
diff --git a/src/params/error/cls-decl-meth.template b/src/function-forms/error/cls-decl-meth.template
similarity index 100%
rename from src/params/error/cls-decl-meth.template
rename to src/function-forms/error/cls-decl-meth.template
diff --git a/src/params/error/cls-expr-async-gen-meth-static.template b/src/function-forms/error/cls-expr-async-gen-meth-static.template
similarity index 100%
rename from src/params/error/cls-expr-async-gen-meth-static.template
rename to src/function-forms/error/cls-expr-async-gen-meth-static.template
diff --git a/src/params/error/cls-expr-async-gen-meth.template b/src/function-forms/error/cls-expr-async-gen-meth.template
similarity index 100%
rename from src/params/error/cls-expr-async-gen-meth.template
rename to src/function-forms/error/cls-expr-async-gen-meth.template
diff --git a/src/params/error/cls-expr-gen-meth-static.template b/src/function-forms/error/cls-expr-gen-meth-static.template
similarity index 100%
rename from src/params/error/cls-expr-gen-meth-static.template
rename to src/function-forms/error/cls-expr-gen-meth-static.template
diff --git a/src/params/error/cls-expr-gen-meth.template b/src/function-forms/error/cls-expr-gen-meth.template
similarity index 100%
rename from src/params/error/cls-expr-gen-meth.template
rename to src/function-forms/error/cls-expr-gen-meth.template
diff --git a/src/params/error/cls-expr-meth-static.template b/src/function-forms/error/cls-expr-meth-static.template
similarity index 100%
rename from src/params/error/cls-expr-meth-static.template
rename to src/function-forms/error/cls-expr-meth-static.template
diff --git a/src/params/error/cls-expr-meth.template b/src/function-forms/error/cls-expr-meth.template
similarity index 100%
rename from src/params/error/cls-expr-meth.template
rename to src/function-forms/error/cls-expr-meth.template
diff --git a/src/params/error/func-decl.template b/src/function-forms/error/func-decl.template
similarity index 100%
rename from src/params/error/func-decl.template
rename to src/function-forms/error/func-decl.template
diff --git a/src/params/error/func-expr.template b/src/function-forms/error/func-expr.template
similarity index 100%
rename from src/params/error/func-expr.template
rename to src/function-forms/error/func-expr.template
diff --git a/src/params/error/gen-func-decl.template b/src/function-forms/error/gen-func-decl.template
similarity index 100%
rename from src/params/error/gen-func-decl.template
rename to src/function-forms/error/gen-func-decl.template
diff --git a/src/params/error/gen-func-expr.template b/src/function-forms/error/gen-func-expr.template
similarity index 100%
rename from src/params/error/gen-func-expr.template
rename to src/function-forms/error/gen-func-expr.template
diff --git a/src/params/error/gen-meth.template b/src/function-forms/error/gen-meth.template
similarity index 100%
rename from src/params/error/gen-meth.template
rename to src/function-forms/error/gen-meth.template
diff --git a/src/params/error/meth.template b/src/function-forms/error/meth.template
similarity index 100%
rename from src/params/error/meth.template
rename to src/function-forms/error/meth.template
diff --git a/src/params/syntax/arrow-function.template b/src/function-forms/syntax/arrow-function.template
similarity index 100%
rename from src/params/syntax/arrow-function.template
rename to src/function-forms/syntax/arrow-function.template
diff --git a/src/params/syntax/async-gen-func-decl.template b/src/function-forms/syntax/async-gen-func-decl.template
similarity index 100%
rename from src/params/syntax/async-gen-func-decl.template
rename to src/function-forms/syntax/async-gen-func-decl.template
diff --git a/src/params/syntax/async-gen-func-expr.template b/src/function-forms/syntax/async-gen-func-expr.template
similarity index 100%
rename from src/params/syntax/async-gen-func-expr.template
rename to src/function-forms/syntax/async-gen-func-expr.template
diff --git a/src/params/syntax/async-gen-meth.template b/src/function-forms/syntax/async-gen-meth.template
similarity index 100%
rename from src/params/syntax/async-gen-meth.template
rename to src/function-forms/syntax/async-gen-meth.template
diff --git a/src/params/syntax/async-gen-named-func-expr.template b/src/function-forms/syntax/async-gen-named-func-expr.template
similarity index 100%
rename from src/params/syntax/async-gen-named-func-expr.template
rename to src/function-forms/syntax/async-gen-named-func-expr.template
diff --git a/src/params/syntax/cls-decl-async-gen-meth-static.template b/src/function-forms/syntax/cls-decl-async-gen-meth-static.template
similarity index 100%
rename from src/params/syntax/cls-decl-async-gen-meth-static.template
rename to src/function-forms/syntax/cls-decl-async-gen-meth-static.template
diff --git a/src/params/syntax/cls-decl-async-gen-meth.template b/src/function-forms/syntax/cls-decl-async-gen-meth.template
similarity index 100%
rename from src/params/syntax/cls-decl-async-gen-meth.template
rename to src/function-forms/syntax/cls-decl-async-gen-meth.template
diff --git a/src/params/syntax/cls-decl-gen-meth-static.template b/src/function-forms/syntax/cls-decl-gen-meth-static.template
similarity index 100%
rename from src/params/syntax/cls-decl-gen-meth-static.template
rename to src/function-forms/syntax/cls-decl-gen-meth-static.template
diff --git a/src/params/syntax/cls-decl-gen-meth.template b/src/function-forms/syntax/cls-decl-gen-meth.template
similarity index 100%
rename from src/params/syntax/cls-decl-gen-meth.template
rename to src/function-forms/syntax/cls-decl-gen-meth.template
diff --git a/src/params/syntax/cls-decl-meth-static.template b/src/function-forms/syntax/cls-decl-meth-static.template
similarity index 100%
rename from src/params/syntax/cls-decl-meth-static.template
rename to src/function-forms/syntax/cls-decl-meth-static.template
diff --git a/src/params/syntax/cls-decl-meth.template b/src/function-forms/syntax/cls-decl-meth.template
similarity index 100%
rename from src/params/syntax/cls-decl-meth.template
rename to src/function-forms/syntax/cls-decl-meth.template
diff --git a/src/params/syntax/cls-expr-async-gen-meth-static.template b/src/function-forms/syntax/cls-expr-async-gen-meth-static.template
similarity index 100%
rename from src/params/syntax/cls-expr-async-gen-meth-static.template
rename to src/function-forms/syntax/cls-expr-async-gen-meth-static.template
diff --git a/src/params/syntax/cls-expr-async-gen-meth.template b/src/function-forms/syntax/cls-expr-async-gen-meth.template
similarity index 100%
rename from src/params/syntax/cls-expr-async-gen-meth.template
rename to src/function-forms/syntax/cls-expr-async-gen-meth.template
diff --git a/src/params/syntax/cls-expr-gen-meth-static.template b/src/function-forms/syntax/cls-expr-gen-meth-static.template
similarity index 100%
rename from src/params/syntax/cls-expr-gen-meth-static.template
rename to src/function-forms/syntax/cls-expr-gen-meth-static.template
diff --git a/src/params/syntax/cls-expr-gen-meth.template b/src/function-forms/syntax/cls-expr-gen-meth.template
similarity index 100%
rename from src/params/syntax/cls-expr-gen-meth.template
rename to src/function-forms/syntax/cls-expr-gen-meth.template
diff --git a/src/params/syntax/cls-expr-meth-static.template b/src/function-forms/syntax/cls-expr-meth-static.template
similarity index 100%
rename from src/params/syntax/cls-expr-meth-static.template
rename to src/function-forms/syntax/cls-expr-meth-static.template
diff --git a/src/params/syntax/cls-expr-meth.template b/src/function-forms/syntax/cls-expr-meth.template
similarity index 100%
rename from src/params/syntax/cls-expr-meth.template
rename to src/function-forms/syntax/cls-expr-meth.template
diff --git a/src/params/syntax/func-decl.template b/src/function-forms/syntax/func-decl.template
similarity index 100%
rename from src/params/syntax/func-decl.template
rename to src/function-forms/syntax/func-decl.template
diff --git a/src/params/syntax/func-expr.template b/src/function-forms/syntax/func-expr.template
similarity index 100%
rename from src/params/syntax/func-expr.template
rename to src/function-forms/syntax/func-expr.template
diff --git a/src/params/syntax/gen-func-decl.template b/src/function-forms/syntax/gen-func-decl.template
similarity index 100%
rename from src/params/syntax/gen-func-decl.template
rename to src/function-forms/syntax/gen-func-decl.template
diff --git a/src/params/syntax/gen-func-expr.template b/src/function-forms/syntax/gen-func-expr.template
similarity index 100%
rename from src/params/syntax/gen-func-expr.template
rename to src/function-forms/syntax/gen-func-expr.template
diff --git a/src/params/syntax/gen-meth.template b/src/function-forms/syntax/gen-meth.template
similarity index 100%
rename from src/params/syntax/gen-meth.template
rename to src/function-forms/syntax/gen-meth.template
diff --git a/src/params/syntax/meth.template b/src/function-forms/syntax/meth.template
similarity index 100%
rename from src/params/syntax/meth.template
rename to src/function-forms/syntax/meth.template
diff --git a/src/params/trailing-comma-dflt-param.case b/src/function-forms/trailing-comma-dflt-param.case
similarity index 100%
rename from src/params/trailing-comma-dflt-param.case
rename to src/function-forms/trailing-comma-dflt-param.case
diff --git a/src/params/trailing-comma-multiple-param.case b/src/function-forms/trailing-comma-multiple-param.case
similarity index 100%
rename from src/params/trailing-comma-multiple-param.case
rename to src/function-forms/trailing-comma-multiple-param.case
diff --git a/src/params/trailing-comma-rest-early-error.case b/src/function-forms/trailing-comma-rest-early-error.case
similarity index 100%
rename from src/params/trailing-comma-rest-early-error.case
rename to src/function-forms/trailing-comma-rest-early-error.case
diff --git a/src/params/trailing-comma-single-param.case b/src/function-forms/trailing-comma-single-param.case
similarity index 100%
rename from src/params/trailing-comma-single-param.case
rename to src/function-forms/trailing-comma-single-param.case
diff --git a/test/language/expressions/arrow-function/params-dflt-abrupt.js b/test/language/expressions/arrow-function/params-dflt-abrupt.js
index c8effea8064e199622d7726c417cef565cce4a88..de17e0dcb1cff06e72eb37eb27b3cc9c22c8678f 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/params/dflt-abrupt.case
-// - src/params/error/arrow-function.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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 d5e77a38a37060cc0848505833fb334465388d59..7bb2faff1305f8bc3e04c7b6b884af2b3637c1e0 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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/arrow-function.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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 510dceba64d22f4323b2eb55b7604a136b2b81c0..d9294149f66e9ef025e2b919732e84bfbf57553c 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/params/dflt-arg-val-undefined.case
-// - src/params/default/arrow-function.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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 f4e2701ce4b5c9054b4ee8566fbad79850e12f88..c552f8da7d8243c3f5b00cfda2e15316773763a3 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/params/dflt-duplicates.case
-// - src/params/syntax/arrow-function.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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 1fc0cc5f2c845c28ac6d1e809b8c4ce3731ddc8e..342636e73dc5aa43ff761314b93b0ce685098edd 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/params/dflt-ref-later.case
-// - src/params/error/arrow-function.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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 585b4fb997b706872d13731205a8ee8f916c7764..135f650de9a297540301dbf806ed3a00edc6405f 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/params/dflt-ref-prior.case
-// - src/params/default/arrow-function.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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 0ccc0d84ceaec04acae621536d8cb0e5d7317997..a4f4b7c752efe8a365b105fde17a9423224a3bb6 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/params/dflt-ref-self.case
-// - src/params/error/arrow-function.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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 850004a24bfb5680b1065d0a66651101d51e8e28..6d3523ab000c65fcc7bc22c9f3709d7734914a28 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/params/dflt-rest.case
-// - src/params/syntax/arrow-function.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/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/arrow-function/params-trailing-comma-dflt-param.js b/test/language/expressions/arrow-function/params-trailing-comma-dflt-param.js
index 6c2176ae5818e6b4f964255b5c847d3d587e0b40..5153f1a29ec8d331255f247b7fa9282c14c8c59d 100644
--- a/test/language/expressions/arrow-function/params-trailing-comma-dflt-param.js
+++ b/test/language/expressions/arrow-function/params-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/arrow-function.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/arrow-function.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (arrow function expression)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/arrow-function/params-trailing-comma-multiple-param.js b/test/language/expressions/arrow-function/params-trailing-comma-multiple-param.js
index bda079a6d218cf933cbca9915a648e7bed5e3ed9..16c0e2654c35abd4ef64dbf51a60ffcb8f9802b1 100644
--- a/test/language/expressions/arrow-function/params-trailing-comma-multiple-param.js
+++ b/test/language/expressions/arrow-function/params-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/arrow-function.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/arrow-function.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (arrow function expression)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/arrow-function/params-trailing-comma-rest-early-error.js b/test/language/expressions/arrow-function/params-trailing-comma-rest-early-error.js
index 2320e3a72450f629251500cea3955f0ce74a2621..cb5a19a168bf3b40d4a576e3b6ae00ee10df1f1b 100644
--- a/test/language/expressions/arrow-function/params-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/arrow-function/params-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/arrow-function.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/arrow-function.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (arrow function expression)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/arrow-function/params-trailing-comma-single-param.js b/test/language/expressions/arrow-function/params-trailing-comma-single-param.js
index 58fa96f4e26dda747e4844cfc0fcf089681c112f..2f588adbe31a4cc521d4717b412e3e4b5401c82f 100644
--- a/test/language/expressions/arrow-function/params-trailing-comma-single-param.js
+++ b/test/language/expressions/arrow-function/params-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/arrow-function.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/arrow-function.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (arrow function expression)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/async-generator/params-dflt-abrupt.js b/test/language/expressions/async-generator/params-dflt-abrupt.js
index 644cdce6e0f35b6e443951dad9f5b8b38638e4ab..039ca48e9afd1aea60267a6baa73b84147cc9780 100644
--- a/test/language/expressions/async-generator/params-dflt-abrupt.js
+++ b/test/language/expressions/async-generator/params-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-abrupt.case
-// - src/params/error/async-gen-func-expr.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/error/async-gen-func-expr.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (async generator function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-dflt-arg-val-not-undefined.js b/test/language/expressions/async-generator/params-dflt-arg-val-not-undefined.js
index 28c385083ed43f01239296ac9e04befcbc5b9da4..6459d01f70a9b790f5b31f548703db94a3bd331b 100644
--- a/test/language/expressions/async-generator/params-dflt-arg-val-not-undefined.js
+++ b/test/language/expressions/async-generator/params-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-not-undefined.case
-// - src/params/default/async-gen-func-expr.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/default/async-gen-func-expr.template
 /*---
 description: Use of intializer when argument value is not `undefined` (async generator function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-dflt-arg-val-undefined.js b/test/language/expressions/async-generator/params-dflt-arg-val-undefined.js
index 624160d65acf6f09999d35bf1d63f199814e731f..3efac1218242072d3a2aa902af031d6b0bdd3a8e 100644
--- a/test/language/expressions/async-generator/params-dflt-arg-val-undefined.js
+++ b/test/language/expressions/async-generator/params-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-undefined.case
-// - src/params/default/async-gen-func-expr.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/default/async-gen-func-expr.template
 /*---
 description: Use of intializer when argument value is `undefined` (async generator function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-dflt-duplicates.js b/test/language/expressions/async-generator/params-dflt-duplicates.js
index 745c94e254e67305d3fc81ee080ee2bf0f3dede4..c87f18a69b069e92011f6b92a527d6d1dd5f8519 100644
--- a/test/language/expressions/async-generator/params-dflt-duplicates.js
+++ b/test/language/expressions/async-generator/params-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-duplicates.case
-// - src/params/syntax/async-gen-func-expr.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/syntax/async-gen-func-expr.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (async generator function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-dflt-ref-later.js b/test/language/expressions/async-generator/params-dflt-ref-later.js
index c3d810701d788340f97ff0a9b24919c8495a8c5d..aee03311f15bfba887541e26d74c8aa861aeffe2 100644
--- a/test/language/expressions/async-generator/params-dflt-ref-later.js
+++ b/test/language/expressions/async-generator/params-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-later.case
-// - src/params/error/async-gen-func-expr.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/error/async-gen-func-expr.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (async generator function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-dflt-ref-prior.js b/test/language/expressions/async-generator/params-dflt-ref-prior.js
index 04e4f2c7227934cd9972994596842d6ec48148a2..2b9dc29ef18f5fc7635193f7064786b0d78a8764 100644
--- a/test/language/expressions/async-generator/params-dflt-ref-prior.js
+++ b/test/language/expressions/async-generator/params-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-prior.case
-// - src/params/default/async-gen-func-expr.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/default/async-gen-func-expr.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (async generator function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-dflt-ref-self.js b/test/language/expressions/async-generator/params-dflt-ref-self.js
index 99a971be1e8a29d0c32315cce883f3b2d77c7fd8..f49711c3f8856b0fba8d079423ed8a539aaf21dc 100644
--- a/test/language/expressions/async-generator/params-dflt-ref-self.js
+++ b/test/language/expressions/async-generator/params-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-self.case
-// - src/params/error/async-gen-func-expr.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/error/async-gen-func-expr.template
 /*---
 description: Referencing a parameter from within its own initializer (async generator function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-dflt-rest.js b/test/language/expressions/async-generator/params-dflt-rest.js
index 5ff97c42135bb69e478db720e5a6199e71b4f77c..f5df8e60365a6961aba957f07b1404bbdc65657a 100644
--- a/test/language/expressions/async-generator/params-dflt-rest.js
+++ b/test/language/expressions/async-generator/params-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-rest.case
-// - src/params/syntax/async-gen-func-expr.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/syntax/async-gen-func-expr.template
 /*---
 description: RestParameter does not support an initializer (async generator function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-named-dflt-abrupt.js b/test/language/expressions/async-generator/params-named-dflt-abrupt.js
index 6621d0bbc2cddae8b658584fdd42c1abe68267f9..f571306a448adede5e61783f049d1e374391ef62 100644
--- a/test/language/expressions/async-generator/params-named-dflt-abrupt.js
+++ b/test/language/expressions/async-generator/params-named-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-abrupt.case
-// - src/params/error/async-gen-named-func-expr.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/error/async-gen-named-func-expr.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (async generator named function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-named-dflt-arg-val-not-undefined.js b/test/language/expressions/async-generator/params-named-dflt-arg-val-not-undefined.js
index 608673ab905eaca9998a5046b47d0403d5dbf88b..bbd83f939624bee30f5ecd786902590424cb9023 100644
--- a/test/language/expressions/async-generator/params-named-dflt-arg-val-not-undefined.js
+++ b/test/language/expressions/async-generator/params-named-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-not-undefined.case
-// - src/params/default/async-gen-named-func-expr.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/default/async-gen-named-func-expr.template
 /*---
 description: Use of intializer when argument value is not `undefined` (async generator named function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-named-dflt-arg-val-undefined.js b/test/language/expressions/async-generator/params-named-dflt-arg-val-undefined.js
index 22789874fd67d441eed63d03b0270c48e8b92abd..e1b0da273bfb1e765fd6fa3aaa0f3416a01a26c0 100644
--- a/test/language/expressions/async-generator/params-named-dflt-arg-val-undefined.js
+++ b/test/language/expressions/async-generator/params-named-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-undefined.case
-// - src/params/default/async-gen-named-func-expr.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/default/async-gen-named-func-expr.template
 /*---
 description: Use of intializer when argument value is `undefined` (async generator named function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-named-dflt-duplicates.js b/test/language/expressions/async-generator/params-named-dflt-duplicates.js
index 65e95019c768914f168b327dee7ea354dfee912f..ee00423e633d3f2d8c355583e7c6b38d18a638f6 100644
--- a/test/language/expressions/async-generator/params-named-dflt-duplicates.js
+++ b/test/language/expressions/async-generator/params-named-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-duplicates.case
-// - src/params/syntax/async-gen-named-func-expr.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/syntax/async-gen-named-func-expr.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (async generator named function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-named-dflt-ref-later.js b/test/language/expressions/async-generator/params-named-dflt-ref-later.js
index 2306d9ab0d012d5a1535506a677425aa98208f2d..3cfdb11c858f8c0f2b784cccef2147b96f39633d 100644
--- a/test/language/expressions/async-generator/params-named-dflt-ref-later.js
+++ b/test/language/expressions/async-generator/params-named-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-later.case
-// - src/params/error/async-gen-named-func-expr.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/error/async-gen-named-func-expr.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (async generator named function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-named-dflt-ref-prior.js b/test/language/expressions/async-generator/params-named-dflt-ref-prior.js
index 668346f84a159d2ae698148030a8c33f142d784d..b04e4ceae27ef1abc0216d8b7279470f8d6412d6 100644
--- a/test/language/expressions/async-generator/params-named-dflt-ref-prior.js
+++ b/test/language/expressions/async-generator/params-named-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-prior.case
-// - src/params/default/async-gen-named-func-expr.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/default/async-gen-named-func-expr.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (async generator named function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-named-dflt-ref-self.js b/test/language/expressions/async-generator/params-named-dflt-ref-self.js
index 0696d5de01379fb8815b7f0937ad30ba733a4717..769be4780f54ae9e1aab01bcf616338043010ee9 100644
--- a/test/language/expressions/async-generator/params-named-dflt-ref-self.js
+++ b/test/language/expressions/async-generator/params-named-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-self.case
-// - src/params/error/async-gen-named-func-expr.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/error/async-gen-named-func-expr.template
 /*---
 description: Referencing a parameter from within its own initializer (async generator named function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-named-dflt-rest.js b/test/language/expressions/async-generator/params-named-dflt-rest.js
index 8881488df7ce486c0138d81965969e7381b32650..0efea64c0cb11800200b8bad7aa10ff2621f78a9 100644
--- a/test/language/expressions/async-generator/params-named-dflt-rest.js
+++ b/test/language/expressions/async-generator/params-named-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-rest.case
-// - src/params/syntax/async-gen-named-func-expr.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/syntax/async-gen-named-func-expr.template
 /*---
 description: RestParameter does not support an initializer (async generator named function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-named-trailing-comma-dflt-param.js b/test/language/expressions/async-generator/params-named-trailing-comma-dflt-param.js
index 602d72e7131e42032e19218f6cb737e7d1c1b552..974189c0264f82d3933b571a08519e64b816db18 100644
--- a/test/language/expressions/async-generator/params-named-trailing-comma-dflt-param.js
+++ b/test/language/expressions/async-generator/params-named-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/async-gen-named-func-expr.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/async-gen-named-func-expr.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (async generator named function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-named-trailing-comma-multiple-param.js b/test/language/expressions/async-generator/params-named-trailing-comma-multiple-param.js
index f33913bce0b503f10c809cfcc7de738c17077977..638c03327588be639c6851a899a02e3f338649f1 100644
--- a/test/language/expressions/async-generator/params-named-trailing-comma-multiple-param.js
+++ b/test/language/expressions/async-generator/params-named-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/async-gen-named-func-expr.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/async-gen-named-func-expr.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (async generator named function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-named-trailing-comma-rest-early-error.js b/test/language/expressions/async-generator/params-named-trailing-comma-rest-early-error.js
index 93ea1b70998f06f63d8248f6c840aca6bc8e2fa9..68dbdedf50665046268b3fe98c6f1d5e5e695ee0 100644
--- a/test/language/expressions/async-generator/params-named-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/async-generator/params-named-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/async-gen-named-func-expr.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/async-gen-named-func-expr.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (async generator named function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-named-trailing-comma-single-param.js b/test/language/expressions/async-generator/params-named-trailing-comma-single-param.js
index 15265b64744a7a7f8177ddb0e12ddcb79a80eab4..1e36fa7a9b487e4abe34e5e4f5f3ddc094b90d81 100644
--- a/test/language/expressions/async-generator/params-named-trailing-comma-single-param.js
+++ b/test/language/expressions/async-generator/params-named-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/async-gen-named-func-expr.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/async-gen-named-func-expr.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (async generator named function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-trailing-comma-dflt-param.js b/test/language/expressions/async-generator/params-trailing-comma-dflt-param.js
index e53a3d07161a28d97de3e011f98b7e083107a9ac..cecedbc44a92ce4d32b29a9ee643157f5560d325 100644
--- a/test/language/expressions/async-generator/params-trailing-comma-dflt-param.js
+++ b/test/language/expressions/async-generator/params-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/async-gen-func-expr.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/async-gen-func-expr.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (async generator function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-trailing-comma-multiple-param.js b/test/language/expressions/async-generator/params-trailing-comma-multiple-param.js
index c325742537989bbb78daee9b5e122f2b7b9fa653..fab93501b5f5ddc52e09371e9d910ffe82ec752b 100644
--- a/test/language/expressions/async-generator/params-trailing-comma-multiple-param.js
+++ b/test/language/expressions/async-generator/params-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/async-gen-func-expr.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/async-gen-func-expr.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (async generator function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-trailing-comma-rest-early-error.js b/test/language/expressions/async-generator/params-trailing-comma-rest-early-error.js
index 3b8f40d3359503e9f7d866efa89a3aa24582ff07..f76477bd799a8c34196da7668323148335771dd5 100644
--- a/test/language/expressions/async-generator/params-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/async-generator/params-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/async-gen-func-expr.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/async-gen-func-expr.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (async generator function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/async-generator/params-trailing-comma-single-param.js b/test/language/expressions/async-generator/params-trailing-comma-single-param.js
index af9b709eedee1440fcad6eff84fc481912c58610..37f6acf467788c38863b478b7df271cdab8be9d0 100644
--- a/test/language/expressions/async-generator/params-trailing-comma-single-param.js
+++ b/test/language/expressions/async-generator/params-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/async-gen-func-expr.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/async-gen-func-expr.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (async generator function expression)
 esid: sec-asyncgenerator-definitions-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-dflt-abrupt.js b/test/language/expressions/class/params-async-gen-meth-dflt-abrupt.js
index 7122c9c52cfa5e32baeb263154aa7c465730fc5a..31997bc4746c99361f975c12748d60274c8ff2f3 100644
--- a/test/language/expressions/class/params-async-gen-meth-dflt-abrupt.js
+++ b/test/language/expressions/class/params-async-gen-meth-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-abrupt.case
-// - src/params/error/cls-expr-async-gen-meth.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/error/cls-expr-async-gen-meth.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-dflt-arg-val-not-undefined.js b/test/language/expressions/class/params-async-gen-meth-dflt-arg-val-not-undefined.js
index 665d7cbdb2f91d922adcb23ec1d597de90f990dc..6577ab225534ccc3771cd3393b5c1d9a2e37a69a 100644
--- a/test/language/expressions/class/params-async-gen-meth-dflt-arg-val-not-undefined.js
+++ b/test/language/expressions/class/params-async-gen-meth-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-not-undefined.case
-// - src/params/default/cls-expr-async-gen-meth.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/default/cls-expr-async-gen-meth.template
 /*---
 description: Use of intializer when argument value is not `undefined` (class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-dflt-arg-val-undefined.js b/test/language/expressions/class/params-async-gen-meth-dflt-arg-val-undefined.js
index cdfc8994bfbd47077bea314e6699da62d012ea60..a8aada3a166b00fe36d3bd8c403f5f52cb847fe1 100644
--- a/test/language/expressions/class/params-async-gen-meth-dflt-arg-val-undefined.js
+++ b/test/language/expressions/class/params-async-gen-meth-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-undefined.case
-// - src/params/default/cls-expr-async-gen-meth.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/default/cls-expr-async-gen-meth.template
 /*---
 description: Use of intializer when argument value is `undefined` (class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-dflt-duplicates.js b/test/language/expressions/class/params-async-gen-meth-dflt-duplicates.js
index 3c5f065eb2bd580be88c7a713957e3c82f8327c4..0c6c0e847ba596e7d289e0c9557c91994ea93fd6 100644
--- a/test/language/expressions/class/params-async-gen-meth-dflt-duplicates.js
+++ b/test/language/expressions/class/params-async-gen-meth-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-duplicates.case
-// - src/params/syntax/cls-expr-async-gen-meth.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/syntax/cls-expr-async-gen-meth.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-dflt-ref-later.js b/test/language/expressions/class/params-async-gen-meth-dflt-ref-later.js
index ee0356ce441f623093bca17b1a62adc8b669fe8a..865587e582abd67283e6c36d02359315184a1479 100644
--- a/test/language/expressions/class/params-async-gen-meth-dflt-ref-later.js
+++ b/test/language/expressions/class/params-async-gen-meth-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-later.case
-// - src/params/error/cls-expr-async-gen-meth.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/error/cls-expr-async-gen-meth.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-dflt-ref-prior.js b/test/language/expressions/class/params-async-gen-meth-dflt-ref-prior.js
index f1d724f9d3c42312a4bdd7e60612b13abe3b91e7..7ea7e79a013507b92ccb58f00060191fe5095cb2 100644
--- a/test/language/expressions/class/params-async-gen-meth-dflt-ref-prior.js
+++ b/test/language/expressions/class/params-async-gen-meth-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-prior.case
-// - src/params/default/cls-expr-async-gen-meth.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/default/cls-expr-async-gen-meth.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-dflt-ref-self.js b/test/language/expressions/class/params-async-gen-meth-dflt-ref-self.js
index 424deef887f4968ad84fb126f9647be0cf928942..277fbb870b9802b017bfc9c9cee963187dc2b1aa 100644
--- a/test/language/expressions/class/params-async-gen-meth-dflt-ref-self.js
+++ b/test/language/expressions/class/params-async-gen-meth-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-self.case
-// - src/params/error/cls-expr-async-gen-meth.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/error/cls-expr-async-gen-meth.template
 /*---
 description: Referencing a parameter from within its own initializer (class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-dflt-rest.js b/test/language/expressions/class/params-async-gen-meth-dflt-rest.js
index 2b9dcc31ed86468aa9c1c0d518f1d5b818135ff1..47ece7659211c39fe4aa655e101f32096759adcb 100644
--- a/test/language/expressions/class/params-async-gen-meth-dflt-rest.js
+++ b/test/language/expressions/class/params-async-gen-meth-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-rest.case
-// - src/params/syntax/cls-expr-async-gen-meth.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/syntax/cls-expr-async-gen-meth.template
 /*---
 description: RestParameter does not support an initializer (class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-static-dflt-abrupt.js b/test/language/expressions/class/params-async-gen-meth-static-dflt-abrupt.js
index 6f31e8c0c38c9bc980da556d2e24b6ec17f4a0d4..ed210d5ba2fad081045017b054574a203b46f855 100644
--- a/test/language/expressions/class/params-async-gen-meth-static-dflt-abrupt.js
+++ b/test/language/expressions/class/params-async-gen-meth-static-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-abrupt.case
-// - src/params/error/cls-expr-async-gen-meth-static.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/error/cls-expr-async-gen-meth-static.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (static class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-static-dflt-arg-val-not-undefined.js b/test/language/expressions/class/params-async-gen-meth-static-dflt-arg-val-not-undefined.js
index c26d1c825636ae813a7f004fdc73aca9f73d1070..6ef13f769fdd060ac0735146709c4d4f563fb415 100644
--- a/test/language/expressions/class/params-async-gen-meth-static-dflt-arg-val-not-undefined.js
+++ b/test/language/expressions/class/params-async-gen-meth-static-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-not-undefined.case
-// - src/params/default/cls-expr-async-gen-meth-static.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/default/cls-expr-async-gen-meth-static.template
 /*---
 description: Use of intializer when argument value is not `undefined` (static class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-static-dflt-arg-val-undefined.js b/test/language/expressions/class/params-async-gen-meth-static-dflt-arg-val-undefined.js
index f216136fc50d4ac5c52020adc3965863026aad83..1ce9866a9b31ff1bbb9b348e5fa04222a91a5dda 100644
--- a/test/language/expressions/class/params-async-gen-meth-static-dflt-arg-val-undefined.js
+++ b/test/language/expressions/class/params-async-gen-meth-static-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-undefined.case
-// - src/params/default/cls-expr-async-gen-meth-static.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/default/cls-expr-async-gen-meth-static.template
 /*---
 description: Use of intializer when argument value is `undefined` (static class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-static-dflt-duplicates.js b/test/language/expressions/class/params-async-gen-meth-static-dflt-duplicates.js
index 20acf1b9eb8b62fb0d80e33994e0acce218ed998..3b84b2f0602eb770b2247106a688fa4914b5b604 100644
--- a/test/language/expressions/class/params-async-gen-meth-static-dflt-duplicates.js
+++ b/test/language/expressions/class/params-async-gen-meth-static-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-duplicates.case
-// - src/params/syntax/cls-expr-async-gen-meth-static.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/syntax/cls-expr-async-gen-meth-static.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (static class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-static-dflt-ref-later.js b/test/language/expressions/class/params-async-gen-meth-static-dflt-ref-later.js
index 77eeca850215df90221441443683d2a83383ec43..3b44924c408eeaad1271d56110c1588b3c0ec933 100644
--- a/test/language/expressions/class/params-async-gen-meth-static-dflt-ref-later.js
+++ b/test/language/expressions/class/params-async-gen-meth-static-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-later.case
-// - src/params/error/cls-expr-async-gen-meth-static.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/error/cls-expr-async-gen-meth-static.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (static class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-static-dflt-ref-prior.js b/test/language/expressions/class/params-async-gen-meth-static-dflt-ref-prior.js
index c9a61d935ce343c79c6577a8fcdbc5458796278e..86b450c9d2b52501d1a608ee63e7e7391d2f93c4 100644
--- a/test/language/expressions/class/params-async-gen-meth-static-dflt-ref-prior.js
+++ b/test/language/expressions/class/params-async-gen-meth-static-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-prior.case
-// - src/params/default/cls-expr-async-gen-meth-static.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/default/cls-expr-async-gen-meth-static.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (static class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-static-dflt-ref-self.js b/test/language/expressions/class/params-async-gen-meth-static-dflt-ref-self.js
index 6f116fb083e05ac3831c5f1a04667ceae288e9ee..b42b984e4e5cdb85a66211239391615cfcff689c 100644
--- a/test/language/expressions/class/params-async-gen-meth-static-dflt-ref-self.js
+++ b/test/language/expressions/class/params-async-gen-meth-static-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-self.case
-// - src/params/error/cls-expr-async-gen-meth-static.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/error/cls-expr-async-gen-meth-static.template
 /*---
 description: Referencing a parameter from within its own initializer (static class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-static-dflt-rest.js b/test/language/expressions/class/params-async-gen-meth-static-dflt-rest.js
index e54d23842368f14d6c1186547ac776d03a0fcdd1..4e96b42d8a47289583881f7da6c36ed1a1832c08 100644
--- a/test/language/expressions/class/params-async-gen-meth-static-dflt-rest.js
+++ b/test/language/expressions/class/params-async-gen-meth-static-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-rest.case
-// - src/params/syntax/cls-expr-async-gen-meth-static.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/syntax/cls-expr-async-gen-meth-static.template
 /*---
 description: RestParameter does not support an initializer (static class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-dflt-param.js b/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-dflt-param.js
index 50d50b430e0a0c8672b24d81ee63b034289101d0..e58f44d6705b5282e01220ef52dfedc79c99ed84 100644
--- a/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-dflt-param.js
+++ b/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/cls-expr-async-gen-meth-static.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/cls-expr-async-gen-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (static class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-multiple-param.js b/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-multiple-param.js
index 84fb378d983e3e4d26939fe6857390bd0cc6b640..71f951534f89c3114d2755bf94715cb43e897956 100644
--- a/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-multiple-param.js
+++ b/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/cls-expr-async-gen-meth-static.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/cls-expr-async-gen-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (static class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-rest-early-error.js b/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-rest-early-error.js
index 9e58c0e5800297a46a788b5f76d26b91e27179a2..e35726387fcdb29a15f50550f6270d9c4973dc68 100644
--- a/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/cls-expr-async-gen-meth-static.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/cls-expr-async-gen-meth-static.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (static class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-single-param.js b/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-single-param.js
index caa2600511bbf2cc5217eeb8f350b7bb72594ca4..0a7734fe9f637f291e085c00cbdcab3bbf794f48 100644
--- a/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-single-param.js
+++ b/test/language/expressions/class/params-async-gen-meth-static-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/cls-expr-async-gen-meth-static.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/cls-expr-async-gen-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (static class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-trailing-comma-dflt-param.js b/test/language/expressions/class/params-async-gen-meth-trailing-comma-dflt-param.js
index 669df9d070f0c5728b6689c5be1059ce5c3f1fcc..1231bfdd5165acd3ec7f85b5d9c8e74ca54ff59e 100644
--- a/test/language/expressions/class/params-async-gen-meth-trailing-comma-dflt-param.js
+++ b/test/language/expressions/class/params-async-gen-meth-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/cls-expr-async-gen-meth.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/cls-expr-async-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-trailing-comma-multiple-param.js b/test/language/expressions/class/params-async-gen-meth-trailing-comma-multiple-param.js
index e1d934b9914baf4372a85ee7bf4d76a812a5e9a5..20bee541d9ffea014f4c1d47749a0a21c5a62664 100644
--- a/test/language/expressions/class/params-async-gen-meth-trailing-comma-multiple-param.js
+++ b/test/language/expressions/class/params-async-gen-meth-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/cls-expr-async-gen-meth.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/cls-expr-async-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-trailing-comma-rest-early-error.js b/test/language/expressions/class/params-async-gen-meth-trailing-comma-rest-early-error.js
index 122bd17adff402da6103ed53d6b43169e6294880..fb9681cd298f3dd5e7fa4cdf5c9e95900c8cdb84 100644
--- a/test/language/expressions/class/params-async-gen-meth-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/class/params-async-gen-meth-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/cls-expr-async-gen-meth.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/cls-expr-async-gen-meth.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-async-gen-meth-trailing-comma-single-param.js b/test/language/expressions/class/params-async-gen-meth-trailing-comma-single-param.js
index 4e930a0bbd271e7bf7a0bc167a2d0a10c755106b..1a85e1d05fde95e15ec5ea0af06577a242ecb578 100644
--- a/test/language/expressions/class/params-async-gen-meth-trailing-comma-single-param.js
+++ b/test/language/expressions/class/params-async-gen-meth-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/cls-expr-async-gen-meth.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/cls-expr-async-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (class expression async generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-gen-meth-dflt-abrupt.js b/test/language/expressions/class/params-gen-meth-dflt-abrupt.js
index 3b0c35ff31346172e286fb5a429e142fbc136ebd..b9bc3be8a22e908a22098c83a91a52c3db28859a 100644
--- a/test/language/expressions/class/params-gen-meth-dflt-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/params/dflt-abrupt.case
-// - src/params/error/cls-expr-gen-meth.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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-gen-meth-dflt-arg-val-not-undefined.js b/test/language/expressions/class/params-gen-meth-dflt-arg-val-not-undefined.js
index 81ed4639d81f00cb2e5eb12c12118b648232495b..9ad9e2468843f636fbb9242b487c8df265cc45fc 100644
--- a/test/language/expressions/class/params-gen-meth-dflt-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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/cls-expr-gen-meth.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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-gen-meth-dflt-arg-val-undefined.js b/test/language/expressions/class/params-gen-meth-dflt-arg-val-undefined.js
index de53f1a08e8bcd70d95247f60adec44a48006fb1..792329a81ef4ddfc761ddb3110d4b1c2cb98aaec 100644
--- a/test/language/expressions/class/params-gen-meth-dflt-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/params/dflt-arg-val-undefined.case
-// - src/params/default/cls-expr-gen-meth.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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-gen-meth-dflt-duplicates.js b/test/language/expressions/class/params-gen-meth-dflt-duplicates.js
index b64291732235dd40941bbc47609144aa1259580d..6396ed595c18c5f5f18bca121dd5d31e9a1abadd 100644
--- a/test/language/expressions/class/params-gen-meth-dflt-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/params/dflt-duplicates.case
-// - src/params/syntax/cls-expr-gen-meth.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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-gen-meth-dflt-ref-later.js b/test/language/expressions/class/params-gen-meth-dflt-ref-later.js
index 616695dd4d7111559ed83c5eb098eda94e57cb69..c20298514dbb25d3db6add7b5571c9db23267070 100644
--- a/test/language/expressions/class/params-gen-meth-dflt-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/params/dflt-ref-later.case
-// - src/params/error/cls-expr-gen-meth.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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-gen-meth-dflt-ref-prior.js b/test/language/expressions/class/params-gen-meth-dflt-ref-prior.js
index dbe4d42381024a4f27935109628e04aa4b3f83f3..2cc5413dd39849c3ed1aaf4a0b787cf86c9252c2 100644
--- a/test/language/expressions/class/params-gen-meth-dflt-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/params/dflt-ref-prior.case
-// - src/params/default/cls-expr-gen-meth.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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-gen-meth-dflt-ref-self.js b/test/language/expressions/class/params-gen-meth-dflt-ref-self.js
index ef33a5340c337560d919ce240947e02ef010ed76..30dd53f47e76ba2e3f3821762d20f0f204ad475b 100644
--- a/test/language/expressions/class/params-gen-meth-dflt-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/params/dflt-ref-self.case
-// - src/params/error/cls-expr-gen-meth.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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-gen-meth-dflt-rest.js b/test/language/expressions/class/params-gen-meth-dflt-rest.js
index 3ca1280e6f3b7bda00a5b02f4b6e732ee9e1f178..106dc70c27f4b3b32bea49a70d428ad8ac61a7c4 100644
--- a/test/language/expressions/class/params-gen-meth-dflt-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/params/dflt-rest.case
-// - src/params/syntax/cls-expr-gen-meth.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/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-gen-meth-static-dflt-abrupt.js b/test/language/expressions/class/params-gen-meth-static-dflt-abrupt.js
index e4611d88824f4df600530d1b3a83077de11a52ea..782ee0f9a3dc132f109b5da25ada067323cd356a 100644
--- a/test/language/expressions/class/params-gen-meth-static-dflt-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/params/dflt-abrupt.case
-// - src/params/error/cls-expr-gen-meth-static.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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-gen-meth-static-dflt-arg-val-not-undefined.js b/test/language/expressions/class/params-gen-meth-static-dflt-arg-val-not-undefined.js
index b6a93cfb9fef32c0ef19875525c3c0ae7d4c2391..a40aee7bc9dabf39f4b0afe140bdbbf51c4579e6 100644
--- a/test/language/expressions/class/params-gen-meth-static-dflt-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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/cls-expr-gen-meth-static.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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-gen-meth-static-dflt-arg-val-undefined.js b/test/language/expressions/class/params-gen-meth-static-dflt-arg-val-undefined.js
index 2277054a8e6fd276ab447092f5c105ce0f81acf5..1ca7363ab38c69146e12caddc91453d08e905d60 100644
--- a/test/language/expressions/class/params-gen-meth-static-dflt-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/params/dflt-arg-val-undefined.case
-// - src/params/default/cls-expr-gen-meth-static.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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-gen-meth-static-dflt-duplicates.js b/test/language/expressions/class/params-gen-meth-static-dflt-duplicates.js
index a673383892e2a9e8641d30c3c81ff6aa8a80d7b9..c46878e085f0d819a2946ea708c0189b3b54db93 100644
--- a/test/language/expressions/class/params-gen-meth-static-dflt-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/params/dflt-duplicates.case
-// - src/params/syntax/cls-expr-gen-meth-static.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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-gen-meth-static-dflt-ref-later.js b/test/language/expressions/class/params-gen-meth-static-dflt-ref-later.js
index 6d0af997f31f8f518a29f9e36c160b08286ec9bb..24dab85e8c271f4d75e00b441e9bb74ec0652d1c 100644
--- a/test/language/expressions/class/params-gen-meth-static-dflt-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/params/dflt-ref-later.case
-// - src/params/error/cls-expr-gen-meth-static.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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-gen-meth-static-dflt-ref-prior.js b/test/language/expressions/class/params-gen-meth-static-dflt-ref-prior.js
index 411121d7640ec86978959534e10aa973ec6e6ac3..c7d8b4bd428b63078eb7082982ec6f93d8d1b385 100644
--- a/test/language/expressions/class/params-gen-meth-static-dflt-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/params/dflt-ref-prior.case
-// - src/params/default/cls-expr-gen-meth-static.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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-gen-meth-static-dflt-ref-self.js b/test/language/expressions/class/params-gen-meth-static-dflt-ref-self.js
index aac921a51a28c67480d6cf8f3f59be96626fc430..0daf83b82e580b6d02f233fe0f335a143c3162d6 100644
--- a/test/language/expressions/class/params-gen-meth-static-dflt-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/params/dflt-ref-self.case
-// - src/params/error/cls-expr-gen-meth-static.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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-gen-meth-static-dflt-rest.js b/test/language/expressions/class/params-gen-meth-static-dflt-rest.js
index eae16f52eab72f31f98fd7d5a08194771aa08311..6bf05035f965a58c24472fafa219a81bb89b0e0b 100644
--- a/test/language/expressions/class/params-gen-meth-static-dflt-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/params/dflt-rest.case
-// - src/params/syntax/cls-expr-gen-meth-static.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/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-gen-meth-static-trailing-comma-dflt-param.js b/test/language/expressions/class/params-gen-meth-static-trailing-comma-dflt-param.js
index 70b541a49162657e933e4201e74d317979777af0..5e5af9cb3c68d57109335898aa56fb92451bd816 100644
--- a/test/language/expressions/class/params-gen-meth-static-trailing-comma-dflt-param.js
+++ b/test/language/expressions/class/params-gen-meth-static-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/cls-expr-gen-meth-static.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/cls-expr-gen-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-gen-meth-static-trailing-comma-multiple-param.js b/test/language/expressions/class/params-gen-meth-static-trailing-comma-multiple-param.js
index 0a6b554df387383648570f84b573a8e69b31e459..94ccc4b6cead8858b59d76b2b812cfbad6c583c6 100644
--- a/test/language/expressions/class/params-gen-meth-static-trailing-comma-multiple-param.js
+++ b/test/language/expressions/class/params-gen-meth-static-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/cls-expr-gen-meth-static.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/cls-expr-gen-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-gen-meth-static-trailing-comma-rest-early-error.js b/test/language/expressions/class/params-gen-meth-static-trailing-comma-rest-early-error.js
index 3b24651de7035f2377e6bf5ef40850db784c2847..4b462a0e461b341d3b3458555f0452c8810ef817 100644
--- a/test/language/expressions/class/params-gen-meth-static-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/class/params-gen-meth-static-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/cls-expr-gen-meth-static.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/cls-expr-gen-meth-static.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-gen-meth-static-trailing-comma-single-param.js b/test/language/expressions/class/params-gen-meth-static-trailing-comma-single-param.js
index 0cbb0a165293cb37facaf24b80c15a4f7a3a4573..670864212f2390730dfba772d1aafc69602cde9a 100644
--- a/test/language/expressions/class/params-gen-meth-static-trailing-comma-single-param.js
+++ b/test/language/expressions/class/params-gen-meth-static-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/cls-expr-gen-meth-static.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/cls-expr-gen-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-gen-meth-trailing-comma-dflt-param.js b/test/language/expressions/class/params-gen-meth-trailing-comma-dflt-param.js
index abc4464392a6e1ba6375a64cddc9d41fd0eff49f..0b910445e6f3563cf04e57dba80b3bc17b3a8f5b 100644
--- a/test/language/expressions/class/params-gen-meth-trailing-comma-dflt-param.js
+++ b/test/language/expressions/class/params-gen-meth-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/cls-expr-gen-meth.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/cls-expr-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-gen-meth-trailing-comma-multiple-param.js b/test/language/expressions/class/params-gen-meth-trailing-comma-multiple-param.js
index 765da753eb1f205a874937480471592e6d6f6c29..a485e44ee8039666b4c86371412bdd6c19138703 100644
--- a/test/language/expressions/class/params-gen-meth-trailing-comma-multiple-param.js
+++ b/test/language/expressions/class/params-gen-meth-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/cls-expr-gen-meth.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/cls-expr-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-gen-meth-trailing-comma-rest-early-error.js b/test/language/expressions/class/params-gen-meth-trailing-comma-rest-early-error.js
index e27ec7586d1eec163650305f28ec69c3a2475d1b..0737dd45b09f5c3c5d31cd804b97a185c968309d 100644
--- a/test/language/expressions/class/params-gen-meth-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/class/params-gen-meth-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/cls-expr-gen-meth.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/cls-expr-gen-meth.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-gen-meth-trailing-comma-single-param.js b/test/language/expressions/class/params-gen-meth-trailing-comma-single-param.js
index a70cfb511aeb0ae6158dc4d6fa031a88470fa5d5..63a26f7b569c5f4378393068e02acc338e815adc 100644
--- a/test/language/expressions/class/params-gen-meth-trailing-comma-single-param.js
+++ b/test/language/expressions/class/params-gen-meth-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/cls-expr-gen-meth.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/cls-expr-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-meth-dflt-abrupt.js b/test/language/expressions/class/params-meth-dflt-abrupt.js
index dde91b1ce7d94bfea06d006452467d8d3e817266..2cca3bcb03471a3489125e398f1a1c067b80966b 100644
--- a/test/language/expressions/class/params-meth-dflt-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/params/dflt-abrupt.case
-// - src/params/error/cls-expr-meth.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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-meth-dflt-arg-val-not-undefined.js b/test/language/expressions/class/params-meth-dflt-arg-val-not-undefined.js
index 9d902d5a26b64d967280c9d9667b8ebadc8acd8d..3d940d179bec5d389cf16533a319dec4c5ff41dc 100644
--- a/test/language/expressions/class/params-meth-dflt-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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/cls-expr-meth.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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-meth-dflt-arg-val-undefined.js b/test/language/expressions/class/params-meth-dflt-arg-val-undefined.js
index 4633b03c74894ba30cf76c4183bae23d3abd734b..2ebc185c23498ea8541b8708ff96195f9d05e7db 100644
--- a/test/language/expressions/class/params-meth-dflt-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/params/dflt-arg-val-undefined.case
-// - src/params/default/cls-expr-meth.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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-meth-dflt-duplicates.js b/test/language/expressions/class/params-meth-dflt-duplicates.js
index ef0754259d4bb345a15ddec4a407ba1b5725e717..a214faeeca2c890aa722b8bbfdbec065a7ce8514 100644
--- a/test/language/expressions/class/params-meth-dflt-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/params/dflt-duplicates.case
-// - src/params/syntax/cls-expr-meth.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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-meth-dflt-ref-later.js b/test/language/expressions/class/params-meth-dflt-ref-later.js
index 9ceda5b205414bb914b244e9df3fae24bb9cb4b8..7a2c81ab4a13347bf446a61cddc1d124afb36c40 100644
--- a/test/language/expressions/class/params-meth-dflt-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/params/dflt-ref-later.case
-// - src/params/error/cls-expr-meth.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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-meth-dflt-ref-prior.js b/test/language/expressions/class/params-meth-dflt-ref-prior.js
index cb3941336c2cfd1b7e4af634d22cddb4710798d5..c6336a5767924228f0e67660c4c36b26274990a5 100644
--- a/test/language/expressions/class/params-meth-dflt-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/params/dflt-ref-prior.case
-// - src/params/default/cls-expr-meth.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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-meth-dflt-ref-self.js b/test/language/expressions/class/params-meth-dflt-ref-self.js
index 5586d076de93f7b617c09b88b2a89b23257dfefd..49c0d70f226919146baa5f5a54199da8af025c5a 100644
--- a/test/language/expressions/class/params-meth-dflt-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/params/dflt-ref-self.case
-// - src/params/error/cls-expr-meth.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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-meth-dflt-rest.js b/test/language/expressions/class/params-meth-dflt-rest.js
index 7eddbc7841e00f2cd6d86294ef96ef3a5b5a3482..43199aa0bdc19ed0c22416d0adf674c6a6c365bc 100644
--- a/test/language/expressions/class/params-meth-dflt-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/params/dflt-rest.case
-// - src/params/syntax/cls-expr-meth.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/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-meth-static-dflt-abrupt.js b/test/language/expressions/class/params-meth-static-dflt-abrupt.js
index e920bcb370656b10cd06124a8c2b1cc773977bf2..d19ddc46a5a522b6b85e0048789d215b7f2ec41d 100644
--- a/test/language/expressions/class/params-meth-static-dflt-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/params/dflt-abrupt.case
-// - src/params/error/cls-expr-meth-static.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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-meth-static-dflt-arg-val-not-undefined.js b/test/language/expressions/class/params-meth-static-dflt-arg-val-not-undefined.js
index aead2df6eb13c1962590445414c3868031e6b26a..a6a04dc5fd242845ef050b5091159df9555eac63 100644
--- a/test/language/expressions/class/params-meth-static-dflt-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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/cls-expr-meth-static.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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-meth-static-dflt-arg-val-undefined.js b/test/language/expressions/class/params-meth-static-dflt-arg-val-undefined.js
index de9a16f614b24abb59118fb503bcdb9ce90db46a..08c0112fdd0ef7e8bdeec91cd9f3c8b355699eb1 100644
--- a/test/language/expressions/class/params-meth-static-dflt-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/params/dflt-arg-val-undefined.case
-// - src/params/default/cls-expr-meth-static.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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-meth-static-dflt-duplicates.js b/test/language/expressions/class/params-meth-static-dflt-duplicates.js
index 05590c838c9f1e79449a2f80d1db219e39979be6..57fd5eb26a6c59ead4ce395121b0b83cb00d589c 100644
--- a/test/language/expressions/class/params-meth-static-dflt-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/params/dflt-duplicates.case
-// - src/params/syntax/cls-expr-meth-static.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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-meth-static-dflt-ref-later.js b/test/language/expressions/class/params-meth-static-dflt-ref-later.js
index 9672c7e34e55b997856e488d7da32f96e07693b6..81583141eb6ed0e4830c3080a0024f35e7c45ab0 100644
--- a/test/language/expressions/class/params-meth-static-dflt-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/params/dflt-ref-later.case
-// - src/params/error/cls-expr-meth-static.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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-meth-static-dflt-ref-prior.js b/test/language/expressions/class/params-meth-static-dflt-ref-prior.js
index fe278ec16801b304b23bd77635c4314907b607f4..77aa35555dd4dc0cfb3883dc2cbe8e09844d1ac4 100644
--- a/test/language/expressions/class/params-meth-static-dflt-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/params/dflt-ref-prior.case
-// - src/params/default/cls-expr-meth-static.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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-meth-static-dflt-ref-self.js b/test/language/expressions/class/params-meth-static-dflt-ref-self.js
index cf6bca9e1f21a607748e43ad18e31bf69d7a48ed..5b74043e3145803ff769e8ef13731047e6c076a8 100644
--- a/test/language/expressions/class/params-meth-static-dflt-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/params/dflt-ref-self.case
-// - src/params/error/cls-expr-meth-static.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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-meth-static-dflt-rest.js b/test/language/expressions/class/params-meth-static-dflt-rest.js
index afcfab563835d170962049cc0a7bb3a483f71a7f..1b83468802ea5189c42df8258041c0968d75cedf 100644
--- a/test/language/expressions/class/params-meth-static-dflt-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/params/dflt-rest.case
-// - src/params/syntax/cls-expr-meth-static.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/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/class/params-meth-static-trailing-comma-dflt-param.js b/test/language/expressions/class/params-meth-static-trailing-comma-dflt-param.js
index 92402aa988c4f45e091df4f313a264bf5f7b39ad..68c81f18a8d7d2db317e5acc79e5d7870b4c0cec 100644
--- a/test/language/expressions/class/params-meth-static-trailing-comma-dflt-param.js
+++ b/test/language/expressions/class/params-meth-static-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/cls-expr-meth-static.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/cls-expr-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (static class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-meth-static-trailing-comma-multiple-param.js b/test/language/expressions/class/params-meth-static-trailing-comma-multiple-param.js
index a0fc8c066f7b1cb5b905e2244eed6526c831f4a6..bb4c13ec2c4017ddfb0587a7c993fb1bdc605855 100644
--- a/test/language/expressions/class/params-meth-static-trailing-comma-multiple-param.js
+++ b/test/language/expressions/class/params-meth-static-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/cls-expr-meth-static.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/cls-expr-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (static class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-meth-static-trailing-comma-rest-early-error.js b/test/language/expressions/class/params-meth-static-trailing-comma-rest-early-error.js
index 9b72e72ce3753f2069c15c7057393c0dfe1db5b8..94424dc21dc0666bbf1f1c990be780ffd13a1528 100644
--- a/test/language/expressions/class/params-meth-static-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/class/params-meth-static-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/cls-expr-meth-static.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/cls-expr-meth-static.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (static class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-meth-static-trailing-comma-single-param.js b/test/language/expressions/class/params-meth-static-trailing-comma-single-param.js
index cfb1d3a81304b646a932560ac920b24c06b85feb..560c4babdcfae0994e34afbe5146e5c6002e3965 100644
--- a/test/language/expressions/class/params-meth-static-trailing-comma-single-param.js
+++ b/test/language/expressions/class/params-meth-static-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/cls-expr-meth-static.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/cls-expr-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (static class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-meth-trailing-comma-dflt-param.js b/test/language/expressions/class/params-meth-trailing-comma-dflt-param.js
index 1943005915cfa76657c21c39a0d32be41c0e94c7..8323bc14c8d3efee446da03ca1db8e1ee2d0051b 100644
--- a/test/language/expressions/class/params-meth-trailing-comma-dflt-param.js
+++ b/test/language/expressions/class/params-meth-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/cls-expr-meth.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/cls-expr-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-meth-trailing-comma-multiple-param.js b/test/language/expressions/class/params-meth-trailing-comma-multiple-param.js
index 97c81b7653d68e1e41ce1b76b97a2ea777a4684f..03ff141e27fadb2694a4ad00fa232e70076af841 100644
--- a/test/language/expressions/class/params-meth-trailing-comma-multiple-param.js
+++ b/test/language/expressions/class/params-meth-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/cls-expr-meth.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/cls-expr-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-meth-trailing-comma-rest-early-error.js b/test/language/expressions/class/params-meth-trailing-comma-rest-early-error.js
index a8db528c57da37845ef97afde391ca2b4b07c558..6703152b56f6b48ee4ef58d0e4d81a569c6e6dcd 100644
--- a/test/language/expressions/class/params-meth-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/class/params-meth-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/cls-expr-meth.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/cls-expr-meth.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/class/params-meth-trailing-comma-single-param.js b/test/language/expressions/class/params-meth-trailing-comma-single-param.js
index f8cd36aa985e926cc7d0136bad33809513a8a3ca..cddfc6643bce34962862ac81756d7c722c07afeb 100644
--- a/test/language/expressions/class/params-meth-trailing-comma-single-param.js
+++ b/test/language/expressions/class/params-meth-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/cls-expr-meth.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/cls-expr-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (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 9a8b26e80e17888d9f773151c8209ae2cd254b67..54732890efa5f232bb36a83d937ef3059dde629b 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/params/dflt-abrupt.case
-// - src/params/error/func-expr.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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 5584719edf7f1d786a75ed2d6c0329044f824543..da52bd1a7b2490c1bf37fea0b97396cbcaca3da5 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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/func-expr.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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 f21c2206474612d46dd3879ce69081f84206d0da..4e8b2a7d9a1c0b85bc5a2d455ff148b01456c9f2 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/params/dflt-arg-val-undefined.case
-// - src/params/default/func-expr.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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 102e507795fec9f0f6932a0e13d400482d8cc950..c5b6ceb7aa1df396330c7488fba3a028afbd10f9 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/params/dflt-duplicates.case
-// - src/params/syntax/func-expr.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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 26309aca043ad7bd0c76f4f81240dfa94b83e65a..f781306ce4a88e07b71f36a5404d89ef831905da 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/params/dflt-ref-later.case
-// - src/params/error/func-expr.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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 e6b985f8329bc2957c9f6a0beee50f59b3179915..6b86c6368480b9166f657a9fb8a20705e29559f7 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/params/dflt-ref-prior.case
-// - src/params/default/func-expr.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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 d05f5f0c36759d9f7e24a08ece04b48859d06ab9..bcf935cae3e852cb284a7c300ed9ee4a76636216 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/params/dflt-ref-self.case
-// - src/params/error/func-expr.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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 2465e13fb156d09a8215d34bdc7c43701e90b342..69bcde8df48f2794fac1c675527e6545998ab8d1 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/params/dflt-rest.case
-// - src/params/syntax/func-expr.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/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/function/params-trailing-comma-dflt-param.js b/test/language/expressions/function/params-trailing-comma-dflt-param.js
index ec90313c83bd3ccf287b97e028bbe2739832c263..dc83d13e308998e2759f67e03777d57af3612904 100644
--- a/test/language/expressions/function/params-trailing-comma-dflt-param.js
+++ b/test/language/expressions/function/params-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/func-expr.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/func-expr.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (function expression)
 esid: sec-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/function/params-trailing-comma-multiple-param.js b/test/language/expressions/function/params-trailing-comma-multiple-param.js
index 26deae9551a59858191586feeb9cb3bb46b3c94e..c0d1c436e5aba66559165ddc9af945b64dbd8f0c 100644
--- a/test/language/expressions/function/params-trailing-comma-multiple-param.js
+++ b/test/language/expressions/function/params-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/func-expr.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/func-expr.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (function expression)
 esid: sec-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/function/params-trailing-comma-rest-early-error.js b/test/language/expressions/function/params-trailing-comma-rest-early-error.js
index 5150a66ceb9246da3c571902d950b226d6c33b29..ede500aa21b256dfc9f4b556ee83cd3a17c1c47c 100644
--- a/test/language/expressions/function/params-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/function/params-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/func-expr.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/func-expr.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (function expression)
 esid: sec-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/function/params-trailing-comma-single-param.js b/test/language/expressions/function/params-trailing-comma-single-param.js
index 5191202f6eba849b6627db57d5f94041b8d59b32..baed40509b97b40107ebdb88e866f20e15962014 100644
--- a/test/language/expressions/function/params-trailing-comma-single-param.js
+++ b/test/language/expressions/function/params-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/func-expr.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/func-expr.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (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 851afb39825f1faa0892db1e9743231bef1b0412..3a8b1e8eb950ffc27d92ba7ee143bbd5e86a8901 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/params/dflt-abrupt.case
-// - src/params/error/gen-func-expr.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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 50cbc474b21dc5126a9545cecd706a195049759e..68e6485cafd13ef03aba642975d6ea7882d07adf 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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/gen-func-expr.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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 77815a27e93773846424bf8dc389cff422709bc5..83edde353fc9165267b59e3e50e4811e1a963c98 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/params/dflt-arg-val-undefined.case
-// - src/params/default/gen-func-expr.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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 6b79c5039e376fd00cdef3a4db289524e5e43e99..e42c77dc63a53c1b6ffbb10cb13267371bd5a24d 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/params/dflt-duplicates.case
-// - src/params/syntax/gen-func-expr.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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 c5bebc78622104121f553109eb1ca425fe9cc2d8..53feb83f1521eb575ce8b9526d1cff0806f6e9ec 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/params/dflt-ref-later.case
-// - src/params/error/gen-func-expr.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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 cbc7d5264b72fc57ef077f6b94ee84a1339708df..bb686793c8d373af700372865f75f2def5d0fab2 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/params/dflt-ref-prior.case
-// - src/params/default/gen-func-expr.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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 b7623981461aa9d5e0457e5c2ebcb79bde7bf43f..fb99b6875504e96fdc194821efbeea0d410f7c89 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/params/dflt-ref-self.case
-// - src/params/error/gen-func-expr.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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 565b131385dbd0716e9bb75752f1e77ed66ead33..7bb5aecedad3431215e98bb0213a6915a193c458 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/params/dflt-rest.case
-// - src/params/syntax/gen-func-expr.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/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/generators/params-trailing-comma-dflt-param.js b/test/language/expressions/generators/params-trailing-comma-dflt-param.js
index 2f8406af9486a3776d314727cd6d98aa41fd236f..476577cbafc8927a416f12674d477a684e70a384 100644
--- a/test/language/expressions/generators/params-trailing-comma-dflt-param.js
+++ b/test/language/expressions/generators/params-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/gen-func-expr.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/gen-func-expr.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (generator function expression)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/generators/params-trailing-comma-multiple-param.js b/test/language/expressions/generators/params-trailing-comma-multiple-param.js
index 21db7901946e69c16fbd914b84af3fc06caf1eef..667358035f4227bf1448b53fc13be63abb4f9c2a 100644
--- a/test/language/expressions/generators/params-trailing-comma-multiple-param.js
+++ b/test/language/expressions/generators/params-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/gen-func-expr.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/gen-func-expr.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (generator function expression)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/generators/params-trailing-comma-rest-early-error.js b/test/language/expressions/generators/params-trailing-comma-rest-early-error.js
index b82ced0c4638bdc612f27e54f48ed8d963514aa7..826a347a42e346e05fd2c91a11ee0a3d3ac9fcaf 100644
--- a/test/language/expressions/generators/params-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/generators/params-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/gen-func-expr.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/gen-func-expr.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (generator function expression)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/generators/params-trailing-comma-single-param.js b/test/language/expressions/generators/params-trailing-comma-single-param.js
index 28f04739fc20a1876ae1ff6c641cbb94f22c7323..ddad8b0f161d8a29038d39e9d9c5ead5b4028e3a 100644
--- a/test/language/expressions/generators/params-trailing-comma-single-param.js
+++ b/test/language/expressions/generators/params-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/gen-func-expr.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/gen-func-expr.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (generator function expression)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
diff --git a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-abrupt.js b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-abrupt.js
index 2f6c0c554cd523fa3135dbec1788e3b3a8c85c4b..32dc959baa2a2e997419aaef195704ae947a9fa8 100644
--- a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-abrupt.js
+++ b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-abrupt.case
-// - src/params/error/async-gen-meth.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/error/async-gen-meth.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (async generator method)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-arg-val-not-undefined.js b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-arg-val-not-undefined.js
index 9d3c7820d2b90e5871d24d9de6270db3662605da..2ed89209b0ccdb2af9d9d2a5e99b99362ac1a79d 100644
--- a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-arg-val-not-undefined.js
+++ b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-not-undefined.case
-// - src/params/default/async-gen-meth.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/default/async-gen-meth.template
 /*---
 description: Use of intializer when argument value is not `undefined` (async generator method)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-arg-val-undefined.js b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-arg-val-undefined.js
index adef672abd6d294f66c0486ec4598754346326a5..a5a2cdb01ebb15981bb43608776916b7004e8563 100644
--- a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-arg-val-undefined.js
+++ b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-undefined.case
-// - src/params/default/async-gen-meth.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/default/async-gen-meth.template
 /*---
 description: Use of intializer when argument value is `undefined` (async generator method)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-duplicates.js b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-duplicates.js
index 9010b6ce3e9573c5cd9ddd5832e968171e79b020..4755683d9df3dc9ba433550ad8f518d7fd02ead7 100644
--- a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-duplicates.js
+++ b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-duplicates.case
-// - src/params/syntax/async-gen-meth.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/syntax/async-gen-meth.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (async generator method)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-ref-later.js b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-ref-later.js
index db8b2a53119c9d36a18478a2a050bf9182eeeb1f..b66c4d9fc1ed1fbd3760df8cac891d2d00ddd5ea 100644
--- a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-ref-later.js
+++ b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-later.case
-// - src/params/error/async-gen-meth.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/error/async-gen-meth.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (async generator method)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-ref-prior.js b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-ref-prior.js
index 3f0515f0bc935ed11754a022de3f579398c23668..3432e64bd61b7de9cbcb3d000a210c0d2d69c90f 100644
--- a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-ref-prior.js
+++ b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-prior.case
-// - src/params/default/async-gen-meth.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/default/async-gen-meth.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (async generator method)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-ref-self.js b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-ref-self.js
index 0d218040446e00d9fdd759d0e3cc326edc22247f..63b53ff25cf94694c14d8b20aa838a999e3453e6 100644
--- a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-ref-self.js
+++ b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-self.case
-// - src/params/error/async-gen-meth.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/error/async-gen-meth.template
 /*---
 description: Referencing a parameter from within its own initializer (async generator method)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-rest.js b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-rest.js
index 93c7750f93fbf186f8320788bbd7fa23207be2d1..b75306e590d77eb92f40e3f4326e11dfc054cead 100644
--- a/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-rest.js
+++ b/test/language/expressions/object/method-definition/params-async-gen-meth-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-rest.case
-// - src/params/syntax/async-gen-meth.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/syntax/async-gen-meth.template
 /*---
 description: RestParameter does not support an initializer (async generator method)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-dflt-param.js b/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-dflt-param.js
index 1ec0d52e545dfcb5638af30e3ecfe08a2dd488dc..a3dce45401894b0312622df9abf6ab41f538bccd 100644
--- a/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-dflt-param.js
+++ b/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/async-gen-meth.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/async-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (async generator method)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-multiple-param.js b/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-multiple-param.js
index 8a8cc5936078e7e4ed8fc0e72568680b6bc7d813..d357e487f6053e5a7ea212c4c908b39d7aabfc34 100644
--- a/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-multiple-param.js
+++ b/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/async-gen-meth.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/async-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (async generator method)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-rest-early-error.js b/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-rest-early-error.js
index 096c7d9d5a83ba1beda1e6e9a3b285fe9f316516..d9de6650b1ae60dcc02868801ae7ab4241b9a01b 100644
--- a/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/async-gen-meth.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/async-gen-meth.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (async generator method)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-single-param.js b/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-single-param.js
index 879a1534ddc2fbd4bc2237c62de170a1a4d272e1..274e46d70cf19c8678a2e18cf6e39c75d47e0ec6 100644
--- a/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-single-param.js
+++ b/test/language/expressions/object/method-definition/params-async-gen-meth-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/async-gen-meth.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/async-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (async generator method)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-gen-meth-dflt-abrupt.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-abrupt.js
index 33a9a496af65c71848a0bcdc8cfd7758deb7f1ed..05b9e50ea69d39037cfb062c5a5ec429dcfc7bc6 100644
--- a/test/language/expressions/object/method-definition/params-gen-meth-dflt-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/params/dflt-abrupt.case
-// - src/params/error/gen-meth.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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-gen-meth-dflt-arg-val-not-undefined.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-arg-val-not-undefined.js
index b7dd464edc939166bc0f93d4edadf6a368ec1960..61a5d6ac01f234e08ea7fe7696e4c4668c3b283a 100644
--- a/test/language/expressions/object/method-definition/params-gen-meth-dflt-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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/gen-meth.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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-gen-meth-dflt-arg-val-undefined.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-arg-val-undefined.js
index 6c954ce62dc80a614739a2849b4a3e33512d91c3..e226a700d00965d12a87668c798bbbefbb08213d 100644
--- a/test/language/expressions/object/method-definition/params-gen-meth-dflt-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/params/dflt-arg-val-undefined.case
-// - src/params/default/gen-meth.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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-gen-meth-dflt-duplicates.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-duplicates.js
index 3705576f84299d64a93ce5c8f43f1b8a6efe2d90..69fda8637e3d85dca0a45f9957b8bbed1a7df0a8 100644
--- a/test/language/expressions/object/method-definition/params-gen-meth-dflt-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/params/dflt-duplicates.case
-// - src/params/syntax/gen-meth.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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-gen-meth-dflt-ref-later.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-ref-later.js
index f17dcc09b98793812b237c2e338da5aee233a29e..76a83f062fd12d59bc3ef2a10f71bd6c6c79762e 100644
--- a/test/language/expressions/object/method-definition/params-gen-meth-dflt-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/params/dflt-ref-later.case
-// - src/params/error/gen-meth.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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-gen-meth-dflt-ref-prior.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-ref-prior.js
index 1c20b640aa642e783eb6e59c1f73662ccd7f1e16..29c960ea532c96ce857b1e5f4527af5f0d9c21ee 100644
--- a/test/language/expressions/object/method-definition/params-gen-meth-dflt-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/params/dflt-ref-prior.case
-// - src/params/default/gen-meth.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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-gen-meth-dflt-ref-self.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-ref-self.js
index 96c4fb5078bfc2888e48f6e32d530ed969af1d4f..80dbde9ab519053c84c7b4a9416ec2b8498b2fb1 100644
--- a/test/language/expressions/object/method-definition/params-gen-meth-dflt-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/params/dflt-ref-self.case
-// - src/params/error/gen-meth.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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-gen-meth-dflt-rest.js b/test/language/expressions/object/method-definition/params-gen-meth-dflt-rest.js
index e15e47763565aaeb980de0b1dce10eda300f6a20..3a89cee509e4a80fd9cbfdaebfb104474058a44b 100644
--- a/test/language/expressions/object/method-definition/params-gen-meth-dflt-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/params/dflt-rest.case
-// - src/params/syntax/gen-meth.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/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-gen-meth-trailing-comma-dflt-param.js b/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-dflt-param.js
index f2639f72ba9fd26f33e7aa1213a2dabe81f7034f..bbf900a2e80fe30b18e220c59e12b06aba12e144 100644
--- a/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-dflt-param.js
+++ b/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/gen-meth.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-multiple-param.js b/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-multiple-param.js
index 2c68bce2a1d7e4f47fcba569f50a5c0a192035cd..364c56ff5fefbd3adb88211b055c4d1439eb26d2 100644
--- a/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-multiple-param.js
+++ b/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/gen-meth.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-rest-early-error.js b/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-rest-early-error.js
index e6cba3f2b0db99a953bcb103ede8905a6e7bebb4..462a153c177c4a0445f86b76564a15156855da1f 100644
--- a/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/gen-meth.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/gen-meth.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-single-param.js b/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-single-param.js
index 241af20b7584320d42aba974d84996cf0debcc25..1f4bb9c060faa351a08bed9471d202a353526699 100644
--- a/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-single-param.js
+++ b/test/language/expressions/object/method-definition/params-gen-meth-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/gen-meth.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
diff --git a/test/language/expressions/object/method-definition/params-meth-dflt-abrupt.js b/test/language/expressions/object/method-definition/params-meth-dflt-abrupt.js
index 82c842178f75789ee72af91af4b2409c7259cc4b..ab75eb37f46c2ab7ee89794026861e8fb22b578e 100644
--- a/test/language/expressions/object/method-definition/params-meth-dflt-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/params/dflt-abrupt.case
-// - src/params/error/meth.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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-meth-dflt-arg-val-not-undefined.js b/test/language/expressions/object/method-definition/params-meth-dflt-arg-val-not-undefined.js
index 64fba3eb7b315f39191d94da864b39da67806b5a..544019e6aaae8a4812990895dbf872a0600b3285 100644
--- a/test/language/expressions/object/method-definition/params-meth-dflt-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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/meth.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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-meth-dflt-arg-val-undefined.js b/test/language/expressions/object/method-definition/params-meth-dflt-arg-val-undefined.js
index 45606ad6d7feb7d3acf3a4b2d23126dcb74509dc..ce6608249e685db14946800856cb492ca163e57b 100644
--- a/test/language/expressions/object/method-definition/params-meth-dflt-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/params/dflt-arg-val-undefined.case
-// - src/params/default/meth.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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-meth-dflt-duplicates.js b/test/language/expressions/object/method-definition/params-meth-dflt-duplicates.js
index df786d259f67583e9725eedd4d0d296b70c5bbb2..1021a5e91bec97ee76a020606e4edf8391e7f1b5 100644
--- a/test/language/expressions/object/method-definition/params-meth-dflt-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/params/dflt-duplicates.case
-// - src/params/syntax/meth.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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-meth-dflt-ref-later.js b/test/language/expressions/object/method-definition/params-meth-dflt-ref-later.js
index 1bc6593a23af7a207329e7e891b6fe424ebd8aae..ebf9db451db51367a9af7d0b756339e18fce11c8 100644
--- a/test/language/expressions/object/method-definition/params-meth-dflt-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/params/dflt-ref-later.case
-// - src/params/error/meth.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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-meth-dflt-ref-prior.js b/test/language/expressions/object/method-definition/params-meth-dflt-ref-prior.js
index 8993def0e83c99878cb6556d1dadde2f1b6ce651..893c8d82a55f82b92c31a87fefacdeadcc1152e7 100644
--- a/test/language/expressions/object/method-definition/params-meth-dflt-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/params/dflt-ref-prior.case
-// - src/params/default/meth.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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-meth-dflt-ref-self.js b/test/language/expressions/object/method-definition/params-meth-dflt-ref-self.js
index 388a36d2e6f6f4013c171039aac783ac96a62deb..8c9edc68d73cc6f640764aa82073fe8339d1a803 100644
--- a/test/language/expressions/object/method-definition/params-meth-dflt-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/params/dflt-ref-self.case
-// - src/params/error/meth.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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-meth-dflt-rest.js b/test/language/expressions/object/method-definition/params-meth-dflt-rest.js
index 5ebf06a6f5d42e84b50f24656316e3b903c35a6a..5654997b0245ee59317e4df2813cd6ce747de725 100644
--- a/test/language/expressions/object/method-definition/params-meth-dflt-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/params/dflt-rest.case
-// - src/params/syntax/meth.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/syntax/meth.template
 /*---
 description: RestParameter does not support an initializer (method)
 esid: sec-runtime-semantics-definemethod
diff --git a/test/language/expressions/object/method-definition/params-meth-trailing-comma-dflt-param.js b/test/language/expressions/object/method-definition/params-meth-trailing-comma-dflt-param.js
index b3319b00167145935526f0380aa8e939d344ce30..82deafb0064443243c2d4de422cd4ff8b0f6633c 100644
--- a/test/language/expressions/object/method-definition/params-meth-trailing-comma-dflt-param.js
+++ b/test/language/expressions/object/method-definition/params-meth-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/meth.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/meth.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (method)
 esid: sec-runtime-semantics-definemethod
diff --git a/test/language/expressions/object/method-definition/params-meth-trailing-comma-multiple-param.js b/test/language/expressions/object/method-definition/params-meth-trailing-comma-multiple-param.js
index 5d66ead1f2676ef722d5ec4d12e250bbbd3ab130..7d9296c001aa29faec36b6fd889728a2e720456a 100644
--- a/test/language/expressions/object/method-definition/params-meth-trailing-comma-multiple-param.js
+++ b/test/language/expressions/object/method-definition/params-meth-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/meth.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/meth.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (method)
 esid: sec-runtime-semantics-definemethod
diff --git a/test/language/expressions/object/method-definition/params-meth-trailing-comma-rest-early-error.js b/test/language/expressions/object/method-definition/params-meth-trailing-comma-rest-early-error.js
index 076efc323d99c250bdcad80798aa143e867298d4..5afb841d99dcea72efb4c355bd13973bf08c809e 100644
--- a/test/language/expressions/object/method-definition/params-meth-trailing-comma-rest-early-error.js
+++ b/test/language/expressions/object/method-definition/params-meth-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/meth.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/meth.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (method)
 esid: sec-runtime-semantics-definemethod
diff --git a/test/language/expressions/object/method-definition/params-meth-trailing-comma-single-param.js b/test/language/expressions/object/method-definition/params-meth-trailing-comma-single-param.js
index 80cfa9371523715120d7c1bfbfce609b7111a5f2..d3f32782001da956f281edfeb5c7afef51eed295 100644
--- a/test/language/expressions/object/method-definition/params-meth-trailing-comma-single-param.js
+++ b/test/language/expressions/object/method-definition/params-meth-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/meth.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/meth.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (method)
 esid: sec-runtime-semantics-definemethod
diff --git a/test/language/statements/async-generator/params-dflt-abrupt.js b/test/language/statements/async-generator/params-dflt-abrupt.js
index d9d5b14131762c2d2c94bc60325d381046d64058..d8ac2523f3f5706c21511cfbb021faa1da3d36f7 100644
--- a/test/language/statements/async-generator/params-dflt-abrupt.js
+++ b/test/language/statements/async-generator/params-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-abrupt.case
-// - src/params/error/async-gen-func-decl.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/error/async-gen-func-decl.template
 /*---
 description: Abrupt completion returned by evaluation of initializer (async generator function declaration)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
diff --git a/test/language/statements/async-generator/params-dflt-arg-val-not-undefined.js b/test/language/statements/async-generator/params-dflt-arg-val-not-undefined.js
index b3edd7fa37b9e0225f727772e0cf96cf6964f6b1..e840f27b31af2baafbbc27ac3920d17f1ac3180f 100644
--- a/test/language/statements/async-generator/params-dflt-arg-val-not-undefined.js
+++ b/test/language/statements/async-generator/params-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-not-undefined.case
-// - src/params/default/async-gen-func-decl.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/default/async-gen-func-decl.template
 /*---
 description: Use of intializer when argument value is not `undefined` (async generator function declaration)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
diff --git a/test/language/statements/async-generator/params-dflt-arg-val-undefined.js b/test/language/statements/async-generator/params-dflt-arg-val-undefined.js
index 210f7ed02fe8c07a3ca1ae67e3e62384f65d2b0c..0af23ba1b42fc740b5a209eb0be9734b239581ed 100644
--- a/test/language/statements/async-generator/params-dflt-arg-val-undefined.js
+++ b/test/language/statements/async-generator/params-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-undefined.case
-// - src/params/default/async-gen-func-decl.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/default/async-gen-func-decl.template
 /*---
 description: Use of intializer when argument value is `undefined` (async generator function declaration)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
diff --git a/test/language/statements/async-generator/params-dflt-duplicates.js b/test/language/statements/async-generator/params-dflt-duplicates.js
index c4ce7ec567d0dc48336c9e566a8f37c51301a994..564016b44be98244f88ef622a11691771c7df6d8 100644
--- a/test/language/statements/async-generator/params-dflt-duplicates.js
+++ b/test/language/statements/async-generator/params-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-duplicates.case
-// - src/params/syntax/async-gen-func-decl.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/syntax/async-gen-func-decl.template
 /*---
 description: It is a Syntax Error if BoundNames of FormalParameters contains any duplicate elements. (async generator function declaration)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
diff --git a/test/language/statements/async-generator/params-dflt-ref-later.js b/test/language/statements/async-generator/params-dflt-ref-later.js
index 0b784bd6d23ad057bf2ab68fdd1e27f11b24fbea..e247ef69d98c8aa7cc95de3419cbbb5adb5740d4 100644
--- a/test/language/statements/async-generator/params-dflt-ref-later.js
+++ b/test/language/statements/async-generator/params-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-later.case
-// - src/params/error/async-gen-func-decl.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/error/async-gen-func-decl.template
 /*---
 description: Referencing a parameter that occurs later in the ParameterList (async generator function declaration)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
diff --git a/test/language/statements/async-generator/params-dflt-ref-prior.js b/test/language/statements/async-generator/params-dflt-ref-prior.js
index bd15783b963e6b366b8b28c4e21f0df05e74ba74..e692f5700a0d726381f139d5ce118fc99fc22646 100644
--- a/test/language/statements/async-generator/params-dflt-ref-prior.js
+++ b/test/language/statements/async-generator/params-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-prior.case
-// - src/params/default/async-gen-func-decl.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/default/async-gen-func-decl.template
 /*---
 description: Referencing a parameter that occurs earlier in the ParameterList (async generator function declaration)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
diff --git a/test/language/statements/async-generator/params-dflt-ref-self.js b/test/language/statements/async-generator/params-dflt-ref-self.js
index 593279c3ea073a82985406cdac03ee3106e84b15..80ef75878bd78911785b145ffd1f606281333140 100644
--- a/test/language/statements/async-generator/params-dflt-ref-self.js
+++ b/test/language/statements/async-generator/params-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-self.case
-// - src/params/error/async-gen-func-decl.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/error/async-gen-func-decl.template
 /*---
 description: Referencing a parameter from within its own initializer (async generator function declaration)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
diff --git a/test/language/statements/async-generator/params-dflt-rest.js b/test/language/statements/async-generator/params-dflt-rest.js
index ab7f2f509b2ce57bfa699bcd09f631da659fb338..71204f455541f07cc3e75b06fb1df83e0e26f6db 100644
--- a/test/language/statements/async-generator/params-dflt-rest.js
+++ b/test/language/statements/async-generator/params-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-rest.case
-// - src/params/syntax/async-gen-func-decl.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/syntax/async-gen-func-decl.template
 /*---
 description: RestParameter does not support an initializer (async generator function declaration)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
diff --git a/test/language/statements/async-generator/params-trailing-comma-dflt-param.js b/test/language/statements/async-generator/params-trailing-comma-dflt-param.js
index 2dccdb9f19e323cfdf4193073ce07d13eb8c5dbc..0392bc0db03b0eb4392c517f27ce3393cf588b7b 100644
--- a/test/language/statements/async-generator/params-trailing-comma-dflt-param.js
+++ b/test/language/statements/async-generator/params-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/async-gen-func-decl.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/async-gen-func-decl.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (async generator function declaration)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
diff --git a/test/language/statements/async-generator/params-trailing-comma-multiple-param.js b/test/language/statements/async-generator/params-trailing-comma-multiple-param.js
index dee70cc77182d029c1c99de0daa2d8954b9dbfe3..bcfe76cb186a323515c28ce4f083fe46a5734310 100644
--- a/test/language/statements/async-generator/params-trailing-comma-multiple-param.js
+++ b/test/language/statements/async-generator/params-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/async-gen-func-decl.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/async-gen-func-decl.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (async generator function declaration)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
diff --git a/test/language/statements/async-generator/params-trailing-comma-rest-early-error.js b/test/language/statements/async-generator/params-trailing-comma-rest-early-error.js
index 34d07ebb8791019f0febaf12ec96088a17b89660..58287fe081569b512460cbe2bcfa45c1fe9fa3dd 100644
--- a/test/language/statements/async-generator/params-trailing-comma-rest-early-error.js
+++ b/test/language/statements/async-generator/params-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/async-gen-func-decl.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/async-gen-func-decl.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (async generator function declaration)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
diff --git a/test/language/statements/async-generator/params-trailing-comma-single-param.js b/test/language/statements/async-generator/params-trailing-comma-single-param.js
index a5c911f9a38514191029c928c6b8843fd3355871..d27a76514c819192cf48963d5ab56b0a2d21abe0 100644
--- a/test/language/statements/async-generator/params-trailing-comma-single-param.js
+++ b/test/language/statements/async-generator/params-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/async-gen-func-decl.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/async-gen-func-decl.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (async generator function declaration)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
diff --git a/test/language/statements/class/params-async-gen-meth-dflt-abrupt.js b/test/language/statements/class/params-async-gen-meth-dflt-abrupt.js
index 68f5f7a1b7f0cee9bb802670617aa26239ed6db8..13140655249427014045fbfc466ff3cbf8df2851 100644
--- a/test/language/statements/class/params-async-gen-meth-dflt-abrupt.js
+++ b/test/language/statements/class/params-async-gen-meth-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-abrupt.case
-// - src/params/error/cls-decl-async-gen-meth.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/error/cls-decl-async-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-async-gen-meth-dflt-arg-val-not-undefined.js b/test/language/statements/class/params-async-gen-meth-dflt-arg-val-not-undefined.js
index 0252ab3a7223507a0e93b858e40c319750edcbc0..fbbdf0795f2a84a40e8bc7152b9d9bcd0c644aea 100644
--- a/test/language/statements/class/params-async-gen-meth-dflt-arg-val-not-undefined.js
+++ b/test/language/statements/class/params-async-gen-meth-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-not-undefined.case
-// - src/params/default/cls-decl-async-gen-meth.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/default/cls-decl-async-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-async-gen-meth-dflt-arg-val-undefined.js b/test/language/statements/class/params-async-gen-meth-dflt-arg-val-undefined.js
index 833d873aaa31e464dac647de6c28cc7e15ebd6c7..2e537d137d95aab2452ed223237a26f25596f1ad 100644
--- a/test/language/statements/class/params-async-gen-meth-dflt-arg-val-undefined.js
+++ b/test/language/statements/class/params-async-gen-meth-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-undefined.case
-// - src/params/default/cls-decl-async-gen-meth.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/default/cls-decl-async-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-async-gen-meth-dflt-duplicates.js b/test/language/statements/class/params-async-gen-meth-dflt-duplicates.js
index 249d39f7bbaa6b7ae6b2a8085a67981b6b9a8404..a017606419795137074bf2e5d527d420e87134dd 100644
--- a/test/language/statements/class/params-async-gen-meth-dflt-duplicates.js
+++ b/test/language/statements/class/params-async-gen-meth-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-duplicates.case
-// - src/params/syntax/cls-decl-async-gen-meth.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/syntax/cls-decl-async-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-async-gen-meth-dflt-ref-later.js b/test/language/statements/class/params-async-gen-meth-dflt-ref-later.js
index e493997ba3c8adfdbe044fe410114f8341d7de7a..9199416357354c6e6d953684ca09f6db87f926af 100644
--- a/test/language/statements/class/params-async-gen-meth-dflt-ref-later.js
+++ b/test/language/statements/class/params-async-gen-meth-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-later.case
-// - src/params/error/cls-decl-async-gen-meth.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/error/cls-decl-async-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-async-gen-meth-dflt-ref-prior.js b/test/language/statements/class/params-async-gen-meth-dflt-ref-prior.js
index 01382f822f9d7d9922982817dd70bf3873857ac3..4e0b22d6bfbb69c86435daf3c2adb1aba51d9457 100644
--- a/test/language/statements/class/params-async-gen-meth-dflt-ref-prior.js
+++ b/test/language/statements/class/params-async-gen-meth-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-prior.case
-// - src/params/default/cls-decl-async-gen-meth.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/default/cls-decl-async-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-async-gen-meth-dflt-ref-self.js b/test/language/statements/class/params-async-gen-meth-dflt-ref-self.js
index a2145b880155a0ff5c0288e21504fe31f2d56ec5..44f5d36ba4d87b41704c26e22ea4fcbaf17a4067 100644
--- a/test/language/statements/class/params-async-gen-meth-dflt-ref-self.js
+++ b/test/language/statements/class/params-async-gen-meth-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-self.case
-// - src/params/error/cls-decl-async-gen-meth.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/error/cls-decl-async-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-async-gen-meth-dflt-rest.js b/test/language/statements/class/params-async-gen-meth-dflt-rest.js
index 97291afb3da17eb192c365aabff33dfa7b3051a7..64711af94212399576570d84501220a4f1777440 100644
--- a/test/language/statements/class/params-async-gen-meth-dflt-rest.js
+++ b/test/language/statements/class/params-async-gen-meth-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-rest.case
-// - src/params/syntax/cls-decl-async-gen-meth.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/syntax/cls-decl-async-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-async-gen-meth-static-dflt-abrupt.js b/test/language/statements/class/params-async-gen-meth-static-dflt-abrupt.js
index 906342013a0c277dbecec4871d9b8d36ef590b9f..be5493237177b6d7d08d0d82dee2aeaa3b0dfc9b 100644
--- a/test/language/statements/class/params-async-gen-meth-static-dflt-abrupt.js
+++ b/test/language/statements/class/params-async-gen-meth-static-dflt-abrupt.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-abrupt.case
-// - src/params/error/cls-decl-async-gen-meth-static.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/error/cls-decl-async-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-async-gen-meth-static-dflt-arg-val-not-undefined.js b/test/language/statements/class/params-async-gen-meth-static-dflt-arg-val-not-undefined.js
index 638ffdda687a1ed9ecdc58d78865ccecedef23d7..fb05a00f78b9fc8fe91fef23785ca9abaaf4f041 100644
--- a/test/language/statements/class/params-async-gen-meth-static-dflt-arg-val-not-undefined.js
+++ b/test/language/statements/class/params-async-gen-meth-static-dflt-arg-val-not-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-not-undefined.case
-// - src/params/default/cls-decl-async-gen-meth-static.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/default/cls-decl-async-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-async-gen-meth-static-dflt-arg-val-undefined.js b/test/language/statements/class/params-async-gen-meth-static-dflt-arg-val-undefined.js
index e06aab096529369e9e16a01022fd256140aa42fd..6fe42ef81205f62891eb15bac2a870737266a35e 100644
--- a/test/language/statements/class/params-async-gen-meth-static-dflt-arg-val-undefined.js
+++ b/test/language/statements/class/params-async-gen-meth-static-dflt-arg-val-undefined.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-arg-val-undefined.case
-// - src/params/default/cls-decl-async-gen-meth-static.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/default/cls-decl-async-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-async-gen-meth-static-dflt-duplicates.js b/test/language/statements/class/params-async-gen-meth-static-dflt-duplicates.js
index 71b0dbf18457ec0bfdc289cea0e0dc23ee908594..75fc99c7e1749c62e5dfac81e5338190c8bf0137 100644
--- a/test/language/statements/class/params-async-gen-meth-static-dflt-duplicates.js
+++ b/test/language/statements/class/params-async-gen-meth-static-dflt-duplicates.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-duplicates.case
-// - src/params/syntax/cls-decl-async-gen-meth-static.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/syntax/cls-decl-async-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-async-gen-meth-static-dflt-ref-later.js b/test/language/statements/class/params-async-gen-meth-static-dflt-ref-later.js
index b04a655ac9698384bc9bafd7ce6dd9ac159ff07c..0a37d303542019301fad16b88203ac3034833881 100644
--- a/test/language/statements/class/params-async-gen-meth-static-dflt-ref-later.js
+++ b/test/language/statements/class/params-async-gen-meth-static-dflt-ref-later.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-later.case
-// - src/params/error/cls-decl-async-gen-meth-static.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/error/cls-decl-async-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-async-gen-meth-static-dflt-ref-prior.js b/test/language/statements/class/params-async-gen-meth-static-dflt-ref-prior.js
index e4eef390ec317b5914836d39f02dcfbdb9fd00b6..68eb0d3b6de30d3a836963eb78b5b31ddc9834ec 100644
--- a/test/language/statements/class/params-async-gen-meth-static-dflt-ref-prior.js
+++ b/test/language/statements/class/params-async-gen-meth-static-dflt-ref-prior.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-prior.case
-// - src/params/default/cls-decl-async-gen-meth-static.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/default/cls-decl-async-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-async-gen-meth-static-dflt-ref-self.js b/test/language/statements/class/params-async-gen-meth-static-dflt-ref-self.js
index 8ff36da0b8ecbffe9ed58d6579cf132c5ae73fee..c9e34b61fd2b62068eab7f4fce375127a9df5dbf 100644
--- a/test/language/statements/class/params-async-gen-meth-static-dflt-ref-self.js
+++ b/test/language/statements/class/params-async-gen-meth-static-dflt-ref-self.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-ref-self.case
-// - src/params/error/cls-decl-async-gen-meth-static.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/error/cls-decl-async-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-async-gen-meth-static-dflt-rest.js b/test/language/statements/class/params-async-gen-meth-static-dflt-rest.js
index 367e6a6df47efa90cfaac316c334e86629a3c85e..cb55ecd724df5b0b1af5f24029ad2860d6d0a038 100644
--- a/test/language/statements/class/params-async-gen-meth-static-dflt-rest.js
+++ b/test/language/statements/class/params-async-gen-meth-static-dflt-rest.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/dflt-rest.case
-// - src/params/syntax/cls-decl-async-gen-meth-static.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/syntax/cls-decl-async-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-async-gen-meth-static-trailing-comma-dflt-param.js b/test/language/statements/class/params-async-gen-meth-static-trailing-comma-dflt-param.js
index 9e1c6b1bca3eaad3e8f4dd3024895e617beefc0c..cf551cd262131a5ec4e797c69cc2c52a11d115c1 100644
--- a/test/language/statements/class/params-async-gen-meth-static-trailing-comma-dflt-param.js
+++ b/test/language/statements/class/params-async-gen-meth-static-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/cls-decl-async-gen-meth-static.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/cls-decl-async-gen-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-async-gen-meth-static-trailing-comma-multiple-param.js b/test/language/statements/class/params-async-gen-meth-static-trailing-comma-multiple-param.js
index 65f08dfdf95b3d9d2e2afd088bf9b703d231b8e7..4d5cb5ac286c0028169f7647f5c28d61a41237b5 100644
--- a/test/language/statements/class/params-async-gen-meth-static-trailing-comma-multiple-param.js
+++ b/test/language/statements/class/params-async-gen-meth-static-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/cls-decl-async-gen-meth-static.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/cls-decl-async-gen-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-async-gen-meth-static-trailing-comma-rest-early-error.js b/test/language/statements/class/params-async-gen-meth-static-trailing-comma-rest-early-error.js
index 8d616a80f57f87964867e4f4c8e2dbda8f345c72..b6c26bce6ab9f65808bc18e4aa7b14034e1962aa 100644
--- a/test/language/statements/class/params-async-gen-meth-static-trailing-comma-rest-early-error.js
+++ b/test/language/statements/class/params-async-gen-meth-static-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/cls-decl-async-gen-meth-static.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/cls-decl-async-gen-meth-static.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-async-gen-meth-static-trailing-comma-single-param.js b/test/language/statements/class/params-async-gen-meth-static-trailing-comma-single-param.js
index 2b8aa496f07586370cc33ffa8d2f581fefa07095..4787526f25b117ca3d970c9b0dfdf720755e8de8 100644
--- a/test/language/statements/class/params-async-gen-meth-static-trailing-comma-single-param.js
+++ b/test/language/statements/class/params-async-gen-meth-static-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/cls-decl-async-gen-meth-static.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/cls-decl-async-gen-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-async-gen-meth-trailing-comma-dflt-param.js b/test/language/statements/class/params-async-gen-meth-trailing-comma-dflt-param.js
index 16b87a2c0cdff34da16970705cd1620cbac8d508..de1ae76e035ff4868805bb2fa5016a06bbdf0f53 100644
--- a/test/language/statements/class/params-async-gen-meth-trailing-comma-dflt-param.js
+++ b/test/language/statements/class/params-async-gen-meth-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/cls-decl-async-gen-meth.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/cls-decl-async-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-async-gen-meth-trailing-comma-multiple-param.js b/test/language/statements/class/params-async-gen-meth-trailing-comma-multiple-param.js
index 3920841dc5fb6487c104f509b3dfd484657ad450..2e543f2c405d63dbf8b157207c547d20d0df8940 100644
--- a/test/language/statements/class/params-async-gen-meth-trailing-comma-multiple-param.js
+++ b/test/language/statements/class/params-async-gen-meth-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/cls-decl-async-gen-meth.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/cls-decl-async-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-async-gen-meth-trailing-comma-rest-early-error.js b/test/language/statements/class/params-async-gen-meth-trailing-comma-rest-early-error.js
index 482ba93b79504854b14dba57e4a0c55ab7ad17f9..0abaaaf97d2954c114c939dba8094b8e3e434183 100644
--- a/test/language/statements/class/params-async-gen-meth-trailing-comma-rest-early-error.js
+++ b/test/language/statements/class/params-async-gen-meth-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/cls-decl-async-gen-meth.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/cls-decl-async-gen-meth.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-async-gen-meth-trailing-comma-single-param.js b/test/language/statements/class/params-async-gen-meth-trailing-comma-single-param.js
index 4e950fc9f6ad25d6ff29d67719834b160d63311b..87a817ff6d4c56f11e29361cee9fae5b663990e4 100644
--- a/test/language/statements/class/params-async-gen-meth-trailing-comma-single-param.js
+++ b/test/language/statements/class/params-async-gen-meth-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/cls-decl-async-gen-meth.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/cls-decl-async-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-gen-meth-dflt-abrupt.js b/test/language/statements/class/params-gen-meth-dflt-abrupt.js
index 84e1c370ca22ec2ea68805e76e21484d0e304555..e79d3722690b6bf5be6ded3b2fc57274dc0bdab2 100644
--- a/test/language/statements/class/params-gen-meth-dflt-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/params/dflt-abrupt.case
-// - src/params/error/cls-decl-gen-meth.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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-gen-meth-dflt-arg-val-not-undefined.js b/test/language/statements/class/params-gen-meth-dflt-arg-val-not-undefined.js
index fdd99e9b3e28353320fb9200e5b92235584cb193..196f38df2ac20d45936abef49432c27e16f31d75 100644
--- a/test/language/statements/class/params-gen-meth-dflt-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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/cls-decl-gen-meth.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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-gen-meth-dflt-arg-val-undefined.js b/test/language/statements/class/params-gen-meth-dflt-arg-val-undefined.js
index 31eae172c333feec079fcdaa3c9599fd41bb150c..cbac42231b29854b2fe473ddd5ec826090688756 100644
--- a/test/language/statements/class/params-gen-meth-dflt-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/params/dflt-arg-val-undefined.case
-// - src/params/default/cls-decl-gen-meth.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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-gen-meth-dflt-duplicates.js b/test/language/statements/class/params-gen-meth-dflt-duplicates.js
index 1126eef9439ed118cabacdfb9de550bc4b145a6d..2455c678e75999f00fa390436c4cd64412a8b137 100644
--- a/test/language/statements/class/params-gen-meth-dflt-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/params/dflt-duplicates.case
-// - src/params/syntax/cls-decl-gen-meth.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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-gen-meth-dflt-ref-later.js b/test/language/statements/class/params-gen-meth-dflt-ref-later.js
index 26501ea4f19df519e7e6fb7bb2f6da4dfc217adc..ac3d7356680c1b78e2ec6b76e141921bf9bc0fde 100644
--- a/test/language/statements/class/params-gen-meth-dflt-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/params/dflt-ref-later.case
-// - src/params/error/cls-decl-gen-meth.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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-gen-meth-dflt-ref-prior.js b/test/language/statements/class/params-gen-meth-dflt-ref-prior.js
index d7ec950ac04a3200380746cf75e892d0e43a3295..08187adfc4b1801747d731a34bf51c0301ffad0b 100644
--- a/test/language/statements/class/params-gen-meth-dflt-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/params/dflt-ref-prior.case
-// - src/params/default/cls-decl-gen-meth.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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-gen-meth-dflt-ref-self.js b/test/language/statements/class/params-gen-meth-dflt-ref-self.js
index f7422a4093ebafeb5b1852ea61e50a2719d1befe..13ebde0d5a2859ce0f02b7e71bae768fd804cea8 100644
--- a/test/language/statements/class/params-gen-meth-dflt-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/params/dflt-ref-self.case
-// - src/params/error/cls-decl-gen-meth.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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-gen-meth-dflt-rest.js b/test/language/statements/class/params-gen-meth-dflt-rest.js
index 963bc1effbcefd94f2c54febd1af3d718cac5c7c..6fb84b04da60ef5bec3a84421c4479a46e15dec5 100644
--- a/test/language/statements/class/params-gen-meth-dflt-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/params/dflt-rest.case
-// - src/params/syntax/cls-decl-gen-meth.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/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-gen-meth-static-dflt-abrupt.js b/test/language/statements/class/params-gen-meth-static-dflt-abrupt.js
index aedbb3720b16e0d4268954ca68355c5627cbc1c0..e6dd84234cee6bcda800e3fea1082bf97a778a9f 100644
--- a/test/language/statements/class/params-gen-meth-static-dflt-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/params/dflt-abrupt.case
-// - src/params/error/cls-decl-gen-meth-static.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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-gen-meth-static-dflt-arg-val-not-undefined.js b/test/language/statements/class/params-gen-meth-static-dflt-arg-val-not-undefined.js
index b9adc7a0ca81337694e7f20a754fb60e27a8d291..f07e043bd8278c4d328e353d7484938abeab4931 100644
--- a/test/language/statements/class/params-gen-meth-static-dflt-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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/cls-decl-gen-meth-static.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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-gen-meth-static-dflt-arg-val-undefined.js b/test/language/statements/class/params-gen-meth-static-dflt-arg-val-undefined.js
index 1cf3649dae4d5fc2a34f3f2c78ceae4431819c3b..c7bf75f103c274a2b2a00356ac2d5f353222d851 100644
--- a/test/language/statements/class/params-gen-meth-static-dflt-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/params/dflt-arg-val-undefined.case
-// - src/params/default/cls-decl-gen-meth-static.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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-gen-meth-static-dflt-duplicates.js b/test/language/statements/class/params-gen-meth-static-dflt-duplicates.js
index d33956ccf73d9d891e03ddbc869b72147e407148..803c6e13b572122534f242de803b109085f712d2 100644
--- a/test/language/statements/class/params-gen-meth-static-dflt-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/params/dflt-duplicates.case
-// - src/params/syntax/cls-decl-gen-meth-static.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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-gen-meth-static-dflt-ref-later.js b/test/language/statements/class/params-gen-meth-static-dflt-ref-later.js
index 6af8064d1b494ff8a71c767948b64e2f276044fb..7d232ffe1c27771262e99b11f4ccea2ce8e8c32f 100644
--- a/test/language/statements/class/params-gen-meth-static-dflt-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/params/dflt-ref-later.case
-// - src/params/error/cls-decl-gen-meth-static.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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-gen-meth-static-dflt-ref-prior.js b/test/language/statements/class/params-gen-meth-static-dflt-ref-prior.js
index ccd2e16fc45f6cfc8ee0ab7607a997edc5c3df69..c75ef40cc20668f71ac131bc5174263b00777aaf 100644
--- a/test/language/statements/class/params-gen-meth-static-dflt-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/params/dflt-ref-prior.case
-// - src/params/default/cls-decl-gen-meth-static.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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-gen-meth-static-dflt-ref-self.js b/test/language/statements/class/params-gen-meth-static-dflt-ref-self.js
index 0fd59e5eb593908b0050348653783a35eac5a0d5..7d3a0c5e1879c6b153178dd75b92dc9358da5ca9 100644
--- a/test/language/statements/class/params-gen-meth-static-dflt-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/params/dflt-ref-self.case
-// - src/params/error/cls-decl-gen-meth-static.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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-gen-meth-static-dflt-rest.js b/test/language/statements/class/params-gen-meth-static-dflt-rest.js
index 101e4aef98f1edb8287b6e675ab962cbda612621..8c7d5109500cb93ba447429dff3f8e0cc7f8443c 100644
--- a/test/language/statements/class/params-gen-meth-static-dflt-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/params/dflt-rest.case
-// - src/params/syntax/cls-decl-gen-meth-static.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/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-gen-meth-static-trailing-comma-dflt-param.js b/test/language/statements/class/params-gen-meth-static-trailing-comma-dflt-param.js
index 9dae0a9d171bbe6a54560f34b7f43957f0439fc0..dd1359843ac9cb1cd6582236276f9141813d0936 100644
--- a/test/language/statements/class/params-gen-meth-static-trailing-comma-dflt-param.js
+++ b/test/language/statements/class/params-gen-meth-static-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/cls-decl-gen-meth-static.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/cls-decl-gen-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-gen-meth-static-trailing-comma-multiple-param.js b/test/language/statements/class/params-gen-meth-static-trailing-comma-multiple-param.js
index 9abf69079270b124173d455e809638ad2e03a33c..6621187e18754478847ede4868d1a3857b718c5d 100644
--- a/test/language/statements/class/params-gen-meth-static-trailing-comma-multiple-param.js
+++ b/test/language/statements/class/params-gen-meth-static-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/cls-decl-gen-meth-static.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/cls-decl-gen-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-gen-meth-static-trailing-comma-rest-early-error.js b/test/language/statements/class/params-gen-meth-static-trailing-comma-rest-early-error.js
index 107c980582d9d5af21967c955dd0568c9399e261..c8136f1c1ea0a2b88fa84a5a924178fe4dbcc09e 100644
--- a/test/language/statements/class/params-gen-meth-static-trailing-comma-rest-early-error.js
+++ b/test/language/statements/class/params-gen-meth-static-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/cls-decl-gen-meth-static.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/cls-decl-gen-meth-static.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-gen-meth-static-trailing-comma-single-param.js b/test/language/statements/class/params-gen-meth-static-trailing-comma-single-param.js
index 8d962fd3e8b4eec171e70073cc996d59ba3fa6c6..619855a215aa6c27416b7e700dad2b80f874ac27 100644
--- a/test/language/statements/class/params-gen-meth-static-trailing-comma-single-param.js
+++ b/test/language/statements/class/params-gen-meth-static-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/cls-decl-gen-meth-static.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/cls-decl-gen-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-gen-meth-trailing-comma-dflt-param.js b/test/language/statements/class/params-gen-meth-trailing-comma-dflt-param.js
index a4aef5bc3f4eb5d0e0269e04b6867604cc1b1c3c..5351dd9291849a7475715ee7a4449ba898d24bbf 100644
--- a/test/language/statements/class/params-gen-meth-trailing-comma-dflt-param.js
+++ b/test/language/statements/class/params-gen-meth-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/cls-decl-gen-meth.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/cls-decl-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-gen-meth-trailing-comma-multiple-param.js b/test/language/statements/class/params-gen-meth-trailing-comma-multiple-param.js
index ec34e2d000429ea5b4174e3279e9b300001ee0b2..8d874bdcb3b945e074bc9b3f6a065d24ad9ee31f 100644
--- a/test/language/statements/class/params-gen-meth-trailing-comma-multiple-param.js
+++ b/test/language/statements/class/params-gen-meth-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/cls-decl-gen-meth.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/cls-decl-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-gen-meth-trailing-comma-rest-early-error.js b/test/language/statements/class/params-gen-meth-trailing-comma-rest-early-error.js
index 80174c76d15efc35b308c8566e43ea3d2f63fee3..bf104c98d4fc1aaa2d392474fdd370f0e5906082 100644
--- a/test/language/statements/class/params-gen-meth-trailing-comma-rest-early-error.js
+++ b/test/language/statements/class/params-gen-meth-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/cls-decl-gen-meth.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/cls-decl-gen-meth.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-gen-meth-trailing-comma-single-param.js b/test/language/statements/class/params-gen-meth-trailing-comma-single-param.js
index af5c2a03e31d9c9180cef1f6d6d4fe94b9a29912..a1263452e09f21c77dd152e6c677b447aeb49a0a 100644
--- a/test/language/statements/class/params-gen-meth-trailing-comma-single-param.js
+++ b/test/language/statements/class/params-gen-meth-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/cls-decl-gen-meth.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/cls-decl-gen-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
diff --git a/test/language/statements/class/params-meth-dflt-abrupt.js b/test/language/statements/class/params-meth-dflt-abrupt.js
index b7838d3fc738a1323c7afbf5a2a67d3723b36130..ef260c25e9d925f9ce4dda1d39c66f83d953223c 100644
--- a/test/language/statements/class/params-meth-dflt-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/params/dflt-abrupt.case
-// - src/params/error/cls-decl-meth.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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-meth-dflt-arg-val-not-undefined.js b/test/language/statements/class/params-meth-dflt-arg-val-not-undefined.js
index 2637fbdb847bfe88c39809a18933324f883d8597..09a8b28b859a0802d02b74310d2c0fc704785151 100644
--- a/test/language/statements/class/params-meth-dflt-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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/cls-decl-meth.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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-meth-dflt-arg-val-undefined.js b/test/language/statements/class/params-meth-dflt-arg-val-undefined.js
index 36cec475fb0dd9e18377c694a1977000d23a3af4..a07d4bdcd903e82cafb1666bc2b632068f61533b 100644
--- a/test/language/statements/class/params-meth-dflt-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/params/dflt-arg-val-undefined.case
-// - src/params/default/cls-decl-meth.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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-meth-dflt-duplicates.js b/test/language/statements/class/params-meth-dflt-duplicates.js
index ad35e955fc83ed3a259e507d4751352e6d473566..91716c305604cf0f2e7c3ae934e6c87a8de55bcc 100644
--- a/test/language/statements/class/params-meth-dflt-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/params/dflt-duplicates.case
-// - src/params/syntax/cls-decl-meth.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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-meth-dflt-ref-later.js b/test/language/statements/class/params-meth-dflt-ref-later.js
index fe776b9753e52eb5f19d74479cda49a8960a533d..6a0cee8527cfb0406c15a4960787619df33cd3d6 100644
--- a/test/language/statements/class/params-meth-dflt-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/params/dflt-ref-later.case
-// - src/params/error/cls-decl-meth.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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-meth-dflt-ref-prior.js b/test/language/statements/class/params-meth-dflt-ref-prior.js
index eb4ae2890a9368741efbc5fff6bd4179d5cd3303..8a5eb4eacdf18f6d42c22866cc92ea668dfe0492 100644
--- a/test/language/statements/class/params-meth-dflt-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/params/dflt-ref-prior.case
-// - src/params/default/cls-decl-meth.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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-meth-dflt-ref-self.js b/test/language/statements/class/params-meth-dflt-ref-self.js
index 95d1ef15941665dbfca5b94bff95d00f9b4698f6..fdbbc5519dbaf1731668bb69ab2099ef94a01f57 100644
--- a/test/language/statements/class/params-meth-dflt-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/params/dflt-ref-self.case
-// - src/params/error/cls-decl-meth.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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-meth-dflt-rest.js b/test/language/statements/class/params-meth-dflt-rest.js
index 6265a1eddc65f6ad3af1c463cf69c4bf4bc66612..86223eb3a7c36edbb81e7f2551d40af57d563f6e 100644
--- a/test/language/statements/class/params-meth-dflt-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/params/dflt-rest.case
-// - src/params/syntax/cls-decl-meth.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/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-meth-static-dflt-abrupt.js b/test/language/statements/class/params-meth-static-dflt-abrupt.js
index 881f682864ea356d183e2432cc43a1a79da49ec5..13b1d442ee0b6b5694f17121e551f4853c45a8a3 100644
--- a/test/language/statements/class/params-meth-static-dflt-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/params/dflt-abrupt.case
-// - src/params/error/cls-decl-meth-static.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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-meth-static-dflt-arg-val-not-undefined.js b/test/language/statements/class/params-meth-static-dflt-arg-val-not-undefined.js
index 14ce38b7450a91ad62f415c003ac50fbfd16e024..b7ac45e474c1a929f79ca9a5eecdee4a2d2d5ed2 100644
--- a/test/language/statements/class/params-meth-static-dflt-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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/cls-decl-meth-static.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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-meth-static-dflt-arg-val-undefined.js b/test/language/statements/class/params-meth-static-dflt-arg-val-undefined.js
index 61582c661a99d9f247b7450e2616594dd87137e2..8b051c0a67199e95871ab7c5818b0fb5295a6631 100644
--- a/test/language/statements/class/params-meth-static-dflt-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/params/dflt-arg-val-undefined.case
-// - src/params/default/cls-decl-meth-static.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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-meth-static-dflt-duplicates.js b/test/language/statements/class/params-meth-static-dflt-duplicates.js
index 832f780a2a00339aa94e0587be4696f6a188152d..ba658c78127fb61afc86d13b920c643cef91b750 100644
--- a/test/language/statements/class/params-meth-static-dflt-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/params/dflt-duplicates.case
-// - src/params/syntax/cls-decl-meth-static.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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-meth-static-dflt-ref-later.js b/test/language/statements/class/params-meth-static-dflt-ref-later.js
index 1e4c068cb82438fbb6ff06e3dd3c9a4b1e1d6ce8..b23f668275caf8880ad79e8404d4cb4b5b7524a5 100644
--- a/test/language/statements/class/params-meth-static-dflt-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/params/dflt-ref-later.case
-// - src/params/error/cls-decl-meth-static.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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-meth-static-dflt-ref-prior.js b/test/language/statements/class/params-meth-static-dflt-ref-prior.js
index b0de2c3f9bc20f1c00acae2e4809757ad361df02..7c3748c3b003437ccfb3c1e4e4bb751ed6678a30 100644
--- a/test/language/statements/class/params-meth-static-dflt-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/params/dflt-ref-prior.case
-// - src/params/default/cls-decl-meth-static.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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-meth-static-dflt-ref-self.js b/test/language/statements/class/params-meth-static-dflt-ref-self.js
index ac908d2b76152ec133b0d9356286a6f97f93b74e..e935e2e8df90590e471e99c4fe21574dcd1bc453 100644
--- a/test/language/statements/class/params-meth-static-dflt-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/params/dflt-ref-self.case
-// - src/params/error/cls-decl-meth-static.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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-meth-static-dflt-rest.js b/test/language/statements/class/params-meth-static-dflt-rest.js
index 54e3936cda96d7dfe0f36917b2f071cb360c822c..2303bf8e710a0ac663af307bb1efad2677e307c4 100644
--- a/test/language/statements/class/params-meth-static-dflt-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/params/dflt-rest.case
-// - src/params/syntax/cls-decl-meth-static.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/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/class/params-meth-static-trailing-comma-dflt-param.js b/test/language/statements/class/params-meth-static-trailing-comma-dflt-param.js
index 6740652d7c2c1e60e595200c07cff3d2cef9347b..61227f21af174fdc3b4a19355da079990ad5f133 100644
--- a/test/language/statements/class/params-meth-static-trailing-comma-dflt-param.js
+++ b/test/language/statements/class/params-meth-static-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/cls-decl-meth-static.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/cls-decl-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (static class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-meth-static-trailing-comma-multiple-param.js b/test/language/statements/class/params-meth-static-trailing-comma-multiple-param.js
index c35ab4c8ec4832db3163784c2a58cf6ff88eaaab..fff7d216f61b00efd5f2c1ac15d28f5799631474 100644
--- a/test/language/statements/class/params-meth-static-trailing-comma-multiple-param.js
+++ b/test/language/statements/class/params-meth-static-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/cls-decl-meth-static.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/cls-decl-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (static class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-meth-static-trailing-comma-rest-early-error.js b/test/language/statements/class/params-meth-static-trailing-comma-rest-early-error.js
index a81f165a50dc89e478d1caabf723aeea74e578ee..996080c2f8a2ae9f2258a52c394377ce9ef6c8e4 100644
--- a/test/language/statements/class/params-meth-static-trailing-comma-rest-early-error.js
+++ b/test/language/statements/class/params-meth-static-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/cls-decl-meth-static.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/cls-decl-meth-static.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (static class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-meth-static-trailing-comma-single-param.js b/test/language/statements/class/params-meth-static-trailing-comma-single-param.js
index 0fecdec2b6196eb31c32955ab73a89fe7ad109fe..ddd38dd2f88452c7396d4d3139043ff597a84f6f 100644
--- a/test/language/statements/class/params-meth-static-trailing-comma-single-param.js
+++ b/test/language/statements/class/params-meth-static-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/cls-decl-meth-static.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/cls-decl-meth-static.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (static class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-meth-trailing-comma-dflt-param.js b/test/language/statements/class/params-meth-trailing-comma-dflt-param.js
index 303794abd05938742b553e5977fa94ea0b8dc935..f421dfaf2f50bdf71f1d7ca8825a8d51994b0158 100644
--- a/test/language/statements/class/params-meth-trailing-comma-dflt-param.js
+++ b/test/language/statements/class/params-meth-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/cls-decl-meth.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/cls-decl-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-meth-trailing-comma-multiple-param.js b/test/language/statements/class/params-meth-trailing-comma-multiple-param.js
index c266a79aceca303015263c780b1462df78ba34cd..9298f8a45d89808f391b3152ef1d8907856acb2c 100644
--- a/test/language/statements/class/params-meth-trailing-comma-multiple-param.js
+++ b/test/language/statements/class/params-meth-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/cls-decl-meth.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/cls-decl-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-meth-trailing-comma-rest-early-error.js b/test/language/statements/class/params-meth-trailing-comma-rest-early-error.js
index b0738a8c77df581f30bce06aa12cad3d580b6b32..a13b0f2f13ae779cc99ea5631bcceb4baf91ec20 100644
--- a/test/language/statements/class/params-meth-trailing-comma-rest-early-error.js
+++ b/test/language/statements/class/params-meth-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/cls-decl-meth.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/cls-decl-meth.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (class expression method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
diff --git a/test/language/statements/class/params-meth-trailing-comma-single-param.js b/test/language/statements/class/params-meth-trailing-comma-single-param.js
index c7e65d8eae92865285ae6a8928b64c633048e4b3..6fb779a2cf7258a28c2b966c174c0d668c36d07a 100644
--- a/test/language/statements/class/params-meth-trailing-comma-single-param.js
+++ b/test/language/statements/class/params-meth-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/cls-decl-meth.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/cls-decl-meth.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (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 857046ef5c122c02c9489bff63ac1cdd0ccb9f19..be2943bea012ec0e5a3a94b42604fa2fc2a386d5 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/params/dflt-abrupt.case
-// - src/params/error/func-decl.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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 aa0f1d24d5dcadbc1395faf05d9014617aa72db2..5940a3b49f93e77dd2ba4e969ac0eed5bcd6d455 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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/func-decl.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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 7928036d187b51893ddf03d56b896cd2ae8e8079..94ac62b05f9857ad19d652c75279001affedbb25 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/params/dflt-arg-val-undefined.case
-// - src/params/default/func-decl.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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 166ab91f115d009ce7cde7c29758cd0f983a3911..c6bd4d05dec7e41f989344a1936fdfa8661a10c3 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/params/dflt-duplicates.case
-// - src/params/syntax/func-decl.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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 c02b4ccea549d4581c123ac8c5e71a6d62734fb0..3fac60a259cad6257d80f8a69fcae175438a1ed9 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/params/dflt-ref-later.case
-// - src/params/error/func-decl.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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 d77b7d8af89236393c6732ea92ab0c62803b2993..4a160ca5a57a6335346d883c90c7b5eadac0a0f7 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/params/dflt-ref-prior.case
-// - src/params/default/func-decl.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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 fa4647c01ccabdf5b848b32eee43ea9abbb6e214..c87facdce3d79a48941a717d051a07cc722a96b2 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/params/dflt-ref-self.case
-// - src/params/error/func-decl.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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 c5f0e3f031115b4d29c24dd58e43ddb0676c1548..0698f798081481cf13532229d0d074a96e300544 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/params/dflt-rest.case
-// - src/params/syntax/func-decl.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/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/function/params-trailing-comma-dflt-param.js b/test/language/statements/function/params-trailing-comma-dflt-param.js
index 798cc36d69404be49c33f49ea9414eec7f5bc85e..cffac9665ab428b25fa7b3b51c6bc10c4676e01c 100644
--- a/test/language/statements/function/params-trailing-comma-dflt-param.js
+++ b/test/language/statements/function/params-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/func-decl.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/func-decl.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (function declaration)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/function/params-trailing-comma-multiple-param.js b/test/language/statements/function/params-trailing-comma-multiple-param.js
index 954e8addb0e7d6010eff6f5da0e2682b4b6766bf..1e6edb0df8fbcb599e84b8ad63c94f08db5e62e3 100644
--- a/test/language/statements/function/params-trailing-comma-multiple-param.js
+++ b/test/language/statements/function/params-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/func-decl.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/func-decl.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (function declaration)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/function/params-trailing-comma-rest-early-error.js b/test/language/statements/function/params-trailing-comma-rest-early-error.js
index 97fdf457646e16e6c9c397ac753cce6102a3777d..254d616c8ba93767cf6a100cb678e52589856d4b 100644
--- a/test/language/statements/function/params-trailing-comma-rest-early-error.js
+++ b/test/language/statements/function/params-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/func-decl.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/func-decl.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (function declaration)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/function/params-trailing-comma-single-param.js b/test/language/statements/function/params-trailing-comma-single-param.js
index 0442dc94f542c9719afa555c9b99be1e2c8ffca3..1c575780a681aade0a76773f845665f346d2a6bf 100644
--- a/test/language/statements/function/params-trailing-comma-single-param.js
+++ b/test/language/statements/function/params-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/func-decl.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/func-decl.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (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 67b726d32c04c2b36d61add57c6d21d04aaec96f..be0d0f1b79e1c19bdfbbde094c9aad08a0e454ba 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/params/dflt-abrupt.case
-// - src/params/error/gen-func-decl.template
+// - src/function-forms/dflt-abrupt.case
+// - src/function-forms/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 1ad912886c1b8dac51c088a9d2c8258befa3753c..82a607d1c5679e3e9607459d2b12ef1430e038ee 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/params/dflt-arg-val-not-undefined.case
-// - src/params/default/gen-func-decl.template
+// - src/function-forms/dflt-arg-val-not-undefined.case
+// - src/function-forms/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 f64a4c96280fc999f135203cf5c0c33f37ce2c68..8270c9050df7230eb85201913f0b250704d68c39 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/params/dflt-arg-val-undefined.case
-// - src/params/default/gen-func-decl.template
+// - src/function-forms/dflt-arg-val-undefined.case
+// - src/function-forms/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 21149681b8f4f3f189456f7e5e619e523ae10703..dab5023306f1673f582dc6f1a02170d30e9416da 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/params/dflt-duplicates.case
-// - src/params/syntax/gen-func-decl.template
+// - src/function-forms/dflt-duplicates.case
+// - src/function-forms/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 fdc223ca7edc61f29238c54b0c55a34a7aa9c64f..cfdb9377a54381ab694ce238ccca19aaadb1c05e 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/params/dflt-ref-later.case
-// - src/params/error/gen-func-decl.template
+// - src/function-forms/dflt-ref-later.case
+// - src/function-forms/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 ca40dcc9ca1d214cb09fe9b4b22de8c3b6251b6b..9498dcade25315f8b4ea9fb6d1f45086c7aa552c 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/params/dflt-ref-prior.case
-// - src/params/default/gen-func-decl.template
+// - src/function-forms/dflt-ref-prior.case
+// - src/function-forms/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 03dbf2c76a57f8f93f4bfc1a2e3bd228d35ffce4..c9f041bcf41d3c1d882a3299d038bdfb87126585 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/params/dflt-ref-self.case
-// - src/params/error/gen-func-decl.template
+// - src/function-forms/dflt-ref-self.case
+// - src/function-forms/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 3ff34e7f61f3c18fd025c85775b8fac9da5b8645..e4cafaece4bd35e860976731732f35dad4df549b 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/params/dflt-rest.case
-// - src/params/syntax/gen-func-decl.template
+// - src/function-forms/dflt-rest.case
+// - src/function-forms/syntax/gen-func-decl.template
 /*---
 description: RestParameter does not support an initializer (generator function declaration)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/generators/params-trailing-comma-dflt-param.js b/test/language/statements/generators/params-trailing-comma-dflt-param.js
index 8a3969b75b992e97ae6abb7c23e5161e8c435b44..602c6749ffac5ae81aa310166a789814c57d5ae5 100644
--- a/test/language/statements/generators/params-trailing-comma-dflt-param.js
+++ b/test/language/statements/generators/params-trailing-comma-dflt-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-dflt-param.case
-// - src/params/default/gen-func-decl.template
+// - src/function-forms/trailing-comma-dflt-param.case
+// - src/function-forms/default/gen-func-decl.template
 /*---
 description: A trailing comma should not increase the respective length, using default parameters (generator function declaration)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/generators/params-trailing-comma-multiple-param.js b/test/language/statements/generators/params-trailing-comma-multiple-param.js
index ee039ffd1a740969f87668e6c68009dcdd50ecd1..13e6370a2c2aa61d46ce3298a84b89d8d82a509f 100644
--- a/test/language/statements/generators/params-trailing-comma-multiple-param.js
+++ b/test/language/statements/generators/params-trailing-comma-multiple-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-multiple-param.case
-// - src/params/default/gen-func-decl.template
+// - src/function-forms/trailing-comma-multiple-param.case
+// - src/function-forms/default/gen-func-decl.template
 /*---
 description: A trailing comma should not increase the respective length, using multiple parameters (generator function declaration)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/generators/params-trailing-comma-rest-early-error.js b/test/language/statements/generators/params-trailing-comma-rest-early-error.js
index 04b33339ee96512b094d9db20c9986ed06c0aac4..464669ec1f174fa13c842f7fee1af53bea7bf4d2 100644
--- a/test/language/statements/generators/params-trailing-comma-rest-early-error.js
+++ b/test/language/statements/generators/params-trailing-comma-rest-early-error.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-rest-early-error.case
-// - src/params/syntax/gen-func-decl.template
+// - src/function-forms/trailing-comma-rest-early-error.case
+// - src/function-forms/syntax/gen-func-decl.template
 /*---
 description: It's a syntax error if a FunctionRestParameter is followed by a trailing comma (generator function declaration)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
diff --git a/test/language/statements/generators/params-trailing-comma-single-param.js b/test/language/statements/generators/params-trailing-comma-single-param.js
index 4a6cf4c070850c0b59d8b8c210126512ed47979f..dcce7705ee8eace0c0f6ea8ae0e0625b39c2cc84 100644
--- a/test/language/statements/generators/params-trailing-comma-single-param.js
+++ b/test/language/statements/generators/params-trailing-comma-single-param.js
@@ -1,6 +1,6 @@
 // This file was procedurally generated from the following sources:
-// - src/params/trailing-comma-single-param.case
-// - src/params/default/gen-func-decl.template
+// - src/function-forms/trailing-comma-single-param.case
+// - src/function-forms/default/gen-func-decl.template
 /*---
 description: A trailing comma should not increase the respective length, using a single parameter (generator function declaration)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject