From c945da864bd7130af00e6d363eeb075657a62362 Mon Sep 17 00:00:00 2001
From: Leo Balter <leonardo.balter@gmail.com>
Date: Fri, 21 Dec 2018 15:54:43 -0200
Subject: [PATCH] rename fields folders to 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 +-
 .../delete-error/cls-decl-field-delete-covered.template         | 2 +-
 .../delete-error/cls-decl-field-delete-twice-covered.template   | 2 +-
 src/class-elements/delete-error/cls-decl-field-delete.template  | 2 +-
 .../delete-error/cls-decl-method-delete-covered.template        | 2 +-
 .../delete-error/cls-decl-method-delete-twice-covered.template  | 2 +-
 src/class-elements/delete-error/cls-decl-method-delete.template | 2 +-
 .../delete-error/cls-expr-field-delete-covered.template         | 2 +-
 .../delete-error/cls-expr-field-delete-twice-covered.template   | 2 +-
 src/class-elements/delete-error/cls-expr-field-delete.template  | 2 +-
 .../delete-error/cls-expr-method-delete-covered.template        | 2 +-
 .../delete-error/cls-expr-method-delete-twice-covered.template  | 2 +-
 src/class-elements/delete-error/cls-expr-method-delete.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 +-
 .../syntax/invalid/cls-decl-elements-invalid-syntax.template    | 2 +-
 .../syntax/invalid/cls-expr-elements-invalid-syntax.template    | 2 +-
 .../syntax/valid/cls-decl-elements-valid-syntax.template        | 2 +-
 .../syntax/valid/cls-expr-elements-valid-syntax.template        | 2 +-
 132 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/src/class-elements/class-evaluation-error/cls-decl.template b/src/class-elements/class-evaluation-error/cls-decl.template
index 5a91999973..fb1f941202 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/elements/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 139e925228..7e40abe926 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/elements/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 97cd9f4be6..31a7f8e86e 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/elements/
 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 62b1ffe81e..d2b63f698e 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/elements/
 name: field definitions in a class expression
 features: [class]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/delete-error/cls-decl-field-delete-covered.template b/src/class-elements/delete-error/cls-decl-field-delete-covered.template
index a398ff36a2..b41e14741f 100644
--- a/src/class-elements/delete-error/cls-decl-field-delete-covered.template
+++ b/src/class-elements/delete-error/cls-decl-field-delete-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields/syntax/early-errors/delete/field-delete-covered-
+path: language/statements/class/elements/syntax/early-errors/delete/field-delete-covered-
 name: in field, covered
 info: |
   Static Semantics: Early Errors
diff --git a/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template b/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template
index 97920829dd..bf19a2750d 100644
--- a/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields/syntax/early-errors/delete/field-delete-twice-covered-
+path: language/statements/class/elements/syntax/early-errors/delete/field-delete-twice-covered-
 name: in field, recursively covered
 info: |
   Static Semantics: Early Errors
diff --git a/src/class-elements/delete-error/cls-decl-field-delete.template b/src/class-elements/delete-error/cls-decl-field-delete.template
index 6ec73fbf8f..a5c99fe0a4 100644
--- a/src/class-elements/delete-error/cls-decl-field-delete.template
+++ b/src/class-elements/delete-error/cls-decl-field-delete.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields/syntax/early-errors/delete/field-delete-
+path: language/statements/class/elements/syntax/early-errors/delete/field-delete-
 name: in field
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-decl-method-delete-covered.template b/src/class-elements/delete-error/cls-decl-method-delete-covered.template
index a22ed8114a..ba5a9c09a0 100644
--- a/src/class-elements/delete-error/cls-decl-method-delete-covered.template
+++ b/src/class-elements/delete-error/cls-decl-method-delete-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields/syntax/early-errors/delete/method-delete-covered-
+path: language/statements/class/elements/syntax/early-errors/delete/method-delete-covered-
 name: in method, covered
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template b/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template
index 5a9f126314..9eae957dd1 100644
--- a/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields/syntax/early-errors/delete/method-delete-twice-covered-
+path: language/statements/class/elements/syntax/early-errors/delete/method-delete-twice-covered-
 name: in method, recursively covered
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-decl-method-delete.template b/src/class-elements/delete-error/cls-decl-method-delete.template
index e7871303f9..c4e7322162 100644
--- a/src/class-elements/delete-error/cls-decl-method-delete.template
+++ b/src/class-elements/delete-error/cls-decl-method-delete.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields/syntax/early-errors/delete/method-delete-
+path: language/statements/class/elements/syntax/early-errors/delete/method-delete-
 name: in method
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-expr-field-delete-covered.template b/src/class-elements/delete-error/cls-expr-field-delete-covered.template
index 07720b8554..f79b7b35e4 100644
--- a/src/class-elements/delete-error/cls-expr-field-delete-covered.template
+++ b/src/class-elements/delete-error/cls-expr-field-delete-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields/syntax/early-errors/delete/field-delete-covered-
+path: language/expressions/class/elements/syntax/early-errors/delete/field-delete-covered-
 name: in field, covered
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template b/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template
index de544a4936..7a98b44e39 100644
--- a/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields/syntax/early-errors/delete/field-delete-twice-covered-
+path: language/expressions/class/elements/syntax/early-errors/delete/field-delete-twice-covered-
 name: in field, recursively covered
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-expr-field-delete.template b/src/class-elements/delete-error/cls-expr-field-delete.template
index dca07453ed..1355bdc020 100644
--- a/src/class-elements/delete-error/cls-expr-field-delete.template
+++ b/src/class-elements/delete-error/cls-expr-field-delete.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields/syntax/early-errors/delete/field-delete-
+path: language/expressions/class/elements/syntax/early-errors/delete/field-delete-
 name: in field
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-expr-method-delete-covered.template b/src/class-elements/delete-error/cls-expr-method-delete-covered.template
index 3f4a9af763..6493f5126a 100644
--- a/src/class-elements/delete-error/cls-expr-method-delete-covered.template
+++ b/src/class-elements/delete-error/cls-expr-method-delete-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields/syntax/early-errors/delete/method-delete-covered-
+path: language/expressions/class/elements/syntax/early-errors/delete/method-delete-covered-
 name: in method, covered
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template b/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template
index 7baf4fdeca..3b2e22285e 100644
--- a/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields/syntax/early-errors/delete/method-delete-twice-covered-
+path: language/expressions/class/elements/syntax/early-errors/delete/method-delete-twice-covered-
 name: in method, recursively covered
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-expr-method-delete.template b/src/class-elements/delete-error/cls-expr-method-delete.template
index 3875506276..651f5bc6ab 100644
--- a/src/class-elements/delete-error/cls-expr-method-delete.template
+++ b/src/class-elements/delete-error/cls-expr-method-delete.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields/syntax/early-errors/delete/method-delete-
+path: language/expressions/class/elements/syntax/early-errors/delete/method-delete-
 name: in method
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
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 7d544f6990..89ea1b6d07 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/elements/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 39aed5619e..eeb5d5630b 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/elements/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 e663e8d2f4..b924c13975 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/elements/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 e97af3e87f..a6a7122322 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/elements/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 ce0172fbbf..3a16e7d084 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/elements/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 c8feeed498..14f538ef4c 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/elements/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 f715d5f081..edd381b0c3 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/elements/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 68359fd287..4ad37196d3 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/elements/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 f972c83fe0..7622f57b96 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/elements/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 cc4699d767..ce7b23fa6d 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/elements/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 ea8af17b77..9e0460d815 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/elements/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 8fa7782f80..0d8f7690cc 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/elements/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 c0b69ebc76..cd24c29eae 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/elements/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 c577e1ef94..30b21642c6 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/elements/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 2bdad1ab80..b02785c2e4 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/elements/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 eed79363c6..31b71b2c50 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/elements/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 c94184cc6f..f33401ce09 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/elements/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 37f8d63592..8611cc3e64 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/elements/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 8c10bfcdd7..410d6e6578 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/elements/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 27271628da..ec23c765d9 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/elements/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 7a6aa4cfa9..ed9bc05e5c 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/elements/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 2ef6e1290e..223adb4ffb 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/elements/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 709b153ffc..71f4c8da7d 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/elements/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 65cd58e288..027baa985b 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/elements/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 2be130203d..62aff728d8 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/elements/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 afdc17415f..111c0562b6 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/elements/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 c89403500c..4ca5f71b13 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/elements/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 d9131614c5..d1a6fe7b31 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/elements/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 21ad762768..dc4e5b9cd2 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/elements/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 23b32fa27e..54b831653a 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/elements/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 defc5aa846..d811a1b459 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/elements/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 c01572a3d1..a2984a62fb 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/elements/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 d2b808b0fc..db874601b7 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/elements/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 526c7c5503..b7bfd20de7 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/elements/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 b87460dceb..1c0d472d90 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/elements/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 6db3e45cda..a01261764a 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/elements/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 0b6859756d..934d5cac52 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/elements/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 26e5098ec3..0b45619af0 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/elements/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 fdfa74f693..df7467e69d 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/elements/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 73b71dba8f..f62f655c8e 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/elements/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 274faa5aec..03a7f1f306 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/elements/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 3062f9c366..361a4e9202 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/elements/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 c2bcb1061a..3b66945594 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/elements/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 ca3e112f1a..222860785d 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/elements/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 42aaae90fd..12686c7e96 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/elements/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 1a2bf06751..4abee0e270 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/elements/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 83d6c44cde..3138fd2d0f 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/elements/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 ed8cf531d4..d0b3354451 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/elements/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 85ee95ae7d..e3cc083ffd 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/elements/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 68870f84e6..cffa8f306c 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/elements/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 2cad118a09..df527a848b 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/elements/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 3b9684008f..9e54603b1c 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/elements/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 0bc11e4001..e72676a88a 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/elements/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 8316382c70..fc529aa9e7 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/elements/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 e31a727d2c..25f5a91ba0 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/elements/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 7a33d51997..425da5db07 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/elements/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 add00ea319..4cc64b5196 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/elements/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 afa9c3b06e..190843d7b8 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/elements/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 1eacb75b50..bc3cc74d55 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/elements/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 1c83f144bd..493af53c0b 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/elements/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 32ab40a021..4fb5a17b22 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/elements/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 76b8e65e4e..da1938411a 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/elements/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 2243675ccd..99f60e07a4 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/elements/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 c1cc057708..c5aaa96051 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/elements/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 6e4b7179be..dc37a2ea8f 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/elements/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 dbc45759af..7bd11e7fdf 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/elements/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 787daae660..f1b1e8d18d 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/elements/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 cf71061e74..dc846804ce 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/elements/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 5533497910..dd20f2df04 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/elements/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 fd6262b585..f05a9a9977 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/elements/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 defc5aa846..d811a1b459 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/elements/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 c01572a3d1..a2984a62fb 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/elements/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 d2b808b0fc..db874601b7 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/elements/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 526c7c5503..b7bfd20de7 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/elements/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 b87460dceb..1c0d472d90 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/elements/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 dad1a9ad68..479a06b46a 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/elements/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 0b6859756d..934d5cac52 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/elements/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 952a49cd93..7cd9f78574 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/elements/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 fdc38a89f9..5f839f8a42 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/elements/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 d3d463bb18..a8d3434532 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/elements/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 5c910c5ce0..6ac71e1f96 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/elements/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 2597351573..664ab1c0de 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/elements/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 79815d08ce..2489e31fc1 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/elements/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 e3f7914476..3fa400320d 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/elements/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 b8502fd217..265b2e64ff 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/elements/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 ba00fc57e7..0ba05f6836 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/elements/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 c1bdad44e5..27285d01c6 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/elements/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 f073560369..aaea634320 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/elements/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 6c123e9955..b8021e9189 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/elements/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 1cec8d9d2c..e915233e77 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/elements/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 d53944e118..c58f9d0f25 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/elements/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 ce61c58cd1..fcdd16466e 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/elements/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 f49b1fd8da..185abc6e64 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/elements/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 29a7516da4..c69f4ebf47 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/elements/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 e298c80633..4969511a67 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/elements/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 7507c644ab..606dd761cf 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/elements/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 4da07f0197..22656d2760 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/elements/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 9e25d5dd87..797659ac7e 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/elements/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 9d950555e2..4802e7e468 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/elements/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 34f1db78f9..67fddd165d 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/elements/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 3e072a45fc..06f1734c34 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/elements/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 fbb95db598..e6febf4019 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/elements/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 081496c143..46439fb682 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/elements/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 732b4c69cc..a790fa63c5 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/elements/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 5c6bb55dca..4adcbf341f 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/elements/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 f12bf82588..ba99b599d5 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/elements/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 5849d6286d..ee5a2cee28 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/elements/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 f3a6142e16..1d864f8994 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/elements/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 2a5a5d6c25..a641425da0 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/elements/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 91a477d87d..7e7e2280a1 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/elements/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 57b05fae4f..93ab10f298 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/elements/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 afbe930d7b..dc2a14f5f6 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/elements/wrapped-in-sc-
 name: fields definition wrapped in semicolons
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template b/src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template
index 9542c38b44..146a57a7d7 100644
--- a/src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template
+++ b/src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template
@@ -4,7 +4,7 @@
 /*---
 esid: prod-ClassElement
 name: class declaration
-path: language/statements/class/fields/syntax/early-errors/
+path: language/statements/class/elements/syntax/early-errors/
 features: [class]
 negative:
   phase: parse
diff --git a/src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template b/src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template
index 9cb77223a8..556c8c802e 100644
--- a/src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template
+++ b/src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template
@@ -4,7 +4,7 @@
 /*---
 esid: prod-ClassElement
 name: class expression
-path: language/expressions/class/fields/syntax/early-errors/
+path: language/expressions/class/elements/syntax/early-errors/
 features: [class]
 negative:
   phase: parse
diff --git a/src/class-elements/syntax/valid/cls-decl-elements-valid-syntax.template b/src/class-elements/syntax/valid/cls-decl-elements-valid-syntax.template
index dee85b3dea..13b0717756 100644
--- a/src/class-elements/syntax/valid/cls-decl-elements-valid-syntax.template
+++ b/src/class-elements/syntax/valid/cls-decl-elements-valid-syntax.template
@@ -4,7 +4,7 @@
 /*---
 esid: prod-ClassElement
 name: class declaration
-path: language/statements/class/fields/syntax/valid/
+path: language/statements/class/elements/syntax/valid/
 features: [class]
 ---*/
 
diff --git a/src/class-elements/syntax/valid/cls-expr-elements-valid-syntax.template b/src/class-elements/syntax/valid/cls-expr-elements-valid-syntax.template
index 591a9eb26a..7bcf51318d 100644
--- a/src/class-elements/syntax/valid/cls-expr-elements-valid-syntax.template
+++ b/src/class-elements/syntax/valid/cls-expr-elements-valid-syntax.template
@@ -4,7 +4,7 @@
 /*---
 esid: prod-ClassElement
 name: class expression
-path: language/expressions/class/fields/syntax/valid/
+path: language/expressions/class/elements/syntax/valid/
 features: [class]
 ---*/
 
-- 
GitLab