diff --git a/src/function-forms/default/arrow-function.template b/src/function-forms/default/arrow-function.template
index fd20b024015e641c39fa737d423a450856e53168..62fb7e5b657c97ebb534bc8f8f64a424c188d655 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 ad18e33c2058f638f38a39c784a7c07fb07d5399..9fa27aecd5b10f4ea3931ab93c6fa7d43a68782d 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 bf472577229021df25236f20117ea6dfcd713d18..e42fe98fcb94720ef4d29e470ec4f4ab1056cd2f 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 88531de653b351ef9ac3f46d351706f23067dbfd..69678ea9eb155dd48057d7fa45bfaab509147bb7 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 4d8aa531e6224efdbeb88f5e727f93cdf7aaf4cf..acb8edb4fb6bb0d037c66c8f0c3456168e2c9278 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 896c1a4d0bc7c28b4530ff5845dbf58a43bcbac9..32fa9073a183f53c8aa2962bc184706650b00d1b 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 045c679440480ae78ae9f385a6b9ee84398f7f9e..d0ef01303bab6ee5e788c617fba6c07b125b1b84 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 27c85fe30df3f7ae62ff52cec48a1bb17a103a72..fd8639a30cf821d697be8cc62be090ddea858f73 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 f44f7eb8977adcf9aaccc1cf71c5d0420693e0a3..731f437302590d0ad848873b1d03c001fbe79caf 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 c6287aa2031f7b687eaf41d16e6d7baa1fd49261..4f97319d45a5b249bba4fec375e71fd06a5f466e 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 695624b95037b0dc08d1a1efd457cd9f53e3a514..7cff1cd0d99a1f9243d669c3dc81aa102ccbc8ec 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 345191dd4405fa0ac834008133fcd49eeb6a65eb..2f44f8fff2378842e7e6a65481683cbb49df2f89 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 ca94df65a2ecc5494025d40426c782d5f1f3f8be..4829b7ffe9f99276b2a4bc06b5bca2127763a8c9 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 05ed9a797cbdc211d47a69160d3c26e312d50405..7cd524ed305a5fe1a73d0d070c09375a9114207b 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 0e7cf0d161db4509b9212d2c8354e079729bdf67..bc863bfd3bbc8fd40c5f3b1907d2c66761e876f4 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 789a94b13c0cd526f77ed991dd0ac2b6d41b8ed7..50906f462d55faf73212ca3fb0ffc66aa9e228da 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 9dba08c1e658edbc49232618ea1c64e282f000f8..68ccff1cb81b50820403a4f0722ef1eb2544e54f 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 8ef8a19e8691428d9c8e2b7c0b97bbf63793cecd..a35e250c73be8c56a886ba987c0a01474b472583 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 43df028a9e56252a35952df355b3cbea71d53fd0..be20064ae87b369968a570731b961313f1b40cad 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 e35835e7bfa9cbc5c49030fa5add5a5d5d2ad163..14e737972156098a11c58e8d0d7b77949df4f0e2 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 5ba0714cff3a46d25982a7d6734971b17f7e6dfd..a59300437a19935a6836375aeb06df11f7b02890 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 17caf8cf9ec1b736a09536d2be9f94c389aa6b65..3e2fe8ac614e9c70051592d932fcb014c8d38ee4 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 bafbfe807aaaeda8f70c71bfbab30422a07b73dc..c4accbb3c6474cda591930ee481f9b480086deb8 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 a91cc38364e2a255226dfbf1d82556341f1a0ff4..735e025bff75ac7601fce32bbca2ea458148cf60 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 913d2b61d8b5be776a8d1667156397e9af8aaa93..c5e61f1aab007613a706db0eac756387ece4a9b2 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 2f2c9e44aa0959b94074f298478e62d30a5cc8d3..994b234da3be6452dd251e6b1bdb15a4ea2496f2 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 8fc908ea6594cb423f4c61639a0f95aa56360e0a..486f4ba0f2ed57aead8e8e656aeda8dce841b83d 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 852b2c1a7d0ab9bb893dcc83d91f9497cc07e7df..77a85c4669c73bf5a9a63556f20bc43ecb20f285 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 5c89cf028c4b4f8c2e0d98c1fdff9104b0c4f5f6..3fd1feb0c199f68c746378e31f4a7a8f47db8592 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 a8295f8df346f02b3d0095263306dc38d9d0b976..540b641e33c52818a580cf147fd12cd17873b60d 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 25d450673c980c4bc9e65d466fc27298ba8cfd12..272f03796895d005849160de855e0c2c50bd6f0c 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 13a8e27890cfb3c81bb55b23b5169c472623b10f..31389ed892ab1837480fc52aec8c7f9ef9746bbd 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 0252314e07900862399a968073275b0b007f4dff..2e8bf54df7fd8dacea401da6ac06656b7752d22b 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 9f688960386f1d78af0fbd2e9a3e2641670291ab..dad78b2184389ff36214a8f40a28358cec4c9f73 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 c01742a081d575aedbd3894a74b5e99fb70e8118..f7f3534e365b7837df7ddcfabd86079aadc9f884 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 2f8735d2895f65438e12e526092c0a3baf10a352..d702eca1a431557d8f9ccf0a7ed026219ea17762 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 14c8afc662b4a4bab0d73b6f6c154cf3679e4135..ac61f1c024b92e5fa86a5fa775f0c4348d67dbdd 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 5dbf2727a60670df7905c842e2959310814cd28e..804d2d8a1cdab7ee648222cd070349fc5a51104e 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 0be31534eb6845783693bcfc356d5fb6d1c85262..562ac933b16be86a786a6067cdf7d0c4942f6783 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 75c353d2405e1bcad6d4c4fb6a1603ce0396944c..449d1c6d0dc25515cadd8fb7f52151ca4f61de19 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 d57e6fa54bd6a9d58918a7dc14f49b5548eeda4e..89262fbda7fc61358141dad87e1ea77bd64dc531 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 62155d91778424aa74b275c7f60d69e8da0244fe..2003802ecf45037bc8fc05004eecea2da46c2235 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 9b414763a43ed5ecca078c7c9fc17e592498243b..4f6cbeb0e5c83f9e5bd8169db0c8a066c303182d 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 411c6db75d3e25fd4c05512535ebd48850721239..c84b1d5960353632de19a0285515bc354240aee6 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 bf6f0cc232586e94781c717760c54357f7a4ebe0..ddc1db97b96cdab18ab72db0acdba1f0fde60a68 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 6d923cc4601a802cff377d6f4377619556ae265d..ccec4a7ef6ebe2ca2f0a2c2e49ed8e5378f60769 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 c1ada16c822ddc3f18b8dffa3922db7735408ef4..e607d972ee66f748fcf88bb37c8b4cca16eba764 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 905c4a9a8792609d59446ec6eef13994b3d8497d..a586e7ed324543be6635d1ba54c6aec7f1bf1761 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 681ca487202fe0545588c9b64548042573efcd53..744b8988023340d2f90693be4c351a1c68beb9f1 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 fbec15467c57f667b0397342b755bf54136e7ecf..f2f69bda4b21493d235fc82f7c821aefccadce2b 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 ba804028b18dbc61e9098bd3281a4a8b4ab9b627..d30eaeef1ef84bf89516de590eee86741248831f 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 ecd372f7a7cf2cb962596fb5f18ff57bcd2f6e35..6482e99d5d24791162d54589e2580567f715551f 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 20f4527e0a39aca4c29c0adcdc4bfcc8b02066d7..83b0edc6497cbcdda1cad720b4f8c75b978a0773 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 674b9951d844a04e639f30f0297a96cd0a9af832..c0db9b4992999963d97a7c35c09fe8b21bae1050 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 58fcf0596cfecf04afd66fd0ff3c0ef58d69c055..786b317a2b545335e3807b52b7078fcd05ead003 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 b31325bc04aa9466cb9f809416bc2edbdf1db2dd..89273df18242ce1ac9f6cde1bba87cc87b7c55eb 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 e33de83c6359db368f023ab882f6c72bf126e48d..21c6a9d29b75e4da99e216a99e23d86206456e7b 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 25c81044a01823e6a3a1ba5ff6c8bcf095404124..040a3b47b76ec89ef2e57bf3f60802ce7abd997a 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 c3ca6b5131820bb675b4a96a3a0125ddacf9e9dc..c691525cf6debc27e2959a3151bd3e0e39a47898 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 3864b123bf51d80e6f214eb8d56986df6bf48fb8..7bf6f00e13d30205702c0280e533edd8ac7e13ac 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 dfd8b3260ff75c90ce55993819f13685fa4dac91..33891b3a2282ea2727beaccccbe4cc37d84fd00f 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 b2f7156294cb4558623b2108f3bcf38c730ee807..3939fbae13603a65ebbb04b5875fd0a8e805ad0d 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 d303acfbe13044f5341e98eea18d691bfc43a5ad..30d8e846032be4fed4e6a0063f0fce2e48b5b77f 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 a87474e5b9f848d77b0f5ba36357b2cf9fda26bb..b830048e98bb2f562f09261a8f11e9cda717c4d0 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 1c078c507a79e50b0e602d6bb66c1b45264a91e3..37894cc9fda1566d615d7f630260e984f33196ce 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 ce97faca8290e074ef3b4a611b4824d7798c3cbb..6dd1da6ec4fd9de3691812605320f7b333a660cd 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 5a80646ec9831c6b19bdbc4a2327bab360236a56..141e88e98dd8d6a2d3e8f0f944fe5674989f6651 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 c52cdb04a65537ee6ecad6b2d22b1472b1c13da9..c44507f91f2b4c6e295aad14695fd1c9091e3e8c 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 02f4909cac3523d7a9dd381c9530ebd788840382..0e58d3d3257ec36f582e44cdc384c61096bc78bf 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: |