diff --git a/src/class-elements/class-evaluation-error/cls-decl.template b/src/class-elements/class-evaluation-error/cls-decl.template
index 5a919999739fcb3abe231305fbae9e20314c3e2f..fb1f94120292af8b5e4227edcb0f433d518ba28a 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 139e9252281685702883878f97b8aec4b8241367..7e40abe9266cb28c7844ef04be1d5d27e4f7f4aa 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 97cd9f4be6c056c68c8c465da69fbb3a89fd7edc..31a7f8e86e7c15f51225b2dff8268d02369c0fbb 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 62b1ffe81e004c61b2bc090353c5492dcfad40ee..d2b63f698ebf4020608cd3608cf034fce77641a9 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 a398ff36a2e0e6688987d207a00d08294f88c658..b41e14741ff936ef1bb5dadd8380675ce413694c 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 97920829dd297109276b4197c8b205de1ced2c8d..bf19a2750d22053a1c89a08ada1b4c0e7d12fafe 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 6ec73fbf8f782a85e13760883e3d4b1e46705ee3..a5c99fe0a4bf27ef09ef7c23c239a143bac7bbc4 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 a22ed8114ac397e4c15bb8523bb6c05587216f9d..ba5a9c09a0f8667b3e8ba2415d1c65c58b64e890 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 5a9f126314f0722c18527eed290e53f99b9c2f07..9eae957dd152303df4ac8a54602f7a4d8d46f972 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 e7871303f97496aea7fcb1c9d128fa32813d2453..c4e732216232d6803d74764902df1a0da8917942 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 07720b85549ecc7582db5a7a3e6147993ff96e02..f79b7b35e4d410edf98de54e43053d50d998c393 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 de544a493669efa9931e55c4b65c975fe3aa56e4..7a98b44e398d322acb83c016225a8e64a301e71e 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 dca07453ede2ce7549225184611f077e91c15a63..1355bdc020b4781d8a700ffa184415f495b7c9b4 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 3f4a9af7632a381671754a5edde5e35379d7bc97..6493f5126ade379747da38923991d02804565c47 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 7baf4fdeca783c6a4064f1fb9218bdaaf5378c99..3b2e22285ec8498cbb524ea07025ac86c0453e31 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 3875506276c92f6db545239ce45febf9241ab774..651f5bc6ab4f1cd6453e5fb0c3823e5aa4210bdc 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 7d544f6990731c928d411a55977612019c95db4f..89ea1b6d075220c700bc303f011664b94d74881d 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 39aed5619ec3a6b82469500e7246daafedac039d..eeb5d5630b941ea91f641e12577f66720be5e0dd 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 e663e8d2f46e28dd2e5dc239fb2a9782cd375ac4..b924c139751c05dda52c936749aadb1b46ef8f46 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 e97af3e87f2cf11f7e2538c4cb2b8bb87fbaa236..a6a712232204bd1349f98a70766ecb66b02aff70 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 ce0172fbbf120366ac1ee347ceee5ef1d6961d58..3a16e7d0848fb160e883127fff90cd6673f33ef7 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 c8feeed498d58cd8204e7645629fd09216847f54..14f538ef4cdd453f74babdf5eac0504659ac049e 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 f715d5f0812ff67de0cac792192fc62c2fe285c5..edd381b0c31298708145981c4237aa30e6632132 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 68359fd287026650aa491a9d2d2ff6b4f8ea7219..4ad37196d37bfd3daf1c4be2773c853614c5598e 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 f972c83fe01913db349291286f5fbe2d0ad68bac..7622f57b96aa90e043711e5d502c91d184eb55ac 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 cc4699d7679507f6b9ebe4db9b1fd3c13e45ca41..ce7b23fa6d111320d8067c8616d4105e76f0c458 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 ea8af17b7741374ee84501b48ed5fb4cf0f30e9a..9e0460d815fe0a38569d7ce71705bbb3a88b2fee 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 8fa7782f80c15c9f08b0502df90023b3a31760c8..0d8f7690cc1d9a493120b27255ec6624a33f6192 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 c0b69ebc768e2245aaa07d264a80eed779cb7cba..cd24c29eae529303bca19eace3f10a57b5c147c3 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 c577e1ef94d445d6b70d891e56b9f6b147702e0b..30b21642c66afd4aa27fb30a5e882cb729e8f9ad 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 2bdad1ab801c84fc19e8d5b8f79e2d4fae026e6a..b02785c2e4400eb1b1f31a2429c5934ad845d47b 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 eed79363c64c5e2ec19d58ce84cf4b680b9fcc7f..31b71b2c509e3cda0fdba0170435d67305e2ae6d 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 c94184cc6f61f2f6b288fe3a641ba5add01b7cc5..f33401ce09f4116b474278894ffba458e7047bc8 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 37f8d63592e85432ae7ba89976f6b94b0b813c50..8611cc3e64f08a207e9d4b426f46882293d1e4fe 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 8c10bfcdd7bd64e7d94daf6ade6c47f57ee611d1..410d6e657881f5a3d270193c7804486b22b33975 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 27271628da11e2c58fc875465658f4144c6f59d2..ec23c765d944ad7ed6ebdd266a218ade20a5ba2a 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 7a6aa4cfa95dfc74c8490d6f2a477af2238d0cc2..ed9bc05e5c2289a73b9eb175074253c530e683cf 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 2ef6e1290ed6cf23623c20fe495d4f30d8fd1839..223adb4ffbef372f678af27b1b38f02b181a6232 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 709b153ffc246a74850a641395bf38d00ec055b0..71f4c8da7d4053706995f156804130ebf0d68cdf 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 65cd58e288b7fc106628b16dd73d603e341c1e5f..027baa985b82079dbeaa370b679cccf3360ca92d 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 2be130203d0a737584c24960e498544e52d83113..62aff728d8e594cac3558817461422545852402e 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 afdc17415f35a986909b0563310bdb80c5194c44..111c0562b6c9d2f07f47329df1ac012f9e5384d4 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 c89403500c8b5e6ebc7ceff28db17b566a80ab84..4ca5f71b1376d4ef4f6c59c98c99679d3c2f14c4 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 d9131614c5bf154a31c5c28407c8932b8898d32c..d1a6fe7b3197ededf76856d2a0e6a8d7331e8d01 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 21ad7627688fd9ac576efe1b87fef074abe2b0cd..dc4e5b9cd292b3adb941c93fb2597cfa5a6407e7 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 23b32fa27e85eec003cb0b15176d975f6c677718..54b831653a5ccfd5252170e18f518d64345dcac8 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 defc5aa846ee904b2f2db6d0373d7581aa21d38b..d811a1b459e18042b9562947b2c1250137202a47 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 c01572a3d122b40371bb6b52d20ccd494d222c6e..a2984a62fb9c7ad2e42ed7085b0d1bbff1f7c1ec 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 d2b808b0fc60846ac7b279d5588fb123e2e73d00..db874601b7a31677c2c045001e45951ac0be3621 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 526c7c5503f1b49652bf88c7984a323680686083..b7bfd20de74a6cac83d06c32d30d334e8bbc397c 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 b87460dceb3f7208b181bcbe8514743af1012519..1c0d472d90ca3da07088d95a2fe9d1ff77b28a35 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 6db3e45cdad6d8e9606410591d7326d58d6035cd..a01261764a8257e7188a63bce45d48de435e5de0 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 0b6859756d0c1d1b17e8cf56c8d2ead4378119a5..934d5cac52bf7132cf788f53f2483a2d431906d4 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 26e5098ec34af31be14982f23131f6ff7fff7f9d..0b45619af035f30a8925607b5bdc6090f3e65dd9 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 fdfa74f693d19eca4d48e95d6a0d293108987de4..df7467e69da88e5c9d6e4df633bfc0e02400a375 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 73b71dba8f91058eae4614f6223ffb332b9e3380..f62f655c8ea205e639a53cb05668466ad72994c7 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 274faa5aec463a1ba7fc7124fbb8ebeb85bbc504..03a7f1f3063952bd75df97c42923699763746dd8 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 3062f9c366ccb4c4a21a43619ed6d39566c79443..361a4e9202223016050c2884f80d6520a602feca 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 c2bcb1061ac9e9bb5fa5005a6bb58b32483d5929..3b66945594d9761edcdf1f2206128ad900e0ab6a 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 ca3e112f1ad5fd461d43a071ab50820d457ed16d..222860785d112e16b84092c7c795f83d93f11835 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 42aaae90fdc9fb0490e298e32d75a13545a6ffb7..12686c7e9653f47058b4cb8e2c1b963aea06479a 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 1a2bf06751ee42357b928102c6d6156db5832e9d..4abee0e2704b7a23d3b8f79512aa90d2ce1bbd09 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 83d6c44cded7043b2e767d6c5a6dd47c19c80400..3138fd2d0fe75e5c2333467d506473a4f9256c47 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 ed8cf531d442166f8b2525d67b943232b883052f..d0b3354451c50d9c9e84a784446a1d028bdc2914 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 85ee95ae7de30e7dfc1e88dbd935b618fd3e00c7..e3cc083ffd821ca194630e057750e9f6548b2436 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 68870f84e6b4c2168cc7e5a0c271e39c9201dc85..cffa8f306c8532c7d6cfce15e564c9004c47a3aa 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 2cad118a09f9c28a391afbef87d6baf7199d50cf..df527a848b86df23617c222732c03bc3a023e54b 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 3b9684008fca10864ee013ac0fff57835383adfb..9e54603b1cea8f0c6ececfc9239dc2d35467ff75 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 0bc11e4001079b8a4d82e2028cd53e4d875caae8..e72676a88a3d3cc1489f8b31bba6c1f6107a686e 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 8316382c7077053565c469f7a33ae1794cdf1675..fc529aa9e7d2ab169a024af2f6cbb35a07ceef1d 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 e31a727d2c716a86b617ace07672727efc9b847d..25f5a91ba033ef71f287de0bd33332745d0a3869 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 7a33d51997b6322fb627725e7d3868dcc4d0115f..425da5db0728940a399ec273bb0ff621554825a5 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 add00ea319d5905ef9bf05ee639031ec8a5ec344..4cc64b519685dcb1964fc1f3e761b5e016b00adc 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 afa9c3b06e4023d817fe2646629878c3e18ffe69..190843d7b89c96e739f0936d06aabf4d55399471 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 1eacb75b50ad1fe5cd693d667c8fe8b27052cc69..bc3cc74d55ed22ab9ed1a4df6835e5831b9d87ef 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 1c83f144bd0e9e37cb4cc688da334cefbb495103..493af53c0b3b6ee02f26940a7e0660d324825045 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 32ab40a0210bb45925c737d21d7a497ecb1d65c9..4fb5a17b2248ddae8e2de3ed1f15557611cc1f98 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 76b8e65e4e32d8110221b6917d0b87bc06735af1..da1938411a7585162ce4c9c284483102be42a4df 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 2243675ccd1768525c9a1552ee2a1c6d73b34215..99f60e07a466302fab5d8b8d780ac67c74616bc7 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 c1cc057708ad19bfb5622ab5631ae2220a5de3d7..c5aaa96051a3d72cf03d240f6c203f50115224bc 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 6e4b7179be5b8de84a5295214eca102945356fe6..dc37a2ea8f111c721e431f66e6bbc736d918ed3c 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 dbc45759af494d0c481042fde94d49dc0e074e0e..7bd11e7fdfaa8067871b477317038099759e9f16 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 787daae660bb3e205a25ec3288a720ac22bb6502..f1b1e8d18da4be8cf8335a55e26f625b64662fe2 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 cf71061e742dd9e60fdabd0fc92fbf88087e3eb9..dc846804ceb0df270dbe8ad724e2d4c350d946bc 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 5533497910a30babde847e3a10c9720e4d2a560b..dd20f2df043a7e2c470fabe6d70a006753fca607 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 fd6262b5850a1e2eb9b11efaae309a37047171f7..f05a9a997716c145c0e4c946ed349bb539c6c656 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 defc5aa846ee904b2f2db6d0373d7581aa21d38b..d811a1b459e18042b9562947b2c1250137202a47 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 c01572a3d122b40371bb6b52d20ccd494d222c6e..a2984a62fb9c7ad2e42ed7085b0d1bbff1f7c1ec 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 d2b808b0fc60846ac7b279d5588fb123e2e73d00..db874601b7a31677c2c045001e45951ac0be3621 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 526c7c5503f1b49652bf88c7984a323680686083..b7bfd20de74a6cac83d06c32d30d334e8bbc397c 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 b87460dceb3f7208b181bcbe8514743af1012519..1c0d472d90ca3da07088d95a2fe9d1ff77b28a35 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 dad1a9ad68b75ce1a7e9ce0170748ef2500f0688..479a06b46a52119049931027348aa83cf51045a0 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 0b6859756d0c1d1b17e8cf56c8d2ead4378119a5..934d5cac52bf7132cf788f53f2483a2d431906d4 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 952a49cd93213b93a5c79ebf1a62aeb899c03367..7cd9f785749af805fc66ed74ca7e8f0b526cc389 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 fdc38a89f9e6d41e7beaccf4d1b1a4a83829c7c9..5f839f8a426234fac7df03ca9454a60b9ecd292a 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 d3d463bb18f02324abfe79b4a953806430bb3dc4..a8d3434532bd6175cafe1e7929a5635eb11851f4 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 5c910c5ce08533d16b1ceff963528a1c27e9d688..6ac71e1f96ecc9909300bd6da8c0baff2b6d59d3 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 2597351573ed9dad0ddce0188858a6e679dbf45f..664ab1c0de432827191267859ecb03f6312f53d7 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 79815d08cea98f94263d2434612b55fb00fc91c8..2489e31fc1b458e5cdbf9641e571d8b205959bfc 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 e3f7914476396e6679b32010b3ca4c72fc8ae486..3fa400320d026f24d822d870a93c9d06a3046cd9 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 b8502fd217efa3d0c919e13d6128eb10e6163575..265b2e64ff3c4b6ab95b0bc21c6de1d3eb774f1b 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 ba00fc57e7cfa5fcf7a8886621f9cdad5a4c4346..0ba05f6836d6aeb1423af55a1ac3eefc5102f92a 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 c1bdad44e572b41e525a9fb0142801e65af85910..27285d01c6246df6a985301faf08ef6b022e551a 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 f073560369489d138e91230f8cb30a4ba4c156cc..aaea634320b0a5c6f7faaf84a0d0043e1c233554 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 6c123e995508be8940f9644d1dd6f1af58b7e93e..b8021e9189b8bbb4feffb96d01a84cb38c346439 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 1cec8d9d2c0149b296b262f6ee72f865e605ef7b..e915233e77562c76691910182e5bf9538642465e 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 d53944e1182801b9a0294dd3ddd0523c75c24c90..c58f9d0f25e8528633b19ebfd812703118ec210f 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 ce61c58cd1a359e12b1e3c7c927a9aa0556f757e..fcdd16466e45d175c6e6367a93a01e4d426c552e 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 f49b1fd8da6a3c892f71dbc5e908b0d74a1abf6a..185abc6e643247b3a6a8a545050ddd699fcc48b9 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 29a7516da45ebd1eedbecd30869698c3ff786a55..c69f4ebf4702fd38756a94f1a89608122e753f14 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 e298c806339062b807e00f2baa9784105e882a90..4969511a672a94312faf4bde02155e92bfa26cd6 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 7507c644ab2e466d012c5668a96ba3d3b5a86289..606dd761cf535a845ae192be0889f52023eb01c4 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 4da07f019758fc9d58e16fb7794adbb157a1aa16..22656d276031f75366209eff561de1f6bebd597c 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 9e25d5dd87571c9075981ee852aacd2c0eed66c0..797659ac7e8e49132e6aec3708e56f89b2813aff 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 9d950555e2bd0d3d10b186490e93efc9623cc8f3..4802e7e4684606e5ab676f8aa785c31a5c9dd0d1 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 34f1db78f9e099ff5a3a78e702edc59532bf9d8f..67fddd165dfc66980b175e14cdeb8a5cb5b67057 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 3e072a45fc1d0cecdea9fb51dd8bea73e8c353ce..06f1734c34c7392215fc486fe9ebd080abdc6279 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 fbb95db598e88459c58070f708c5d812ed8d97e6..e6febf40190e0f4dae73aa55ee123ef269ba2d15 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 081496c1430cbc9b564c6c7cfa288367612c1ba7..46439fb6822c65454ee5bb48d589f750f6dce9a9 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 732b4c69cce4d92ba364e04b64042f8a617a4295..a790fa63c56fc9f0bef5d8da183120361140c144 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 5c6bb55dcaf1e90f33873a70f455d344c5c45a39..4adcbf341f123f2855009e527e9f6268545bdbab 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 f12bf825887b188cc75bc245e2e027ffb2bc2860..ba99b599d50dac6044a16b283e0ccd8995c903c5 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 5849d6286d8718e7469766a6d6a68696c8e4e2f6..ee5a2cee28b816bc155fe08b6608230bacfbce3e 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 f3a6142e163967549d4463207315add0c85e2c4c..1d864f8994adb7a0631b502a183922a70206d605 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 2a5a5d6c255ebbc41d648e8712d99d0363cf2c40..a641425da0514cf3ddcb14c8f59f7f4a205887d7 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 91a477d87d1e3b311ae22b3837f16ce0f5e9131a..7e7e2280a1e3ec5c210d23ca890ac58b632d076c 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 57b05fae4f9fe9540fa1b7035a24691be00d9649..93ab10f2987738b0f0f45cebf20de032b56cf95d 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 afbe930d7b9e523fb7e7c1429cd293b21ecfcb4e..dc2a14f5f6449f5b99245aab6889c5f32be2c9af 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 9542c38b442373385466233a6e254a6861756d29..146a57a7d723995c8c4b8437b835c1397d1b124f 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 9cb77223a8bf4cdbcf042811130c48e34250fd78..556c8c802e9497eb0b644c3fca7251b2723d826b 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 dee85b3dea4ddd378fe49bd89f77b011caa8eb3c..13b0717756445a3dd981c85bec6f7d390dacfbde 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 591a9eb26ab52772c1007e3c86bc1caa8071a837..7bcf51318d10bd59acd2298936a32b8e4a9eae25 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]
 ---*/