From b8d43a3982785aa1dc667be6ed705368d953bd1b Mon Sep 17 00:00:00 2001
From: Leo Balter <leonardo.balter@gmail.com>
Date: Fri, 21 Dec 2018 17:28:23 -0200
Subject: [PATCH] More reorganization for the class folder

---
 src/accessor-names/default/cls-decl-inst.template               | 2 +-
 src/accessor-names/default/cls-decl-static.template             | 2 +-
 src/accessor-names/default/cls-expr-inst.template               | 2 +-
 src/accessor-names/default/cls-expr-static.template             | 2 +-
 src/accessor-names/error/cls-decl-inst.template                 | 2 +-
 src/accessor-names/error/cls-decl-static.template               | 2 +-
 src/accessor-names/error/cls-expr-inst.template                 | 2 +-
 src/accessor-names/error/cls-expr-static.template               | 2 +-
 src/accessor-names/private/cls-private-decl-inst.template       | 2 +-
 src/accessor-names/private/cls-private-decl-static.template     | 2 +-
 src/accessor-names/private/cls-private-expr-inst.template       | 2 +-
 src/accessor-names/private/cls-private-expr-static.template     | 2 +-
 src/async-functions/syntax/async-class-decl-method.template     | 2 +-
 .../syntax/async-class-decl-private-method.template             | 2 +-
 .../syntax/async-class-decl-static-method.template              | 2 +-
 .../syntax/async-class-decl-static-private-method.template      | 2 +-
 src/async-functions/syntax/async-class-expr-method.template     | 2 +-
 .../syntax/async-class-expr-private-method.template             | 2 +-
 .../syntax/async-class-expr-static-method.template              | 2 +-
 .../syntax/async-class-expr-static-private-method.template      | 2 +-
 src/async-generators/default/async-class-decl-method.template   | 2 +-
 .../default/async-class-decl-private-method.template            | 2 +-
 .../default/async-class-decl-static-method.template             | 2 +-
 .../default/async-class-decl-static-private-method.template     | 2 +-
 src/async-generators/default/async-class-expr-method.template   | 2 +-
 .../default/async-class-expr-private-method.template            | 2 +-
 .../default/async-class-expr-static-method.template             | 2 +-
 .../default/async-class-expr-static-private-method.template     | 2 +-
 src/async-generators/syntax/async-class-decl-method.template    | 2 +-
 .../syntax/async-class-decl-private-method.template             | 2 +-
 .../syntax/async-class-decl-static-method.template              | 2 +-
 .../syntax/async-class-decl-static-private-method.template      | 2 +-
 src/async-generators/syntax/async-class-expr-method.template    | 2 +-
 .../syntax/async-class-expr-private-method.template             | 2 +-
 .../syntax/async-class-expr-static-method.template              | 2 +-
 .../syntax/async-class-expr-static-private-method.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-async-meth-static.template  | 2 +-
 src/function-forms/default/cls-decl-async-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-async-meth-static.template  | 2 +-
 src/function-forms/default/cls-expr-async-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 +-
 .../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-async-meth-static.template    | 2 +-
 src/function-forms/error/cls-decl-async-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-async-meth-static.template    | 2 +-
 src/function-forms/error/cls-expr-async-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 +-
 .../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-async-meth-static.template   | 2 +-
 src/function-forms/syntax/cls-decl-async-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-async-meth-static.template   | 2 +-
 src/function-forms/syntax/cls-expr-async-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/generators/default/class-decl-method.template               | 2 +-
 src/generators/default/class-decl-private-method.template       | 2 +-
 src/generators/default/class-decl-static-method.template        | 2 +-
 .../default/class-decl-static-private-method.template           | 2 +-
 src/generators/default/class-expr-method.template               | 2 +-
 src/generators/default/class-expr-private-method.template       | 2 +-
 src/generators/default/class-expr-static-method.template        | 2 +-
 .../default/class-expr-static-private-method.template           | 2 +-
 src/generators/syntax/class-decl-method.template                | 2 +-
 src/generators/syntax/class-decl-private-method.template        | 2 +-
 src/generators/syntax/class-decl-static-method.template         | 2 +-
 src/generators/syntax/class-decl-static-private-method.template | 2 +-
 src/generators/syntax/class-expr-method.template                | 2 +-
 src/generators/syntax/class-expr-private-method.template        | 2 +-
 src/generators/syntax/class-expr-static-method.template         | 2 +-
 src/generators/syntax/class-expr-static-private-method.template | 2 +-
 .../default/cls-decl-field-initializer-fn.template              | 2 +-
 .../default/cls-decl-field-initializer-heritage.template        | 2 +-
 .../default/cls-decl-field-initializer.template                 | 2 +-
 .../default/cls-decl-inner-method.template                      | 2 +-
 src/invalid-private-names/default/cls-decl-method-fn.template   | 2 +-
 .../default/cls-decl-method-heritage.template                   | 2 +-
 src/invalid-private-names/default/cls-decl-method.template      | 2 +-
 .../default/cls-decl-outter-method.template                     | 2 +-
 .../default/cls-expr-field-initializer-fn.template              | 2 +-
 .../default/cls-expr-field-initializer-heritage.template        | 2 +-
 .../default/cls-expr-field-initializer.template                 | 2 +-
 .../default/cls-expr-inner-method.template                      | 2 +-
 src/invalid-private-names/default/cls-expr-method-fn.template   | 2 +-
 .../default/cls-expr-method-heritage.template                   | 2 +-
 src/invalid-private-names/default/cls-expr-method.template      | 2 +-
 .../default/cls-expr-outter-method.template                     | 2 +-
 116 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/src/accessor-names/default/cls-decl-inst.template b/src/accessor-names/default/cls-decl-inst.template
index ba8a7c25ea..dd9c973015 100644
--- a/src/accessor-names/default/cls-decl-inst.template
+++ b/src/accessor-names/default/cls-decl-inst.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Mike Pennisi. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/accessor-name-inst-
+path: language/statements/class/accessor-name-inst/
 name: Class declaration, instance method
 esid: sec-runtime-semantics-classdefinitionevaluation
 es6id: 14.5.14
diff --git a/src/accessor-names/default/cls-decl-static.template b/src/accessor-names/default/cls-decl-static.template
index 166c4f80e7..3f995ae464 100644
--- a/src/accessor-names/default/cls-decl-static.template
+++ b/src/accessor-names/default/cls-decl-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Mike Pennisi. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/accessor-name-static-
+path: language/statements/class/accessor-name-static/
 name: Class declaration, static method
 esid: sec-runtime-semantics-classdefinitionevaluation
 es6id: 14.5.14
diff --git a/src/accessor-names/default/cls-expr-inst.template b/src/accessor-names/default/cls-expr-inst.template
index 3557bd4a8d..02f0654332 100644
--- a/src/accessor-names/default/cls-expr-inst.template
+++ b/src/accessor-names/default/cls-expr-inst.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Mike Pennisi. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/accessor-name-inst-
+path: language/expressions/class/accessor-name-inst/
 name: Class expression, instance method
 esid: sec-runtime-semantics-classdefinitionevaluation
 es6id: 14.5.14
diff --git a/src/accessor-names/default/cls-expr-static.template b/src/accessor-names/default/cls-expr-static.template
index 23659a813e..bdbf9bc70d 100644
--- a/src/accessor-names/default/cls-expr-static.template
+++ b/src/accessor-names/default/cls-expr-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Mike Pennisi. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/accessor-name-static-
+path: language/expressions/class/accessor-name-static/
 name: Class expression, static method
 esid: sec-runtime-semantics-classdefinitionevaluation
 es6id: 14.5.14
diff --git a/src/accessor-names/error/cls-decl-inst.template b/src/accessor-names/error/cls-decl-inst.template
index 1a32ff17f8..98a717730c 100644
--- a/src/accessor-names/error/cls-decl-inst.template
+++ b/src/accessor-names/error/cls-decl-inst.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Mike Pennisi. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/accessor-name-inst-
+path: language/statements/class/accessor-name-inst/
 name: Class declaration, instance method
 esid: sec-runtime-semantics-classdefinitionevaluation
 es6id: 14.5.14
diff --git a/src/accessor-names/error/cls-decl-static.template b/src/accessor-names/error/cls-decl-static.template
index 1eea03e751..08658e9375 100644
--- a/src/accessor-names/error/cls-decl-static.template
+++ b/src/accessor-names/error/cls-decl-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Mike Pennisi. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/accessor-name-static-
+path: language/statements/class/accessor-name-static/
 name: Class declaration, static method
 esid: sec-runtime-semantics-classdefinitionevaluation
 es6id: 14.5.14
diff --git a/src/accessor-names/error/cls-expr-inst.template b/src/accessor-names/error/cls-expr-inst.template
index 00aca595c9..705b41a844 100644
--- a/src/accessor-names/error/cls-expr-inst.template
+++ b/src/accessor-names/error/cls-expr-inst.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Mike Pennisi. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/accessor-name-inst-
+path: language/expressions/class/accessor-name-inst/
 name: Class expression, instance method
 esid: sec-runtime-semantics-classdefinitionevaluation
 es6id: 14.5.14
diff --git a/src/accessor-names/error/cls-expr-static.template b/src/accessor-names/error/cls-expr-static.template
index 692b90f1b4..a3a259295c 100644
--- a/src/accessor-names/error/cls-expr-static.template
+++ b/src/accessor-names/error/cls-expr-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Mike Pennisi. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/accessor-name-static-
+path: language/expressions/class/accessor-name-static/
 name: Class expression, static method
 esid: sec-runtime-semantics-classdefinitionevaluation
 es6id: 14.5.14
diff --git a/src/accessor-names/private/cls-private-decl-inst.template b/src/accessor-names/private/cls-private-decl-inst.template
index 25040ddd11..ebcc13239e 100644
--- a/src/accessor-names/private/cls-private-decl-inst.template
+++ b/src/accessor-names/private/cls-private-decl-inst.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Katie Broida. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/private-accessor-name/inst-
+path: language/statements/class/elements/private-accessor-name/inst-
 name: Class declaration, private instance method
 esid: #prod-MethodDefinition
 info: |
diff --git a/src/accessor-names/private/cls-private-decl-static.template b/src/accessor-names/private/cls-private-decl-static.template
index a1d0a38129..3457d4684d 100644
--- a/src/accessor-names/private/cls-private-decl-static.template
+++ b/src/accessor-names/private/cls-private-decl-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Katie Broida. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/private-accessor-name/static-
+path: language/statements/class/elements/private-accessor-name/static-
 name: Class declaration, static method
 esid: #prod-MethodDefinition
 info: |
diff --git a/src/accessor-names/private/cls-private-expr-inst.template b/src/accessor-names/private/cls-private-expr-inst.template
index 718ae187c7..43f7f66da2 100644
--- a/src/accessor-names/private/cls-private-expr-inst.template
+++ b/src/accessor-names/private/cls-private-expr-inst.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Katie Broida. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/private-accessor-name/inst-
+path: language/expressions/class/elements/private-accessor-name/inst-
 name: Class expression, instance private method
 esid: #prod-MethodDefinition
 info: |
diff --git a/src/accessor-names/private/cls-private-expr-static.template b/src/accessor-names/private/cls-private-expr-static.template
index 2a86f3b184..379a09d50e 100644
--- a/src/accessor-names/private/cls-private-expr-static.template
+++ b/src/accessor-names/private/cls-private-expr-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Katie Broida. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/private-accessor-name/static-
+path: language/expressions/class/elements/private-accessor-name/static-
 name: Class expression, static private method
 esid: #prod-MethodDefinition
 info: |
diff --git a/src/async-functions/syntax/async-class-decl-method.template b/src/async-functions/syntax/async-class-decl-method.template
index 812e90199a..241a621894 100644
--- a/src/async-functions/syntax/async-class-decl-method.template
+++ b/src/async-functions/syntax/async-class-decl-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-method-
+path: language/statements/class/async-method/
 name: Async method as a ClassDeclaration element
 esid: prod-AsyncMethod
 info: |
diff --git a/src/async-functions/syntax/async-class-decl-private-method.template b/src/async-functions/syntax/async-class-decl-private-method.template
index 5a3949ab24..1d252d3f3a 100644
--- a/src/async-functions/syntax/async-class-decl-private-method.template
+++ b/src/async-functions/syntax/async-class-decl-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-private-method-
+path: language/statements/class/async-private-method/
 name: Async private method as a ClassDeclaration element
 esid: prod-AsyncMethod
 info: |
diff --git a/src/async-functions/syntax/async-class-decl-static-method.template b/src/async-functions/syntax/async-class-decl-static-method.template
index e48f5a253c..2a6c146ec1 100644
--- a/src/async-functions/syntax/async-class-decl-static-method.template
+++ b/src/async-functions/syntax/async-class-decl-static-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-method-static-
+path: language/statements/class/async-method-static/
 name: Static async method as a ClassDeclaration element
 esid: prod-AsyncMethod
 info: |
diff --git a/src/async-functions/syntax/async-class-decl-static-private-method.template b/src/async-functions/syntax/async-class-decl-static-private-method.template
index 5d9e912804..98c9dbc45b 100644
--- a/src/async-functions/syntax/async-class-decl-static-private-method.template
+++ b/src/async-functions/syntax/async-class-decl-static-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-private-method-static-
+path: language/statements/class/async-private-method-static/
 name: Static async private method as a ClassDeclaration element
 esid: prod-AsyncMethod
 info: |
diff --git a/src/async-functions/syntax/async-class-expr-method.template b/src/async-functions/syntax/async-class-expr-method.template
index 9f7a757b33..4e988ba410 100644
--- a/src/async-functions/syntax/async-class-expr-method.template
+++ b/src/async-functions/syntax/async-class-expr-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-method-
+path: language/expressions/class/async-method/
 name: Async method as a ClassExpression element
 esid: prod-AsyncMethod
 info: |
diff --git a/src/async-functions/syntax/async-class-expr-private-method.template b/src/async-functions/syntax/async-class-expr-private-method.template
index 8f047f74d0..7be79ef126 100644
--- a/src/async-functions/syntax/async-class-expr-private-method.template
+++ b/src/async-functions/syntax/async-class-expr-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-private-method-
+path: language/expressions/class/async-private-method/
 name: Async private method as a ClassExpression element
 esid: prod-AsyncMethod
 info: |
diff --git a/src/async-functions/syntax/async-class-expr-static-method.template b/src/async-functions/syntax/async-class-expr-static-method.template
index 3e7d66391b..9af0668c2e 100644
--- a/src/async-functions/syntax/async-class-expr-static-method.template
+++ b/src/async-functions/syntax/async-class-expr-static-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-method-static-
+path: language/expressions/class/async-method-static/
 name: Static async method as a ClassExpression element
 esid: prod-AsyncMethod
 info: |
diff --git a/src/async-functions/syntax/async-class-expr-static-private-method.template b/src/async-functions/syntax/async-class-expr-static-private-method.template
index 136b6782eb..e38e4b70eb 100644
--- a/src/async-functions/syntax/async-class-expr-static-private-method.template
+++ b/src/async-functions/syntax/async-class-expr-static-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-private-method-static-
+path: language/expressions/class/async-private-method-static/
 name: Static private async method as a ClassExpression element
 esid: prod-AsyncMethod
 info: |
diff --git a/src/async-generators/default/async-class-decl-method.template b/src/async-generators/default/async-class-decl-method.template
index 87cd550d46..93217f412b 100644
--- a/src/async-generators/default/async-class-decl-method.template
+++ b/src/async-generators/default/async-class-decl-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-method-
+path: language/statements/class/async-gen-method/
 name: Async Generator method as a ClassDeclaration element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/default/async-class-decl-private-method.template b/src/async-generators/default/async-class-decl-private-method.template
index 44ff11ea49..91a8b48608 100644
--- a/src/async-generators/default/async-class-decl-private-method.template
+++ b/src/async-generators/default/async-class-decl-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-private-method-
+path: language/statements/class/async-gen-private-method/
 name: Async Generator method as a ClassDeclaration element
 esid: prod-AsyncGeneratorPrivateMethod
 info: |
diff --git a/src/async-generators/default/async-class-decl-static-method.template b/src/async-generators/default/async-class-decl-static-method.template
index 00b105ad43..08647343bd 100644
--- a/src/async-generators/default/async-class-decl-static-method.template
+++ b/src/async-generators/default/async-class-decl-static-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-method-static-
+path: language/statements/class/async-gen-method-static/
 name: Static async generator method as a ClassDeclaration element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/default/async-class-decl-static-private-method.template b/src/async-generators/default/async-class-decl-static-private-method.template
index 9e4f7d5fc1..76cd2e0437 100644
--- a/src/async-generators/default/async-class-decl-static-private-method.template
+++ b/src/async-generators/default/async-class-decl-static-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-private-method-static-
+path: language/statements/class/async-gen-private-method-static/
 name: Static async generator method as a ClassDeclaration element
 esid: prod-AsyncGeneratorPrivateMethod
 info: |
diff --git a/src/async-generators/default/async-class-expr-method.template b/src/async-generators/default/async-class-expr-method.template
index 745a8e9279..458ade5920 100644
--- a/src/async-generators/default/async-class-expr-method.template
+++ b/src/async-generators/default/async-class-expr-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-gen-method-
+path: language/expressions/class/async-gen-method/
 name: Async generator method as a ClassExpression element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/default/async-class-expr-private-method.template b/src/async-generators/default/async-class-expr-private-method.template
index c2509020a5..72a6172e6a 100644
--- a/src/async-generators/default/async-class-expr-private-method.template
+++ b/src/async-generators/default/async-class-expr-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-gen-private-method-
+path: language/expressions/class/async-gen-private-method/
 name: Async generator method as a ClassExpression element
 esid: prod-AsyncGeneratorPrivateMethod
 info: |
diff --git a/src/async-generators/default/async-class-expr-static-method.template b/src/async-generators/default/async-class-expr-static-method.template
index ac7328fff2..1767ac5e29 100644
--- a/src/async-generators/default/async-class-expr-static-method.template
+++ b/src/async-generators/default/async-class-expr-static-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-gen-method-static-
+path: language/expressions/class/async-gen-method-static/
 name: Static async generator method as a ClassExpression element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/default/async-class-expr-static-private-method.template b/src/async-generators/default/async-class-expr-static-private-method.template
index 828930de22..cb7f200eab 100644
--- a/src/async-generators/default/async-class-expr-static-private-method.template
+++ b/src/async-generators/default/async-class-expr-static-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-gen-private-method-static-
+path: language/expressions/class/async-gen-private-method-static/
 name: Static async generator method as a ClassExpression element
 esid: prod-AsyncGeneratorPrivateMethod
 info: |
diff --git a/src/async-generators/syntax/async-class-decl-method.template b/src/async-generators/syntax/async-class-decl-method.template
index e6c2a7017d..c489b26471 100644
--- a/src/async-generators/syntax/async-class-decl-method.template
+++ b/src/async-generators/syntax/async-class-decl-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-method-
+path: language/statements/class/async-gen-method/
 name: Async Generator method as a ClassDeclaration element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/syntax/async-class-decl-private-method.template b/src/async-generators/syntax/async-class-decl-private-method.template
index b9072ff2d5..e74cfc11d4 100644
--- a/src/async-generators/syntax/async-class-decl-private-method.template
+++ b/src/async-generators/syntax/async-class-decl-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-private-method-
+path: language/statements/class/async-gen-private-method/
 name: Async Generator private method as a ClassDeclaration element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/syntax/async-class-decl-static-method.template b/src/async-generators/syntax/async-class-decl-static-method.template
index d5872bffe8..dbef0d588b 100644
--- a/src/async-generators/syntax/async-class-decl-static-method.template
+++ b/src/async-generators/syntax/async-class-decl-static-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-method-static-
+path: language/statements/class/async-gen-method-static/
 name: Static async generator method as a ClassDeclaration element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/syntax/async-class-decl-static-private-method.template b/src/async-generators/syntax/async-class-decl-static-private-method.template
index ad427cca7b..ad9009af6d 100644
--- a/src/async-generators/syntax/async-class-decl-static-private-method.template
+++ b/src/async-generators/syntax/async-class-decl-static-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-private-method-static-
+path: language/statements/class/async-gen-private-method-static/
 name: Static async generator private method as a ClassDeclaration element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/syntax/async-class-expr-method.template b/src/async-generators/syntax/async-class-expr-method.template
index 8f0dac898e..dc0f73d14a 100644
--- a/src/async-generators/syntax/async-class-expr-method.template
+++ b/src/async-generators/syntax/async-class-expr-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-gen-method-
+path: language/expressions/class/async-gen-method/
 name: Async generator method as a ClassExpression element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/syntax/async-class-expr-private-method.template b/src/async-generators/syntax/async-class-expr-private-method.template
index 78938bc4a0..178385f508 100644
--- a/src/async-generators/syntax/async-class-expr-private-method.template
+++ b/src/async-generators/syntax/async-class-expr-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-gen-private-method-
+path: language/expressions/class/async-gen-private-method/
 name: Async generator private method as a ClassExpression element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/syntax/async-class-expr-static-method.template b/src/async-generators/syntax/async-class-expr-static-method.template
index aab90d484b..01088caa25 100644
--- a/src/async-generators/syntax/async-class-expr-static-method.template
+++ b/src/async-generators/syntax/async-class-expr-static-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-gen-method-static-
+path: language/expressions/class/async-gen-method-static/
 name: Static async generator method as a ClassExpression element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/syntax/async-class-expr-static-private-method.template b/src/async-generators/syntax/async-class-expr-static-private-method.template
index 52324446ea..3f804af8b4 100644
--- a/src/async-generators/syntax/async-class-expr-static-private-method.template
+++ b/src/async-generators/syntax/async-class-expr-static-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-gen-private-method-static-
+path: language/expressions/class/async-gen-private-method-static/
 name: Static async generator private method as a ClassExpression element
 esid: prod-AsyncGeneratorMethod
 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 ae172b8eb6..d564d60799 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/async-gen-meth-static-
+path: language/statements/class/async-gen-meth-static/
 name: static class declaration async 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 400ad4c6cd..9ac00af96b 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/async-gen-meth-
+path: language/statements/class/async-gen-meth/
 name: class declaration async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-async-meth-static.template b/src/function-forms/default/cls-decl-async-meth-static.template
index b745a86a41..0d43f58195 100644
--- a/src/function-forms/default/cls-decl-async-meth-static.template
+++ b/src/function-forms/default/cls-decl-async-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-meth-static-
+path: language/statements/class/async-meth-static/
 name: static class declaration async method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-async-meth.template b/src/function-forms/default/cls-decl-async-meth.template
index 812cd4aba6..873cb0fbc9 100644
--- a/src/function-forms/default/cls-decl-async-meth.template
+++ b/src/function-forms/default/cls-decl-async-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-meth-
+path: language/statements/class/async-meth/
 name: class declaration async 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 70577ea99d..d6f14d6588 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/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 675da76740..fd7e975c27 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/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 4f97319d45..ce90f407e5 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/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 7cff1cd0d9..3ed7201e66 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/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 2f44f8fff2..94229234c4 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/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 4829b7ffe9..6c26f31029 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/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-async-meth-static.template b/src/function-forms/default/cls-expr-async-meth-static.template
index d558633a61..19738eb26f 100644
--- a/src/function-forms/default/cls-expr-async-meth-static.template
+++ b/src/function-forms/default/cls-expr-async-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/async-meth-static-
+path: language/expressions/class/async-meth-static/
 name: static class expression async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-async-meth.template b/src/function-forms/default/cls-expr-async-meth.template
index 0590f67c01..150b91e35b 100644
--- a/src/function-forms/default/cls-expr-async-meth.template
+++ b/src/function-forms/default/cls-expr-async-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/async-meth-
+path: language/expressions/class/async-meth/
 name: class expression async 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 d1480f8dff..94f53cda00 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/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 1a537ca14f..0d47f8c579 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/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 50906f462d..7bc897aad1 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/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 68ccff1cb8..b6bf732ab3 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/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/cls-decl-async-gen-meth-static.template b/src/function-forms/error/cls-decl-async-gen-meth-static.template
index 3fd1feb0c1..efad52db0c 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/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 540b641e33..541710ad4d 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/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-async-meth-static.template b/src/function-forms/error/cls-decl-async-meth-static.template
index b3f9941e2f..5652a91cc3 100644
--- a/src/function-forms/error/cls-decl-async-meth-static.template
+++ b/src/function-forms/error/cls-decl-async-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-meth-static-
+path: language/statements/class/async-meth-static/
 name: static class declaration async method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-async-meth.template b/src/function-forms/error/cls-decl-async-meth.template
index 9ee782999d..fa1d23b912 100644
--- a/src/function-forms/error/cls-decl-async-meth.template
+++ b/src/function-forms/error/cls-decl-async-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-meth-
+path: language/statements/class/async-meth/
 name: class declaration async 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 513de136b5..48802287b9 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/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 0519d95412..8e5def37b6 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/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 2e8bf54df7..005ed11e15 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/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 dad78b2184..911db8a773 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/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 f7f3534e36..64779bd30c 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/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 d702eca1a4..07bf7f9843 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/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-async-meth-static.template b/src/function-forms/error/cls-expr-async-meth-static.template
index 33e35a56f3..5f6ff6f6cf 100644
--- a/src/function-forms/error/cls-expr-async-meth-static.template
+++ b/src/function-forms/error/cls-expr-async-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-meth-static-
+path: language/expressions/class/async-meth-static/
 name: static class expression async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-async-meth.template b/src/function-forms/error/cls-expr-async-meth.template
index 45dc7335dd..7e80b8b55e 100644
--- a/src/function-forms/error/cls-expr-async-meth.template
+++ b/src/function-forms/error/cls-expr-async-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-meth-
+path: language/expressions/class/async-meth/
 name: class expression async 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 a292acfdde..7b9629cfbf 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/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 a9a32455bc..3a6f2c9399 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/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 562ac933b1..b271cc9763 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/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 449d1c6d0d..3b9f01931b 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/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/cls-decl-async-gen-meth-static.template b/src/function-forms/syntax/cls-decl-async-gen-meth-static.template
index 6482e99d5d..04c3c7ccec 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/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 83b0edc649..00bfd6960f 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/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-async-meth-static.template b/src/function-forms/syntax/cls-decl-async-meth-static.template
index b0600cbce7..b355156e70 100644
--- a/src/function-forms/syntax/cls-decl-async-meth-static.template
+++ b/src/function-forms/syntax/cls-decl-async-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-meth-static-
+path: language/statements/class/async-meth-static/
 name: static class declaration async method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-async-meth.template b/src/function-forms/syntax/cls-decl-async-meth.template
index b8bbe5ea34..18f450d1a5 100644
--- a/src/function-forms/syntax/cls-decl-async-meth.template
+++ b/src/function-forms/syntax/cls-decl-async-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-meth-
+path: language/statements/class/async-meth/
 name: class declaration async 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 bcac531200..cbbfa6fb1b 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/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 d33a041491..3fb269a899 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/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 89273df182..47f2dd28f6 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/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 21c6a9d29b..d0e554f95e 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/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 040a3b47b7..f9823e4bb3 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/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 c691525cf6..86d96f3e58 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/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-async-meth-static.template b/src/function-forms/syntax/cls-expr-async-meth-static.template
index 9fb25c1729..a954c09e7b 100644
--- a/src/function-forms/syntax/cls-expr-async-meth-static.template
+++ b/src/function-forms/syntax/cls-expr-async-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/async-meth-static-
+path: language/expressions/class/async-meth-static/
 name: static class expression async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-async-meth.template b/src/function-forms/syntax/cls-expr-async-meth.template
index a7f86f364f..83f82cb6d1 100644
--- a/src/function-forms/syntax/cls-expr-async-meth.template
+++ b/src/function-forms/syntax/cls-expr-async-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/async-meth-
+path: language/expressions/class/async-meth/
 name: class expression async 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 077fca09e3..6e54d7b0a2 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/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 f385dd8d91..7c013f636c 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/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 3939fbae13..9cf5f711d1 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/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 30d8e84603..6ee49c0fe6 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/meth-
+path: language/expressions/class/meth/
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/generators/default/class-decl-method.template b/src/generators/default/class-decl-method.template
index a1562a76fa..3052fed164 100644
--- a/src/generators/default/class-decl-method.template
+++ b/src/generators/default/class-decl-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-method-
+path: language/statements/class/gen-method/
 name: Generator method as a ClassDeclaration element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/default/class-decl-private-method.template b/src/generators/default/class-decl-private-method.template
index 9676db5790..6d955d1006 100644
--- a/src/generators/default/class-decl-private-method.template
+++ b/src/generators/default/class-decl-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-private-method-
+path: language/statements/class/gen-private-method/
 name: Generator private method as a ClassDeclaration element
 esid: prod-GeneratorPrivateMethod
 info: |
diff --git a/src/generators/default/class-decl-static-method.template b/src/generators/default/class-decl-static-method.template
index e25ce70a5a..09bc7630ea 100644
--- a/src/generators/default/class-decl-static-method.template
+++ b/src/generators/default/class-decl-static-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-method-static-
+path: language/statements/class/gen-method-static/
 name: Static generator method as a ClassDeclaration element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/default/class-decl-static-private-method.template b/src/generators/default/class-decl-static-private-method.template
index 4a5f38b801..cd5be38b0d 100644
--- a/src/generators/default/class-decl-static-private-method.template
+++ b/src/generators/default/class-decl-static-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-private-method-static-
+path: language/statements/class/gen-private-method-static/
 name: Static generator private method as a ClassDeclaration element
 esid: prod-GeneratorPrivateMethod
 info: |
diff --git a/src/generators/default/class-expr-method.template b/src/generators/default/class-expr-method.template
index 7ab56d1cb3..0fa8ae616c 100644
--- a/src/generators/default/class-expr-method.template
+++ b/src/generators/default/class-expr-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-method-
+path: language/expressions/class/gen-method/
 name: Generator method as a ClassExpression element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/default/class-expr-private-method.template b/src/generators/default/class-expr-private-method.template
index cede4ddfb0..7e775d67c7 100644
--- a/src/generators/default/class-expr-private-method.template
+++ b/src/generators/default/class-expr-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-private-method-
+path: language/expressions/class/gen-private-method/
 name: Generator private method as a ClassExpression element
 esid: prod-GeneratorPrivateMethod
 info: |
diff --git a/src/generators/default/class-expr-static-method.template b/src/generators/default/class-expr-static-method.template
index 609097dbcb..34dc1f6a9c 100644
--- a/src/generators/default/class-expr-static-method.template
+++ b/src/generators/default/class-expr-static-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-method-static-
+path: language/expressions/class/gen-method-static/
 name: Static generator method as a ClassExpression element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/default/class-expr-static-private-method.template b/src/generators/default/class-expr-static-private-method.template
index eb150dfcaf..a84a691979 100644
--- a/src/generators/default/class-expr-static-private-method.template
+++ b/src/generators/default/class-expr-static-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-private-method-static-
+path: language/expressions/class/gen-private-method-static/
 name: Static generator private method as a ClassExpression element
 esid: prod-GeneratorPrivateMethod
 info: |
diff --git a/src/generators/syntax/class-decl-method.template b/src/generators/syntax/class-decl-method.template
index 0bffb7201c..8b6593ffdf 100644
--- a/src/generators/syntax/class-decl-method.template
+++ b/src/generators/syntax/class-decl-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-method-
+path: language/statements/class/gen-method/
 name: Generator method as a ClassDeclaration element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/syntax/class-decl-private-method.template b/src/generators/syntax/class-decl-private-method.template
index 52877753ee..0c6c71c540 100644
--- a/src/generators/syntax/class-decl-private-method.template
+++ b/src/generators/syntax/class-decl-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-private-method-
+path: language/statements/class/gen-private-method/
 name: Generator method as a ClassDeclaration element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/syntax/class-decl-static-method.template b/src/generators/syntax/class-decl-static-method.template
index 2a1b84f587..a3461c2d96 100644
--- a/src/generators/syntax/class-decl-static-method.template
+++ b/src/generators/syntax/class-decl-static-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-method-static-
+path: language/statements/class/gen-method-static/
 name: Static generator method as a ClassDeclaration element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/syntax/class-decl-static-private-method.template b/src/generators/syntax/class-decl-static-private-method.template
index c240dbee80..a2e7448b14 100644
--- a/src/generators/syntax/class-decl-static-private-method.template
+++ b/src/generators/syntax/class-decl-static-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-private-method-static-
+path: language/statements/class/gen-private-method-static/
 name: Static generator method as a ClassDeclaration element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/syntax/class-expr-method.template b/src/generators/syntax/class-expr-method.template
index f4f524e9d3..1565c07ab5 100644
--- a/src/generators/syntax/class-expr-method.template
+++ b/src/generators/syntax/class-expr-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-method-
+path: language/expressions/class/gen-method/
 name: Generator method as a ClassExpression element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/syntax/class-expr-private-method.template b/src/generators/syntax/class-expr-private-method.template
index db8559834c..5b4548f3a3 100644
--- a/src/generators/syntax/class-expr-private-method.template
+++ b/src/generators/syntax/class-expr-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-private-method-
+path: language/expressions/class/gen-private-method/
 name: Generator private method as a ClassExpression element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/syntax/class-expr-static-method.template b/src/generators/syntax/class-expr-static-method.template
index 62b1e85f77..3536865b4d 100644
--- a/src/generators/syntax/class-expr-static-method.template
+++ b/src/generators/syntax/class-expr-static-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-method-static-
+path: language/expressions/class/gen-method-static/
 name: Static generator method as a ClassExpression element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/syntax/class-expr-static-private-method.template b/src/generators/syntax/class-expr-static-private-method.template
index e436df940f..39a468170a 100644
--- a/src/generators/syntax/class-expr-static-private-method.template
+++ b/src/generators/syntax/class-expr-static-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-private-method-static-
+path: language/expressions/class/gen-private-method-static/
 name: Static generator private method as a ClassExpression element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/invalid-private-names/default/cls-decl-field-initializer-fn.template b/src/invalid-private-names/default/cls-decl-field-initializer-fn.template
index b4da088fc3..1a362c8348 100644
--- a/src/invalid-private-names/default/cls-decl-field-initializer-fn.template
+++ b/src/invalid-private-names/default/cls-decl-field-initializer-fn.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/syntax/early-errors/invalid-names/field-init-fn-
+path: language/statements/class/elements/syntax/early-errors/invalid-names/field-init-fn-
 name: >
   Invalid private names should throw a SyntaxError,
   function in class field initializer in class declaration
diff --git a/src/invalid-private-names/default/cls-decl-field-initializer-heritage.template b/src/invalid-private-names/default/cls-decl-field-initializer-heritage.template
index c4a22bbba4..981479864e 100644
--- a/src/invalid-private-names/default/cls-decl-field-initializer-heritage.template
+++ b/src/invalid-private-names/default/cls-decl-field-initializer-heritage.template
@@ -3,7 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/syntax/early-errors/invalid-names/fields-init-heritage-
+path: language/statements/class/elements/syntax/early-errors/invalid-names/fields-init-heritage-
 name: >
   Invalid private names should throw a SyntaxError,
   class field initializer in class declaration
diff --git a/src/invalid-private-names/default/cls-decl-field-initializer.template b/src/invalid-private-names/default/cls-decl-field-initializer.template
index 7e40eced0f..cacc390322 100644
--- a/src/invalid-private-names/default/cls-decl-field-initializer.template
+++ b/src/invalid-private-names/default/cls-decl-field-initializer.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/syntax/early-errors/invalid-names/field-init-
+path: language/statements/class/elements/syntax/early-errors/invalid-names/field-init-
 name: >
   Invalid private names should throw a SyntaxError,
   class field initializer in class declaration
diff --git a/src/invalid-private-names/default/cls-decl-inner-method.template b/src/invalid-private-names/default/cls-decl-inner-method.template
index 23bb2862c9..285973029e 100644
--- a/src/invalid-private-names/default/cls-decl-inner-method.template
+++ b/src/invalid-private-names/default/cls-decl-inner-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/syntax/early-errors/invalid-names/method-inner-
+path: language/statements/class/elements/syntax/early-errors/invalid-names/method-inner-
 name: >
   Invalid private names should throw a SyntaxError,
   method in inner class declaration
diff --git a/src/invalid-private-names/default/cls-decl-method-fn.template b/src/invalid-private-names/default/cls-decl-method-fn.template
index f4f4ee3fb3..b07a239042 100644
--- a/src/invalid-private-names/default/cls-decl-method-fn.template
+++ b/src/invalid-private-names/default/cls-decl-method-fn.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/syntax/early-errors/invalid-names/method-fn-
+path: language/statements/class/elements/syntax/early-errors/invalid-names/method-fn-
 name: >
   Invalid private names should throw a SyntaxError,
   inner function in method in class declaration
diff --git a/src/invalid-private-names/default/cls-decl-method-heritage.template b/src/invalid-private-names/default/cls-decl-method-heritage.template
index 758909c8ad..0508752420 100644
--- a/src/invalid-private-names/default/cls-decl-method-heritage.template
+++ b/src/invalid-private-names/default/cls-decl-method-heritage.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/syntax/early-errors/invalid-names/method-heritage-
+path: language/statements/class/elements/syntax/early-errors/invalid-names/method-heritage-
 name: >
   Invalid private names should throw a SyntaxError,
   method in class declaration
diff --git a/src/invalid-private-names/default/cls-decl-method.template b/src/invalid-private-names/default/cls-decl-method.template
index 776dee46aa..94b85712b7 100644
--- a/src/invalid-private-names/default/cls-decl-method.template
+++ b/src/invalid-private-names/default/cls-decl-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/syntax/early-errors/invalid-names/method-
+path: language/statements/class/elements/syntax/early-errors/invalid-names/method-
 name: >
   Invalid private names should throw a SyntaxError,
   method in class declaration
diff --git a/src/invalid-private-names/default/cls-decl-outter-method.template b/src/invalid-private-names/default/cls-decl-outter-method.template
index d4b6a3c7cd..c2dd35f916 100644
--- a/src/invalid-private-names/default/cls-decl-outter-method.template
+++ b/src/invalid-private-names/default/cls-decl-outter-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/syntax/early-errors/invalid-names/method-outter-
+path: language/statements/class/elements/syntax/early-errors/invalid-names/method-outter-
 name: >
   Invalid private names should throw a SyntaxError,
   method in outter class declaration
diff --git a/src/invalid-private-names/default/cls-expr-field-initializer-fn.template b/src/invalid-private-names/default/cls-expr-field-initializer-fn.template
index 8a2ad2d19c..5d64d04ff0 100644
--- a/src/invalid-private-names/default/cls-expr-field-initializer-fn.template
+++ b/src/invalid-private-names/default/cls-expr-field-initializer-fn.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/syntax/early-errors/invalid-names/field-init-fn-
+path: language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-fn-
 name: >
   Invalid private names should throw a SyntaxError,
   function in class field initializer in class expression
diff --git a/src/invalid-private-names/default/cls-expr-field-initializer-heritage.template b/src/invalid-private-names/default/cls-expr-field-initializer-heritage.template
index d743217e63..ebd722b8ba 100644
--- a/src/invalid-private-names/default/cls-expr-field-initializer-heritage.template
+++ b/src/invalid-private-names/default/cls-expr-field-initializer-heritage.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/syntax/early-errors/invalid-names/field-init-heritage-
+path: language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-heritage-
 name: >
   Invalid private names should throw a SyntaxError,
   field initializer in inner class expression
diff --git a/src/invalid-private-names/default/cls-expr-field-initializer.template b/src/invalid-private-names/default/cls-expr-field-initializer.template
index e49e9f3316..aede4e6a95 100644
--- a/src/invalid-private-names/default/cls-expr-field-initializer.template
+++ b/src/invalid-private-names/default/cls-expr-field-initializer.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/syntax/early-errors/invalid-names/field-init-
+path: language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-
 name: >
   Invalid private names should throw a SyntaxError,
   class field initializer in class expression
diff --git a/src/invalid-private-names/default/cls-expr-inner-method.template b/src/invalid-private-names/default/cls-expr-inner-method.template
index f0081d3310..afe21203a0 100644
--- a/src/invalid-private-names/default/cls-expr-inner-method.template
+++ b/src/invalid-private-names/default/cls-expr-inner-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/syntax/early-errors/invalid-names/method-inner-
+path: language/expressions/class/elements/syntax/early-errors/invalid-names/method-inner-
 name: >
   Invalid private names should throw a SyntaxError,
   method in inner class expression
diff --git a/src/invalid-private-names/default/cls-expr-method-fn.template b/src/invalid-private-names/default/cls-expr-method-fn.template
index 68e7db30dd..ffa4a97d39 100644
--- a/src/invalid-private-names/default/cls-expr-method-fn.template
+++ b/src/invalid-private-names/default/cls-expr-method-fn.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/syntax/early-errors/invalid-names/method-fn-
+path: language/expressions/class/elements/syntax/early-errors/invalid-names/method-fn-
 name: >
   Invalid private names should throw a SyntaxError,
   inner function in method in class expression
diff --git a/src/invalid-private-names/default/cls-expr-method-heritage.template b/src/invalid-private-names/default/cls-expr-method-heritage.template
index a38c4532bc..e16c6aeca3 100644
--- a/src/invalid-private-names/default/cls-expr-method-heritage.template
+++ b/src/invalid-private-names/default/cls-expr-method-heritage.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/syntax/early-errors/invalid-names/method-heritage-
+path: language/expressions/class/elements/syntax/early-errors/invalid-names/method-heritage-
 name: >
   Invalid private names should throw a SyntaxError,
   method in inner class expression
diff --git a/src/invalid-private-names/default/cls-expr-method.template b/src/invalid-private-names/default/cls-expr-method.template
index 25ed93ad45..18b4340b8a 100644
--- a/src/invalid-private-names/default/cls-expr-method.template
+++ b/src/invalid-private-names/default/cls-expr-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/syntax/early-errors/invalid-names/method-
+path: language/expressions/class/elements/syntax/early-errors/invalid-names/method-
 name: >
   Invalid private names should throw a SyntaxError,
   method in class expression
diff --git a/src/invalid-private-names/default/cls-expr-outter-method.template b/src/invalid-private-names/default/cls-expr-outter-method.template
index 0936f7991a..57aebd8605 100644
--- a/src/invalid-private-names/default/cls-expr-outter-method.template
+++ b/src/invalid-private-names/default/cls-expr-outter-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/syntax/early-errors/invalid-names/method-outter-
+path: language/expressions/class/elements/syntax/early-errors/invalid-names/method-outter-
 name: >
   Invalid private names should throw a SyntaxError,
   method in outter class expression
-- 
GitLab