From 20d496729d930bb5cb158b93cb79be736f56e54a Mon Sep 17 00:00:00 2001
From: Leo Balter <leonardo.balter@gmail.com>
Date: Thu, 20 Apr 2017 11:04:52 -0400
Subject: [PATCH] Rename src/params to src/function-forms
The templates are being used for many tests reusing the same available function forms.
The format they are provided allow us to extend tests with cases for other tests relying
in the same formats.
---
.../default/arrow-function.template | 0
.../default/async-gen-func-decl.template | 0
.../default/async-gen-func-expr.template | 0
.../default/async-gen-meth.template | 0
.../default/async-gen-named-func-expr.template | 0
.../default/cls-decl-async-gen-meth-static.template | 0
.../default/cls-decl-async-gen-meth.template | 0
.../default/cls-decl-gen-meth-static.template | 0
.../default/cls-decl-gen-meth.template | 0
.../default/cls-decl-meth-static.template | 0
src/{params => function-forms}/default/cls-decl-meth.template | 0
.../default/cls-expr-async-gen-meth-static.template | 0
.../default/cls-expr-async-gen-meth.template | 0
.../default/cls-expr-gen-meth-static.template | 0
.../default/cls-expr-gen-meth.template | 0
.../default/cls-expr-meth-static.template | 0
src/{params => function-forms}/default/cls-expr-meth.template | 0
src/{params => function-forms}/default/func-decl.template | 0
src/{params => function-forms}/default/func-expr.template | 0
src/{params => function-forms}/default/gen-func-decl.template | 0
src/{params => function-forms}/default/gen-func-expr.template | 0
src/{params => function-forms}/default/gen-meth.template | 0
src/{params => function-forms}/default/meth.template | 0
src/{params => function-forms}/dflt-abrupt.case | 0
.../dflt-arg-val-not-undefined.case | 0
src/{params => function-forms}/dflt-arg-val-undefined.case | 0
src/{params => function-forms}/dflt-duplicates.case | 0
src/{params => function-forms}/dflt-ref-later.case | 0
src/{params => function-forms}/dflt-ref-prior.case | 0
src/{params => function-forms}/dflt-ref-self.case | 0
src/{params => function-forms}/dflt-rest.case | 0
src/{params => function-forms}/error/arrow-function.template | 0
.../error/async-gen-func-decl.template | 0
.../error/async-gen-func-expr.template | 0
src/{params => function-forms}/error/async-gen-meth.template | 0
.../error/async-gen-named-func-expr.template | 0
.../error/cls-decl-async-gen-meth-static.template | 0
.../error/cls-decl-async-gen-meth.template | 0
.../error/cls-decl-gen-meth-static.template | 0
.../error/cls-decl-gen-meth.template | 0
.../error/cls-decl-meth-static.template | 0
src/{params => function-forms}/error/cls-decl-meth.template | 0
.../error/cls-expr-async-gen-meth-static.template | 0
.../error/cls-expr-async-gen-meth.template | 0
.../error/cls-expr-gen-meth-static.template | 0
.../error/cls-expr-gen-meth.template | 0
.../error/cls-expr-meth-static.template | 0
src/{params => function-forms}/error/cls-expr-meth.template | 0
src/{params => function-forms}/error/func-decl.template | 0
src/{params => function-forms}/error/func-expr.template | 0
src/{params => function-forms}/error/gen-func-decl.template | 0
src/{params => function-forms}/error/gen-func-expr.template | 0
src/{params => function-forms}/error/gen-meth.template | 0
src/{params => function-forms}/error/meth.template | 0
src/{params => function-forms}/syntax/arrow-function.template | 0
.../syntax/async-gen-func-decl.template | 0
.../syntax/async-gen-func-expr.template | 0
src/{params => function-forms}/syntax/async-gen-meth.template | 0
.../syntax/async-gen-named-func-expr.template | 0
.../syntax/cls-decl-async-gen-meth-static.template | 0
.../syntax/cls-decl-async-gen-meth.template | 0
.../syntax/cls-decl-gen-meth-static.template | 0
.../syntax/cls-decl-gen-meth.template | 0
.../syntax/cls-decl-meth-static.template | 0
src/{params => function-forms}/syntax/cls-decl-meth.template | 0
.../syntax/cls-expr-async-gen-meth-static.template | 0
.../syntax/cls-expr-async-gen-meth.template | 0
.../syntax/cls-expr-gen-meth-static.template | 0
.../syntax/cls-expr-gen-meth.template | 0
.../syntax/cls-expr-meth-static.template | 0
src/{params => function-forms}/syntax/cls-expr-meth.template | 0
src/{params => function-forms}/syntax/func-decl.template | 0
src/{params => function-forms}/syntax/func-expr.template | 0
src/{params => function-forms}/syntax/gen-func-decl.template | 0
src/{params => function-forms}/syntax/gen-func-expr.template | 0
src/{params => function-forms}/syntax/gen-meth.template | 0
src/{params => function-forms}/syntax/meth.template | 0
src/{params => function-forms}/trailing-comma-dflt-param.case | 0
.../trailing-comma-multiple-param.case | 0
.../trailing-comma-rest-early-error.case | 0
.../trailing-comma-single-param.case | 0
.../language/expressions/arrow-function/params-dflt-abrupt.js | 4 ++--
.../arrow-function/params-dflt-arg-val-not-undefined.js | 4 ++--
.../arrow-function/params-dflt-arg-val-undefined.js | 4 ++--
.../expressions/arrow-function/params-dflt-duplicates.js | 4 ++--
.../expressions/arrow-function/params-dflt-ref-later.js | 4 ++--
.../expressions/arrow-function/params-dflt-ref-prior.js | 4 ++--
.../expressions/arrow-function/params-dflt-ref-self.js | 4 ++--
test/language/expressions/arrow-function/params-dflt-rest.js | 4 ++--
.../arrow-function/params-trailing-comma-dflt-param.js | 4 ++--
.../arrow-function/params-trailing-comma-multiple-param.js | 4 ++--
.../arrow-function/params-trailing-comma-rest-early-error.js | 4 ++--
.../arrow-function/params-trailing-comma-single-param.js | 4 ++--
.../expressions/async-generator/params-dflt-abrupt.js | 4 ++--
.../async-generator/params-dflt-arg-val-not-undefined.js | 4 ++--
.../async-generator/params-dflt-arg-val-undefined.js | 4 ++--
.../expressions/async-generator/params-dflt-duplicates.js | 4 ++--
.../expressions/async-generator/params-dflt-ref-later.js | 4 ++--
.../expressions/async-generator/params-dflt-ref-prior.js | 4 ++--
.../expressions/async-generator/params-dflt-ref-self.js | 4 ++--
test/language/expressions/async-generator/params-dflt-rest.js | 4 ++--
.../expressions/async-generator/params-named-dflt-abrupt.js | 4 ++--
.../params-named-dflt-arg-val-not-undefined.js | 4 ++--
.../async-generator/params-named-dflt-arg-val-undefined.js | 4 ++--
.../async-generator/params-named-dflt-duplicates.js | 4 ++--
.../async-generator/params-named-dflt-ref-later.js | 4 ++--
.../async-generator/params-named-dflt-ref-prior.js | 4 ++--
.../expressions/async-generator/params-named-dflt-ref-self.js | 4 ++--
.../expressions/async-generator/params-named-dflt-rest.js | 4 ++--
.../async-generator/params-named-trailing-comma-dflt-param.js | 4 ++--
.../params-named-trailing-comma-multiple-param.js | 4 ++--
.../params-named-trailing-comma-rest-early-error.js | 4 ++--
.../params-named-trailing-comma-single-param.js | 4 ++--
.../async-generator/params-trailing-comma-dflt-param.js | 4 ++--
.../async-generator/params-trailing-comma-multiple-param.js | 4 ++--
.../async-generator/params-trailing-comma-rest-early-error.js | 4 ++--
.../async-generator/params-trailing-comma-single-param.js | 4 ++--
.../expressions/class/params-async-gen-meth-dflt-abrupt.js | 4 ++--
.../class/params-async-gen-meth-dflt-arg-val-not-undefined.js | 4 ++--
.../class/params-async-gen-meth-dflt-arg-val-undefined.js | 4 ++--
.../class/params-async-gen-meth-dflt-duplicates.js | 4 ++--
.../expressions/class/params-async-gen-meth-dflt-ref-later.js | 4 ++--
.../expressions/class/params-async-gen-meth-dflt-ref-prior.js | 4 ++--
.../expressions/class/params-async-gen-meth-dflt-ref-self.js | 4 ++--
.../expressions/class/params-async-gen-meth-dflt-rest.js | 4 ++--
.../class/params-async-gen-meth-static-dflt-abrupt.js | 4 ++--
...params-async-gen-meth-static-dflt-arg-val-not-undefined.js | 4 ++--
.../params-async-gen-meth-static-dflt-arg-val-undefined.js | 4 ++--
.../class/params-async-gen-meth-static-dflt-duplicates.js | 4 ++--
.../class/params-async-gen-meth-static-dflt-ref-later.js | 4 ++--
.../class/params-async-gen-meth-static-dflt-ref-prior.js | 4 ++--
.../class/params-async-gen-meth-static-dflt-ref-self.js | 4 ++--
.../class/params-async-gen-meth-static-dflt-rest.js | 4 ++--
.../params-async-gen-meth-static-trailing-comma-dflt-param.js | 4 ++--
...ams-async-gen-meth-static-trailing-comma-multiple-param.js | 4 ++--
...s-async-gen-meth-static-trailing-comma-rest-early-error.js | 4 ++--
...arams-async-gen-meth-static-trailing-comma-single-param.js | 4 ++--
.../class/params-async-gen-meth-trailing-comma-dflt-param.js | 4 ++--
.../params-async-gen-meth-trailing-comma-multiple-param.js | 4 ++--
.../params-async-gen-meth-trailing-comma-rest-early-error.js | 4 ++--
.../params-async-gen-meth-trailing-comma-single-param.js | 4 ++--
.../language/expressions/class/params-gen-meth-dflt-abrupt.js | 4 ++--
.../class/params-gen-meth-dflt-arg-val-not-undefined.js | 4 ++--
.../class/params-gen-meth-dflt-arg-val-undefined.js | 4 ++--
.../expressions/class/params-gen-meth-dflt-duplicates.js | 4 ++--
.../expressions/class/params-gen-meth-dflt-ref-later.js | 4 ++--
.../expressions/class/params-gen-meth-dflt-ref-prior.js | 4 ++--
.../expressions/class/params-gen-meth-dflt-ref-self.js | 4 ++--
test/language/expressions/class/params-gen-meth-dflt-rest.js | 4 ++--
.../expressions/class/params-gen-meth-static-dflt-abrupt.js | 4 ++--
.../params-gen-meth-static-dflt-arg-val-not-undefined.js | 4 ++--
.../class/params-gen-meth-static-dflt-arg-val-undefined.js | 4 ++--
.../class/params-gen-meth-static-dflt-duplicates.js | 4 ++--
.../class/params-gen-meth-static-dflt-ref-later.js | 4 ++--
.../class/params-gen-meth-static-dflt-ref-prior.js | 4 ++--
.../expressions/class/params-gen-meth-static-dflt-ref-self.js | 4 ++--
.../expressions/class/params-gen-meth-static-dflt-rest.js | 4 ++--
.../class/params-gen-meth-static-trailing-comma-dflt-param.js | 4 ++--
.../params-gen-meth-static-trailing-comma-multiple-param.js | 4 ++--
.../params-gen-meth-static-trailing-comma-rest-early-error.js | 4 ++--
.../params-gen-meth-static-trailing-comma-single-param.js | 4 ++--
.../class/params-gen-meth-trailing-comma-dflt-param.js | 4 ++--
.../class/params-gen-meth-trailing-comma-multiple-param.js | 4 ++--
.../class/params-gen-meth-trailing-comma-rest-early-error.js | 4 ++--
.../class/params-gen-meth-trailing-comma-single-param.js | 4 ++--
test/language/expressions/class/params-meth-dflt-abrupt.js | 4 ++--
.../class/params-meth-dflt-arg-val-not-undefined.js | 4 ++--
.../expressions/class/params-meth-dflt-arg-val-undefined.js | 4 ++--
.../language/expressions/class/params-meth-dflt-duplicates.js | 4 ++--
test/language/expressions/class/params-meth-dflt-ref-later.js | 4 ++--
test/language/expressions/class/params-meth-dflt-ref-prior.js | 4 ++--
test/language/expressions/class/params-meth-dflt-ref-self.js | 4 ++--
test/language/expressions/class/params-meth-dflt-rest.js | 4 ++--
.../expressions/class/params-meth-static-dflt-abrupt.js | 4 ++--
.../class/params-meth-static-dflt-arg-val-not-undefined.js | 4 ++--
.../class/params-meth-static-dflt-arg-val-undefined.js | 4 ++--
.../expressions/class/params-meth-static-dflt-duplicates.js | 4 ++--
.../expressions/class/params-meth-static-dflt-ref-later.js | 4 ++--
.../expressions/class/params-meth-static-dflt-ref-prior.js | 4 ++--
.../expressions/class/params-meth-static-dflt-ref-self.js | 4 ++--
.../expressions/class/params-meth-static-dflt-rest.js | 4 ++--
.../class/params-meth-static-trailing-comma-dflt-param.js | 4 ++--
.../class/params-meth-static-trailing-comma-multiple-param.js | 4 ++--
.../params-meth-static-trailing-comma-rest-early-error.js | 4 ++--
.../class/params-meth-static-trailing-comma-single-param.js | 4 ++--
.../class/params-meth-trailing-comma-dflt-param.js | 4 ++--
.../class/params-meth-trailing-comma-multiple-param.js | 4 ++--
.../class/params-meth-trailing-comma-rest-early-error.js | 4 ++--
.../class/params-meth-trailing-comma-single-param.js | 4 ++--
test/language/expressions/function/params-dflt-abrupt.js | 4 ++--
.../expressions/function/params-dflt-arg-val-not-undefined.js | 4 ++--
.../expressions/function/params-dflt-arg-val-undefined.js | 4 ++--
test/language/expressions/function/params-dflt-duplicates.js | 4 ++--
test/language/expressions/function/params-dflt-ref-later.js | 4 ++--
test/language/expressions/function/params-dflt-ref-prior.js | 4 ++--
test/language/expressions/function/params-dflt-ref-self.js | 4 ++--
test/language/expressions/function/params-dflt-rest.js | 4 ++--
.../expressions/function/params-trailing-comma-dflt-param.js | 4 ++--
.../function/params-trailing-comma-multiple-param.js | 4 ++--
.../function/params-trailing-comma-rest-early-error.js | 4 ++--
.../function/params-trailing-comma-single-param.js | 4 ++--
test/language/expressions/generators/params-dflt-abrupt.js | 4 ++--
.../generators/params-dflt-arg-val-not-undefined.js | 4 ++--
.../expressions/generators/params-dflt-arg-val-undefined.js | 4 ++--
.../language/expressions/generators/params-dflt-duplicates.js | 4 ++--
test/language/expressions/generators/params-dflt-ref-later.js | 4 ++--
test/language/expressions/generators/params-dflt-ref-prior.js | 4 ++--
test/language/expressions/generators/params-dflt-ref-self.js | 4 ++--
test/language/expressions/generators/params-dflt-rest.js | 4 ++--
.../generators/params-trailing-comma-dflt-param.js | 4 ++--
.../generators/params-trailing-comma-multiple-param.js | 4 ++--
.../generators/params-trailing-comma-rest-early-error.js | 4 ++--
.../generators/params-trailing-comma-single-param.js | 4 ++--
.../method-definition/params-async-gen-meth-dflt-abrupt.js | 4 ++--
.../params-async-gen-meth-dflt-arg-val-not-undefined.js | 4 ++--
.../params-async-gen-meth-dflt-arg-val-undefined.js | 4 ++--
.../params-async-gen-meth-dflt-duplicates.js | 4 ++--
.../method-definition/params-async-gen-meth-dflt-ref-later.js | 4 ++--
.../method-definition/params-async-gen-meth-dflt-ref-prior.js | 4 ++--
.../method-definition/params-async-gen-meth-dflt-ref-self.js | 4 ++--
.../method-definition/params-async-gen-meth-dflt-rest.js | 4 ++--
.../params-async-gen-meth-trailing-comma-dflt-param.js | 4 ++--
.../params-async-gen-meth-trailing-comma-multiple-param.js | 4 ++--
.../params-async-gen-meth-trailing-comma-rest-early-error.js | 4 ++--
.../params-async-gen-meth-trailing-comma-single-param.js | 4 ++--
.../object/method-definition/params-gen-meth-dflt-abrupt.js | 4 ++--
.../params-gen-meth-dflt-arg-val-not-undefined.js | 4 ++--
.../params-gen-meth-dflt-arg-val-undefined.js | 4 ++--
.../method-definition/params-gen-meth-dflt-duplicates.js | 4 ++--
.../method-definition/params-gen-meth-dflt-ref-later.js | 4 ++--
.../method-definition/params-gen-meth-dflt-ref-prior.js | 4 ++--
.../object/method-definition/params-gen-meth-dflt-ref-self.js | 4 ++--
.../object/method-definition/params-gen-meth-dflt-rest.js | 4 ++--
.../params-gen-meth-trailing-comma-dflt-param.js | 4 ++--
.../params-gen-meth-trailing-comma-multiple-param.js | 4 ++--
.../params-gen-meth-trailing-comma-rest-early-error.js | 4 ++--
.../params-gen-meth-trailing-comma-single-param.js | 4 ++--
.../object/method-definition/params-meth-dflt-abrupt.js | 4 ++--
.../params-meth-dflt-arg-val-not-undefined.js | 4 ++--
.../method-definition/params-meth-dflt-arg-val-undefined.js | 4 ++--
.../object/method-definition/params-meth-dflt-duplicates.js | 4 ++--
.../object/method-definition/params-meth-dflt-ref-later.js | 4 ++--
.../object/method-definition/params-meth-dflt-ref-prior.js | 4 ++--
.../object/method-definition/params-meth-dflt-ref-self.js | 4 ++--
.../object/method-definition/params-meth-dflt-rest.js | 4 ++--
.../params-meth-trailing-comma-dflt-param.js | 4 ++--
.../params-meth-trailing-comma-multiple-param.js | 4 ++--
.../params-meth-trailing-comma-rest-early-error.js | 4 ++--
.../params-meth-trailing-comma-single-param.js | 4 ++--
.../language/statements/async-generator/params-dflt-abrupt.js | 4 ++--
.../async-generator/params-dflt-arg-val-not-undefined.js | 4 ++--
.../async-generator/params-dflt-arg-val-undefined.js | 4 ++--
.../statements/async-generator/params-dflt-duplicates.js | 4 ++--
.../statements/async-generator/params-dflt-ref-later.js | 4 ++--
.../statements/async-generator/params-dflt-ref-prior.js | 4 ++--
.../statements/async-generator/params-dflt-ref-self.js | 4 ++--
test/language/statements/async-generator/params-dflt-rest.js | 4 ++--
.../async-generator/params-trailing-comma-dflt-param.js | 4 ++--
.../async-generator/params-trailing-comma-multiple-param.js | 4 ++--
.../async-generator/params-trailing-comma-rest-early-error.js | 4 ++--
.../async-generator/params-trailing-comma-single-param.js | 4 ++--
.../statements/class/params-async-gen-meth-dflt-abrupt.js | 4 ++--
.../class/params-async-gen-meth-dflt-arg-val-not-undefined.js | 4 ++--
.../class/params-async-gen-meth-dflt-arg-val-undefined.js | 4 ++--
.../statements/class/params-async-gen-meth-dflt-duplicates.js | 4 ++--
.../statements/class/params-async-gen-meth-dflt-ref-later.js | 4 ++--
.../statements/class/params-async-gen-meth-dflt-ref-prior.js | 4 ++--
.../statements/class/params-async-gen-meth-dflt-ref-self.js | 4 ++--
.../statements/class/params-async-gen-meth-dflt-rest.js | 4 ++--
.../class/params-async-gen-meth-static-dflt-abrupt.js | 4 ++--
...params-async-gen-meth-static-dflt-arg-val-not-undefined.js | 4 ++--
.../params-async-gen-meth-static-dflt-arg-val-undefined.js | 4 ++--
.../class/params-async-gen-meth-static-dflt-duplicates.js | 4 ++--
.../class/params-async-gen-meth-static-dflt-ref-later.js | 4 ++--
.../class/params-async-gen-meth-static-dflt-ref-prior.js | 4 ++--
.../class/params-async-gen-meth-static-dflt-ref-self.js | 4 ++--
.../class/params-async-gen-meth-static-dflt-rest.js | 4 ++--
.../params-async-gen-meth-static-trailing-comma-dflt-param.js | 4 ++--
...ams-async-gen-meth-static-trailing-comma-multiple-param.js | 4 ++--
...s-async-gen-meth-static-trailing-comma-rest-early-error.js | 4 ++--
...arams-async-gen-meth-static-trailing-comma-single-param.js | 4 ++--
.../class/params-async-gen-meth-trailing-comma-dflt-param.js | 4 ++--
.../params-async-gen-meth-trailing-comma-multiple-param.js | 4 ++--
.../params-async-gen-meth-trailing-comma-rest-early-error.js | 4 ++--
.../params-async-gen-meth-trailing-comma-single-param.js | 4 ++--
test/language/statements/class/params-gen-meth-dflt-abrupt.js | 4 ++--
.../class/params-gen-meth-dflt-arg-val-not-undefined.js | 4 ++--
.../class/params-gen-meth-dflt-arg-val-undefined.js | 4 ++--
.../statements/class/params-gen-meth-dflt-duplicates.js | 4 ++--
.../statements/class/params-gen-meth-dflt-ref-later.js | 4 ++--
.../statements/class/params-gen-meth-dflt-ref-prior.js | 4 ++--
.../statements/class/params-gen-meth-dflt-ref-self.js | 4 ++--
test/language/statements/class/params-gen-meth-dflt-rest.js | 4 ++--
.../statements/class/params-gen-meth-static-dflt-abrupt.js | 4 ++--
.../params-gen-meth-static-dflt-arg-val-not-undefined.js | 4 ++--
.../class/params-gen-meth-static-dflt-arg-val-undefined.js | 4 ++--
.../class/params-gen-meth-static-dflt-duplicates.js | 4 ++--
.../statements/class/params-gen-meth-static-dflt-ref-later.js | 4 ++--
.../statements/class/params-gen-meth-static-dflt-ref-prior.js | 4 ++--
.../statements/class/params-gen-meth-static-dflt-ref-self.js | 4 ++--
.../statements/class/params-gen-meth-static-dflt-rest.js | 4 ++--
.../class/params-gen-meth-static-trailing-comma-dflt-param.js | 4 ++--
.../params-gen-meth-static-trailing-comma-multiple-param.js | 4 ++--
.../params-gen-meth-static-trailing-comma-rest-early-error.js | 4 ++--
.../params-gen-meth-static-trailing-comma-single-param.js | 4 ++--
.../class/params-gen-meth-trailing-comma-dflt-param.js | 4 ++--
.../class/params-gen-meth-trailing-comma-multiple-param.js | 4 ++--
.../class/params-gen-meth-trailing-comma-rest-early-error.js | 4 ++--
.../class/params-gen-meth-trailing-comma-single-param.js | 4 ++--
test/language/statements/class/params-meth-dflt-abrupt.js | 4 ++--
.../class/params-meth-dflt-arg-val-not-undefined.js | 4 ++--
.../statements/class/params-meth-dflt-arg-val-undefined.js | 4 ++--
test/language/statements/class/params-meth-dflt-duplicates.js | 4 ++--
test/language/statements/class/params-meth-dflt-ref-later.js | 4 ++--
test/language/statements/class/params-meth-dflt-ref-prior.js | 4 ++--
test/language/statements/class/params-meth-dflt-ref-self.js | 4 ++--
test/language/statements/class/params-meth-dflt-rest.js | 4 ++--
.../statements/class/params-meth-static-dflt-abrupt.js | 4 ++--
.../class/params-meth-static-dflt-arg-val-not-undefined.js | 4 ++--
.../class/params-meth-static-dflt-arg-val-undefined.js | 4 ++--
.../statements/class/params-meth-static-dflt-duplicates.js | 4 ++--
.../statements/class/params-meth-static-dflt-ref-later.js | 4 ++--
.../statements/class/params-meth-static-dflt-ref-prior.js | 4 ++--
.../statements/class/params-meth-static-dflt-ref-self.js | 4 ++--
.../language/statements/class/params-meth-static-dflt-rest.js | 4 ++--
.../class/params-meth-static-trailing-comma-dflt-param.js | 4 ++--
.../class/params-meth-static-trailing-comma-multiple-param.js | 4 ++--
.../params-meth-static-trailing-comma-rest-early-error.js | 4 ++--
.../class/params-meth-static-trailing-comma-single-param.js | 4 ++--
.../statements/class/params-meth-trailing-comma-dflt-param.js | 4 ++--
.../class/params-meth-trailing-comma-multiple-param.js | 4 ++--
.../class/params-meth-trailing-comma-rest-early-error.js | 4 ++--
.../class/params-meth-trailing-comma-single-param.js | 4 ++--
test/language/statements/function/params-dflt-abrupt.js | 4 ++--
.../statements/function/params-dflt-arg-val-not-undefined.js | 4 ++--
.../statements/function/params-dflt-arg-val-undefined.js | 4 ++--
test/language/statements/function/params-dflt-duplicates.js | 4 ++--
test/language/statements/function/params-dflt-ref-later.js | 4 ++--
test/language/statements/function/params-dflt-ref-prior.js | 4 ++--
test/language/statements/function/params-dflt-ref-self.js | 4 ++--
test/language/statements/function/params-dflt-rest.js | 4 ++--
.../statements/function/params-trailing-comma-dflt-param.js | 4 ++--
.../function/params-trailing-comma-multiple-param.js | 4 ++--
.../function/params-trailing-comma-rest-early-error.js | 4 ++--
.../statements/function/params-trailing-comma-single-param.js | 4 ++--
test/language/statements/generators/params-dflt-abrupt.js | 4 ++--
.../generators/params-dflt-arg-val-not-undefined.js | 4 ++--
.../statements/generators/params-dflt-arg-val-undefined.js | 4 ++--
test/language/statements/generators/params-dflt-duplicates.js | 4 ++--
test/language/statements/generators/params-dflt-ref-later.js | 4 ++--
test/language/statements/generators/params-dflt-ref-prior.js | 4 ++--
test/language/statements/generators/params-dflt-ref-self.js | 4 ++--
test/language/statements/generators/params-dflt-rest.js | 4 ++--
.../statements/generators/params-trailing-comma-dflt-param.js | 4 ++--
.../generators/params-trailing-comma-multiple-param.js | 4 ++--
.../generators/params-trailing-comma-rest-early-error.js | 4 ++--
.../generators/params-trailing-comma-single-param.js | 4 ++--
357 files changed, 552 insertions(+), 552 deletions(-)
rename src/{params => function-forms}/default/arrow-function.template (100%)
rename src/{params => function-forms}/default/async-gen-func-decl.template (100%)
rename src/{params => function-forms}/default/async-gen-func-expr.template (100%)
rename src/{params => function-forms}/default/async-gen-meth.template (100%)
rename src/{params => function-forms}/default/async-gen-named-func-expr.template (100%)
rename src/{params => function-forms}/default/cls-decl-async-gen-meth-static.template (100%)
rename src/{params => function-forms}/default/cls-decl-async-gen-meth.template (100%)
rename src/{params => function-forms}/default/cls-decl-gen-meth-static.template (100%)
rename src/{params => function-forms}/default/cls-decl-gen-meth.template (100%)
rename src/{params => function-forms}/default/cls-decl-meth-static.template (100%)
rename src/{params => function-forms}/default/cls-decl-meth.template (100%)
rename src/{params => function-forms}/default/cls-expr-async-gen-meth-static.template (100%)
rename src/{params => function-forms}/default/cls-expr-async-gen-meth.template (100%)
rename src/{params => function-forms}/default/cls-expr-gen-meth-static.template (100%)
rename src/{params => function-forms}/default/cls-expr-gen-meth.template (100%)
rename src/{params => function-forms}/default/cls-expr-meth-static.template (100%)
rename src/{params => function-forms}/default/cls-expr-meth.template (100%)
rename src/{params => function-forms}/default/func-decl.template (100%)
rename src/{params => function-forms}/default/func-expr.template (100%)
rename src/{params => function-forms}/default/gen-func-decl.template (100%)
rename src/{params => function-forms}/default/gen-func-expr.template (100%)
rename src/{params => function-forms}/default/gen-meth.template (100%)
rename src/{params => function-forms}/default/meth.template (100%)
rename src/{params => function-forms}/dflt-abrupt.case (100%)
rename src/{params => function-forms}/dflt-arg-val-not-undefined.case (100%)
rename src/{params => function-forms}/dflt-arg-val-undefined.case (100%)
rename src/{params => function-forms}/dflt-duplicates.case (100%)
rename src/{params => function-forms}/dflt-ref-later.case (100%)
rename src/{params => function-forms}/dflt-ref-prior.case (100%)
rename src/{params => function-forms}/dflt-ref-self.case (100%)
rename src/{params => function-forms}/dflt-rest.case (100%)
rename src/{params => function-forms}/error/arrow-function.template (100%)
rename src/{params => function-forms}/error/async-gen-func-decl.template (100%)
rename src/{params => function-forms}/error/async-gen-func-expr.template (100%)
rename src/{params => function-forms}/error/async-gen-meth.template (100%)
rename src/{params => function-forms}/error/async-gen-named-func-expr.template (100%)
rename src/{params => function-forms}/error/cls-decl-async-gen-meth-static.template (100%)
rename src/{params => function-forms}/error/cls-decl-async-gen-meth.template (100%)
rename src/{params => function-forms}/error/cls-decl-gen-meth-static.template (100%)
rename src/{params => function-forms}/error/cls-decl-gen-meth.template (100%)
rename src/{params => function-forms}/error/cls-decl-meth-static.template (100%)
rename src/{params => function-forms}/error/cls-decl-meth.template (100%)
rename src/{params => function-forms}/error/cls-expr-async-gen-meth-static.template (100%)
rename src/{params => function-forms}/error/cls-expr-async-gen-meth.template (100%)
rename src/{params => function-forms}/error/cls-expr-gen-meth-static.template (100%)
rename src/{params => function-forms}/error/cls-expr-gen-meth.template (100%)
rename src/{params => function-forms}/error/cls-expr-meth-static.template (100%)
rename src/{params => function-forms}/error/cls-expr-meth.template (100%)
rename src/{params => function-forms}/error/func-decl.template (100%)
rename src/{params => function-forms}/error/func-expr.template (100%)
rename src/{params => function-forms}/error/gen-func-decl.template (100%)
rename src/{params => function-forms}/error/gen-func-expr.template (100%)
rename src/{params => function-forms}/error/gen-meth.template (100%)
rename src/{params => function-forms}/error/meth.template (100%)
rename src/{params => function-forms}/syntax/arrow-function.template (100%)
rename src/{params => function-forms}/syntax/async-gen-func-decl.template (100%)
rename src/{params => function-forms}/syntax/async-gen-func-expr.template (100%)
rename src/{params => function-forms}/syntax/async-gen-meth.template (100%)
rename src/{params => function-forms}/syntax/async-gen-named-func-expr.template (100%)
rename src/{params => function-forms}/syntax/cls-decl-async-gen-meth-static.template (100%)
rename src/{params => function-forms}/syntax/cls-decl-async-gen-meth.template (100%)
rename src/{params => function-forms}/syntax/cls-decl-gen-meth-static.template (100%)
rename src/{params => function-forms}/syntax/cls-decl-gen-meth.template (100%)
rename src/{params => function-forms}/syntax/cls-decl-meth-static.template (100%)
rename src/{params => function-forms}/syntax/cls-decl-meth.template (100%)
rename src/{params => function-forms}/syntax/cls-expr-async-gen-meth-static.template (100%)
rename src/{params => function-forms}/syntax/cls-expr-async-gen-meth.template (100%)
rename src/{params => function-forms}/syntax/cls-expr-gen-meth-static.template (100%)
rename src/{params => function-forms}/syntax/cls-expr-gen-meth.template (100%)
rename src/{params => function-forms}/syntax/cls-expr-meth-static.template (100%)
rename src/{params => function-forms}/syntax/cls-expr-meth.template (100%)
rename src/{params => function-forms}/syntax/func-decl.template (100%)
rename src/{params => function-forms}/syntax/func-expr.template (100%)
rename src/{params => function-forms}/syntax/gen-func-decl.template (100%)
rename src/{params => function-forms}/syntax/gen-func-expr.template (100%)
rename src/{params => function-forms}/syntax/gen-meth.template (100%)
rename src/{params => function-forms}/syntax/meth.template (100%)
rename src/{params => function-forms}/trailing-comma-dflt-param.case (100%)
rename src/{params => function-forms}/trailing-comma-multiple-param.case (100%)
rename src/{params => function-forms}/trailing-comma-rest-early-error.case (100%)
rename src/{params => function-forms}/trailing-comma-single-param.case (100%)
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 c8effea806..de17e0dcb1 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 d5e77a38a3..7bb2faff13 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 510dceba64..d9294149f6 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 f4e2701ce4..c552f8da7d 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 1fc0cc5f2c..342636e73d 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 585b4fb997..135f650de9 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 0ccc0d84ce..a4f4b7c752 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 850004a24b..6d3523ab00 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 6c2176ae58..5153f1a29e 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 bda079a6d2..16c0e2654c 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 2320e3a724..cb5a19a168 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 58fa96f4e2..2f588adbe3 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 644cdce6e0..039ca48e9a 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 28c385083e..6459d01f70 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 624160d65a..3efac12182 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 745c94e254..c87f18a69b 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 c3d810701d..aee03311f1 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 04e4f2c722..2b9dc29ef1 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 99a971be1e..f49711c3f8 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 5ff97c4213..f5df8e6036 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 6621d0bbc2..f571306a44 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 608673ab90..bbd83f9396 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 22789874fd..e1b0da273b 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 65e95019c7..ee00423e63 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 2306d9ab0d..3cfdb11c85 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 668346f84a..b04e4ceae2 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 0696d5de01..769be4780f 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 8881488df7..0efea64c0c 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 602d72e713..974189c026 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 f33913bce0..638c033275 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 93ea1b7099..68dbdedf50 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 15265b6474..1e36fa7a9b 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 e53a3d0716..cecedbc44a 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 c325742537..fab93501b5 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 3b8f40d335..f76477bd79 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 af9b709eed..37f6acf467 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 7122c9c52c..31997bc474 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 665d7cbdb2..6577ab2255 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 cdfc8994bf..a8aada3a16 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 3c5f065eb2..0c6c0e847b 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 ee0356ce44..865587e582 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 f1d724f9d3..7ea7e79a01 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 424deef887..277fbb870b 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 2b9dcc31ed..47ece76592 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 6f31e8c0c3..ed210d5ba2 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 c26d1c8256..6ef13f769f 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 f216136fc5..1ce9866a9b 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 20acf1b9eb..3b84b2f060 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 77eeca8502..3b44924c40 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 c9a61d935c..86b450c9d2 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 6f116fb083..b42b984e4e 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 e54d238423..4e96b42d8a 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 50d50b430e..e58f44d670 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 84fb378d98..71f951534f 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 9e58c0e580..e35726387f 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 caa2600511..0a7734fe9f 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 669df9d070..1231bfdd51 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 e1d934b991..20bee541d9 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 122bd17adf..fb9681cd29 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 4e930a0bbd..1a85e1d05f 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 3b0c35ff31..b9bc3be8a2 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 81ed4639d8..9ad9e24688 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 de53f1a08e..792329a81e 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 b642917322..6396ed595c 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 616695dd4d..c20298514d 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 dbe4d42381..2cc5413dd3 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 ef33a5340c..30dd53f47e 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 3ca1280e6f..106dc70c27 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 e4611d8882..782ee0f9a3 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 b6a93cfb9f..a40aee7bc9 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 2277054a8e..1ca7363ab3 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 a673383892..c46878e085 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 6d0af997f3..24dab85e8c 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 411121d764..c7d8b4bd42 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 aac921a51a..0daf83b82e 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 eae16f52ea..6bf05035f9 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 70b541a491..5e5af9cb3c 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 0a6b554df3..94ccc4b6ce 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 3b24651de7..4b462a0e46 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 0cbb0a1652..670864212f 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 abc4464392..0b910445e6 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 765da753eb..a485e44ee8 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 e27ec7586d..0737dd45b0 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 a70cfb511a..63a26f7b56 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 dde91b1ce7..2cca3bcb03 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 9d902d5a26..3d940d179b 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 4633b03c74..2ebc185c23 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 ef0754259d..a214faeeca 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 9ceda5b205..7a2c81ab4a 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 cb3941336c..c6336a5767 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 5586d076de..49c0d70f22 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 7eddbc7841..43199aa0bd 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 e920bcb370..d19ddc46a5 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 aead2df6eb..a6a04dc5fd 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 de9a16f614..08c0112fdd 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 05590c838c..57fd5eb26a 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 9672c7e34e..81583141eb 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 fe278ec168..77aa35555d 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 cf6bca9e1f..5b74043e31 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 afcfab5638..1b83468802 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 92402aa988..68c81f18a8 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 a0fc8c066f..bb4c13ec2c 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 9b72e72ce3..94424dc21d 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 cfb1d3a813..560c4babdc 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 1943005915..8323bc14c8 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 97c81b7653..03ff141e27 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 a8db528c57..6703152b56 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 f8cd36aa98..cddfc6643b 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 9a8b26e80e..54732890ef 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 5584719edf..da52bd1a7b 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 f21c220647..4e8b2a7d9a 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 102e507795..c5b6ceb7aa 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 26309aca04..f781306ce4 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 e6b985f832..6b86c63684 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 d05f5f0c36..bcf935cae3 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 2465e13fb1..69bcde8df4 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 ec90313c83..dc83d13e30 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 26deae9551..c0d1c436e5 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 5150a66ceb..ede500aa21 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 5191202f6e..baed40509b 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 851afb3982..3a8b1e8eb9 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 50cbc474b2..68e6485caf 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 77815a27e9..83edde353f 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 6b79c5039e..e42c77dc63 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 c5bebc7862..53feb83f15 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 cbc7d5264b..bb686793c8 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 b762398146..fb99b68755 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 565b131385..7bb5aeceda 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 2f8406af94..476577cbaf 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 21db790194..667358035f 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 b82ced0c46..826a347a42 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 28f04739fc..ddad8b0f16 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 2f6c0c554c..32dc959baa 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 9d3c7820d2..2ed89209b0 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 adef672abd..a5a2cdb01e 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 9010b6ce3e..4755683d9d 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 db8b2a5311..b66c4d9fc1 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 3f0515f0bc..3432e64bd6 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 0d21804044..63b53ff25c 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 93c7750f93..b75306e590 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 1ec0d52e54..a3dce45401 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 8a8cc59360..d357e487f6 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 096c7d9d5a..d9de6650b1 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 879a1534dd..274e46d70c 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 33a9a496af..05b9e50ea6 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 b7dd464edc..61a5d6ac01 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 6c954ce62d..e226a700d0 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 3705576f84..69fda8637e 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 f17dcc09b9..76a83f062f 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 1c20b640aa..29c960ea53 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 96c4fb5078..80dbde9ab5 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 e15e477635..3a89cee509 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 f2639f72ba..bbf900a2e8 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 2c68bce2a1..364c56ff5f 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 e6cba3f2b0..462a153c17 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 241af20b75..1f4bb9c060 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 82c842178f..ab75eb37f4 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 64fba3eb7b..544019e6aa 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 45606ad6d7..ce6608249e 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 df786d259f..1021a5e91b 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 1bc6593a23..ebf9db451d 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 8993def0e8..893c8d82a5 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 388a36d2e6..8c9edc68d7 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 5ebf06a6f5..5654997b02 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 b3319b0016..82deafb006 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 5d66ead1f2..7d9296c001 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 076efc323d..5afb841d99 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 80cfa93715..d3f3278200 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 d9d5b14131..d8ac2523f3 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 b3edd7fa37..e840f27b31 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 210f7ed02f..0af23ba1b4 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 c4ce7ec567..564016b44b 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 0b784bd6d2..e247ef69d9 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 bd15783b96..e692f5700a 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 593279c3ea..80ef75878b 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 ab7f2f509b..71204f4555 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 2dccdb9f19..0392bc0db0 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 dee70cc771..bcfe76cb18 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 34d07ebb87..58287fe081 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 a5c911f9a3..d27a76514c 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 68f5f7a1b7..1314065524 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 0252ab3a72..fbbdf0795f 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 833d873aaa..2e537d137d 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 249d39f7bb..a017606419 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 e493997ba3..9199416357 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 01382f822f..4e0b22d6bf 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 a2145b8801..44f5d36ba4 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 97291afb3d..64711af942 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 906342013a..be54932371 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 638ffdda68..fb05a00f78 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 e06aab0965..6fe42ef812 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 71b0dbf184..75fc99c7e1 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 b04a655ac9..0a37d30354 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 e4eef390ec..68eb0d3b6d 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 8ff36da0b8..c9e34b61fd 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 367e6a6df4..cb55ecd724 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 9e1c6b1bca..cf551cd262 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 65f08dfdf9..4d5cb5ac28 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 8d616a80f5..b6c26bce6a 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 2b8aa496f0..4787526f25 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 16b87a2c0c..de1ae76e03 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 3920841dc5..2e543f2c40 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 482ba93b79..0abaaaf97d 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 4e950fc9f6..87a817ff6d 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 84e1c370ca..e79d372269 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 fdd99e9b3e..196f38df2a 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 31eae172c3..cbac42231b 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 1126eef943..2455c678e7 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 26501ea4f1..ac3d735668 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 d7ec950ac0..08187adfc4 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 f7422a4093..13ebde0d5a 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 963bc1effb..6fb84b04da 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 aedbb3720b..e6dd84234c 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 b9adc7a0ca..f07e043bd8 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 1cf3649dae..c7bf75f103 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 d33956ccf7..803c6e13b5 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 6af8064d1b..7d232ffe1c 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 ccd2e16fc4..c75ef40cc2 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 0fd59e5eb5..7d3a0c5e18 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 101e4aef98..8c7d510950 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 9dae0a9d17..dd1359843a 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 9abf690792..6621187e18 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 107c980582..c8136f1c1e 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 8d962fd3e8..619855a215 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 a4aef5bc3f..5351dd9291 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 ec34e2d000..8d874bdcb3 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 80174c76d1..bf104c98d4 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 af5c2a03e3..a1263452e0 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 b7838d3fc7..ef260c25e9 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 2637fbdb84..09a8b28b85 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 36cec475fb..a07d4bdcd9 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 ad35e955fc..91716c3056 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 fe776b9753..6a0cee8527 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 eb4ae2890a..8a5eb4eacd 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 95d1ef1594..fdbbc5519d 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 6265a1eddc..86223eb3a7 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 881f682864..13b1d442ee 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 14ce38b745..b7ac45e474 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 61582c661a..8b051c0a67 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 832f780a2a..ba658c7812 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 1e4c068cb8..b23f668275 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 b0de2c3f9b..7c3748c3b0 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 ac908d2b76..e935e2e8df 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 54e3936cda..2303bf8e71 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 6740652d7c..61227f21af 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 c35ab4c8ec..fff7d216f6 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 a81f165a50..996080c2f8 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 0fecdec2b6..ddd38dd2f8 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 303794abd0..f421dfaf2f 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 c266a79ace..9298f8a45d 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 b0738a8c77..a13b0f2f13 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 c7e65d8eae..6fb779a2cf 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 857046ef5c..be2943bea0 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 aa0f1d24d5..5940a3b49f 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 7928036d18..94ac62b05f 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 166ab91f11..c6bd4d05de 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 c02b4ccea5..3fac60a259 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 d77b7d8af8..4a160ca5a5 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 fa4647c01c..c87facdce3 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 c5f0e3f031..0698f79808 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 798cc36d69..cffac9665a 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 954e8addb0..1e6edb0df8 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 97fdf45764..254d616c8b 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 0442dc94f5..1c575780a6 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 67b726d32c..be0d0f1b79 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 1ad912886c..82a607d1c5 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 f64a4c9628..8270c9050d 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 21149681b8..dab5023306 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 fdc223ca7e..cfdb9377a5 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 ca40dcc9ca..9498dcade2 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 03dbf2c76a..c9f041bcf4 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 3ff34e7f61..e4cafaece4 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 8a3969b75b..602c6749ff 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 ee039ffd1a..13e6370a2c 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 04b33339ee..464669ec1f 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 4a6cf4c070..dcce7705ee 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
--
GitLab