diff --git a/src/class-elements/class-evaluation-error/cls-decl.template b/src/class-elements/class-evaluation-error/cls-decl.template
index f29a6c2ae2cc36c6ccf2aa989870bdcbe30c5a13..5a919999739fcb3abe231305fbae9e20314c3e2f 100644
--- a/src/class-elements/class-evaluation-error/cls-decl.template
+++ b/src/class-elements/class-evaluation-error/cls-decl.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-evaluation-error/
+path: language/statements/class/fields/evaluation-error/
 name: field definitions in a class declaration
 features: [class]
 esid: sec-runtime-semantics-classdefinitionevaluation
diff --git a/src/class-elements/class-evaluation-error/cls-expr.template b/src/class-elements/class-evaluation-error/cls-expr.template
index 083ce095ce5e0eb78d0ec345034d199df924e929..139e9252281685702883878f97b8aec4b8241367 100644
--- a/src/class-elements/class-evaluation-error/cls-expr.template
+++ b/src/class-elements/class-evaluation-error/cls-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-evaluation-error/
+path: language/expressions/class/fields/evaluation-error/
 name: field definitions in a class expression
 features: [class]
 esid: sec-runtime-semantics-classdefinitionevaluation
diff --git a/src/class-elements/default/cls-decl.template b/src/class-elements/default/cls-decl.template
index 2fea2b1fbd9326d5fa2f57c17d2248ad77ff90eb..97cd9f4be6c056c68c8c465da69fbb3a89fd7edc 100644
--- a/src/class-elements/default/cls-decl.template
+++ b/src/class-elements/default/cls-decl.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-
+path: language/statements/class/fields/
 name: field definitions in a class declaration
 features: [class]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/default/cls-expr.template b/src/class-elements/default/cls-expr.template
index 0efa7ab1fec548dd4ce2b498e256a5c2e417183c..62b1ffe81e004c61b2bc090353c5492dcfad40ee 100644
--- a/src/class-elements/default/cls-expr.template
+++ b/src/class-elements/default/cls-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-
+path: language/expressions/class/fields/
 name: field definitions in a class expression
 features: [class]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/initializer-error/cls-decl-fields-arrow-fnc.template b/src/class-elements/initializer-error/cls-decl-fields-arrow-fnc.template
index 3b7811b14f7947c5392f7362bdfc2f366474f43f..7d544f6990731c928d411a55977612019c95db4f 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-arrow-fnc.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-arrow-fnc.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-arrow-fnc-
+path: language/statements/class/fields/arrow-fnc-
 name: arrow function expression
 features: [arrow-function, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-comp-name.template b/src/class-elements/initializer-error/cls-decl-fields-comp-name.template
index 4db66f243fc89cacf675153ad7ba792ec96445f3..39aed5619ec3a6b82469500e7246daafedac039d 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-comp-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-comp-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-comp-name-
+path: language/statements/class/fields/comp-name-
 name: computed ClassElementName
 features: [class, class-fields-public, computed-property-names]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-equality.template b/src/class-elements/initializer-error/cls-decl-fields-equality.template
index 0811ecd49ea7bc9d0cadaaf86b55e08696f8add6..e663e8d2f46e28dd2e5dc239fb2a9782cd375ac4 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-equality.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-equality.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-equality-
+path: language/statements/class/fields/equality-
 name: equality expression
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-literal-name.template b/src/class-elements/initializer-error/cls-decl-fields-literal-name.template
index c136f5a24a2935628aaa97b9beaee43838449da1..e97af3e87f2cf11f7e2538c4cb2b8bb87fbaa236 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-literal-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-literal-name-
+path: language/statements/class/fields/literal-name-
 name: literal ClassElementName
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-private-arrow-fnc.template b/src/class-elements/initializer-error/cls-decl-fields-private-arrow-fnc.template
index 38199b19a5c11c4e92b8428313b394fd23df32a3..ce0172fbbf120366ac1ee347ceee5ef1d6961d58 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-private-arrow-fnc.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-private-arrow-fnc.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-private-arrow-fnc-
+path: language/statements/class/fields/private-arrow-fnc-
 name: private field, arrow function expression
 features: [class, arrow-function, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-private-name.template b/src/class-elements/initializer-error/cls-decl-fields-private-name.template
index 705a8841e129c9c24d1e9e0082be0ef2907e225a..c8feeed498d58cd8204e7645629fd09216847f54 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-private-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-private-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-private-literal-name-
+path: language/statements/class/fields/private-literal-name-
 name: ClassElementName PrivateName
 features: [class, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-private-ternary.template b/src/class-elements/initializer-error/cls-decl-fields-private-ternary.template
index 628e12bdf3c2460bf85dbe55c8c3832bc9002963..f715d5f0812ff67de0cac792192fc62c2fe285c5 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-private-ternary.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-private-ternary.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-private-ternary-
+path: language/statements/class/fields/private-ternary-
 name: private field, ternary expression
 features: [class, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-private-typeof.template b/src/class-elements/initializer-error/cls-decl-fields-private-typeof.template
index bba1b43fd5a3f7dfe5a99c03ec8b78ef346458d4..68359fd287026650aa491a9d2d2ff6b4f8ea7219 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-private-typeof.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-private-typeof.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-private-typeof-
+path: language/statements/class/fields/private-typeof-
 name: private field, typeof expression
 features: [class, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-static-comp-name.template b/src/class-elements/initializer-error/cls-decl-fields-static-comp-name.template
index 0b9656f7c9476f06dcfe2fd2e4e0cfca9cba5ea2..f972c83fe01913db349291286f5fbe2d0ad68bac 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-static-comp-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-static-comp-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-static-comp-name-
+path: language/statements/class/fields/static-comp-name-
 name: static computed ClassElementName
 features: [class, class-static-fields-public, computed-property-names]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-static-literal-name.template b/src/class-elements/initializer-error/cls-decl-fields-static-literal-name.template
index ae25c329d1568a632c5a6e17884c9fb27957b879..cc4699d7679507f6b9ebe4db9b1fd3c13e45ca41 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-static-literal-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-static-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-static-literal-
+path: language/statements/class/fields/static-literal-
 name: static literal ClassElementName
 features: [class, class-static-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-static-private-name.template b/src/class-elements/initializer-error/cls-decl-fields-static-private-name.template
index d514fbffff5a08e1502daf18699d50df80d36640..ea8af17b7741374ee84501b48ed5fb4cf0f30e9a 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-static-private-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-static-private-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-static-private-
+path: language/statements/class/fields/static-private-
 name: static PrivateName
 features: [class, class-static-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-static-string-literal-name.template b/src/class-elements/initializer-error/cls-decl-fields-static-string-literal-name.template
index 574ee8dffc5beefa786c97c274f68f9402cdf700..8fa7782f80c15c9f08b0502df90023b3a31760c8 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-static-string-literal-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-static-string-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-static-string-literal-name-
+path: language/statements/class/fields/static-string-literal-name-
 name: static string literal ClassElementName
 features: [class, class-static-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-string-literal-name.template b/src/class-elements/initializer-error/cls-decl-fields-string-literal-name.template
index 708a25b181516a7c63465aa5d9c3205700a43374..c0b69ebc768e2245aaa07d264a80eed779cb7cba 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-string-literal-name.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-string-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-string-literal-name-
+path: language/statements/class/fields/string-literal-name-
 name: string literal ClassElementName
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-ternary.template b/src/class-elements/initializer-error/cls-decl-fields-ternary.template
index bdce269e5db1cb56d4dbb32b4f83be2f6a7eb126..c577e1ef94d445d6b70d891e56b9f6b147702e0b 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-ternary.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-ternary.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-ternary-
+path: language/statements/class/fields/ternary-
 name: ternary expression
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-decl-fields-typeof.template b/src/class-elements/initializer-error/cls-decl-fields-typeof.template
index b83bf837bf60a71b51c575b3e81f4dd7880d92d7..2bdad1ab801c84fc19e8d5b8f79e2d4fae026e6a 100644
--- a/src/class-elements/initializer-error/cls-decl-fields-typeof.template
+++ b/src/class-elements/initializer-error/cls-decl-fields-typeof.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/fields-typeof-
+path: language/statements/class/fields/typeof-
 name: typeof expression
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-arrow-fnc.template b/src/class-elements/initializer-error/cls-expr-fields-arrow-fnc.template
index f1c475c3307e6e8ac170841253d28a563d31d693..eed79363c64c5e2ec19d58ce84cf4b680b9fcc7f 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-arrow-fnc.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-arrow-fnc.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-arrow-fnc-
+path: language/expressions/class/fields/arrow-fnc-
 name: arrow function expression
 features: [arrow-function, class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-comp-name.template b/src/class-elements/initializer-error/cls-expr-fields-comp-name.template
index 2bbd48d435757b39e6b5c07744869af7fa1f40f9..c94184cc6f61f2f6b288fe3a641ba5add01b7cc5 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-comp-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-comp-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-comp-name-
+path: language/expressions/class/fields/comp-name-
 name: computed ClassElementName
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-equality.template b/src/class-elements/initializer-error/cls-expr-fields-equality.template
index e3f4b680a16d857b995b8912c4670890c1b54cb9..37f8d63592e85432ae7ba89976f6b94b0b813c50 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-equality.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-equality.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-equality-
+path: language/expressions/class/fields/equality-
 name: equality expression
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-literal-name.template b/src/class-elements/initializer-error/cls-expr-fields-literal-name.template
index 6adccb4c4266d8c0b56fa91fb173297857f0ed4b..8c10bfcdd7bd64e7d94daf6ade6c47f57ee611d1 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-literal-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-literal-name-
+path: language/expressions/class/fields/literal-name-
 name: literal ClassElementName
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-private-arrow-fnc.template b/src/class-elements/initializer-error/cls-expr-fields-private-arrow-fnc.template
index 0aea408fc146464c9d385c241891b3fb96695e2e..27271628da11e2c58fc875465658f4144c6f59d2 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-private-arrow-fnc.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-private-arrow-fnc.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-private-arrow-fnc-
+path: language/expressions/class/fields/private-arrow-fnc-
 name: private field, arrow function expression
 features: [class, arrow-function, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-private-name.template b/src/class-elements/initializer-error/cls-expr-fields-private-name.template
index 2847f4ca9ffacd12343021f3c38daed2c6f46cf8..7a6aa4cfa95dfc74c8490d6f2a477af2238d0cc2 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-private-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-private-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-private-literal-name-
+path: language/expressions/class/fields/private-literal-name-
 name: ClassElementName PrivateName
 features: [class, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-private-ternary.template b/src/class-elements/initializer-error/cls-expr-fields-private-ternary.template
index c6d7ec8467965dcac9cdad53c22ebfb0cac2fed8..2ef6e1290ed6cf23623c20fe495d4f30d8fd1839 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-private-ternary.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-private-ternary.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-private-ternary-
+path: language/expressions/class/fields/private-ternary-
 name: private field, ternary expression
 features: [class, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-private-typeof.template b/src/class-elements/initializer-error/cls-expr-fields-private-typeof.template
index 548c8e6e4bd7f1369a9519c651d4d75a84365634..709b153ffc246a74850a641395bf38d00ec055b0 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-private-typeof.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-private-typeof.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-private-typeof-
+path: language/expressions/class/fields/private-typeof-
 name: private field, typeof expression
 features: [class, class-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-static-comp-name.template b/src/class-elements/initializer-error/cls-expr-fields-static-comp-name.template
index 8df9a0480def30d055228004ce3ffb518502007d..65cd58e288b7fc106628b16dd73d603e341c1e5f 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-static-comp-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-static-comp-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-static-comp-name-
+path: language/expressions/class/fields/static-comp-name-
 name: static computed ClassElementName
 features: [class, class-static-fields-public, computed-property-names]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-static-literal-name.template b/src/class-elements/initializer-error/cls-expr-fields-static-literal-name.template
index 367b31af41aae0c73f915e5879d106de1b8b6b15..2be130203d0a737584c24960e498544e52d83113 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-static-literal-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-static-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-static-literal-
+path: language/expressions/class/fields/static-literal-
 name: static literal ClassElementName
 features: [class, class-static-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-static-private-name.template b/src/class-elements/initializer-error/cls-expr-fields-static-private-name.template
index 49bc4c9c10d6840a11ac4bd74d3fa0d1614f2718..afdc17415f35a986909b0563310bdb80c5194c44 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-static-private-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-static-private-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-static-private-
+path: language/expressions/class/fields/static-private-
 name: static PrivateName
 features: [class, class-static-fields-private]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-static-string-literal-name.template b/src/class-elements/initializer-error/cls-expr-fields-static-string-literal-name.template
index 8641726242085cc687eeb7df8fdd63f4d8fcaf53..c89403500c8b5e6ebc7ceff28db17b566a80ab84 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-static-string-literal-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-static-string-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-static-string-literal-name-
+path: language/expressions/class/fields/static-string-literal-name-
 name: static string literal ClassElementName
 features: [class, class-static-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-string-literal-name.template b/src/class-elements/initializer-error/cls-expr-fields-string-literal-name.template
index 4a9411721f6d107d6fe2c59b27c4a57ab8228901..d9131614c5bf154a31c5c28407c8932b8898d32c 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-string-literal-name.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-string-literal-name.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-string-literal-name-
+path: language/expressions/class/fields/string-literal-name-
 name: string literal ClassElementName
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-ternary.template b/src/class-elements/initializer-error/cls-expr-fields-ternary.template
index a7110b7a824a06c080e45493d9c9e53e49e5fb43..21ad7627688fd9ac576efe1b87fef074abe2b0cd 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-ternary.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-ternary.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-ternary-
+path: language/expressions/class/fields/ternary-
 name: ternary expression
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-error/cls-expr-fields-typeof.template b/src/class-elements/initializer-error/cls-expr-fields-typeof.template
index 66e31ac1302b10a4b8ac69f413b5a15e520b4a92..23b32fa27e85eec003cb0b15176d975f6c677718 100644
--- a/src/class-elements/initializer-error/cls-expr-fields-typeof.template
+++ b/src/class-elements/initializer-error/cls-expr-fields-typeof.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/fields-typeof-
+path: language/expressions/class/fields/typeof-
 name: typeof expression
 features: [class, class-fields-public]
 negative:
diff --git a/src/class-elements/initializer-eval-arguments/cls-decl-fields-eval.template b/src/class-elements/initializer-eval-arguments/cls-decl-fields-eval.template
index 90859a8a9a25e3fe92598b6eb09b386d116a60b1..defc5aa846ee904b2f2db6d0373d7581aa21d38b 100644
--- a/src/class-elements/initializer-eval-arguments/cls-decl-fields-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-decl-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-direct-
+path: language/statements/class/fields/direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-decl-fields-indirect-eval.template b/src/class-elements/initializer-eval-arguments/cls-decl-fields-indirect-eval.template
index b08b5ee379e682853b8b7596086304af8db85abc..c01572a3d122b40371bb6b52d20ccd494d222c6e 100644
--- a/src/class-elements/initializer-eval-arguments/cls-decl-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-decl-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-indirect-
+path: language/statements/class/fields/indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-eval.template b/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-eval.template
index 27551d328be9e9373422f860d7e264e466293634..d2b808b0fc60846ac7b279d5588fb123e2e73d00 100644
--- a/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-direct-
+path: language/statements/class/fields/private-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-indirect-eval.template
index 6a77ba9f22fa9377e035dc4d2d4625d22ce33a85..526c7c5503f1b49652bf88c7984a323680686083 100644
--- a/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-decl-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-indirect-
+path: language/statements/class/fields/private-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-expr-fields-eval.template b/src/class-elements/initializer-eval-arguments/cls-expr-fields-eval.template
index 6afff75bc9f98743134053e712bfd75f81c3099d..b87460dceb3f7208b181bcbe8514743af1012519 100644
--- a/src/class-elements/initializer-eval-arguments/cls-expr-fields-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-expr-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-direct-
+path: language/expressions/class/fields/direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-expr-fields-indirect-eval.template b/src/class-elements/initializer-eval-arguments/cls-expr-fields-indirect-eval.template
index d6064ff6cbf6aed7848485a1fc842d935b4d90d6..6db3e45cdad6d8e9606410591d7326d58d6035cd 100644
--- a/src/class-elements/initializer-eval-arguments/cls-expr-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-expr-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-indirect-
+path: language/expressions/class/fields/indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-eval.template b/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-eval.template
index 656a7c81a0d2c38ddbdf7c0f2595072994bce4fc..0b6859756d0c1d1b17e8cf56c8d2ead4378119a5 100644
--- a/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-direct-
+path: language/expressions/class/fields/private-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-indirect-eval.template
index 4127bd1a86a0633856f420b78b75013517bbd016..26e5098ec34af31be14982f23131f6ff7fff7f9d 100644
--- a/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-arguments/cls-expr-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-indirect-
+path: language/expressions/class/fields/private-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-decl-fields-eval.template b/src/class-elements/initializer-eval-newtarget/cls-decl-fields-eval.template
index fce4c331aa19b2418bc49f72d258b40645354311..fdfa74f693d19eca4d48e95d6a0d293108987de4 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-decl-fields-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-decl-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-direct-
+path: language/statements/class/fields/direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-decl-fields-indirect-eval.template b/src/class-elements/initializer-eval-newtarget/cls-decl-fields-indirect-eval.template
index 57db8034721be5f7754e13f2b9b1b5deaffb96ea..73b71dba8f91058eae4614f6223ffb332b9e3380 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-decl-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-decl-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-indirect-
+path: language/statements/class/fields/indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-eval.template b/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-eval.template
index 14cdf6b266348cacec8f227062916be4a25ef187..274faa5aec463a1ba7fc7124fbb8ebeb85bbc504 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-direct-
+path: language/statements/class/fields/private-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-indirect-eval.template
index bb7eb64337576a3f72bf78a5d832d28fdbf0b01c..3062f9c366ccb4c4a21a43619ed6d39566c79443 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-decl-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-indirect-
+path: language/statements/class/fields/private-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-expr-fields-eval.template b/src/class-elements/initializer-eval-newtarget/cls-expr-fields-eval.template
index bdadf99c0b65505f4d9a36d611db09d0567aeed5..c2bcb1061ac9e9bb5fa5005a6bb58b32483d5929 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-expr-fields-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-expr-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-direct-
+path: language/expressions/class/fields/direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-expr-fields-indirect-eval.template b/src/class-elements/initializer-eval-newtarget/cls-expr-fields-indirect-eval.template
index 0acfccf7df37da7a876823ac4fb7b666d67b9a51..ca3e112f1ad5fd461d43a071ab50820d457ed16d 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-expr-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-expr-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-indirect-
+path: language/expressions/class/fields/indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-eval.template b/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-eval.template
index 3efe9eb6ee5281f1ac693d5107b0b65a0df46690..42aaae90fdc9fb0490e298e32d75a13545a6ffb7 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-direct-
+path: language/expressions/class/fields/private-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-indirect-eval.template
index 032852f7b3d2c432663fb229e579539a7077b1b5..1a2bf06751ee42357b928102c6d6156db5832e9d 100644
--- a/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-newtarget/cls-expr-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-indirect-
+path: language/expressions/class/fields/private-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-call/cls-decl-fields-eval.template b/src/class-elements/initializer-eval-super-call/cls-decl-fields-eval.template
index 53579b49d36618fcf757113a3417e1e031be8735..83d6c44cded7043b2e767d6c5a6dd47c19c80400 100644
--- a/src/class-elements/initializer-eval-super-call/cls-decl-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-decl-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-derived-cls-direct-
+path: language/statements/class/fields/derived-cls-direct-
 name: direct eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-decl-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-call/cls-decl-fields-indirect-eval.template
index ad0bf241de52af7a0deec56cbd4eccb2628d05b9..ed8cf531d442166f8b2525d67b943232b883052f 100644
--- a/src/class-elements/initializer-eval-super-call/cls-decl-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-decl-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-derived-cls-indirect-
+path: language/statements/class/fields/derived-cls-indirect-
 name: indirect eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-eval.template b/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-eval.template
index 1e910bf87a0e7f0ffbee3c5f9cc98fa9cb5e13db..85ee95ae7de30e7dfc1e88dbd935b618fd3e00c7 100644
--- a/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-derived-cls-direct-
+path: language/statements/class/fields/private-derived-cls-direct-
 name: direct eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-indirect-eval.template
index cc49df82ab6d658a06069fc8f9b917c833ff4194..68870f84e6b4c2168cc7e5a0c271e39c9201dc85 100644
--- a/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-decl-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-derived-cls-indirect-
+path: language/statements/class/fields/private-derived-cls-indirect-
 name: indirect eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-expr-fields-eval.template b/src/class-elements/initializer-eval-super-call/cls-expr-fields-eval.template
index 1c9716a7a9e585635610920042be798ccf03232d..2cad118a09f9c28a391afbef87d6baf7199d50cf 100644
--- a/src/class-elements/initializer-eval-super-call/cls-expr-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-expr-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-derived-cls-direct-
+path: language/expressions/class/fields/derived-cls-direct-
 name: direct eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-expr-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-call/cls-expr-fields-indirect-eval.template
index 28f8bfe58bb11288183bc226fb04d6d9217ca471..3b9684008fca10864ee013ac0fff57835383adfb 100644
--- a/src/class-elements/initializer-eval-super-call/cls-expr-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-expr-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-derived-cls-indirect-
+path: language/expressions/class/fields/derived-cls-indirect-
 name: indirect eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-eval.template b/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-eval.template
index ea4c3586ebd9cd949f43b160b3263c51829abb8f..0bc11e4001079b8a4d82e2028cd53e4d875caae8 100644
--- a/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-derived-cls-direct-
+path: language/expressions/class/fields/private-derived-cls-direct-
 name: direct eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-indirect-eval.template
index 9fcd914567fab076b558ee1e4a8f5437d37b8e89..8316382c7077053565c469f7a33ae1794cdf1675 100644
--- a/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-call/cls-expr-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-derived-cls-indirect-
+path: language/expressions/class/fields/private-derived-cls-indirect-
 name: indirect eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-property/cls-decl-fields-eval.template b/src/class-elements/initializer-eval-super-property/cls-decl-fields-eval.template
index 52b0180ab8027cb9c6c58736d3852e08804fe8ca..e31a727d2c716a86b617ace07672727efc9b847d 100644
--- a/src/class-elements/initializer-eval-super-property/cls-decl-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-decl-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-derived-cls-direct-
+path: language/statements/class/fields/derived-cls-direct-
 name: direct eval
 ---*/
 
diff --git a/src/class-elements/initializer-eval-super-property/cls-decl-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-property/cls-decl-fields-indirect-eval.template
index f521f8982974e34a69c9aeb44bcb4bb951ebd236..7a33d51997b6322fb627725e7d3868dcc4d0115f 100644
--- a/src/class-elements/initializer-eval-super-property/cls-decl-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-decl-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-derived-cls-indirect-
+path: language/statements/class/fields/derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-eval.template b/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-eval.template
index b50d046983ee88388f90abc5018d484e75ae47c7..add00ea319d5905ef9bf05ee639031ec8a5ec344 100644
--- a/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-derived-cls-direct-
+path: language/statements/class/fields/private-derived-cls-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-indirect-eval.template
index 68fb2ca06f116d8d728aea5d748f70ad5ff6eb95..afa9c3b06e4023d817fe2646629878c3e18ffe69 100644
--- a/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-decl-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-derived-cls-indirect-
+path: language/statements/class/fields/private-derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-property/cls-expr-fields-eval.template b/src/class-elements/initializer-eval-super-property/cls-expr-fields-eval.template
index c25cb861f570b4a48c0dd4744f415a9fe19999f3..1eacb75b50ad1fe5cd693d667c8fe8b27052cc69 100644
--- a/src/class-elements/initializer-eval-super-property/cls-expr-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-expr-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-derived-cls-direct-
+path: language/expressions/class/fields/derived-cls-direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-property/cls-expr-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-property/cls-expr-fields-indirect-eval.template
index 20d6c9c9de5823afb2cbe3f871eab1c55fa8a141..1c83f144bd0e9e37cb4cc688da334cefbb495103 100644
--- a/src/class-elements/initializer-eval-super-property/cls-expr-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-expr-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-derived-cls-indirect-
+path: language/expressions/class/fields/derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-eval.template b/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-eval.template
index e004b28305f6bb1f052780dc111a09590298d00c..32ab40a0210bb45925c737d21d7a497ecb1d65c9 100644
--- a/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-derived-cls-direct-
+path: language/expressions/class/fields/private-derived-cls-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-indirect-eval.template
index fe022864713f5332b5345a01cdb1539c65d5baa7..76b8e65e4e32d8110221b6917d0b87bc06735af1 100644
--- a/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super-property/cls-expr-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-derived-cls-indirect-
+path: language/expressions/class/fields/private-derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-decl-fields-eval.template b/src/class-elements/initializer-eval-super/cls-decl-fields-eval.template
index 9c94c4f9692c0fa21afbb4ba99de1b3044be79e6..2243675ccd1768525c9a1552ee2a1c6d73b34215 100644
--- a/src/class-elements/initializer-eval-super/cls-decl-fields-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-decl-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-derived-cls-direct-
+path: language/statements/class/fields/derived-cls-direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-decl-fields-indirect-eval.template b/src/class-elements/initializer-eval-super/cls-decl-fields-indirect-eval.template
index 98200556b64d7b53fd1d516c9fca989670230220..c1cc057708ad19bfb5622ab5631ae2220a5de3d7 100644
--- a/src/class-elements/initializer-eval-super/cls-decl-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-decl-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-derived-cls-indirect-
+path: language/statements/class/fields/derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-decl-private-fields-eval.template b/src/class-elements/initializer-eval-super/cls-decl-private-fields-eval.template
index f536ad4266107110b13499106ef0e27cebcd8a10..6e4b7179be5b8de84a5295214eca102945356fe6 100644
--- a/src/class-elements/initializer-eval-super/cls-decl-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-decl-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-derived-cls-direct-
+path: language/statements/class/fields/private-derived-cls-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-decl-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-super/cls-decl-private-fields-indirect-eval.template
index 1b4adf525cc4e3f3162218e59e308c1034bd3815..dbc45759af494d0c481042fde94d49dc0e074e0e 100644
--- a/src/class-elements/initializer-eval-super/cls-decl-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-decl-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-derived-cls-indirect-
+path: language/statements/class/fields/private-derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-expr-fields-eval.template b/src/class-elements/initializer-eval-super/cls-expr-fields-eval.template
index 83a2632f7b6833ec370098c683a09de773bc4b70..787daae660bb3e205a25ec3288a720ac22bb6502 100644
--- a/src/class-elements/initializer-eval-super/cls-expr-fields-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-expr-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-derived-cls-direct-
+path: language/expressions/class/fields/derived-cls-direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-expr-fields-indirect-eval.template b/src/class-elements/initializer-eval-super/cls-expr-fields-indirect-eval.template
index 2af99eb2710bbce55296705f07d910b0f711a216..cf71061e742dd9e60fdabd0fc92fbf88087e3eb9 100644
--- a/src/class-elements/initializer-eval-super/cls-expr-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-expr-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-derived-cls-indirect-
+path: language/expressions/class/fields/derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-expr-private-fields-eval.template b/src/class-elements/initializer-eval-super/cls-expr-private-fields-eval.template
index c55f04ad2ed05c1a6741bac54b931461be581a7f..5533497910a30babde847e3a10c9720e4d2a560b 100644
--- a/src/class-elements/initializer-eval-super/cls-expr-private-fields-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-expr-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-derived-cls-direct-
+path: language/expressions/class/fields/private-derived-cls-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval-super/cls-expr-private-fields-indirect-eval.template b/src/class-elements/initializer-eval-super/cls-expr-private-fields-indirect-eval.template
index 5f22b7ac6fe044f14b00a0c19c4ae30637830cb9..fd6262b5850a1e2eb9b11efaae309a37047171f7 100644
--- a/src/class-elements/initializer-eval-super/cls-expr-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval-super/cls-expr-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-derived-cls-indirect-
+path: language/expressions/class/fields/private-derived-cls-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-decl-fields-eval.template b/src/class-elements/initializer-eval/cls-decl-fields-eval.template
index 90859a8a9a25e3fe92598b6eb09b386d116a60b1..defc5aa846ee904b2f2db6d0373d7581aa21d38b 100644
--- a/src/class-elements/initializer-eval/cls-decl-fields-eval.template
+++ b/src/class-elements/initializer-eval/cls-decl-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-direct-
+path: language/statements/class/fields/direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-decl-fields-indirect-eval.template b/src/class-elements/initializer-eval/cls-decl-fields-indirect-eval.template
index b08b5ee379e682853b8b7596086304af8db85abc..c01572a3d122b40371bb6b52d20ccd494d222c6e 100644
--- a/src/class-elements/initializer-eval/cls-decl-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval/cls-decl-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-indirect-
+path: language/statements/class/fields/indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-decl-private-fields-eval.template b/src/class-elements/initializer-eval/cls-decl-private-fields-eval.template
index 27551d328be9e9373422f860d7e264e466293634..d2b808b0fc60846ac7b279d5588fb123e2e73d00 100644
--- a/src/class-elements/initializer-eval/cls-decl-private-fields-eval.template
+++ b/src/class-elements/initializer-eval/cls-decl-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-direct-
+path: language/statements/class/fields/private-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-decl-private-fields-indirect-eval.template b/src/class-elements/initializer-eval/cls-decl-private-fields-indirect-eval.template
index 6a77ba9f22fa9377e035dc4d2d4625d22ce33a85..526c7c5503f1b49652bf88c7984a323680686083 100644
--- a/src/class-elements/initializer-eval/cls-decl-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval/cls-decl-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/statements/class/fields-private-indirect-
+path: language/statements/class/fields/private-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-expr-fields-eval.template b/src/class-elements/initializer-eval/cls-expr-fields-eval.template
index 6afff75bc9f98743134053e712bfd75f81c3099d..b87460dceb3f7208b181bcbe8514743af1012519 100644
--- a/src/class-elements/initializer-eval/cls-expr-fields-eval.template
+++ b/src/class-elements/initializer-eval/cls-expr-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-direct-
+path: language/expressions/class/fields/direct-
 name: direct eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-expr-fields-indirect-eval.template b/src/class-elements/initializer-eval/cls-expr-fields-indirect-eval.template
index 2716c4ace742c647e1dc57fe7662837a879650d6..dad1a9ad68b75ce1a7e9ce0170748ef2500f0688 100644
--- a/src/class-elements/initializer-eval/cls-expr-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval/cls-expr-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-indirect-
+path: language/expressions/class/fields/indirect-
 name: indirect eval
 features: [class, class-fields-public]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-expr-private-fields-eval.template b/src/class-elements/initializer-eval/cls-expr-private-fields-eval.template
index 656a7c81a0d2c38ddbdf7c0f2595072994bce4fc..0b6859756d0c1d1b17e8cf56c8d2ead4378119a5 100644
--- a/src/class-elements/initializer-eval/cls-expr-private-fields-eval.template
+++ b/src/class-elements/initializer-eval/cls-expr-private-fields-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-direct-
+path: language/expressions/class/fields/private-direct-
 name: direct eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/initializer-eval/cls-expr-private-fields-indirect-eval.template b/src/class-elements/initializer-eval/cls-expr-private-fields-indirect-eval.template
index ade5a5749137d9009182705b8c7fc6a8aa9bd2b5..952a49cd93213b93a5c79ebf1a62aeb899c03367 100644
--- a/src/class-elements/initializer-eval/cls-expr-private-fields-indirect-eval.template
+++ b/src/class-elements/initializer-eval/cls-expr-private-fields-indirect-eval.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-performeval-rules-in-initializer
-path: language/expressions/class/fields-private-indirect-
+path: language/expressions/class/fields/private-indirect-
 name: indirect eval
 features: [class, class-fields-private]
 ---*/
diff --git a/src/class-elements/productions/cls-decl-after-same-line-async-gen.template b/src/class-elements/productions/cls-decl-after-same-line-async-gen.template
index 9b2a19895c5a3e48fdfeebf4820be7cb89badc9c..fdc38a89f9e6d41e7beaccf4d1b1a4a83829c7c9 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-async-gen.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-async-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-same-line-async-gen-
+path: language/statements/class/fields/same-line-async-gen-
 name: field definitions after an async generator in the same line
 features: [class, class-fields-public, async-iteration]
 flags: [async]
diff --git a/src/class-elements/productions/cls-decl-after-same-line-async-method.template b/src/class-elements/productions/cls-decl-after-same-line-async-method.template
index 13ab916fe6daaaa932c7939935d50ef53243d981..d3d463bb18f02324abfe79b4a953806430bb3dc4 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-async-method.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-async-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-same-line-async-method-
+path: language/statements/class/fields/same-line-async-method-
 name: field definitions after an async method in the same line
 features: [class, class-fields-public, async-functions]
 flags: [async]
diff --git a/src/class-elements/productions/cls-decl-after-same-line-gen.template b/src/class-elements/productions/cls-decl-after-same-line-gen.template
index 9bb76e6ca7deb775ff3fb33be200f7b926878a93..5c910c5ce08533d16b1ceff963528a1c27e9d688 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-gen.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-after-same-line-gen-
+path: language/statements/class/fields/after-same-line-gen-
 name: field definitions after a generator in the same line
 features: [generators, class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-after-same-line-method.template b/src/class-elements/productions/cls-decl-after-same-line-method.template
index 98002edecd0057918e45c5b81fa4f110bc344337..2597351573ed9dad0ddce0188858a6e679dbf45f 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-method.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-after-same-line-method-
+path: language/statements/class/fields/after-same-line-method-
 name: field definitions after a method in the same line
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-after-same-line-static-async-gen.template b/src/class-elements/productions/cls-decl-after-same-line-static-async-gen.template
index 5c1661c8d054d81d1d661a93be400e5010a1c7a6..79815d08cea98f94263d2434612b55fb00fc91c8 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-static-async-gen.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-static-async-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-after-same-line-static-async-gen-
+path: language/statements/class/fields/after-same-line-static-async-gen-
 name: field definitions after a static async generator in the same line
 features: [class, class-fields-public, async-iteration]
 flags: [async]
diff --git a/src/class-elements/productions/cls-decl-after-same-line-static-async-method.template b/src/class-elements/productions/cls-decl-after-same-line-static-async-method.template
index ffc1d74f3d2d7ddf9244b4a3dc6298131d4688db..e3f7914476396e6679b32010b3ca4c72fc8ae486 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-static-async-method.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-static-async-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-after-same-line-static-async-method-
+path: language/statements/class/fields/after-same-line-static-async-method-
 name: field definitions after a static async method in the same line
 features: [class, class-fields-public, async-functions]
 flags: [async]
diff --git a/src/class-elements/productions/cls-decl-after-same-line-static-gen.template b/src/class-elements/productions/cls-decl-after-same-line-static-gen.template
index 11797010efafd0144e1a4fb6459370a323484cb3..b8502fd217efa3d0c919e13d6128eb10e6163575 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-static-gen.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-static-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-after-same-line-static-gen-
+path: language/statements/class/fields/after-same-line-static-gen-
 name: field definitions after a static generator in the same line
 features: [generators, class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-after-same-line-static-method.template b/src/class-elements/productions/cls-decl-after-same-line-static-method.template
index 20b07ba167a0714d6d50de9e84a6e6237baaf6f5..ba00fc57e7cfa5fcf7a8886621f9cdad5a4c4346 100644
--- a/src/class-elements/productions/cls-decl-after-same-line-static-method.template
+++ b/src/class-elements/productions/cls-decl-after-same-line-static-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-after-same-line-static-method-
+path: language/statements/class/fields/after-same-line-static-method-
 name: field definitions after a static method in the same line
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-multiple-definitions.template b/src/class-elements/productions/cls-decl-multiple-definitions.template
index c8217f285cecc1d05e81781628b9a75d6588e537..c1bdad44e572b41e525a9fb0142801e65af85910 100644
--- a/src/class-elements/productions/cls-decl-multiple-definitions.template
+++ b/src/class-elements/productions/cls-decl-multiple-definitions.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-multiple-definitions-
+path: language/statements/class/fields/multiple-definitions-
 name: multiple fields definitions
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-multiple-stacked-definitions.template b/src/class-elements/productions/cls-decl-multiple-stacked-definitions.template
index 38a7d2ebf44f60eb60803bb26e95e8451b66eedb..f073560369489d138e91230f8cb30a4ba4c156cc 100644
--- a/src/class-elements/productions/cls-decl-multiple-stacked-definitions.template
+++ b/src/class-elements/productions/cls-decl-multiple-stacked-definitions.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-multiple-stacked-definitions-
+path: language/statements/class/fields/multiple-stacked-definitions-
 name: multiple stacked fields definitions through ASI
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-new-no-sc-line-method.template b/src/class-elements/productions/cls-decl-new-no-sc-line-method.template
index b2682e603a9a21e6f732fe6757b47c7fc6665754..6c123e995508be8940f9644d1dd6f1af58b7e93e 100644
--- a/src/class-elements/productions/cls-decl-new-no-sc-line-method.template
+++ b/src/class-elements/productions/cls-decl-new-no-sc-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-new-no-sc-line-method-
+path: language/statements/class/fields/new-no-sc-line-method-
 name: field definitions followed by a method in a new line without a semicolon
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-new-sc-line-generator.template b/src/class-elements/productions/cls-decl-new-sc-line-generator.template
index c1b6259543d3fa0f53bf89cb9f20f24d3eebe8f6..1cec8d9d2c0149b296b262f6ee72f865e605ef7b 100644
--- a/src/class-elements/productions/cls-decl-new-sc-line-generator.template
+++ b/src/class-elements/productions/cls-decl-new-sc-line-generator.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-new-sc-line-gen-
+path: language/statements/class/fields/new-sc-line-gen-
 name: field definitions followed by a method in a new line with a semicolon
 features: [class, class-fields-public, generators]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-new-sc-line-method.template b/src/class-elements/productions/cls-decl-new-sc-line-method.template
index 1c7ce8822714ea4ad381fbb3e89b738bba81e103..d53944e1182801b9a0294dd3ddd0523c75c24c90 100644
--- a/src/class-elements/productions/cls-decl-new-sc-line-method.template
+++ b/src/class-elements/productions/cls-decl-new-sc-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-new-sc-line-method-
+path: language/statements/class/fields/new-sc-line-method-
 name: field definitions followed by a method in a new line with a semicolon
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-regular-definitions.template b/src/class-elements/productions/cls-decl-regular-definitions.template
index 22bb679211a84689a9f3467b02c2c1a1e0efcb10..ce61c58cd1a359e12b1e3c7c927a9aa0556f757e 100644
--- a/src/class-elements/productions/cls-decl-regular-definitions.template
+++ b/src/class-elements/productions/cls-decl-regular-definitions.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-regular-definitions-
+path: language/statements/class/fields/regular-definitions-
 name: regular fields defintion
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-same-line-generator.template b/src/class-elements/productions/cls-decl-same-line-generator.template
index 8edc2b0dc785c6bb1efed149b4353a55e636713a..f49b1fd8da6a3c892f71dbc5e908b0d74a1abf6a 100644
--- a/src/class-elements/productions/cls-decl-same-line-generator.template
+++ b/src/class-elements/productions/cls-decl-same-line-generator.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-same-line-gen-
+path: language/statements/class/fields/same-line-gen-
 name: field definitions followed by a generator method in the same line
 features: [class, class-fields-public, generators]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-same-line-method.template b/src/class-elements/productions/cls-decl-same-line-method.template
index c55d1120b927a491a539740044c3a61e570d4b22..29a7516da45ebd1eedbecd30869698c3ff786a55 100644
--- a/src/class-elements/productions/cls-decl-same-line-method.template
+++ b/src/class-elements/productions/cls-decl-same-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-same-line-method-
+path: language/statements/class/fields/same-line-method-
 name: field definitions followed by a method in the same line
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-decl-wrapped-in-sc.template b/src/class-elements/productions/cls-decl-wrapped-in-sc.template
index 99c9c0b26503491f271f8acf26d5a80c83c499df..e298c806339062b807e00f2baa9784105e882a90 100644
--- a/src/class-elements/productions/cls-decl-wrapped-in-sc.template
+++ b/src/class-elements/productions/cls-decl-wrapped-in-sc.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/fields-wrapped-in-sc-
+path: language/statements/class/fields/wrapped-in-sc-
 name: fields definition wrapped in semicolons
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-after-same-line-async-gen.template b/src/class-elements/productions/cls-expr-after-same-line-async-gen.template
index dae89e21bfdfa8ac4aae96c753ca7abb24395cb1..7507c644ab2e466d012c5668a96ba3d3b5a86289 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-async-gen.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-async-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-same-line-async-gen-
+path: language/expressions/class/fields/same-line-async-gen-
 name: field definitions after an async generator in the same line
 features: [class, class-fields-public, async-iteration]
 flags: [async]
diff --git a/src/class-elements/productions/cls-expr-after-same-line-async-method.template b/src/class-elements/productions/cls-expr-after-same-line-async-method.template
index 8c5a94ce77582ea5ca9f79da5f1568728bb52e87..4da07f019758fc9d58e16fb7794adbb157a1aa16 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-async-method.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-async-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-same-line-async-method-
+path: language/expressions/class/fields/same-line-async-method-
 name: field definitions after an async method in the same line
 features: [class, class-fields-public, async-functions]
 flags: [async]
diff --git a/src/class-elements/productions/cls-expr-after-same-line-gen.template b/src/class-elements/productions/cls-expr-after-same-line-gen.template
index 89b749d8c74d5832879d74c5a8babfefb289a72f..9e25d5dd87571c9075981ee852aacd2c0eed66c0 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-gen.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-after-same-line-gen-
+path: language/expressions/class/fields/after-same-line-gen-
 name: field definitions after a generator in the same line
 features: [generators, class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-after-same-line-method.template b/src/class-elements/productions/cls-expr-after-same-line-method.template
index c277ca18b4aca46ea6d24ea8562cf6035fb13736..9d950555e2bd0d3d10b186490e93efc9623cc8f3 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-method.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-after-same-line-method-
+path: language/expressions/class/fields/after-same-line-method-
 name: field definitions after a method in the same line
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-after-same-line-static-async-gen.template b/src/class-elements/productions/cls-expr-after-same-line-static-async-gen.template
index 1a7ab891c06c6c74d7e143f717826e85ce833ed9..34f1db78f9e099ff5a3a78e702edc59532bf9d8f 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-static-async-gen.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-static-async-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-after-same-line-static-async-gen-
+path: language/expressions/class/fields/after-same-line-static-async-gen-
 name: field definitions after a static async generator in the same line
 features: [class, class-fields-public, async-iteration]
 flags: [async]
diff --git a/src/class-elements/productions/cls-expr-after-same-line-static-async-method.template b/src/class-elements/productions/cls-expr-after-same-line-static-async-method.template
index 5fd81a26bac7bcb88b6e4450481f95d1fb7e7b36..3e072a45fc1d0cecdea9fb51dd8bea73e8c353ce 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-static-async-method.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-static-async-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-after-same-line-static-async-method-
+path: language/expressions/class/fields/after-same-line-static-async-method-
 name: field definitions after a static async method in the same line
 features: [class, class-fields-public, async-functions]
 flags: [async]
diff --git a/src/class-elements/productions/cls-expr-after-same-line-static-gen.template b/src/class-elements/productions/cls-expr-after-same-line-static-gen.template
index 9ba5df2479b078131432603eda02785cc6f34e00..fbb95db598e88459c58070f708c5d812ed8d97e6 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-static-gen.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-static-gen.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-after-same-line-static-gen-
+path: language/expressions/class/fields/after-same-line-static-gen-
 name: field definitions after a static generator in the same line
 features: [generators, class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-after-same-line-static-method.template b/src/class-elements/productions/cls-expr-after-same-line-static-method.template
index 1dccafd7c7b667a2e23150ee83fb628da04d6e0f..081496c1430cbc9b564c6c7cfa288367612c1ba7 100644
--- a/src/class-elements/productions/cls-expr-after-same-line-static-method.template
+++ b/src/class-elements/productions/cls-expr-after-same-line-static-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-after-same-line-static-method-
+path: language/expressions/class/fields/after-same-line-static-method-
 name: field definitions after a static method in the same line
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-multiple-definitions.template b/src/class-elements/productions/cls-expr-multiple-definitions.template
index cfd35b1cdb39752de302481ad73686e0498736a9..732b4c69cce4d92ba364e04b64042f8a617a4295 100644
--- a/src/class-elements/productions/cls-expr-multiple-definitions.template
+++ b/src/class-elements/productions/cls-expr-multiple-definitions.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-multiple-definitions-
+path: language/expressions/class/fields/multiple-definitions-
 name: multiple fields definitions
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-multiple-stacked-definitions.template b/src/class-elements/productions/cls-expr-multiple-stacked-definitions.template
index 4e0286c74b522e27ec7a2fdc8eb813e853533e83..5c6bb55dcaf1e90f33873a70f455d344c5c45a39 100644
--- a/src/class-elements/productions/cls-expr-multiple-stacked-definitions.template
+++ b/src/class-elements/productions/cls-expr-multiple-stacked-definitions.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-multiple-stacked-definitions-
+path: language/expressions/class/fields/multiple-stacked-definitions-
 name: multiple stacked fields definitions through ASI
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-new-no-sc-line-method.template b/src/class-elements/productions/cls-expr-new-no-sc-line-method.template
index 4bae8bbb13bfc00e61b2433f4ac1760673f740f8..f12bf825887b188cc75bc245e2e027ffb2bc2860 100644
--- a/src/class-elements/productions/cls-expr-new-no-sc-line-method.template
+++ b/src/class-elements/productions/cls-expr-new-no-sc-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-new-no-sc-line-method-
+path: language/expressions/class/fields/new-no-sc-line-method-
 name: field definitions followed by a method in a new line without a semicolon
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-new-sc-line-generator.template b/src/class-elements/productions/cls-expr-new-sc-line-generator.template
index f24ae6ef942bbe8e22ef721f6bad010dd328c193..5849d6286d8718e7469766a6d6a68696c8e4e2f6 100644
--- a/src/class-elements/productions/cls-expr-new-sc-line-generator.template
+++ b/src/class-elements/productions/cls-expr-new-sc-line-generator.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-new-sc-line-gen-
+path: language/expressions/class/fields/new-sc-line-gen-
 name: field definitions followed by a method in a new line with a semicolon
 features: [class, class-fields-public, generators]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-new-sc-line-method.template b/src/class-elements/productions/cls-expr-new-sc-line-method.template
index b3c3fc373f0d8a7d12cccebcb4284d4f1489af00..f3a6142e163967549d4463207315add0c85e2c4c 100644
--- a/src/class-elements/productions/cls-expr-new-sc-line-method.template
+++ b/src/class-elements/productions/cls-expr-new-sc-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-new-sc-line-method-
+path: language/expressions/class/fields/new-sc-line-method-
 name: field definitions followed by a method in a new line with a semicolon
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-regular-definitions.template b/src/class-elements/productions/cls-expr-regular-definitions.template
index b2aea65604334fcec30826a27f6aaecf488a284d..2a5a5d6c255ebbc41d648e8712d99d0363cf2c40 100644
--- a/src/class-elements/productions/cls-expr-regular-definitions.template
+++ b/src/class-elements/productions/cls-expr-regular-definitions.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-regular-definitions-
+path: language/expressions/class/fields/regular-definitions-
 name: regular fields defintion
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-same-line-generator.template b/src/class-elements/productions/cls-expr-same-line-generator.template
index f28ad55e96fd16fef8dd1d3d2c0ebe8adc4c2d36..91a477d87d1e3b311ae22b3837f16ce0f5e9131a 100644
--- a/src/class-elements/productions/cls-expr-same-line-generator.template
+++ b/src/class-elements/productions/cls-expr-same-line-generator.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-same-line-gen-
+path: language/expressions/class/fields/same-line-gen-
 name: field definitions followed by a generator method in the same line
 features: [class, class-fields-public, generators]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-same-line-method.template b/src/class-elements/productions/cls-expr-same-line-method.template
index 7f609b27cd850d83cb32c82dac62910bd89e3d94..57b05fae4f9fe9540fa1b7035a24691be00d9649 100644
--- a/src/class-elements/productions/cls-expr-same-line-method.template
+++ b/src/class-elements/productions/cls-expr-same-line-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-same-line-method-
+path: language/expressions/class/fields/same-line-method-
 name: field definitions followed by a method in the same line
 features: [class, class-fields-public]
 esid: prod-FieldDefinition
diff --git a/src/class-elements/productions/cls-expr-wrapped-in-sc.template b/src/class-elements/productions/cls-expr-wrapped-in-sc.template
index dcb0dd6753247e88943ea6515471370e42b43cf5..afbe930d7b9e523fb7e7c1429cd293b21ecfcb4e 100644
--- a/src/class-elements/productions/cls-expr-wrapped-in-sc.template
+++ b/src/class-elements/productions/cls-expr-wrapped-in-sc.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/fields-wrapped-in-sc-
+path: language/expressions/class/fields/wrapped-in-sc-
 name: fields definition wrapped in semicolons
 features: [class, class-fields-public]
 esid: prod-FieldDefinition