From 1aba619c00c4c4c57fc0394a92673931c8ce374a Mon Sep 17 00:00:00 2001
From: Leo Balter <leonardo.balter@gmail.com>
Date: Fri, 21 Dec 2018 15:29:28 -0200
Subject: [PATCH] Reorganize target folders - class fields from
 src/class-elements

---
 src/class-elements/class-evaluation-error/cls-decl.template     | 2 +-
 src/class-elements/class-evaluation-error/cls-expr.template     | 2 +-
 src/class-elements/default/cls-decl.template                    | 2 +-
 src/class-elements/default/cls-expr.template                    | 2 +-
 .../initializer-error/cls-decl-fields-arrow-fnc.template        | 2 +-
 .../initializer-error/cls-decl-fields-comp-name.template        | 2 +-
 .../initializer-error/cls-decl-fields-equality.template         | 2 +-
 .../initializer-error/cls-decl-fields-literal-name.template     | 2 +-
 .../cls-decl-fields-private-arrow-fnc.template                  | 2 +-
 .../initializer-error/cls-decl-fields-private-name.template     | 2 +-
 .../initializer-error/cls-decl-fields-private-ternary.template  | 2 +-
 .../initializer-error/cls-decl-fields-private-typeof.template   | 2 +-
 .../initializer-error/cls-decl-fields-static-comp-name.template | 2 +-
 .../cls-decl-fields-static-literal-name.template                | 2 +-
 .../cls-decl-fields-static-private-name.template                | 2 +-
 .../cls-decl-fields-static-string-literal-name.template         | 2 +-
 .../cls-decl-fields-string-literal-name.template                | 2 +-
 .../initializer-error/cls-decl-fields-ternary.template          | 2 +-
 .../initializer-error/cls-decl-fields-typeof.template           | 2 +-
 .../initializer-error/cls-expr-fields-arrow-fnc.template        | 2 +-
 .../initializer-error/cls-expr-fields-comp-name.template        | 2 +-
 .../initializer-error/cls-expr-fields-equality.template         | 2 +-
 .../initializer-error/cls-expr-fields-literal-name.template     | 2 +-
 .../cls-expr-fields-private-arrow-fnc.template                  | 2 +-
 .../initializer-error/cls-expr-fields-private-name.template     | 2 +-
 .../initializer-error/cls-expr-fields-private-ternary.template  | 2 +-
 .../initializer-error/cls-expr-fields-private-typeof.template   | 2 +-
 .../initializer-error/cls-expr-fields-static-comp-name.template | 2 +-
 .../cls-expr-fields-static-literal-name.template                | 2 +-
 .../cls-expr-fields-static-private-name.template                | 2 +-
 .../cls-expr-fields-static-string-literal-name.template         | 2 +-
 .../cls-expr-fields-string-literal-name.template                | 2 +-
 .../initializer-error/cls-expr-fields-ternary.template          | 2 +-
 .../initializer-error/cls-expr-fields-typeof.template           | 2 +-
 .../initializer-eval-arguments/cls-decl-fields-eval.template    | 2 +-
 .../cls-decl-fields-indirect-eval.template                      | 2 +-
 .../cls-decl-private-fields-eval.template                       | 2 +-
 .../cls-decl-private-fields-indirect-eval.template              | 2 +-
 .../initializer-eval-arguments/cls-expr-fields-eval.template    | 2 +-
 .../cls-expr-fields-indirect-eval.template                      | 2 +-
 .../cls-expr-private-fields-eval.template                       | 2 +-
 .../cls-expr-private-fields-indirect-eval.template              | 2 +-
 .../initializer-eval-newtarget/cls-decl-fields-eval.template    | 2 +-
 .../cls-decl-fields-indirect-eval.template                      | 2 +-
 .../cls-decl-private-fields-eval.template                       | 2 +-
 .../cls-decl-private-fields-indirect-eval.template              | 2 +-
 .../initializer-eval-newtarget/cls-expr-fields-eval.template    | 2 +-
 .../cls-expr-fields-indirect-eval.template                      | 2 +-
 .../cls-expr-private-fields-eval.template                       | 2 +-
 .../cls-expr-private-fields-indirect-eval.template              | 2 +-
 .../initializer-eval-super-call/cls-decl-fields-eval.template   | 2 +-
 .../cls-decl-fields-indirect-eval.template                      | 2 +-
 .../cls-decl-private-fields-eval.template                       | 2 +-
 .../cls-decl-private-fields-indirect-eval.template              | 2 +-
 .../initializer-eval-super-call/cls-expr-fields-eval.template   | 2 +-
 .../cls-expr-fields-indirect-eval.template                      | 2 +-
 .../cls-expr-private-fields-eval.template                       | 2 +-
 .../cls-expr-private-fields-indirect-eval.template              | 2 +-
 .../cls-decl-fields-eval.template                               | 2 +-
 .../cls-decl-fields-indirect-eval.template                      | 2 +-
 .../cls-decl-private-fields-eval.template                       | 2 +-
 .../cls-decl-private-fields-indirect-eval.template              | 2 +-
 .../cls-expr-fields-eval.template                               | 2 +-
 .../cls-expr-fields-indirect-eval.template                      | 2 +-
 .../cls-expr-private-fields-eval.template                       | 2 +-
 .../cls-expr-private-fields-indirect-eval.template              | 2 +-
 .../initializer-eval-super/cls-decl-fields-eval.template        | 2 +-
 .../cls-decl-fields-indirect-eval.template                      | 2 +-
 .../cls-decl-private-fields-eval.template                       | 2 +-
 .../cls-decl-private-fields-indirect-eval.template              | 2 +-
 .../initializer-eval-super/cls-expr-fields-eval.template        | 2 +-
 .../cls-expr-fields-indirect-eval.template                      | 2 +-
 .../cls-expr-private-fields-eval.template                       | 2 +-
 .../cls-expr-private-fields-indirect-eval.template              | 2 +-
 .../initializer-eval/cls-decl-fields-eval.template              | 2 +-
 .../initializer-eval/cls-decl-fields-indirect-eval.template     | 2 +-
 .../initializer-eval/cls-decl-private-fields-eval.template      | 2 +-
 .../cls-decl-private-fields-indirect-eval.template              | 2 +-
 .../initializer-eval/cls-expr-fields-eval.template              | 2 +-
 .../initializer-eval/cls-expr-fields-indirect-eval.template     | 2 +-
 .../initializer-eval/cls-expr-private-fields-eval.template      | 2 +-
 .../cls-expr-private-fields-indirect-eval.template              | 2 +-
 .../productions/cls-decl-after-same-line-async-gen.template     | 2 +-
 .../productions/cls-decl-after-same-line-async-method.template  | 2 +-
 .../productions/cls-decl-after-same-line-gen.template           | 2 +-
 .../productions/cls-decl-after-same-line-method.template        | 2 +-
 .../cls-decl-after-same-line-static-async-gen.template          | 2 +-
 .../cls-decl-after-same-line-static-async-method.template       | 2 +-
 .../productions/cls-decl-after-same-line-static-gen.template    | 2 +-
 .../productions/cls-decl-after-same-line-static-method.template | 2 +-
 .../productions/cls-decl-multiple-definitions.template          | 2 +-
 .../productions/cls-decl-multiple-stacked-definitions.template  | 2 +-
 .../productions/cls-decl-new-no-sc-line-method.template         | 2 +-
 .../productions/cls-decl-new-sc-line-generator.template         | 2 +-
 .../productions/cls-decl-new-sc-line-method.template            | 2 +-
 .../productions/cls-decl-regular-definitions.template           | 2 +-
 .../productions/cls-decl-same-line-generator.template           | 2 +-
 .../productions/cls-decl-same-line-method.template              | 2 +-
 src/class-elements/productions/cls-decl-wrapped-in-sc.template  | 2 +-
 .../productions/cls-expr-after-same-line-async-gen.template     | 2 +-
 .../productions/cls-expr-after-same-line-async-method.template  | 2 +-
 .../productions/cls-expr-after-same-line-gen.template           | 2 +-
 .../productions/cls-expr-after-same-line-method.template        | 2 +-
 .../cls-expr-after-same-line-static-async-gen.template          | 2 +-
 .../cls-expr-after-same-line-static-async-method.template       | 2 +-
 .../productions/cls-expr-after-same-line-static-gen.template    | 2 +-
 .../productions/cls-expr-after-same-line-static-method.template | 2 +-
 .../productions/cls-expr-multiple-definitions.template          | 2 +-
 .../productions/cls-expr-multiple-stacked-definitions.template  | 2 +-
 .../productions/cls-expr-new-no-sc-line-method.template         | 2 +-
 .../productions/cls-expr-new-sc-line-generator.template         | 2 +-
 .../productions/cls-expr-new-sc-line-method.template            | 2 +-
 .../productions/cls-expr-regular-definitions.template           | 2 +-
 .../productions/cls-expr-same-line-generator.template           | 2 +-
 .../productions/cls-expr-same-line-method.template              | 2 +-
 src/class-elements/productions/cls-expr-wrapped-in-sc.template  | 2 +-
 116 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/src/class-elements/class-evaluation-error/cls-decl.template b/src/class-elements/class-evaluation-error/cls-decl.template
index f29a6c2ae2..5a91999973 100644
--- a/src/class-elements/class-evaluation-error/cls-decl.template
+++ b/src/class-elements/class-evaluation-error/cls-decl.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-evaluation-error/
+path: language/statements/class/fields/evaluation-error/
 name: field definitions in a class declaration
 features: [class]
 esid: sec-runtime-semantics-classdefinitionevaluation
diff --git a/src/class-elements/class-evaluation-error/cls-expr.template b/src/class-elements/class-evaluation-error/cls-expr.template
index 083ce095ce..139e925228 100644
--- a/src/class-elements/class-evaluation-error/cls-expr.template
+++ b/src/class-elements/class-evaluation-error/cls-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-evaluation-error/
+path: language/expressions/class/fields/evaluation-error/
 name: field definitions in a class expression
 features: [class]
 esid: sec-runtime-semantics-classdefinitionevaluation
diff --git a/src/class-elements/default/cls-decl.template b/src/class-elements/default/cls-decl.template
index 2fea2b1fbd..97cd9f4be6 100644
--- a/src/class-elements/default/cls-decl.template
+++ b/src/class-elements/default/cls-decl.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-
+path: language/statements/class/fields/
 name: field definitions in a class declaration
 features: [class]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/default/cls-expr.template b/src/class-elements/default/cls-expr.template
index 0efa7ab1fe..62b1ffe81e 100644
--- a/src/class-elements/default/cls-expr.template
+++ b/src/class-elements/default/cls-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-
+path: language/expressions/class/fields/
 name: field definitions in a class expression
 features: [class]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/initializer-error/cls-decl-fields-arrow-fnc.template b/src/class-elements/initializer-error/cls-decl-fields-arrow-fnc.template
index 3b7811b14f..7d544f6990 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-arrow-fnc.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-arrow-fnc.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-arrow-fnc-
+path: language/statements/class/fields/arrow-fnc-
 name: arrow function expression
 features: [arrow-function, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-comp-name.template b/src/class-elements/initializer-error/cls-decl-fields-comp-name.template
index 4db66f243f..39aed5619e 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-comp-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-comp-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-comp-name-
+path: language/statements/class/fields/comp-name-
 name: computed ClassElementName
 features: [class, class-fields-public, computed-property-names]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-equality.template b/src/class-elements/initializer-error/cls-decl-fields-equality.template
index 0811ecd49e..e663e8d2f4 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-equality.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-equality.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-equality-
+path: language/statements/class/fields/equality-
 name: equality expression
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-literal-name.template b/src/class-elements/initializer-error/cls-decl-fields-literal-name.template
index c136f5a24a..e97af3e87f 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-literal-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-literal-name-
+path: language/statements/class/fields/literal-name-
 name: literal ClassElementName
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-private-arrow-fnc.template b/src/class-elements/initializer-error/cls-decl-fields-private-arrow-fnc.template
index 38199b19a5..ce0172fbbf 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-private-arrow-fnc.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-private-arrow-fnc.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-private-arrow-fnc-
+path: language/statements/class/fields/private-arrow-fnc-
 name: private field, arrow function expression
 features: [class, arrow-function, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-private-name.template b/src/class-elements/initializer-error/cls-decl-fields-private-name.template
index 705a8841e1..c8feeed498 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-private-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-private-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-private-literal-name-
+path: language/statements/class/fields/private-literal-name-
 name: ClassElementName PrivateName
 features: [class, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-private-ternary.template b/src/class-elements/initializer-error/cls-decl-fields-private-ternary.template
index 628e12bdf3..f715d5f081 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-private-ternary.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-private-ternary.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-private-ternary-
+path: language/statements/class/fields/private-ternary-
 name: private field, ternary expression
 features: [class, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-private-typeof.template b/src/class-elements/initializer-error/cls-decl-fields-private-typeof.template
index bba1b43fd5..68359fd287 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-private-typeof.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-private-typeof.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-private-typeof-
+path: language/statements/class/fields/private-typeof-
 name: private field, typeof expression
 features: [class, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-static-comp-name.template b/src/class-elements/initializer-error/cls-decl-fields-static-comp-name.template
index 0b9656f7c9..f972c83fe0 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-static-comp-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-static-comp-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-static-comp-name-
+path: language/statements/class/fields/static-comp-name-
 name: static computed ClassElementName
 features: [class, class-static-fields-public, computed-property-names]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-static-literal-name.template b/src/class-elements/initializer-error/cls-decl-fields-static-literal-name.template
index ae25c329d1..cc4699d767 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-static-literal-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-static-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-static-literal-
+path: language/statements/class/fields/static-literal-
 name: static literal ClassElementName
 features: [class, class-static-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-static-private-name.template b/src/class-elements/initializer-error/cls-decl-fields-static-private-name.template
index d514fbffff..ea8af17b77 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-static-private-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-static-private-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-static-private-
+path: language/statements/class/fields/static-private-
 name: static PrivateName
 features: [class, class-static-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-static-string-literal-name.template b/src/class-elements/initializer-error/cls-decl-fields-static-string-literal-name.template
index 574ee8dffc..8fa7782f80 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-static-string-literal-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-static-string-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-static-string-literal-name-
+path: language/statements/class/fields/static-string-literal-name-
 name: static string literal ClassElementName
 features: [class, class-static-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-string-literal-name.template b/src/class-elements/initializer-error/cls-decl-fields-string-literal-name.template
index 708a25b181..c0b69ebc76 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-string-literal-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-string-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-string-literal-name-
+path: language/statements/class/fields/string-literal-name-
 name: string literal ClassElementName
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-ternary.template b/src/class-elements/initializer-error/cls-decl-fields-ternary.template
index bdce269e5d..c577e1ef94 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-ternary.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-ternary.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-ternary-
+path: language/statements/class/fields/ternary-
 name: ternary expression
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-typeof.template b/src/class-elements/initializer-error/cls-decl-fields-typeof.template
index b83bf837bf..2bdad1ab80 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-typeof.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-typeof.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-typeof-
+path: language/statements/class/fields/typeof-
 name: typeof expression
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-arrow-fnc.template b/src/class-elements/initializer-error/cls-expr-fields-arrow-fnc.template
index f1c475c330..eed79363c6 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-arrow-fnc.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-arrow-fnc.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-arrow-fnc-
+path: language/expressions/class/fields/arrow-fnc-
 name: arrow function expression
 features: [arrow-function, class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-comp-name.template b/src/class-elements/initializer-error/cls-expr-fields-comp-name.template
index 2bbd48d435..c94184cc6f 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-comp-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-comp-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-comp-name-
+path: language/expressions/class/fields/comp-name-
 name: computed ClassElementName
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-equality.template b/src/class-elements/initializer-error/cls-expr-fields-equality.template
index e3f4b680a1..37f8d63592 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-equality.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-equality.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-equality-
+path: language/expressions/class/fields/equality-
 name: equality expression
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-literal-name.template b/src/class-elements/initializer-error/cls-expr-fields-literal-name.template
index 6adccb4c42..8c10bfcdd7 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-literal-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-literal-name-
+path: language/expressions/class/fields/literal-name-
 name: literal ClassElementName
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-private-arrow-fnc.template b/src/class-elements/initializer-error/cls-expr-fields-private-arrow-fnc.template
index 0aea408fc1..27271628da 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-private-arrow-fnc.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-private-arrow-fnc.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-private-arrow-fnc-
+path: language/expressions/class/fields/private-arrow-fnc-
 name: private field, arrow function expression
 features: [class, arrow-function, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-private-name.template b/src/class-elements/initializer-error/cls-expr-fields-private-name.template
index 2847f4ca9f..7a6aa4cfa9 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-private-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-private-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-private-literal-name-
+path: language/expressions/class/fields/private-literal-name-
 name: ClassElementName PrivateName
 features: [class, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-private-ternary.template b/src/class-elements/initializer-error/cls-expr-fields-private-ternary.template
index c6d7ec8467..2ef6e1290e 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-private-ternary.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-private-ternary.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-private-ternary-
+path: language/expressions/class/fields/private-ternary-
 name: private field, ternary expression
 features: [class, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-private-typeof.template b/src/class-elements/initializer-error/cls-expr-fields-private-typeof.template
index 548c8e6e4b..709b153ffc 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-private-typeof.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-private-typeof.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-private-typeof-
+path: language/expressions/class/fields/private-typeof-
 name: private field, typeof expression
 features: [class, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-static-comp-name.template b/src/class-elements/initializer-error/cls-expr-fields-static-comp-name.template
index 8df9a0480d..65cd58e288 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-static-comp-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-static-comp-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-static-comp-name-
+path: language/expressions/class/fields/static-comp-name-
 name: static computed ClassElementName
 features: [class, class-static-fields-public, computed-property-names]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-static-literal-name.template b/src/class-elements/initializer-error/cls-expr-fields-static-literal-name.template
index 367b31af41..2be130203d 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-static-literal-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-static-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-static-literal-
+path: language/expressions/class/fields/static-literal-
 name: static literal ClassElementName
 features: [class, class-static-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-static-private-name.template b/src/class-elements/initializer-error/cls-expr-fields-static-private-name.template
index 49bc4c9c10..afdc17415f 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-static-private-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-static-private-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-static-private-
+path: language/expressions/class/fields/static-private-
 name: static PrivateName
 features: [class, class-static-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-static-string-literal-name.template b/src/class-elements/initializer-error/cls-expr-fields-static-string-literal-name.template
index 8641726242..c89403500c 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-static-string-literal-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-static-string-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-static-string-literal-name-
+path: language/expressions/class/fields/static-string-literal-name-
 name: static string literal ClassElementName
 features: [class, class-static-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-string-literal-name.template b/src/class-elements/initializer-error/cls-expr-fields-string-literal-name.template
index 4a9411721f..d9131614c5 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-string-literal-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-string-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-string-literal-name-
+path: language/expressions/class/fields/string-literal-name-
 name: string literal ClassElementName
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-ternary.template b/src/class-elements/initializer-error/cls-expr-fields-ternary.template
index a7110b7a82..21ad762768 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-ternary.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-ternary.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-ternary-
+path: language/expressions/class/fields/ternary-
 name: ternary expression
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-typeof.template b/src/class-elements/initializer-error/cls-expr-fields-typeof.template
index 66e31ac130..23b32fa27e 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-typeof.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-typeof.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-typeof-
+path: language/expressions/class/fields/typeof-
 name: typeof expression
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-eval-arguments/cls-decl-fields-eval.template b/src/class-elements/initializer-eval-arguments/cls-decl-fields-eval.template
index 90859a8a9a..defc5aa846 100644
--- a/src/class-elements/initializer-eval-arguments/cls-decl-fields-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-decl-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-direct-
+path: language/statements/class/fields/direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-decl-fields-indirect-eval.template b/src/class-elements/initializer-eval-arguments/cls-decl-fields-indirect-eval.template
index b08b5ee379..c01572a3d1 100644
--- a/src/class-elements/initializer-eval-arguments/cls-decl-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-decl-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-indirect-
+path: language/statements/class/fields/indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-eval.template b/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-eval.template
index 27551d328b..d2b808b0fc 100644
--- a/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-direct-
+path: language/statements/class/fields/private-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-indirect-eval.template
index 6a77ba9f22..526c7c5503 100644
--- a/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-indirect-
+path: language/statements/class/fields/private-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-expr-fields-eval.template b/src/class-elements/initializer-eval-arguments/cls-expr-fields-eval.template
index 6afff75bc9..b87460dceb 100644
--- a/src/class-elements/initializer-eval-arguments/cls-expr-fields-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-expr-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-direct-
+path: language/expressions/class/fields/direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-expr-fields-indirect-eval.template b/src/class-elements/initializer-eval-arguments/cls-expr-fields-indirect-eval.template
index d6064ff6cb..6db3e45cda 100644
--- a/src/class-elements/initializer-eval-arguments/cls-expr-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-expr-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-indirect-
+path: language/expressions/class/fields/indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-eval.template b/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-eval.template
index 656a7c81a0..0b6859756d 100644
--- a/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-direct-
+path: language/expressions/class/fields/private-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-indirect-eval.template
index 4127bd1a86..26e5098ec3 100644
--- a/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-indirect-
+path: language/expressions/class/fields/private-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-decl-fields-eval.template b/src/class-elements/initializer-eval-newtarget/cls-decl-fields-eval.template
index fce4c331aa..fdfa74f693 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-decl-fields-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-decl-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-direct-
+path: language/statements/class/fields/direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-decl-fields-indirect-eval.template b/src/class-elements/initializer-eval-newtarget/cls-decl-fields-indirect-eval.template
index 57db803472..73b71dba8f 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-decl-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-decl-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-indirect-
+path: language/statements/class/fields/indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-eval.template b/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-eval.template
index 14cdf6b266..274faa5aec 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-direct-
+path: language/statements/class/fields/private-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-indirect-eval.template
index bb7eb64337..3062f9c366 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-indirect-
+path: language/statements/class/fields/private-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-expr-fields-eval.template b/src/class-elements/initializer-eval-newtarget/cls-expr-fields-eval.template
index bdadf99c0b..c2bcb1061a 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-expr-fields-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-expr-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-direct-
+path: language/expressions/class/fields/direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-expr-fields-indirect-eval.template b/src/class-elements/initializer-eval-newtarget/cls-expr-fields-indirect-eval.template
index 0acfccf7df..ca3e112f1a 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-expr-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-expr-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-indirect-
+path: language/expressions/class/fields/indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-eval.template b/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-eval.template
index 3efe9eb6ee..42aaae90fd 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-direct-
+path: language/expressions/class/fields/private-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-indirect-eval.template
index 032852f7b3..1a2bf06751 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-indirect-
+path: language/expressions/class/fields/private-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-call/cls-decl-fields-eval.template b/src/class-elements/initializer-eval-super-call/cls-decl-fields-eval.template
index 53579b49d3..83d6c44cde 100644
--- a/src/class-elements/initializer-eval-super-call/cls-decl-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-decl-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-derived-cls-direct-
+path: language/statements/class/fields/derived-cls-direct-
 name: direct eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-decl-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-call/cls-decl-fields-indirect-eval.template
index ad0bf241de..ed8cf531d4 100644
--- a/src/class-elements/initializer-eval-super-call/cls-decl-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-decl-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-derived-cls-indirect-
+path: language/statements/class/fields/derived-cls-indirect-
 name: indirect eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-eval.template b/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-eval.template
index 1e910bf87a..85ee95ae7d 100644
--- a/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-derived-cls-direct-
+path: language/statements/class/fields/private-derived-cls-direct-
 name: direct eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-indirect-eval.template
index cc49df82ab..68870f84e6 100644
--- a/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-derived-cls-indirect-
+path: language/statements/class/fields/private-derived-cls-indirect-
 name: indirect eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-expr-fields-eval.template b/src/class-elements/initializer-eval-super-call/cls-expr-fields-eval.template
index 1c9716a7a9..2cad118a09 100644
--- a/src/class-elements/initializer-eval-super-call/cls-expr-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-expr-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-derived-cls-direct-
+path: language/expressions/class/fields/derived-cls-direct-
 name: direct eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-expr-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-call/cls-expr-fields-indirect-eval.template
index 28f8bfe58b..3b9684008f 100644
--- a/src/class-elements/initializer-eval-super-call/cls-expr-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-expr-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-derived-cls-indirect-
+path: language/expressions/class/fields/derived-cls-indirect-
 name: indirect eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-eval.template b/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-eval.template
index ea4c3586eb..0bc11e4001 100644
--- a/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-derived-cls-direct-
+path: language/expressions/class/fields/private-derived-cls-direct-
 name: direct eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-indirect-eval.template
index 9fcd914567..8316382c70 100644
--- a/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-derived-cls-indirect-
+path: language/expressions/class/fields/private-derived-cls-indirect-
 name: indirect eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-property/cls-decl-fields-eval.template b/src/class-elements/initializer-eval-super-property/cls-decl-fields-eval.template
index 52b0180ab8..e31a727d2c 100644
--- a/src/class-elements/initializer-eval-super-property/cls-decl-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-decl-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-derived-cls-direct-
+path: language/statements/class/fields/derived-cls-direct-
 name: direct eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-property/cls-decl-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-property/cls-decl-fields-indirect-eval.template
index f521f89829..7a33d51997 100644
--- a/src/class-elements/initializer-eval-super-property/cls-decl-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-decl-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-derived-cls-indirect-
+path: language/statements/class/fields/derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-eval.template b/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-eval.template
index b50d046983..add00ea319 100644
--- a/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-derived-cls-direct-
+path: language/statements/class/fields/private-derived-cls-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-indirect-eval.template
index 68fb2ca06f..afa9c3b06e 100644
--- a/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-derived-cls-indirect-
+path: language/statements/class/fields/private-derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-property/cls-expr-fields-eval.template b/src/class-elements/initializer-eval-super-property/cls-expr-fields-eval.template
index c25cb861f5..1eacb75b50 100644
--- a/src/class-elements/initializer-eval-super-property/cls-expr-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-expr-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-derived-cls-direct-
+path: language/expressions/class/fields/derived-cls-direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-property/cls-expr-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-property/cls-expr-fields-indirect-eval.template
index 20d6c9c9de..1c83f144bd 100644
--- a/src/class-elements/initializer-eval-super-property/cls-expr-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-expr-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-derived-cls-indirect-
+path: language/expressions/class/fields/derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-eval.template b/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-eval.template
index e004b28305..32ab40a021 100644
--- a/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-derived-cls-direct-
+path: language/expressions/class/fields/private-derived-cls-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-indirect-eval.template
index fe02286471..76b8e65e4e 100644
--- a/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-derived-cls-indirect-
+path: language/expressions/class/fields/private-derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-decl-fields-eval.template b/src/class-elements/initializer-eval-super/cls-decl-fields-eval.template
index 9c94c4f969..2243675ccd 100644
--- a/src/class-elements/initializer-eval-super/cls-decl-fields-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-decl-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-derived-cls-direct-
+path: language/statements/class/fields/derived-cls-direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-decl-fields-indirect-eval.template b/src/class-elements/initializer-eval-super/cls-decl-fields-indirect-eval.template
index 98200556b6..c1cc057708 100644
--- a/src/class-elements/initializer-eval-super/cls-decl-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-decl-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-derived-cls-indirect-
+path: language/statements/class/fields/derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-decl-private-fields-eval.template b/src/class-elements/initializer-eval-super/cls-decl-private-fields-eval.template
index f536ad4266..6e4b7179be 100644
--- a/src/class-elements/initializer-eval-super/cls-decl-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-decl-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-derived-cls-direct-
+path: language/statements/class/fields/private-derived-cls-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-decl-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-super/cls-decl-private-fields-indirect-eval.template
index 1b4adf525c..dbc45759af 100644
--- a/src/class-elements/initializer-eval-super/cls-decl-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-decl-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-derived-cls-indirect-
+path: language/statements/class/fields/private-derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-expr-fields-eval.template b/src/class-elements/initializer-eval-super/cls-expr-fields-eval.template
index 83a2632f7b..787daae660 100644
--- a/src/class-elements/initializer-eval-super/cls-expr-fields-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-expr-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-derived-cls-direct-
+path: language/expressions/class/fields/derived-cls-direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-expr-fields-indirect-eval.template b/src/class-elements/initializer-eval-super/cls-expr-fields-indirect-eval.template
index 2af99eb271..cf71061e74 100644
--- a/src/class-elements/initializer-eval-super/cls-expr-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-expr-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-derived-cls-indirect-
+path: language/expressions/class/fields/derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-expr-private-fields-eval.template b/src/class-elements/initializer-eval-super/cls-expr-private-fields-eval.template
index c55f04ad2e..5533497910 100644
--- a/src/class-elements/initializer-eval-super/cls-expr-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-expr-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-derived-cls-direct-
+path: language/expressions/class/fields/private-derived-cls-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-expr-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-super/cls-expr-private-fields-indirect-eval.template
index 5f22b7ac6f..fd6262b585 100644
--- a/src/class-elements/initializer-eval-super/cls-expr-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-expr-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-derived-cls-indirect-
+path: language/expressions/class/fields/private-derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-decl-fields-eval.template b/src/class-elements/initializer-eval/cls-decl-fields-eval.template
index 90859a8a9a..defc5aa846 100644
--- a/src/class-elements/initializer-eval/cls-decl-fields-eval.template
+++ b/src/class-elements/initializer-eval/cls-decl-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-direct-
+path: language/statements/class/fields/direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-decl-fields-indirect-eval.template b/src/class-elements/initializer-eval/cls-decl-fields-indirect-eval.template
index b08b5ee379..c01572a3d1 100644
--- a/src/class-elements/initializer-eval/cls-decl-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval/cls-decl-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-indirect-
+path: language/statements/class/fields/indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-decl-private-fields-eval.template b/src/class-elements/initializer-eval/cls-decl-private-fields-eval.template
index 27551d328b..d2b808b0fc 100644
--- a/src/class-elements/initializer-eval/cls-decl-private-fields-eval.template
+++ b/src/class-elements/initializer-eval/cls-decl-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-direct-
+path: language/statements/class/fields/private-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-decl-private-fields-indirect-eval.template b/src/class-elements/initializer-eval/cls-decl-private-fields-indirect-eval.template
index 6a77ba9f22..526c7c5503 100644
--- a/src/class-elements/initializer-eval/cls-decl-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval/cls-decl-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-indirect-
+path: language/statements/class/fields/private-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-expr-fields-eval.template b/src/class-elements/initializer-eval/cls-expr-fields-eval.template
index 6afff75bc9..b87460dceb 100644
--- a/src/class-elements/initializer-eval/cls-expr-fields-eval.template
+++ b/src/class-elements/initializer-eval/cls-expr-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-direct-
+path: language/expressions/class/fields/direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-expr-fields-indirect-eval.template b/src/class-elements/initializer-eval/cls-expr-fields-indirect-eval.template
index 2716c4ace7..dad1a9ad68 100644
--- a/src/class-elements/initializer-eval/cls-expr-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval/cls-expr-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-indirect-
+path: language/expressions/class/fields/indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-expr-private-fields-eval.template b/src/class-elements/initializer-eval/cls-expr-private-fields-eval.template
index 656a7c81a0..0b6859756d 100644
--- a/src/class-elements/initializer-eval/cls-expr-private-fields-eval.template
+++ b/src/class-elements/initializer-eval/cls-expr-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-direct-
+path: language/expressions/class/fields/private-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-expr-private-fields-indirect-eval.template b/src/class-elements/initializer-eval/cls-expr-private-fields-indirect-eval.template
index ade5a57491..952a49cd93 100644
--- a/src/class-elements/initializer-eval/cls-expr-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval/cls-expr-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-indirect-
+path: language/expressions/class/fields/private-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/productions/cls-decl-after-same-line-async-gen.template b/src/class-elements/productions/cls-decl-after-same-line-async-gen.template
index 9b2a19895c..fdc38a89f9 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-async-gen.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-async-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-same-line-async-gen-
+path: language/statements/class/fields/same-line-async-gen-
 name: field definitions after an async generator in the same line
 features: [class, class-fields-public, async-iteration]
 flags: [async]
diff --git a/src/class-elements/productions/cls-decl-after-same-line-async-method.template b/src/class-elements/productions/cls-decl-after-same-line-async-method.template
index 13ab916fe6..d3d463bb18 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-async-method.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-async-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-same-line-async-method-
+path: language/statements/class/fields/same-line-async-method-
 name: field definitions after an async method in the same line
 features: [class, class-fields-public, async-functions]
 flags: [async]
diff --git a/src/class-elements/productions/cls-decl-after-same-line-gen.template b/src/class-elements/productions/cls-decl-after-same-line-gen.template
index 9bb76e6ca7..5c910c5ce0 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-gen.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-after-same-line-gen-
+path: language/statements/class/fields/after-same-line-gen-
 name: field definitions after a generator in the same line
 features: [generators, class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-after-same-line-method.template b/src/class-elements/productions/cls-decl-after-same-line-method.template
index 98002edecd..2597351573 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-method.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-after-same-line-method-
+path: language/statements/class/fields/after-same-line-method-
 name: field definitions after a method in the same line
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-after-same-line-static-async-gen.template b/src/class-elements/productions/cls-decl-after-same-line-static-async-gen.template
index 5c1661c8d0..79815d08ce 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-static-async-gen.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-static-async-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-after-same-line-static-async-gen-
+path: language/statements/class/fields/after-same-line-static-async-gen-
 name: field definitions after a static async generator in the same line
 features: [class, class-fields-public, async-iteration]
 flags: [async]
diff --git a/src/class-elements/productions/cls-decl-after-same-line-static-async-method.template b/src/class-elements/productions/cls-decl-after-same-line-static-async-method.template
index ffc1d74f3d..e3f7914476 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-static-async-method.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-static-async-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-after-same-line-static-async-method-
+path: language/statements/class/fields/after-same-line-static-async-method-
 name: field definitions after a static async method in the same line
 features: [class, class-fields-public, async-functions]
 flags: [async]
diff --git a/src/class-elements/productions/cls-decl-after-same-line-static-gen.template b/src/class-elements/productions/cls-decl-after-same-line-static-gen.template
index 11797010ef..b8502fd217 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-static-gen.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-static-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-after-same-line-static-gen-
+path: language/statements/class/fields/after-same-line-static-gen-
 name: field definitions after a static generator in the same line
 features: [generators, class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-after-same-line-static-method.template b/src/class-elements/productions/cls-decl-after-same-line-static-method.template
index 20b07ba167..ba00fc57e7 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-static-method.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-static-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-after-same-line-static-method-
+path: language/statements/class/fields/after-same-line-static-method-
 name: field definitions after a static method in the same line
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-multiple-definitions.template b/src/class-elements/productions/cls-decl-multiple-definitions.template
index c8217f285c..c1bdad44e5 100644
--- a/src/class-elements/productions/cls-decl-multiple-definitions.template
+++ b/src/class-elements/productions/cls-decl-multiple-definitions.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-multiple-definitions-
+path: language/statements/class/fields/multiple-definitions-
 name: multiple fields definitions
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-multiple-stacked-definitions.template b/src/class-elements/productions/cls-decl-multiple-stacked-definitions.template
index 38a7d2ebf4..f073560369 100644
--- a/src/class-elements/productions/cls-decl-multiple-stacked-definitions.template
+++ b/src/class-elements/productions/cls-decl-multiple-stacked-definitions.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-multiple-stacked-definitions-
+path: language/statements/class/fields/multiple-stacked-definitions-
 name: multiple stacked fields definitions through ASI
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-new-no-sc-line-method.template b/src/class-elements/productions/cls-decl-new-no-sc-line-method.template
index b2682e603a..6c123e9955 100644
--- a/src/class-elements/productions/cls-decl-new-no-sc-line-method.template
+++ b/src/class-elements/productions/cls-decl-new-no-sc-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-new-no-sc-line-method-
+path: language/statements/class/fields/new-no-sc-line-method-
 name: field definitions followed by a method in a new line without a semicolon
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-new-sc-line-generator.template b/src/class-elements/productions/cls-decl-new-sc-line-generator.template
index c1b6259543..1cec8d9d2c 100644
--- a/src/class-elements/productions/cls-decl-new-sc-line-generator.template
+++ b/src/class-elements/productions/cls-decl-new-sc-line-generator.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-new-sc-line-gen-
+path: language/statements/class/fields/new-sc-line-gen-
 name: field definitions followed by a method in a new line with a semicolon
 features: [class, class-fields-public, generators]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-new-sc-line-method.template b/src/class-elements/productions/cls-decl-new-sc-line-method.template
index 1c7ce88227..d53944e118 100644
--- a/src/class-elements/productions/cls-decl-new-sc-line-method.template
+++ b/src/class-elements/productions/cls-decl-new-sc-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-new-sc-line-method-
+path: language/statements/class/fields/new-sc-line-method-
 name: field definitions followed by a method in a new line with a semicolon
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-regular-definitions.template b/src/class-elements/productions/cls-decl-regular-definitions.template
index 22bb679211..ce61c58cd1 100644
--- a/src/class-elements/productions/cls-decl-regular-definitions.template
+++ b/src/class-elements/productions/cls-decl-regular-definitions.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-regular-definitions-
+path: language/statements/class/fields/regular-definitions-
 name: regular fields defintion
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-same-line-generator.template b/src/class-elements/productions/cls-decl-same-line-generator.template
index 8edc2b0dc7..f49b1fd8da 100644
--- a/src/class-elements/productions/cls-decl-same-line-generator.template
+++ b/src/class-elements/productions/cls-decl-same-line-generator.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-same-line-gen-
+path: language/statements/class/fields/same-line-gen-
 name: field definitions followed by a generator method in the same line
 features: [class, class-fields-public, generators]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-same-line-method.template b/src/class-elements/productions/cls-decl-same-line-method.template
index c55d1120b9..29a7516da4 100644
--- a/src/class-elements/productions/cls-decl-same-line-method.template
+++ b/src/class-elements/productions/cls-decl-same-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-same-line-method-
+path: language/statements/class/fields/same-line-method-
 name: field definitions followed by a method in the same line
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-wrapped-in-sc.template b/src/class-elements/productions/cls-decl-wrapped-in-sc.template
index 99c9c0b265..e298c80633 100644
--- a/src/class-elements/productions/cls-decl-wrapped-in-sc.template
+++ b/src/class-elements/productions/cls-decl-wrapped-in-sc.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-wrapped-in-sc-
+path: language/statements/class/fields/wrapped-in-sc-
 name: fields definition wrapped in semicolons
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-after-same-line-async-gen.template b/src/class-elements/productions/cls-expr-after-same-line-async-gen.template
index dae89e21bf..7507c644ab 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-async-gen.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-async-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-same-line-async-gen-
+path: language/expressions/class/fields/same-line-async-gen-
 name: field definitions after an async generator in the same line
 features: [class, class-fields-public, async-iteration]
 flags: [async]
diff --git a/src/class-elements/productions/cls-expr-after-same-line-async-method.template b/src/class-elements/productions/cls-expr-after-same-line-async-method.template
index 8c5a94ce77..4da07f0197 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-async-method.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-async-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-same-line-async-method-
+path: language/expressions/class/fields/same-line-async-method-
 name: field definitions after an async method in the same line
 features: [class, class-fields-public, async-functions]
 flags: [async]
diff --git a/src/class-elements/productions/cls-expr-after-same-line-gen.template b/src/class-elements/productions/cls-expr-after-same-line-gen.template
index 89b749d8c7..9e25d5dd87 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-gen.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-after-same-line-gen-
+path: language/expressions/class/fields/after-same-line-gen-
 name: field definitions after a generator in the same line
 features: [generators, class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-after-same-line-method.template b/src/class-elements/productions/cls-expr-after-same-line-method.template
index c277ca18b4..9d950555e2 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-method.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-after-same-line-method-
+path: language/expressions/class/fields/after-same-line-method-
 name: field definitions after a method in the same line
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-after-same-line-static-async-gen.template b/src/class-elements/productions/cls-expr-after-same-line-static-async-gen.template
index 1a7ab891c0..34f1db78f9 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-static-async-gen.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-static-async-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-after-same-line-static-async-gen-
+path: language/expressions/class/fields/after-same-line-static-async-gen-
 name: field definitions after a static async generator in the same line
 features: [class, class-fields-public, async-iteration]
 flags: [async]
diff --git a/src/class-elements/productions/cls-expr-after-same-line-static-async-method.template b/src/class-elements/productions/cls-expr-after-same-line-static-async-method.template
index 5fd81a26ba..3e072a45fc 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-static-async-method.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-static-async-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-after-same-line-static-async-method-
+path: language/expressions/class/fields/after-same-line-static-async-method-
 name: field definitions after a static async method in the same line
 features: [class, class-fields-public, async-functions]
 flags: [async]
diff --git a/src/class-elements/productions/cls-expr-after-same-line-static-gen.template b/src/class-elements/productions/cls-expr-after-same-line-static-gen.template
index 9ba5df2479..fbb95db598 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-static-gen.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-static-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-after-same-line-static-gen-
+path: language/expressions/class/fields/after-same-line-static-gen-
 name: field definitions after a static generator in the same line
 features: [generators, class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-after-same-line-static-method.template b/src/class-elements/productions/cls-expr-after-same-line-static-method.template
index 1dccafd7c7..081496c143 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-static-method.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-static-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-after-same-line-static-method-
+path: language/expressions/class/fields/after-same-line-static-method-
 name: field definitions after a static method in the same line
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-multiple-definitions.template b/src/class-elements/productions/cls-expr-multiple-definitions.template
index cfd35b1cdb..732b4c69cc 100644
--- a/src/class-elements/productions/cls-expr-multiple-definitions.template
+++ b/src/class-elements/productions/cls-expr-multiple-definitions.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-multiple-definitions-
+path: language/expressions/class/fields/multiple-definitions-
 name: multiple fields definitions
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-multiple-stacked-definitions.template b/src/class-elements/productions/cls-expr-multiple-stacked-definitions.template
index 4e0286c74b..5c6bb55dca 100644
--- a/src/class-elements/productions/cls-expr-multiple-stacked-definitions.template
+++ b/src/class-elements/productions/cls-expr-multiple-stacked-definitions.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-multiple-stacked-definitions-
+path: language/expressions/class/fields/multiple-stacked-definitions-
 name: multiple stacked fields definitions through ASI
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-new-no-sc-line-method.template b/src/class-elements/productions/cls-expr-new-no-sc-line-method.template
index 4bae8bbb13..f12bf82588 100644
--- a/src/class-elements/productions/cls-expr-new-no-sc-line-method.template
+++ b/src/class-elements/productions/cls-expr-new-no-sc-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-new-no-sc-line-method-
+path: language/expressions/class/fields/new-no-sc-line-method-
 name: field definitions followed by a method in a new line without a semicolon
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-new-sc-line-generator.template b/src/class-elements/productions/cls-expr-new-sc-line-generator.template
index f24ae6ef94..5849d6286d 100644
--- a/src/class-elements/productions/cls-expr-new-sc-line-generator.template
+++ b/src/class-elements/productions/cls-expr-new-sc-line-generator.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-new-sc-line-gen-
+path: language/expressions/class/fields/new-sc-line-gen-
 name: field definitions followed by a method in a new line with a semicolon
 features: [class, class-fields-public, generators]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-new-sc-line-method.template b/src/class-elements/productions/cls-expr-new-sc-line-method.template
index b3c3fc373f..f3a6142e16 100644
--- a/src/class-elements/productions/cls-expr-new-sc-line-method.template
+++ b/src/class-elements/productions/cls-expr-new-sc-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-new-sc-line-method-
+path: language/expressions/class/fields/new-sc-line-method-
 name: field definitions followed by a method in a new line with a semicolon
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-regular-definitions.template b/src/class-elements/productions/cls-expr-regular-definitions.template
index b2aea65604..2a5a5d6c25 100644
--- a/src/class-elements/productions/cls-expr-regular-definitions.template
+++ b/src/class-elements/productions/cls-expr-regular-definitions.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-regular-definitions-
+path: language/expressions/class/fields/regular-definitions-
 name: regular fields defintion
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-same-line-generator.template b/src/class-elements/productions/cls-expr-same-line-generator.template
index f28ad55e96..91a477d87d 100644
--- a/src/class-elements/productions/cls-expr-same-line-generator.template
+++ b/src/class-elements/productions/cls-expr-same-line-generator.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-same-line-gen-
+path: language/expressions/class/fields/same-line-gen-
 name: field definitions followed by a generator method in the same line
 features: [class, class-fields-public, generators]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-same-line-method.template b/src/class-elements/productions/cls-expr-same-line-method.template
index 7f609b27cd..57b05fae4f 100644
--- a/src/class-elements/productions/cls-expr-same-line-method.template
+++ b/src/class-elements/productions/cls-expr-same-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-same-line-method-
+path: language/expressions/class/fields/same-line-method-
 name: field definitions followed by a method in the same line
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-wrapped-in-sc.template b/src/class-elements/productions/cls-expr-wrapped-in-sc.template
index dcb0dd6753..afbe930d7b 100644
--- a/src/class-elements/productions/cls-expr-wrapped-in-sc.template
+++ b/src/class-elements/productions/cls-expr-wrapped-in-sc.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-wrapped-in-sc-
+path: language/expressions/class/fields/wrapped-in-sc-
 name: fields definition wrapped in semicolons
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
-- 
GitLab