Update function forms templates to reflect the params name when appropriate only

77 files changed, 72 insertions, 72 deletions

diff --git a/src/function-forms/default/arrow-function.template b/src/function-forms/default/arrow-function.template
index fd20b0240..62fb7e5b6 100644
--- a/src/function-forms/default/arrow-function.template
+++ b/src/function-forms/default/arrow-function.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/arrow-function/params-
+path: language/expressions/arrow-function/
 name: arrow function expression
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/async-gen-func-decl.template b/src/function-forms/default/async-gen-func-decl.template
index ad18e33c2..9fa27aecd 100644
--- a/src/function-forms/default/async-gen-func-decl.template
+++ b/src/function-forms/default/async-gen-func-decl.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-generator/params-
+path: language/statements/async-generator/
 name: async generator function declaration
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
 info: |
diff --git a/src/function-forms/default/async-gen-func-expr.template b/src/function-forms/default/async-gen-func-expr.template
index bf4725772..e42fe98fc 100644
--- a/src/function-forms/default/async-gen-func-expr.template
+++ b/src/function-forms/default/async-gen-func-expr.template
@@ -2,13 +2,13 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/params-
+path: language/expressions/async-generator/
 name: async generator function expression
 esid: sec-asyncgenerator-definitions-evaluation
 info: |
     AsyncGeneratorExpression : async [no LineTerminator here] function * ( FormalParameters ) {
         AsyncGeneratorBody }
-    
+
         [...]
         3. Let closure be ! AsyncGeneratorFunctionCreate(Normal, FormalParameters,
            AsyncGeneratorBody, scope, strict).
diff --git a/src/function-forms/default/async-gen-meth.template b/src/function-forms/default/async-gen-meth.template
index 88531de65..69678ea9e 100644
--- a/src/function-forms/default/async-gen-meth.template
+++ b/src/function-forms/default/async-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-async-gen-meth-
+path: language/expressions/object/method-definition/async-gen-meth-
 name: async generator method
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
 info: |
diff --git a/src/function-forms/default/async-gen-named-func-expr.template b/src/function-forms/default/async-gen-named-func-expr.template
index 4d8aa531e..acb8edb4f 100644
--- a/src/function-forms/default/async-gen-named-func-expr.template
+++ b/src/function-forms/default/async-gen-named-func-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/params-named-
+path: language/expressions/async-generator/named-
 name: async generator named function expression
 esid: sec-asyncgenerator-definitions-evaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-async-gen-meth-static.template b/src/function-forms/default/cls-decl-async-gen-meth-static.template
index 896c1a4d0..32fa9073a 100644
--- a/src/function-forms/default/cls-decl-async-gen-meth-static.template
+++ b/src/function-forms/default/cls-decl-async-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/params-async-gen-meth-static-
+path: language/statements/class/async-gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-async-gen-meth.template b/src/function-forms/default/cls-decl-async-gen-meth.template
index 045c67944..d0ef01303 100644
--- a/src/function-forms/default/cls-decl-async-gen-meth.template
+++ b/src/function-forms/default/cls-decl-async-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-async-gen-meth-
+path: language/statements/class/async-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-gen-meth-static.template b/src/function-forms/default/cls-decl-gen-meth-static.template
index 27c85fe30..fd8639a30 100644
--- a/src/function-forms/default/cls-decl-gen-meth-static.template
+++ b/src/function-forms/default/cls-decl-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-gen-meth-static-
+path: language/statements/class/gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-gen-meth.template b/src/function-forms/default/cls-decl-gen-meth.template
index f44f7eb89..731f43730 100644
--- a/src/function-forms/default/cls-decl-gen-meth.template
+++ b/src/function-forms/default/cls-decl-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-gen-meth-
+path: language/statements/class/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-meth-static.template b/src/function-forms/default/cls-decl-meth-static.template
index c6287aa20..4f97319d4 100644
--- a/src/function-forms/default/cls-decl-meth-static.template
+++ b/src/function-forms/default/cls-decl-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-meth-static-
+path: language/statements/class/meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-meth.template b/src/function-forms/default/cls-decl-meth.template
index 695624b95..7cff1cd0d 100644
--- a/src/function-forms/default/cls-decl-meth.template
+++ b/src/function-forms/default/cls-decl-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-meth-
+path: language/statements/class/meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-async-gen-meth-static.template b/src/function-forms/default/cls-expr-async-gen-meth-static.template
index 345191dd4..2f44f8fff 100644
--- a/src/function-forms/default/cls-expr-async-gen-meth-static.template
+++ b/src/function-forms/default/cls-expr-async-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-async-gen-meth-static-
+path: language/expressions/class/async-gen-meth-static-
 name: static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-async-gen-meth.template b/src/function-forms/default/cls-expr-async-gen-meth.template
index ca94df65a..4829b7ffe 100644
--- a/src/function-forms/default/cls-expr-async-gen-meth.template
+++ b/src/function-forms/default/cls-expr-async-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-async-gen-meth-
+path: language/expressions/class/async-gen-meth-
 name: class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-gen-meth-static.template b/src/function-forms/default/cls-expr-gen-meth-static.template
index 05ed9a797..7cd524ed3 100644
--- a/src/function-forms/default/cls-expr-gen-meth-static.template
+++ b/src/function-forms/default/cls-expr-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-gen-meth-static-
+path: language/expressions/class/gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-gen-meth.template b/src/function-forms/default/cls-expr-gen-meth.template
index 0e7cf0d16..bc863bfd3 100644
--- a/src/function-forms/default/cls-expr-gen-meth.template
+++ b/src/function-forms/default/cls-expr-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-gen-meth-
+path: language/expressions/class/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-meth-static.template b/src/function-forms/default/cls-expr-meth-static.template
index 789a94b13..50906f462 100644
--- a/src/function-forms/default/cls-expr-meth-static.template
+++ b/src/function-forms/default/cls-expr-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-meth-static-
+path: language/expressions/class/meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-meth.template b/src/function-forms/default/cls-expr-meth.template
index 9dba08c1e..68ccff1cb 100644
--- a/src/function-forms/default/cls-expr-meth.template
+++ b/src/function-forms/default/cls-expr-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-meth-
+path: language/expressions/class/meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/func-decl.template b/src/function-forms/default/func-decl.template
index 8ef8a19e8..a35e250c7 100644
--- a/src/function-forms/default/func-decl.template
+++ b/src/function-forms/default/func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/function/params-
+path: language/statements/function/
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 info: |
diff --git a/src/function-forms/default/func-expr.template b/src/function-forms/default/func-expr.template
index 43df028a9..be20064ae 100644
--- a/src/function-forms/default/func-expr.template
+++ b/src/function-forms/default/func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/function/params-
+path: language/expressions/function/
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/gen-func-decl.template b/src/function-forms/default/gen-func-decl.template
index e35835e7b..14e737972 100644
--- a/src/function-forms/default/gen-func-decl.template
+++ b/src/function-forms/default/gen-func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/generators/params-
+path: language/statements/generators/
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 info: |
diff --git a/src/function-forms/default/gen-func-expr.template b/src/function-forms/default/gen-func-expr.template
index 5ba0714cf..a59300437 100644
--- a/src/function-forms/default/gen-func-expr.template
+++ b/src/function-forms/default/gen-func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/generators/params-
+path: language/expressions/generators/
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/gen-meth.template b/src/function-forms/default/gen-meth.template
index 17caf8cf9..3e2fe8ac6 100644
--- a/src/function-forms/default/gen-meth.template
+++ b/src/function-forms/default/gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-gen-meth-
+path: language/expressions/object/method-definition/gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 info: |
diff --git a/src/function-forms/default/meth.template b/src/function-forms/default/meth.template
index bafbfe807..c4accbb3c 100644
--- a/src/function-forms/default/meth.template
+++ b/src/function-forms/default/meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-meth-
+path: language/expressions/object/method-definition/meth-
 name: method
 esid: sec-runtime-semantics-definemethod
 info: |
diff --git a/src/function-forms/dflt-abrupt.case b/src/function-forms/dflt-params-abrupt.case
index f89c45c70..f89c45c70 100644
--- a/src/function-forms/dflt-abrupt.case
+++ b/src/function-forms/dflt-params-abrupt.case
diff --git a/src/function-forms/dflt-arg-val-not-undefined.case b/src/function-forms/dflt-params-arg-val-not-undefined.case
index 520ce7d91..520ce7d91 100644
--- a/src/function-forms/dflt-arg-val-not-undefined.case
+++ b/src/function-forms/dflt-params-arg-val-not-undefined.case
diff --git a/src/function-forms/dflt-arg-val-undefined.case b/src/function-forms/dflt-params-arg-val-undefined.case
index f1396d31f..f1396d31f 100644
--- a/src/function-forms/dflt-arg-val-undefined.case
+++ b/src/function-forms/dflt-params-arg-val-undefined.case
diff --git a/src/function-forms/dflt-duplicates.case b/src/function-forms/dflt-params-duplicates.case
index 544c444a8..544c444a8 100644
--- a/src/function-forms/dflt-duplicates.case
+++ b/src/function-forms/dflt-params-duplicates.case
diff --git a/src/function-forms/dflt-ref-later.case b/src/function-forms/dflt-params-ref-later.case
index c5931045d..c5931045d 100644
--- a/src/function-forms/dflt-ref-later.case
+++ b/src/function-forms/dflt-params-ref-later.case
diff --git a/src/function-forms/dflt-ref-prior.case b/src/function-forms/dflt-params-ref-prior.case
index 95777ab77..95777ab77 100644
--- a/src/function-forms/dflt-ref-prior.case
+++ b/src/function-forms/dflt-params-ref-prior.case
diff --git a/src/function-forms/dflt-ref-self.case b/src/function-forms/dflt-params-ref-self.case
index d553e0543..d553e0543 100644
--- a/src/function-forms/dflt-ref-self.case
+++ b/src/function-forms/dflt-params-ref-self.case
diff --git a/src/function-forms/dflt-rest.case b/src/function-forms/dflt-params-rest.case
index 2b96d624a..2b96d624a 100644
--- a/src/function-forms/dflt-rest.case
+++ b/src/function-forms/dflt-params-rest.case
diff --git a/src/function-forms/error/arrow-function.template b/src/function-forms/error/arrow-function.template
index a91cc3836..735e025bf 100644
--- a/src/function-forms/error/arrow-function.template
+++ b/src/function-forms/error/arrow-function.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/arrow-function/params-
+path: language/expressions/arrow-function/
 name: arrow function expression
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/async-gen-func-decl.template b/src/function-forms/error/async-gen-func-decl.template
index 913d2b61d..c5e61f1aa 100644
--- a/src/function-forms/error/async-gen-func-decl.template
+++ b/src/function-forms/error/async-gen-func-decl.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-generator/params-
+path: language/statements/async-generator/
 name: async generator function declaration
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
 info: |
diff --git a/src/function-forms/error/async-gen-func-expr.template b/src/function-forms/error/async-gen-func-expr.template
index 2f2c9e44a..994b234da 100644
--- a/src/function-forms/error/async-gen-func-expr.template
+++ b/src/function-forms/error/async-gen-func-expr.template
@@ -2,13 +2,13 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/params-
+path: language/expressions/async-generator/
 name: async generator function expression
 esid: sec-asyncgenerator-definitions-evaluation
 info: |
     AsyncGeneratorExpression : async [no LineTerminator here] function * ( FormalParameters ) {
         AsyncGeneratorBody }
-    
+
         [...]
         3. Let closure be ! AsyncGeneratorFunctionCreate(Normal, FormalParameters,
            AsyncGeneratorBody, scope, strict).
diff --git a/src/function-forms/error/async-gen-meth.template b/src/function-forms/error/async-gen-meth.template
index 8fc908ea6..486f4ba0f 100644
--- a/src/function-forms/error/async-gen-meth.template
+++ b/src/function-forms/error/async-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-async-gen-meth-
+path: language/expressions/object/method-definition/async-gen-meth-
 name: async generator method
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
 info: |
diff --git a/src/function-forms/error/async-gen-named-func-expr.template b/src/function-forms/error/async-gen-named-func-expr.template
index 852b2c1a7..77a85c466 100644
--- a/src/function-forms/error/async-gen-named-func-expr.template
+++ b/src/function-forms/error/async-gen-named-func-expr.template
@@ -2,13 +2,13 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/params-named-
+path: language/expressions/async-generator/named-
 name: async generator named function expression
 esid: sec-asyncgenerator-definitions-evaluation
 info: |
     AsyncGeneratorExpression : async [no LineTerminator here] function * BindingIdentifier
         ( FormalParameters ) { AsyncGeneratorBody }
-    
+
         [...]
         7. Let closure be ! AsyncGeneratorFunctionCreate(Normal, FormalParameters,
            AsyncGeneratorBody, funcEnv, strict).
diff --git a/src/function-forms/error/cls-decl-async-gen-meth-static.template b/src/function-forms/error/cls-decl-async-gen-meth-static.template
index 5c89cf028..3fd1feb0c 100644
--- a/src/function-forms/error/cls-decl-async-gen-meth-static.template
+++ b/src/function-forms/error/cls-decl-async-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/params-async-gen-meth-static-
+path: language/statements/class/async-gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-async-gen-meth.template b/src/function-forms/error/cls-decl-async-gen-meth.template
index a8295f8df..540b641e3 100644
--- a/src/function-forms/error/cls-decl-async-gen-meth.template
+++ b/src/function-forms/error/cls-decl-async-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-async-gen-meth-
+path: language/statements/class/async-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-gen-meth-static.template b/src/function-forms/error/cls-decl-gen-meth-static.template
index 25d450673..272f03796 100644
--- a/src/function-forms/error/cls-decl-gen-meth-static.template
+++ b/src/function-forms/error/cls-decl-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-gen-meth-static-
+path: language/statements/class/gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-gen-meth.template b/src/function-forms/error/cls-decl-gen-meth.template
index 13a8e2789..31389ed89 100644
--- a/src/function-forms/error/cls-decl-gen-meth.template
+++ b/src/function-forms/error/cls-decl-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-gen-meth-
+path: language/statements/class/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-meth-static.template b/src/function-forms/error/cls-decl-meth-static.template
index 0252314e0..2e8bf54df 100644
--- a/src/function-forms/error/cls-decl-meth-static.template
+++ b/src/function-forms/error/cls-decl-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-meth-static-
+path: language/statements/class/meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-meth.template b/src/function-forms/error/cls-decl-meth.template
index 9f6889603..dad78b218 100644
--- a/src/function-forms/error/cls-decl-meth.template
+++ b/src/function-forms/error/cls-decl-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-meth-
+path: language/statements/class/meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-async-gen-meth-static.template b/src/function-forms/error/cls-expr-async-gen-meth-static.template
index c01742a08..f7f3534e3 100644
--- a/src/function-forms/error/cls-expr-async-gen-meth-static.template
+++ b/src/function-forms/error/cls-expr-async-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-async-gen-meth-static-
+path: language/expressions/class/async-gen-meth-static-
 name: static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-async-gen-meth.template b/src/function-forms/error/cls-expr-async-gen-meth.template
index 2f8735d28..d702eca1a 100644
--- a/src/function-forms/error/cls-expr-async-gen-meth.template
+++ b/src/function-forms/error/cls-expr-async-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-async-gen-meth-
+path: language/expressions/class/async-gen-meth-
 name: class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-gen-meth-static.template b/src/function-forms/error/cls-expr-gen-meth-static.template
index 14c8afc66..ac61f1c02 100644
--- a/src/function-forms/error/cls-expr-gen-meth-static.template
+++ b/src/function-forms/error/cls-expr-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-gen-meth-static-
+path: language/expressions/class/gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-gen-meth.template b/src/function-forms/error/cls-expr-gen-meth.template
index 5dbf2727a..804d2d8a1 100644
--- a/src/function-forms/error/cls-expr-gen-meth.template
+++ b/src/function-forms/error/cls-expr-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-gen-meth-
+path: language/expressions/class/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-meth-static.template b/src/function-forms/error/cls-expr-meth-static.template
index 0be31534e..562ac933b 100644
--- a/src/function-forms/error/cls-expr-meth-static.template
+++ b/src/function-forms/error/cls-expr-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-meth-static-
+path: language/expressions/class/meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-meth.template b/src/function-forms/error/cls-expr-meth.template
index 75c353d24..449d1c6d0 100644
--- a/src/function-forms/error/cls-expr-meth.template
+++ b/src/function-forms/error/cls-expr-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-meth-
+path: language/expressions/class/meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/func-decl.template b/src/function-forms/error/func-decl.template
index d57e6fa54..89262fbda 100644
--- a/src/function-forms/error/func-decl.template
+++ b/src/function-forms/error/func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/function/params-
+path: language/statements/function/
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 info: |
diff --git a/src/function-forms/error/func-expr.template b/src/function-forms/error/func-expr.template
index 62155d917..2003802ec 100644
--- a/src/function-forms/error/func-expr.template
+++ b/src/function-forms/error/func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/function/params-
+path: language/expressions/function/
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/gen-func-decl.template b/src/function-forms/error/gen-func-decl.template
index 9b414763a..4f6cbeb0e 100644
--- a/src/function-forms/error/gen-func-decl.template
+++ b/src/function-forms/error/gen-func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/generators/params-
+path: language/statements/generators/
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 info: |
diff --git a/src/function-forms/error/gen-func-expr.template b/src/function-forms/error/gen-func-expr.template
index 411c6db75..c84b1d596 100644
--- a/src/function-forms/error/gen-func-expr.template
+++ b/src/function-forms/error/gen-func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/generators/params-
+path: language/expressions/generators/
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/gen-meth.template b/src/function-forms/error/gen-meth.template
index bf6f0cc23..ddc1db97b 100644
--- a/src/function-forms/error/gen-meth.template
+++ b/src/function-forms/error/gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-gen-meth-
+path: language/expressions/object/method-definition/gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 info: |
diff --git a/src/function-forms/error/meth.template b/src/function-forms/error/meth.template
index 6d923cc46..ccec4a7ef 100644
--- a/src/function-forms/error/meth.template
+++ b/src/function-forms/error/meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-meth-
+path: language/expressions/object/method-definition/meth-
 name: method
 esid: sec-runtime-semantics-definemethod
 info: |
diff --git a/src/function-forms/syntax/arrow-function.template b/src/function-forms/syntax/arrow-function.template
index c1ada16c8..e607d972e 100644
--- a/src/function-forms/syntax/arrow-function.template
+++ b/src/function-forms/syntax/arrow-function.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/arrow-function/params-
+path: language/expressions/arrow-function/
 name: arrow function expression
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/async-gen-func-decl.template b/src/function-forms/syntax/async-gen-func-decl.template
index 905c4a9a8..a586e7ed3 100644
--- a/src/function-forms/syntax/async-gen-func-decl.template
+++ b/src/function-forms/syntax/async-gen-func-decl.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-generator/params-
+path: language/statements/async-generator/
 name: async generator function declaration
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
 info: |
diff --git a/src/function-forms/syntax/async-gen-func-expr.template b/src/function-forms/syntax/async-gen-func-expr.template
index 681ca4872..744b89880 100644
--- a/src/function-forms/syntax/async-gen-func-expr.template
+++ b/src/function-forms/syntax/async-gen-func-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/params-
+path: language/expressions/async-generator/
 name: async generator function expression
 esid: sec-asyncgenerator-definitions-evaluation
 info: |
diff --git a/src/function-forms/syntax/async-gen-meth.template b/src/function-forms/syntax/async-gen-meth.template
index fbec15467..f2f69bda4 100644
--- a/src/function-forms/syntax/async-gen-meth.template
+++ b/src/function-forms/syntax/async-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-async-gen-meth-
+path: language/expressions/object/method-definition/async-gen-meth-
 name: async generator method
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
 info: |
diff --git a/src/function-forms/syntax/async-gen-named-func-expr.template b/src/function-forms/syntax/async-gen-named-func-expr.template
index ba804028b..d30eaeef1 100644
--- a/src/function-forms/syntax/async-gen-named-func-expr.template
+++ b/src/function-forms/syntax/async-gen-named-func-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/params-named-
+path: language/expressions/async-generator/named-
 name: async generator named function expression
 esid: sec-asyncgenerator-definitions-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-async-gen-meth-static.template b/src/function-forms/syntax/cls-decl-async-gen-meth-static.template
index ecd372f7a..6482e99d5 100644
--- a/src/function-forms/syntax/cls-decl-async-gen-meth-static.template
+++ b/src/function-forms/syntax/cls-decl-async-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/params-async-gen-meth-static-
+path: language/statements/class/async-gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-async-gen-meth.template b/src/function-forms/syntax/cls-decl-async-gen-meth.template
index 20f4527e0..83b0edc64 100644
--- a/src/function-forms/syntax/cls-decl-async-gen-meth.template
+++ b/src/function-forms/syntax/cls-decl-async-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-async-gen-meth-
+path: language/statements/class/async-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-gen-meth-static.template b/src/function-forms/syntax/cls-decl-gen-meth-static.template
index 674b9951d..c0db9b499 100644
--- a/src/function-forms/syntax/cls-decl-gen-meth-static.template
+++ b/src/function-forms/syntax/cls-decl-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-gen-meth-static-
+path: language/statements/class/gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-gen-meth.template b/src/function-forms/syntax/cls-decl-gen-meth.template
index 58fcf0596..786b317a2 100644
--- a/src/function-forms/syntax/cls-decl-gen-meth.template
+++ b/src/function-forms/syntax/cls-decl-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-gen-meth-
+path: language/statements/class/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-meth-static.template b/src/function-forms/syntax/cls-decl-meth-static.template
index b31325bc0..89273df18 100644
--- a/src/function-forms/syntax/cls-decl-meth-static.template
+++ b/src/function-forms/syntax/cls-decl-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-meth-static-
+path: language/statements/class/meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-meth.template b/src/function-forms/syntax/cls-decl-meth.template
index e33de83c6..21c6a9d29 100644
--- a/src/function-forms/syntax/cls-decl-meth.template
+++ b/src/function-forms/syntax/cls-decl-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-meth-
+path: language/statements/class/meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-async-gen-meth-static.template b/src/function-forms/syntax/cls-expr-async-gen-meth-static.template
index 25c81044a..040a3b47b 100644
--- a/src/function-forms/syntax/cls-expr-async-gen-meth-static.template
+++ b/src/function-forms/syntax/cls-expr-async-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-async-gen-meth-static-
+path: language/expressions/class/async-gen-meth-static-
 name: static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-async-gen-meth.template b/src/function-forms/syntax/cls-expr-async-gen-meth.template
index c3ca6b513..c691525cf 100644
--- a/src/function-forms/syntax/cls-expr-async-gen-meth.template
+++ b/src/function-forms/syntax/cls-expr-async-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-async-gen-meth-
+path: language/expressions/class/async-gen-meth-
 name: class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-gen-meth-static.template b/src/function-forms/syntax/cls-expr-gen-meth-static.template
index 3864b123b..7bf6f00e1 100644
--- a/src/function-forms/syntax/cls-expr-gen-meth-static.template
+++ b/src/function-forms/syntax/cls-expr-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-gen-meth-static-
+path: language/expressions/class/gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-gen-meth.template b/src/function-forms/syntax/cls-expr-gen-meth.template
index dfd8b3260..33891b3a2 100644
--- a/src/function-forms/syntax/cls-expr-gen-meth.template
+++ b/src/function-forms/syntax/cls-expr-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-gen-meth-
+path: language/expressions/class/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-meth-static.template b/src/function-forms/syntax/cls-expr-meth-static.template
index b2f715629..3939fbae1 100644
--- a/src/function-forms/syntax/cls-expr-meth-static.template
+++ b/src/function-forms/syntax/cls-expr-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-meth-static-
+path: language/expressions/class/meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-meth.template b/src/function-forms/syntax/cls-expr-meth.template
index d303acfbe..30d8e8460 100644
--- a/src/function-forms/syntax/cls-expr-meth.template
+++ b/src/function-forms/syntax/cls-expr-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-meth-
+path: language/expressions/class/meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/func-decl.template b/src/function-forms/syntax/func-decl.template
index a87474e5b..b830048e9 100644
--- a/src/function-forms/syntax/func-decl.template
+++ b/src/function-forms/syntax/func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/function/params-
+path: language/statements/function/
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 info: |
diff --git a/src/function-forms/syntax/func-expr.template b/src/function-forms/syntax/func-expr.template
index 1c078c507..37894cc9f 100644
--- a/src/function-forms/syntax/func-expr.template
+++ b/src/function-forms/syntax/func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/function/params-
+path: language/expressions/function/
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/gen-func-decl.template b/src/function-forms/syntax/gen-func-decl.template
index ce97faca8..6dd1da6ec 100644
--- a/src/function-forms/syntax/gen-func-decl.template
+++ b/src/function-forms/syntax/gen-func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/generators/params-
+path: language/statements/generators/
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 info: |
diff --git a/src/function-forms/syntax/gen-func-expr.template b/src/function-forms/syntax/gen-func-expr.template
index 5a80646ec..141e88e98 100644
--- a/src/function-forms/syntax/gen-func-expr.template
+++ b/src/function-forms/syntax/gen-func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/generators/params-
+path: language/expressions/generators/
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/gen-meth.template b/src/function-forms/syntax/gen-meth.template
index c52cdb04a..c44507f91 100644
--- a/src/function-forms/syntax/gen-meth.template
+++ b/src/function-forms/syntax/gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-gen-meth-
+path: language/expressions/object/method-definition/gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 info: |
diff --git a/src/function-forms/syntax/meth.template b/src/function-forms/syntax/meth.template
index 02f4909ca..0e58d3d32 100644
--- a/src/function-forms/syntax/meth.template
+++ b/src/function-forms/syntax/meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-meth-
+path: language/expressions/object/method-definition/meth-
 name: method
 esid: sec-runtime-semantics-definemethod
 info: |