From a6c5bcf81d4e6ccd56d0b686055e32bc13feb68c Mon Sep 17 00:00:00 2001
From: Leo Balter <leonardo.balter@gmail.com>
Date: Thu, 20 Apr 2017 11:21:35 -0400
Subject: [PATCH] Update function forms templates to reflect the params name
 when appropriate only

---
 src/function-forms/default/arrow-function.template            | 2 +-
 src/function-forms/default/async-gen-func-decl.template       | 2 +-
 src/function-forms/default/async-gen-func-expr.template       | 4 ++--
 src/function-forms/default/async-gen-meth.template            | 2 +-
 src/function-forms/default/async-gen-named-func-expr.template | 2 +-
 .../default/cls-decl-async-gen-meth-static.template           | 2 +-
 src/function-forms/default/cls-decl-async-gen-meth.template   | 2 +-
 src/function-forms/default/cls-decl-gen-meth-static.template  | 2 +-
 src/function-forms/default/cls-decl-gen-meth.template         | 2 +-
 src/function-forms/default/cls-decl-meth-static.template      | 2 +-
 src/function-forms/default/cls-decl-meth.template             | 2 +-
 .../default/cls-expr-async-gen-meth-static.template           | 2 +-
 src/function-forms/default/cls-expr-async-gen-meth.template   | 2 +-
 src/function-forms/default/cls-expr-gen-meth-static.template  | 2 +-
 src/function-forms/default/cls-expr-gen-meth.template         | 2 +-
 src/function-forms/default/cls-expr-meth-static.template      | 2 +-
 src/function-forms/default/cls-expr-meth.template             | 2 +-
 src/function-forms/default/func-decl.template                 | 2 +-
 src/function-forms/default/func-expr.template                 | 2 +-
 src/function-forms/default/gen-func-decl.template             | 2 +-
 src/function-forms/default/gen-func-expr.template             | 2 +-
 src/function-forms/default/gen-meth.template                  | 2 +-
 src/function-forms/default/meth.template                      | 2 +-
 .../{dflt-abrupt.case => dflt-params-abrupt.case}             | 0
 ...-undefined.case => dflt-params-arg-val-not-undefined.case} | 0
 ...-val-undefined.case => dflt-params-arg-val-undefined.case} | 0
 .../{dflt-duplicates.case => dflt-params-duplicates.case}     | 0
 .../{dflt-ref-later.case => dflt-params-ref-later.case}       | 0
 .../{dflt-ref-prior.case => dflt-params-ref-prior.case}       | 0
 .../{dflt-ref-self.case => dflt-params-ref-self.case}         | 0
 src/function-forms/{dflt-rest.case => dflt-params-rest.case}  | 0
 src/function-forms/error/arrow-function.template              | 2 +-
 src/function-forms/error/async-gen-func-decl.template         | 2 +-
 src/function-forms/error/async-gen-func-expr.template         | 4 ++--
 src/function-forms/error/async-gen-meth.template              | 2 +-
 src/function-forms/error/async-gen-named-func-expr.template   | 4 ++--
 .../error/cls-decl-async-gen-meth-static.template             | 2 +-
 src/function-forms/error/cls-decl-async-gen-meth.template     | 2 +-
 src/function-forms/error/cls-decl-gen-meth-static.template    | 2 +-
 src/function-forms/error/cls-decl-gen-meth.template           | 2 +-
 src/function-forms/error/cls-decl-meth-static.template        | 2 +-
 src/function-forms/error/cls-decl-meth.template               | 2 +-
 .../error/cls-expr-async-gen-meth-static.template             | 2 +-
 src/function-forms/error/cls-expr-async-gen-meth.template     | 2 +-
 src/function-forms/error/cls-expr-gen-meth-static.template    | 2 +-
 src/function-forms/error/cls-expr-gen-meth.template           | 2 +-
 src/function-forms/error/cls-expr-meth-static.template        | 2 +-
 src/function-forms/error/cls-expr-meth.template               | 2 +-
 src/function-forms/error/func-decl.template                   | 2 +-
 src/function-forms/error/func-expr.template                   | 2 +-
 src/function-forms/error/gen-func-decl.template               | 2 +-
 src/function-forms/error/gen-func-expr.template               | 2 +-
 src/function-forms/error/gen-meth.template                    | 2 +-
 src/function-forms/error/meth.template                        | 2 +-
 src/function-forms/syntax/arrow-function.template             | 2 +-
 src/function-forms/syntax/async-gen-func-decl.template        | 2 +-
 src/function-forms/syntax/async-gen-func-expr.template        | 2 +-
 src/function-forms/syntax/async-gen-meth.template             | 2 +-
 src/function-forms/syntax/async-gen-named-func-expr.template  | 2 +-
 .../syntax/cls-decl-async-gen-meth-static.template            | 2 +-
 src/function-forms/syntax/cls-decl-async-gen-meth.template    | 2 +-
 src/function-forms/syntax/cls-decl-gen-meth-static.template   | 2 +-
 src/function-forms/syntax/cls-decl-gen-meth.template          | 2 +-
 src/function-forms/syntax/cls-decl-meth-static.template       | 2 +-
 src/function-forms/syntax/cls-decl-meth.template              | 2 +-
 .../syntax/cls-expr-async-gen-meth-static.template            | 2 +-
 src/function-forms/syntax/cls-expr-async-gen-meth.template    | 2 +-
 src/function-forms/syntax/cls-expr-gen-meth-static.template   | 2 +-
 src/function-forms/syntax/cls-expr-gen-meth.template          | 2 +-
 src/function-forms/syntax/cls-expr-meth-static.template       | 2 +-
 src/function-forms/syntax/cls-expr-meth.template              | 2 +-
 src/function-forms/syntax/func-decl.template                  | 2 +-
 src/function-forms/syntax/func-expr.template                  | 2 +-
 src/function-forms/syntax/gen-func-decl.template              | 2 +-
 src/function-forms/syntax/gen-func-expr.template              | 2 +-
 src/function-forms/syntax/gen-meth.template                   | 2 +-
 src/function-forms/syntax/meth.template                       | 2 +-
 77 files changed, 72 insertions(+), 72 deletions(-)
 rename src/function-forms/{dflt-abrupt.case => dflt-params-abrupt.case} (100%)
 rename src/function-forms/{dflt-arg-val-not-undefined.case => dflt-params-arg-val-not-undefined.case} (100%)
 rename src/function-forms/{dflt-arg-val-undefined.case => dflt-params-arg-val-undefined.case} (100%)
 rename src/function-forms/{dflt-duplicates.case => dflt-params-duplicates.case} (100%)
 rename src/function-forms/{dflt-ref-later.case => dflt-params-ref-later.case} (100%)
 rename src/function-forms/{dflt-ref-prior.case => dflt-params-ref-prior.case} (100%)
 rename src/function-forms/{dflt-ref-self.case => dflt-params-ref-self.case} (100%)
 rename src/function-forms/{dflt-rest.case => dflt-params-rest.case} (100%)

diff --git a/src/function-forms/default/arrow-function.template b/src/function-forms/default/arrow-function.template
index fd20b02401..62fb7e5b65 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 ad18e33c20..9fa27aecd5 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 bf47257722..e42fe98fcb 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 88531de653..69678ea9eb 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 4d8aa531e6..acb8edb4fb 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 896c1a4d0b..32fa9073a1 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 045c679440..d0ef01303b 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 27c85fe30d..fd8639a30c 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 f44f7eb897..731f437302 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 c6287aa203..4f97319d45 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 695624b950..7cff1cd0d9 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 345191dd44..2f44f8fff2 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 ca94df65a2..4829b7ffe9 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 05ed9a797c..7cd524ed30 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 0e7cf0d161..bc863bfd3b 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 789a94b13c..50906f462d 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 9dba08c1e6..68ccff1cb8 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 8ef8a19e86..a35e250c73 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 43df028a9e..be20064ae8 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 e35835e7bf..14e7379721 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 5ba0714cff..a59300437a 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 17caf8cf9e..3e2fe8ac61 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 bafbfe807a..c4accbb3c6 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
similarity index 100%
rename from src/function-forms/dflt-abrupt.case
rename to 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
similarity index 100%
rename from src/function-forms/dflt-arg-val-not-undefined.case
rename to 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
similarity index 100%
rename from src/function-forms/dflt-arg-val-undefined.case
rename to 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
similarity index 100%
rename from src/function-forms/dflt-duplicates.case
rename to 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
similarity index 100%
rename from src/function-forms/dflt-ref-later.case
rename to 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
similarity index 100%
rename from src/function-forms/dflt-ref-prior.case
rename to 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
similarity index 100%
rename from src/function-forms/dflt-ref-self.case
rename to 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
similarity index 100%
rename from src/function-forms/dflt-rest.case
rename to 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 a91cc38364..735e025bff 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 913d2b61d8..c5e61f1aab 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 2f2c9e44aa..994b234da3 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 8fc908ea65..486f4ba0f2 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 852b2c1a7d..77a85c4669 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 5c89cf028c..3fd1feb0c1 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 a8295f8df3..540b641e33 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 25d450673c..272f037968 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 13a8e27890..31389ed892 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 0252314e07..2e8bf54df7 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 9f68896038..dad78b2184 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 c01742a081..f7f3534e36 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 2f8735d289..d702eca1a4 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 14c8afc662..ac61f1c024 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 5dbf2727a6..804d2d8a1c 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 0be31534eb..562ac933b1 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 75c353d240..449d1c6d0d 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 d57e6fa54b..89262fbda7 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 62155d9177..2003802ecf 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 9b414763a4..4f6cbeb0e5 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 411c6db75d..c84b1d5960 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 bf6f0cc232..ddc1db97b9 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 6d923cc460..ccec4a7ef6 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 c1ada16c82..e607d972ee 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 905c4a9a87..a586e7ed32 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 681ca48720..744b898802 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 fbec15467c..f2f69bda4b 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 ba804028b1..d30eaeef1e 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 ecd372f7a7..6482e99d5d 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 20f4527e0a..83b0edc649 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 674b9951d8..c0db9b4992 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 58fcf0596c..786b317a2b 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 b31325bc04..89273df182 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 e33de83c63..21c6a9d29b 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 25c81044a0..040a3b47b7 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 c3ca6b5131..c691525cf6 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 3864b123bf..7bf6f00e13 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 dfd8b3260f..33891b3a22 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 b2f7156294..3939fbae13 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 d303acfbe1..30d8e84603 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 a87474e5b9..b830048e98 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 1c078c507a..37894cc9fd 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 ce97faca82..6dd1da6ec4 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 5a80646ec9..141e88e98d 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 c52cdb04a6..c44507f91f 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 02f4909cac..0e58d3d325 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: |
-- 
GitLab