diff --git a/src/class-elements/class-evaluation-error/cls-decl.template b/src/class-elements/class-evaluation-error/cls-decl.template
index 457f6149940b310a28f2e69d7233430e9435e65c..f0af80766c8b9333c92f067c60da08f0871ac3a8 100644
--- a/src/class-elements/class-evaluation-error/cls-decl.template
+++ b/src/class-elements/class-evaluation-error/cls-decl.template
@@ -10,7 +10,7 @@ esid: sec-runtime-semantics-classdefinitionevaluation
 
 function evaluate() {
   class C {
-    /*{ fields }*/
+    /*{ elements }*/
   }
 }
 
diff --git a/src/class-elements/class-evaluation-error/cls-expr.template b/src/class-elements/class-evaluation-error/cls-expr.template
index 3a9ca73b8955e7077925410079e3deedb75ba3c7..070b636cf49bf4f24f51eca6952fc4d0d1dad2dc 100644
--- a/src/class-elements/class-evaluation-error/cls-expr.template
+++ b/src/class-elements/class-evaluation-error/cls-expr.template
@@ -10,7 +10,7 @@ esid: sec-runtime-semantics-classdefinitionevaluation
 
 function evaluate() {
   var C = class {
-    /*{ fields }*/
+    /*{ elements }*/
   };
 }
 
diff --git a/src/class-elements/computed-name-referenceerror.case b/src/class-elements/computed-name-referenceerror.case
index d2d628f297c3affac55f734bb0867568a6b0de5f..336be81eb27410241d04b314a52771130c08ad39 100644
--- a/src/class-elements/computed-name-referenceerror.case
+++ b/src/class-elements/computed-name-referenceerror.case
@@ -45,7 +45,7 @@ function fn() {
   throw new Test262Error();
 }
 
-//- fields
+//- elements
 [noRef] = fn();
 //- error
 ReferenceError
diff --git a/src/class-elements/computed-name-toprimitive-err.case b/src/class-elements/computed-name-toprimitive-err.case
index 6c0301f61320046076d6f1c49487b5ba66e05fb2..5eacea349cbaf86f6c331ac65b095c0f36050d2c 100644
--- a/src/class-elements/computed-name-toprimitive-err.case
+++ b/src/class-elements/computed-name-toprimitive-err.case
@@ -47,7 +47,7 @@ var obj = {
   }
 };
 
-//- fields
+//- elements
 [obj]
 //- error
 Test262Error
diff --git a/src/class-elements/computed-name-toprimitive-returns-noncallable.case b/src/class-elements/computed-name-toprimitive-returns-noncallable.case
index 304011abd866b408c18e902ae40f5adf072be9a2..4e4bf8a71f3cf4408a8816220722d9b3e28d136f 100644
--- a/src/class-elements/computed-name-toprimitive-returns-noncallable.case
+++ b/src/class-elements/computed-name-toprimitive-returns-noncallable.case
@@ -45,7 +45,7 @@ var obj = {
   [Symbol.toPrimitive]: {}
 };
 
-//- fields
+//- elements
 [obj] = refErrorIfEvaluated;
 //- error
 TypeError
diff --git a/src/class-elements/computed-name-toprimitive-returns-nonobject.case b/src/class-elements/computed-name-toprimitive-returns-nonobject.case
index daddfa510e200c1c86fbf60436fc4cd9502cd4a5..1bb999a4de48956c34ac0f9ace1173b9ab8a55d8 100644
--- a/src/class-elements/computed-name-toprimitive-returns-nonobject.case
+++ b/src/class-elements/computed-name-toprimitive-returns-nonobject.case
@@ -45,7 +45,7 @@ var obj = {
   [Symbol.toPrimitive]: 42
 };
 
-//- fields
+//- elements
 [obj] = refErrorIfEvaluated;
 //- error
 TypeError
diff --git a/src/class-elements/computed-name-toprimitive-symbol.case b/src/class-elements/computed-name-toprimitive-symbol.case
index 84b1d59eb4acd3cf7f60ddb6f2e37e5abbf09d66..0b96fa10c56ae0da5f68457180ece82ab9e20679 100644
--- a/src/class-elements/computed-name-toprimitive-symbol.case
+++ b/src/class-elements/computed-name-toprimitive-symbol.case
@@ -62,7 +62,7 @@ var obj3 = {
   valueOf: function() { return s3; }
 };
 
-//- fields
+//- elements
 [obj1] = 42;
 [obj2] = 43;
 [obj3] = 44;
diff --git a/src/class-elements/computed-name-toprimitive.case b/src/class-elements/computed-name-toprimitive.case
index 5a9e5ca60bb4076e10abea47e7a9b0e14dd391b5..2cdd5958daca0782c9c43ee5563038b473198d93 100644
--- a/src/class-elements/computed-name-toprimitive.case
+++ b/src/class-elements/computed-name-toprimitive.case
@@ -59,7 +59,7 @@ var obj3 = {
   valueOf: function() { return "f"; }
 };
 
-//- fields
+//- elements
 [obj1] = 42;
 [obj2] = 43;
 [obj3] = 44;
diff --git a/src/class-elements/computed-name-tostring-err.case b/src/class-elements/computed-name-tostring-err.case
index 06b314a603af55ca22f97880ec54de2d040e4142..9884c4ed28c6330bfe94e9947eb0144b4713de95 100644
--- a/src/class-elements/computed-name-tostring-err.case
+++ b/src/class-elements/computed-name-tostring-err.case
@@ -47,7 +47,7 @@ var obj = {
   }
 };
 
-//- fields
+//- elements
 [obj]
 //- error
 Test262Error
diff --git a/src/class-elements/computed-name-valueof-err.case b/src/class-elements/computed-name-valueof-err.case
index 5b53d1d1702a6f3ebdffe926d131c37127fec7e0..fc1a24ebb570d674c153118e1785118214837130 100644
--- a/src/class-elements/computed-name-valueof-err.case
+++ b/src/class-elements/computed-name-valueof-err.case
@@ -48,7 +48,7 @@ var obj = {
   }
 };
 
-//- fields
+//- elements
 [obj]
 //- error
 Test262Error
diff --git a/src/class-elements/computed-names.case b/src/class-elements/computed-names.case
index 835db98a170529192ecdd4a29a79e0e978fe98e9..cc846c83ef7b06baf58e31232284e0ce43a0482d 100644
--- a/src/class-elements/computed-names.case
+++ b/src/class-elements/computed-names.case
@@ -21,7 +21,7 @@ features: [class-fields-public, computed-property-names]
 //- setup
 var x = "b";
 
-//- fields
+//- elements
 [x] = 42; [10] = "meep"; ["not initialized"]
 //- assertions
 
diff --git a/src/class-elements/computed-symbol-names.case b/src/class-elements/computed-symbol-names.case
index 17aa16dda3855b8f2d4c117cffccecc2149373b8..b2b25dd6f45692a522ed71940ad8d5aa0fe126c7 100644
--- a/src/class-elements/computed-symbol-names.case
+++ b/src/class-elements/computed-symbol-names.case
@@ -22,7 +22,7 @@ features: [class-fields-public, Symbol, computed-property-names]
 var x = Symbol();
 var y = Symbol();
 
-//- fields
+//- elements
 [x]; [y] = 42
 //- assertions
 assert.sameValue(Object.hasOwnProperty.call(C.prototype, x), false);
diff --git a/src/class-elements/ctor-called-after-fields-init.case b/src/class-elements/ctor-called-after-fields-init.case
index d091d8c5e2ee9310b9f86894dfe44a62befafa01..1bbd039a66dbb39cf811249441035f6c790f3c36 100644
--- a/src/class-elements/ctor-called-after-fields-init.case
+++ b/src/class-elements/ctor-called-after-fields-init.case
@@ -19,7 +19,7 @@ features: [class-fields-public]
 
 //- setup
 var ctor;
-//- fields
+//- elements
 constructor() {
   ctor = this.foo;
 }
diff --git a/src/class-elements/default/cls-decl.template b/src/class-elements/default/cls-decl.template
index d37e18acb00c3c69990f1f2431c2d08a1ba2097d..2fea2b1fbd9326d5fa2f57c17d2248ad77ff90eb 100644
--- a/src/class-elements/default/cls-decl.template
+++ b/src/class-elements/default/cls-decl.template
@@ -9,7 +9,7 @@ esid: prod-FieldDefinition
 ---*/
 
 class C {
-  /*{ fields }*/
+  /*{ elements }*/
 }
 
 /*{ assertions }*/
diff --git a/src/class-elements/default/cls-expr.template b/src/class-elements/default/cls-expr.template
index fcf25c6259851654f3ca9544742343ebe51d56a9..0efa7ab1fec548dd4ce2b498e256a5c2e417183c 100644
--- a/src/class-elements/default/cls-expr.template
+++ b/src/class-elements/default/cls-expr.template
@@ -9,7 +9,7 @@ esid: prod-FieldDefinition
 ---*/
 
 var C = class {
-  /*{ fields }*/
+  /*{ elements }*/
 }
 
 /*{ assertions }*/
diff --git a/src/class-elements/grammar-privatename-identifier-semantics-stringvalue.case b/src/class-elements/grammar-privatename-identifier-semantics-stringvalue.case
index 849c52be3cb7a6880526e51032203a146ffec02a..48e9c198d74dec0dc93c0cd779ecc3007f31b10c 100644
--- a/src/class-elements/grammar-privatename-identifier-semantics-stringvalue.case
+++ b/src/class-elements/grammar-privatename-identifier-semantics-stringvalue.case
@@ -62,7 +62,7 @@ template: productions
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #\u{6F};
 #\u2118;
 #ZW_\u200C_NJ;
diff --git a/src/class-elements/init-err-evaluation.case b/src/class-elements/init-err-evaluation.case
index db17e766744be1bc09068891c449b407d5e845e5..1603789e285a97c381f6db6de23e50839f157914 100644
--- a/src/class-elements/init-err-evaluation.case
+++ b/src/class-elements/init-err-evaluation.case
@@ -21,7 +21,7 @@ features: [class-fields-public]
 var x = 0;
 function fn1() { x += 1; }
 function fn2() { throw new Test262Error(); }
-//- fields
+//- elements
 x = fn1();
 y = fn2();
 z = fn1();
diff --git a/src/class-elements/init-value-defined-after-class.case b/src/class-elements/init-value-defined-after-class.case
index d742d14280be6d6322e77fd0173127c0983323ba..5acc47ef8ac92861c738498499fd434315807ebe 100644
--- a/src/class-elements/init-value-defined-after-class.case
+++ b/src/class-elements/init-value-defined-after-class.case
@@ -20,7 +20,7 @@ includes: [propertyHelper.js]
 
 //- setup
 var x = false;
-//- fields
+//- elements
 [x] = x;
 //- assertions
 var c1 = new C();
diff --git a/src/class-elements/init-value-incremental.case b/src/class-elements/init-value-incremental.case
index 84fd4c9a25bf88e2148b31b9f9d298e9168813f0..de4c8c1e5aa963d9ce00d64e6b6b9df4a707f382 100644
--- a/src/class-elements/init-value-incremental.case
+++ b/src/class-elements/init-value-incremental.case
@@ -29,7 +29,7 @@ includes: [propertyHelper.js]
 
 //- setup
 var x = 1;
-//- fields
+//- elements
 [x++] = x++;
 [x++] = x++;
 //- assertions
diff --git a/src/class-elements/literal-names-asi.case b/src/class-elements/literal-names-asi.case
index e95dd43018ea43e5d3234748bd25c84ebaada580..644d7fe8de863aa55e68a6a5ab5bbaf45234429e 100644
--- a/src/class-elements/literal-names-asi.case
+++ b/src/class-elements/literal-names-asi.case
@@ -18,7 +18,7 @@ includes: [propertyHelper.js]
 features: [class-fields-public]
 ---*/
 
-//- fields
+//- elements
 a
 b = 42;
 //- assertions
diff --git a/src/class-elements/literal-names.case b/src/class-elements/literal-names.case
index 84a8b9fa3b72cd7e80b5b52d6a1181bbaaf02027..b9cecd597b0de8794dd879c89029ef5f2d398633 100644
--- a/src/class-elements/literal-names.case
+++ b/src/class-elements/literal-names.case
@@ -21,7 +21,7 @@ features: [class-fields-public]
 //- setup
 const fn = function() {}
 
-//- fields
+//- elements
 a; b = 42;
 c = fn
 //- assertions
diff --git a/src/class-elements/private-field-usage.case b/src/class-elements/private-field-usage.case
index f4597c3c7f5b8293206a26f921a10bb424a209af..a5b0dac7959f01e17ce5577c44874efbbe3e8827 100644
--- a/src/class-elements/private-field-usage.case
+++ b/src/class-elements/private-field-usage.case
@@ -20,7 +20,7 @@ template: productions
 features: [class-methods-private]
 ---*/
 
-//- fields
+//- elements
 #m = 'test262';
 //- privateinspectionfunctions
 method() {
diff --git a/src/class-elements/private-method-getter-usage.case b/src/class-elements/private-method-getter-usage.case
index 6a3dcea2eaa19afe4aeeaf1a41c9d6659e8af521..41ee67ea03c64f2d19c3f53edfbcae9ad67fe29d 100644
--- a/src/class-elements/private-method-getter-usage.case
+++ b/src/class-elements/private-method-getter-usage.case
@@ -20,7 +20,7 @@ template: productions
 features: [class-methods-private]
 ---*/
 
-//- fields
+//- elements
 get #m() { return 'test262'; }
 //- privateinspectionfunctions
 method() {
diff --git a/src/class-elements/private-method-usage.case b/src/class-elements/private-method-usage.case
index e4f2a2684eacd506a495ca2d0d4d39fd07e923a0..03cfec824836bdc8b5f0e43086e1290a061515e7 100644
--- a/src/class-elements/private-method-usage.case
+++ b/src/class-elements/private-method-usage.case
@@ -20,7 +20,7 @@ template: productions
 features: [class-methods-private]
 ---*/
 
-//- fields
+//- elements
 #m() { return 'test262'; }
 //- privateinspectionfunctions
 method() {
diff --git a/src/class-elements/private-names.case b/src/class-elements/private-names.case
index 3dcb1df325e3071926f6f3ee9170032739cba2e3..55518131bfe358181cd1c6f87f44d07ff8594380 100644
--- a/src/class-elements/private-names.case
+++ b/src/class-elements/private-names.case
@@ -21,7 +21,7 @@ template: productions
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #x; #y
 //- privateinspectionfunctions
 x() {
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 f7eb3bd09ee001b53dd3e997e39df4e4c9714520..9b2a19895c5a3e48fdfeebf4820be7cb89badc9c 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
@@ -11,7 +11,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  async *m() { return 42; } /*{ fields }*/;
+  async *m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 f0235f2968cc102e42af64b0d8bc4484a214331c..13ab916fe6daaaa932c7939935d50ef53243d981 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
@@ -11,7 +11,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  async m() { return 42; } /*{ fields }*/;
+  async m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 386fa7a5503da3aa3d0e3d2ee24ea0f4c773f0ac..9bb76e6ca7deb775ff3fb33be200f7b926878a93 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  *m() { return 42; } /*{ fields }*/;
+  *m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 c7716e45a56b57928761af5b2f275e41bc03d310..98002edecd0057918e45c5b81fa4f110bc344337 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  m() { return 42; } /*{ fields }*/;
+  m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 1f20b30cadbe89159d4ebbb5f8a1668403affe75..5c1661c8d054d81d1d661a93be400e5010a1c7a6 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
@@ -11,7 +11,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  static async *m() { return 42; } /*{ fields }*/;
+  static async *m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 15e777602472ed715dbb9abf0a8e9f69efd8410d..ffc1d74f3d2d7ddf9244b4a3dc6298131d4688db 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
@@ -11,7 +11,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  static async m() { return 42; } /*{ fields }*/;
+  static async m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 0796e403bb830fbe968f0acc58af25feb27a4df1..11797010efafd0144e1a4fb6459370a323484cb3 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  static *m() { return 42; } /*{ fields }*/;
+  static *m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 a55ceddf849aa7c238451ccff2fdbe28d0f268ba..20b07ba167a0714d6d50de9e84a6e6237baaf6f5 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  static m() { return 42; } /*{ fields }*/;
+  static m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
diff --git a/src/class-elements/productions/cls-decl-multiple-definitions.template b/src/class-elements/productions/cls-decl-multiple-definitions.template
index ea289635737ca48c7046d8cfe35c1e81d39a853e..c8217f285cecc1d05e81781628b9a75d6588e537 100644
--- a/src/class-elements/productions/cls-decl-multiple-definitions.template
+++ b/src/class-elements/productions/cls-decl-multiple-definitions.template
@@ -12,7 +12,7 @@ includes: [propertyHelper.js]
 class C {
   foo = "foobar";
   m() { return 42 }
-  /*{ fields }*/
+  /*{ elements }*/
   m2() { return 39 }
   bar = "barbaz";
   /*{ privateinspectionfunctions }*/
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 5f86b161c36a6b85142f16f51500c2a77ec6b243..38a7d2ebf44f60eb60803bb26e95e8451b66eedb 100644
--- a/src/class-elements/productions/cls-decl-multiple-stacked-definitions.template
+++ b/src/class-elements/productions/cls-decl-multiple-stacked-definitions.template
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  /*{ fields }*/
+  /*{ elements }*/
   foo = "foobar"
   bar = "barbaz";
   /*{ privateinspectionfunctions }*/
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 e27900a084b2147ce9c86d3819d7ad54edce2f2c..b2682e603a9a21e6f732fe6757b47c7fc6665754 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  /*{ fields }*/
+  /*{ elements }*/
   m() { return 42; }
   /*{ privateinspectionfunctions }*/
 }
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 385d8caddeccf1d283930e50d08cfbc55c18e76d..c1b6259543d3fa0f53bf89cb9f20f24d3eebe8f6 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  /*{ fields }*/;
+  /*{ elements }*/;
   *m() { return 42; }
   /*{ privateinspectionfunctions }*/
 }
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 fa55454f3f3573ea60a6ff1b4bb68ca50b4580af..1c7ce8822714ea4ad381fbb3e89b738bba81e103 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  /*{ fields }*/;
+  /*{ elements }*/;
   m() { return 42; }
   /*{ privateinspectionfunctions }*/
 }
diff --git a/src/class-elements/productions/cls-decl-regular-definitions.template b/src/class-elements/productions/cls-decl-regular-definitions.template
index 5bb2f23b264cd06be4d2c97d5c5b0c90453a5fdb..22bb679211a84689a9f3467b02c2c1a1e0efcb10 100644
--- a/src/class-elements/productions/cls-decl-regular-definitions.template
+++ b/src/class-elements/productions/cls-decl-regular-definitions.template
@@ -9,7 +9,7 @@ esid: prod-FieldDefinition
 ---*/
 
 class C {
-  /*{ fields }*/
+  /*{ elements }*/
   /*{ privateinspectionfunctions }*/
 }
 
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 0fa5df7f09a652d08b23537e2cca30650bafab11..8edc2b0dc785c6bb1efed149b4353a55e636713a 100644
--- a/src/class-elements/productions/cls-decl-same-line-generator.template
+++ b/src/class-elements/productions/cls-decl-same-line-generator.template
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  /*{ fields }*/; *m() { return 42; }
+  /*{ elements }*/; *m() { return 42; }
   /*{ privateinspectionfunctions }*/
 }
 
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 6974a01f707bd65ecb54c20fad67ec3293af3f43..c55d1120b927a491a539740044c3a61e570d4b22 100644
--- a/src/class-elements/productions/cls-decl-same-line-method.template
+++ b/src/class-elements/productions/cls-decl-same-line-method.template
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 class C {
-  /*{ fields }*/; m() { return 42; }
+  /*{ elements }*/; m() { return 42; }
   /*{ privateinspectionfunctions }*/
 }
 
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 2f6db155a4e72e7718d5697dfbd02a7ca31c31d8..99c9c0b26503491f271f8acf26d5a80c83c499df 100644
--- a/src/class-elements/productions/cls-decl-wrapped-in-sc.template
+++ b/src/class-elements/productions/cls-decl-wrapped-in-sc.template
@@ -10,7 +10,7 @@ esid: prod-FieldDefinition
 
 class C {
   ;;;;
-  ;;;;;;/*{ fields }*/;;;;;;;
+  ;;;;;;/*{ elements }*/;;;;;;;
   ;;;;
   /*{ privateinspectionfunctions }*/
 }
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 9fbf8d3abbdced212a505538fb1aa7c58dc3e062..dae89e21bfdfa8ac4aae96c753ca7abb24395cb1 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
@@ -11,7 +11,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  async *m() { return 42; } /*{ fields }*/;
+  async *m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 8b7a65b8841ec0ca8e71c8b78886c706963f8693..8c5a94ce77582ea5ca9f79da5f1568728bb52e87 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
@@ -11,7 +11,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  async m() { return 42; } /*{ fields }*/;
+  async m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 5cfdedecf008258397869a1cc26d7e4bc21cecbe..89b749d8c74d5832879d74c5a8babfefb289a72f 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  *m() { return 42; } /*{ fields }*/;
+  *m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 c89fda4dd408f494a72aa794d9f0eabbaec45df1..c277ca18b4aca46ea6d24ea8562cf6035fb13736 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  m() { return 42; } /*{ fields }*/;
+  m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 f17089165747ec4e9a3b2fafe0c6bb412514a4ef..1a7ab891c06c6c74d7e143f717826e85ce833ed9 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
@@ -11,7 +11,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  static async *m() { return 42; } /*{ fields }*/;
+  static async *m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 2cf8679f24381c8a2d6997841e9a8aa17ec553e6..5fd81a26bac7bcb88b6e4450481f95d1fb7e7b36 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
@@ -11,7 +11,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  static async m() { return 42; } /*{ fields }*/;
+  static async m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 2281b3bc79bfc6db67770807aedc99b5f14a8ac2..9ba5df2479b078131432603eda02785cc6f34e00 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  static *m() { return 42; } /*{ fields }*/;
+  static *m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
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 aa21b2ec2918b92c3ceb6cdac25a7dc35d57b721..1dccafd7c7b667a2e23150ee83fb628da04d6e0f 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  static m() { return 42; } /*{ fields }*/;
+  static m() { return 42; } /*{ elements }*/;
   /*{ privateinspectionfunctions }*/
 }
 
diff --git a/src/class-elements/productions/cls-expr-multiple-definitions.template b/src/class-elements/productions/cls-expr-multiple-definitions.template
index d98b741b84645d62a45a17c75551826022ec0cf0..cfd35b1cdb39752de302481ad73686e0498736a9 100644
--- a/src/class-elements/productions/cls-expr-multiple-definitions.template
+++ b/src/class-elements/productions/cls-expr-multiple-definitions.template
@@ -12,7 +12,7 @@ includes: [propertyHelper.js]
 var C = class {
   foo = "foobar";
   m() { return 42 }
-  /*{ fields }*/
+  /*{ elements }*/
   m2() { return 39 }
   bar = "barbaz";
   /*{ privateinspectionfunctions }*/
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 cbb6f733009b0cf3b269f2855ee33e1ce8aa9f48..4e0286c74b522e27ec7a2fdc8eb813e853533e83 100644
--- a/src/class-elements/productions/cls-expr-multiple-stacked-definitions.template
+++ b/src/class-elements/productions/cls-expr-multiple-stacked-definitions.template
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  /*{ fields }*/
+  /*{ elements }*/
   foo = "foobar"
   bar = "barbaz";
   /*{ privateinspectionfunctions }*/
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 5755b501d02306d0264c8c3fb4a5f3e9ed61286c..4bae8bbb13bfc00e61b2433f4ac1760673f740f8 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  /*{ fields }*/
+  /*{ elements }*/
   m() { return 42; }
   /*{ privateinspectionfunctions }*/
 }
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 0ab3f55e44858838eaba77ca43fb9fc5685d40ca..f24ae6ef942bbe8e22ef721f6bad010dd328c193 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  /*{ fields }*/;
+  /*{ elements }*/;
   *m() { return 42; }
   /*{ privateinspectionfunctions }*/
 }
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 b0ae70949b101ac3e5fc5ea6a1f487a4f420b094..b3c3fc373f0d8a7d12cccebcb4284d4f1489af00 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
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  /*{ fields }*/;
+  /*{ elements }*/;
   m() { return 42; }
   /*{ privateinspectionfunctions }*/
 }
diff --git a/src/class-elements/productions/cls-expr-regular-definitions.template b/src/class-elements/productions/cls-expr-regular-definitions.template
index 08a36b51cbe00c6b12246e49104093bb67ac2c43..b2aea65604334fcec30826a27f6aaecf488a284d 100644
--- a/src/class-elements/productions/cls-expr-regular-definitions.template
+++ b/src/class-elements/productions/cls-expr-regular-definitions.template
@@ -9,7 +9,7 @@ esid: prod-FieldDefinition
 ---*/
 
 var C = class {
-  /*{ fields }*/
+  /*{ elements }*/
   /*{ privateinspectionfunctions }*/
 }
 
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 b69692d68ec93e52aa71b32f5c7f4070df283e72..f28ad55e96fd16fef8dd1d3d2c0ebe8adc4c2d36 100644
--- a/src/class-elements/productions/cls-expr-same-line-generator.template
+++ b/src/class-elements/productions/cls-expr-same-line-generator.template
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  /*{ fields }*/; *m() { return 42; }
+  /*{ elements }*/; *m() { return 42; }
   /*{ privateinspectionfunctions }*/
 }
 
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 7d40e6d65b6a2e2a32ab1532ea6f95d2404fc0d7..7f609b27cd850d83cb32c82dac62910bd89e3d94 100644
--- a/src/class-elements/productions/cls-expr-same-line-method.template
+++ b/src/class-elements/productions/cls-expr-same-line-method.template
@@ -10,7 +10,7 @@ includes: [propertyHelper.js]
 ---*/
 
 var C = class {
-  /*{ fields }*/; m() { return 42; }
+  /*{ elements }*/; m() { return 42; }
   /*{ privateinspectionfunctions }*/
 }
 
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 c90df3c17a7a1f31ed0331db25464179f516bd28..dcb0dd6753247e88943ea6515471370e42b43cf5 100644
--- a/src/class-elements/productions/cls-expr-wrapped-in-sc.template
+++ b/src/class-elements/productions/cls-expr-wrapped-in-sc.template
@@ -10,7 +10,7 @@ esid: prod-FieldDefinition
 
 var C = class {
   ;;;;
-  ;;;;;;/*{ fields }*/;;;;;;;
+  ;;;;;;/*{ elements }*/;;;;;;;
   ;;;;
   /*{ privateinspectionfunctions }*/
 }
diff --git a/src/class-elements/redeclaration-symbol.case b/src/class-elements/redeclaration-symbol.case
index ed87d3eff9b10d973b52dbe2bee3e224e7ac9fae..97317c4bbb97bfb46d48af5642b6d039e229a2a5 100644
--- a/src/class-elements/redeclaration-symbol.case
+++ b/src/class-elements/redeclaration-symbol.case
@@ -33,7 +33,7 @@ includes: [propertyHelper.js, compareArray.js]
 //- setup
 var x = [];
 var y = Symbol();
-//- fields
+//- elements
 [y] = (x.push("a"), "old_value");
 [y] = (x.push("b"), "same_value");
 [y] = (x.push("c"), "same_value");
diff --git a/src/class-elements/redeclaration.case b/src/class-elements/redeclaration.case
index 22211a6c736c2a06c806eac34bc9c0bd24bd6af9..e6310ac3c588663eba460aa1aaa9671b61c87e00 100644
--- a/src/class-elements/redeclaration.case
+++ b/src/class-elements/redeclaration.case
@@ -32,7 +32,7 @@ includes: [propertyHelper.js, compareArray.js]
 
 //- setup
 var x = [];
-//- fields
+//- elements
 y = (x.push("a"), "old_value");
 ["y"] = (x.push("b"), "another_value");
 "y" = (x.push("c"), "same_value");
diff --git a/src/class-elements/rs-field-identifier-initializer.case b/src/class-elements/rs-field-identifier-initializer.case
index 44723c9a2b3e5c151d7d81df5d8ecd4f61ef2ef1..df84acce4d0f9ea7c54fe1c7b82de5ad3a68ac0f 100644
--- a/src/class-elements/rs-field-identifier-initializer.case
+++ b/src/class-elements/rs-field-identifier-initializer.case
@@ -55,7 +55,7 @@ template: productions
 features: [class-fields-public]
 ---*/
 
-//- fields
+//- elements
 $ = 1; _ = 1; \u{6F} = 1; \u2118 = 1; ZW_\u200C_NJ = 1; ZW_\u200D_J = 1
 //- assertions
 assert.sameValue(c.$, 1);
diff --git a/src/class-elements/rs-field-identifier.case b/src/class-elements/rs-field-identifier.case
index 3b04d47cff18f2739bcbf7c62831306f7dd5d105..2eaa89d0c71f571e8a08a869689cb921833c9414 100644
--- a/src/class-elements/rs-field-identifier.case
+++ b/src/class-elements/rs-field-identifier.case
@@ -55,7 +55,7 @@ template: productions
 features: [class-fields-public]
 ---*/
 
-//- fields
+//- elements
 $; _; \u{6F}; \u2118; ZW_\u200C_NJ; ZW_\u200D_J
 //- assertions
 c.$ = 1;
diff --git a/src/class-elements/rs-private-getter-alt.case b/src/class-elements/rs-private-getter-alt.case
index 09fbe307b7dee4efdf9664cabd3d58c3ab9e5985..2738eb4d1d42673d635aab7d5aebd3751f484f98 100644
--- a/src/class-elements/rs-private-getter-alt.case
+++ b/src/class-elements/rs-private-getter-alt.case
@@ -53,7 +53,7 @@ template: productions
 features: [class-methods-private]
 ---*/
 
-//- fields
+//- elements
 #$_; #__; #\u{6F}_; #℘_; #ZW_‌_NJ_; #ZW_‍_J_;
 get #$() {
   return this.#$_;
diff --git a/src/class-elements/rs-private-getter.case b/src/class-elements/rs-private-getter.case
index c77ca44a13c537e513dfc6027d7618f5efa7f3c9..adb2e8a220a7c7551ef96c2113f3be9ed314213a 100644
--- a/src/class-elements/rs-private-getter.case
+++ b/src/class-elements/rs-private-getter.case
@@ -53,7 +53,7 @@ template: productions
 features: [class-methods-private]
 ---*/
 
-//- fields
+//- elements
 #$_; #__; #\u{6F}_; #\u2118_; #ZW_\u200C_NJ_; #ZW_\u200D_J_;
 get #$() {
   return this.#$_;
diff --git a/src/class-elements/rs-private-method-alt.case b/src/class-elements/rs-private-method-alt.case
index cc26fef7534f973f64eeee5ebf7bb85bcb3705bd..4adad2a1638198d3f8d4ef2a30bcf2ad558b028b 100644
--- a/src/class-elements/rs-private-method-alt.case
+++ b/src/class-elements/rs-private-method-alt.case
@@ -52,7 +52,7 @@ template: productions
 features: [class-methods-private]
 ---*/
 
-//- fields
+//- elements
 #$_; #__; #\u{6F}_; #℘_; #ZW_‌_NJ_; #ZW_‍_J_;
 #$() {
   return this.#$_;
diff --git a/src/class-elements/rs-private-method.case b/src/class-elements/rs-private-method.case
index 95d22e5897b093888dd454528458d51de337c786..71aa689c5f9bb5ca0bc329e867663f5da75a4d54 100644
--- a/src/class-elements/rs-private-method.case
+++ b/src/class-elements/rs-private-method.case
@@ -52,7 +52,7 @@ template: productions
 features: [class-methods-private]
 ---*/
 
-//- fields
+//- elements
 #$_; #__; #\u{6F}_; #\u2118_; #ZW_\u200C_NJ_; #ZW_\u200D_J_;
 #$() {
   return this.#$_;
diff --git a/src/class-elements/rs-private-setter-alt.case b/src/class-elements/rs-private-setter-alt.case
index 109c02ea080133b7937c0b4f1125d22435a02231..261688561606180e9ccb5f11e78b9088dbb04302 100644
--- a/src/class-elements/rs-private-setter-alt.case
+++ b/src/class-elements/rs-private-setter-alt.case
@@ -52,7 +52,7 @@ template: productions
 features: [class-methods-private]
 ---*/
 
-//- fields
+//- elements
 #$_; #__; #\u{6F}_; #℘_; #ZW_‌_NJ_; #ZW_‍_J_;
 set #$(value) {
   this.#$_ = value;
diff --git a/src/class-elements/rs-private-setter.case b/src/class-elements/rs-private-setter.case
index f96de3065aad9194724cefeb43752b455fcba756..33a66655106799549047c7fdc5963974ac1aedbe 100644
--- a/src/class-elements/rs-private-setter.case
+++ b/src/class-elements/rs-private-setter.case
@@ -52,7 +52,7 @@ template: productions
 features: [class-methods-private]
 ---*/
 
-//- fields
+//- elements
 #$_; #__; #\u{6F}_; #\u2118_; #ZW_\u200C_NJ_; #ZW_\u200D_J_;
 set #$(value) {
   this.#$_ = value;
diff --git a/src/class-elements/rs-privatename-identifier-alt.case b/src/class-elements/rs-privatename-identifier-alt.case
index 94ec8e31dfa81b4af88357a5713e932f717147ca..6ee2c743ac4e74d40b9e24793de91a91a38563e3 100644
--- a/src/class-elements/rs-privatename-identifier-alt.case
+++ b/src/class-elements/rs-privatename-identifier-alt.case
@@ -53,7 +53,7 @@ template: productions
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #$; #_; #\u{6F}; #℘; #ZW_‌_NJ; #ZW_‍_J
 //- privateinspectionfunctions
 $(value) {
diff --git a/src/class-elements/rs-privatename-identifier-initializer-alt.case b/src/class-elements/rs-privatename-identifier-initializer-alt.case
index 81e6a0daf61c6efc85be9fd43abcac02b1ea8f97..e88ff9435c33b8f52e7949651143e14b128b9767 100644
--- a/src/class-elements/rs-privatename-identifier-initializer-alt.case
+++ b/src/class-elements/rs-privatename-identifier-initializer-alt.case
@@ -53,7 +53,7 @@ template: productions
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #$ = 1; #_ = 1; #\u{6F} = 1; #℘ = 1; #ZW_‌_NJ = 1; #ZW_‍_J = 1
 //- privateinspectionfunctions
 $() {
diff --git a/src/class-elements/rs-privatename-identifier-initializer.case b/src/class-elements/rs-privatename-identifier-initializer.case
index 0c01d8a4f927089e7d704cc455ada6777a4370f1..d8f0809a7fc82d83c9ea8de8aee8f7684f8a8ce7 100644
--- a/src/class-elements/rs-privatename-identifier-initializer.case
+++ b/src/class-elements/rs-privatename-identifier-initializer.case
@@ -53,7 +53,7 @@ template: productions
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #$ = 1; #_ = 1; #\u{6F} = 1; #\u2118 = 1; #ZW_\u200C_NJ = 1; #ZW_\u200D_J = 1
 //- privateinspectionfunctions
 $() {
diff --git a/src/class-elements/rs-privatename-identifier.case b/src/class-elements/rs-privatename-identifier.case
index 587e01aebb04e6deb97e0feed6bdcc45cc5ef9eb..2f953f612105c2309dfccceb9f6c7bb1e5922aaa 100644
--- a/src/class-elements/rs-privatename-identifier.case
+++ b/src/class-elements/rs-privatename-identifier.case
@@ -53,7 +53,7 @@ template: productions
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #$; #_; #\u{6F}; #\u2118; #ZW_\u200C_NJ; #ZW_\u200D_J
 //- privateinspectionfunctions
 $(value) {
diff --git a/src/class-elements/rs-static-async-generator-method-privatename-identifier-alt.case b/src/class-elements/rs-static-async-generator-method-privatename-identifier-alt.case
index d1423a6ef3178625738e95185f39b40142015333..04ba5da5bfe91e81ae4e084a9bb2e9012d0024f5 100644
--- a/src/class-elements/rs-static-async-generator-method-privatename-identifier-alt.case
+++ b/src/class-elements/rs-static-async-generator-method-privatename-identifier-alt.case
@@ -58,7 +58,7 @@ flags: [async]
 features: [class-static-methods-private]
 ---*/
 
-//- fields
+//- elements
 static async * #$(value) {
   yield * await value;
 }
diff --git a/src/class-elements/rs-static-async-generator-method-privatename-identifier.case b/src/class-elements/rs-static-async-generator-method-privatename-identifier.case
index 626d7228858c7d2814fc5c680b0cabeb657f34b1..2cc98d6f4943dd092a1861d89a9c10b8b08197d2 100644
--- a/src/class-elements/rs-static-async-generator-method-privatename-identifier.case
+++ b/src/class-elements/rs-static-async-generator-method-privatename-identifier.case
@@ -58,7 +58,7 @@ flags: [async]
 features: [class-static-methods-private]
 ---*/
 
-//- fields
+//- elements
 static async * #$(value) {
   yield * await value;
 }
diff --git a/src/class-elements/rs-static-async-method-privatename-identifier-alt.case b/src/class-elements/rs-static-async-method-privatename-identifier-alt.case
index 57168ba172f513f9904a4a7531ceb992c08a350a..f2312b6ac3e5ec9f8670ad6599928450e7504e28 100644
--- a/src/class-elements/rs-static-async-method-privatename-identifier-alt.case
+++ b/src/class-elements/rs-static-async-method-privatename-identifier-alt.case
@@ -58,7 +58,7 @@ flags: [async]
 features: [class-static-methods-private]
 ---*/
 
-//- fields
+//- elements
 static async #$(value) {
   return await value;
 }
diff --git a/src/class-elements/rs-static-async-method-privatename-identifier.case b/src/class-elements/rs-static-async-method-privatename-identifier.case
index b715696e6d3594f92922a916635891df0296e423..dc913a5ee69423e18eb337c26d26e702da281f30 100644
--- a/src/class-elements/rs-static-async-method-privatename-identifier.case
+++ b/src/class-elements/rs-static-async-method-privatename-identifier.case
@@ -58,7 +58,7 @@ flags: [async]
 features: [class-static-methods-private]
 ---*/
 
-//- fields
+//- elements
 static async #$(value) {
   return await value;
 }
diff --git a/src/class-elements/rs-static-generator-method-privatename-identifier-alt.case b/src/class-elements/rs-static-generator-method-privatename-identifier-alt.case
index e3a4ab84ff3be919f3168ddf583d641290eeaf06..35b4d50a593d15d69cca9bb9e866a62ec07659ed 100644
--- a/src/class-elements/rs-static-generator-method-privatename-identifier-alt.case
+++ b/src/class-elements/rs-static-generator-method-privatename-identifier-alt.case
@@ -57,7 +57,7 @@ template: productions
 features: [class-static-methods-private]
 ---*/
 
-//- fields
+//- elements
 static * #$(value) {
   yield * value;
 }
diff --git a/src/class-elements/rs-static-generator-method-privatename-identifier.case b/src/class-elements/rs-static-generator-method-privatename-identifier.case
index c239a61ba37a3843c6a1abf68b205636c594ced0..8476ff2d79eb4435a342a10fbc0e0f0ff46628bd 100644
--- a/src/class-elements/rs-static-generator-method-privatename-identifier.case
+++ b/src/class-elements/rs-static-generator-method-privatename-identifier.case
@@ -57,7 +57,7 @@ template: productions
 features: [class-static-methods-private]
 ---*/
 
-//- fields
+//- elements
 static * #$(value) {
   yield * value;
 }
diff --git a/src/class-elements/rs-static-method-privatename-identifier-alt.case b/src/class-elements/rs-static-method-privatename-identifier-alt.case
index fb2504435585fa5fed1ee9754f526a5a72132b3d..bc8405862a2948caa1cfab38fbb7b1be50236046 100644
--- a/src/class-elements/rs-static-method-privatename-identifier-alt.case
+++ b/src/class-elements/rs-static-method-privatename-identifier-alt.case
@@ -54,7 +54,7 @@ template: productions
 features: [class-static-methods-private]
 ---*/
 
-//- fields
+//- elements
 static #$(value) {
   return value;
 }
diff --git a/src/class-elements/rs-static-method-privatename-identifier.case b/src/class-elements/rs-static-method-privatename-identifier.case
index b23332e770a3adcaec07f512c44e90be4d6fc589..478b1750d1591b6587076ddeb5eeebc763de9cbf 100644
--- a/src/class-elements/rs-static-method-privatename-identifier.case
+++ b/src/class-elements/rs-static-method-privatename-identifier.case
@@ -54,7 +54,7 @@ template: productions
 features: [class-static-methods-private]
 ---*/
 
-//- fields
+//- elements
 static #$(value) {
   return value;
 }
diff --git a/src/class-elements/rs-static-privatename-identifier-alt-by-classname.case b/src/class-elements/rs-static-privatename-identifier-alt-by-classname.case
index 846aca8146fcc4152a14459f2031e277d5ce72fe..811732488c479f8ecb9cffd644f78e169ae66272 100644
--- a/src/class-elements/rs-static-privatename-identifier-alt-by-classname.case
+++ b/src/class-elements/rs-static-privatename-identifier-alt-by-classname.case
@@ -54,7 +54,7 @@ template: productions
 features: [class-static-fields-private]
 ---*/
 
-//- fields
+//- elements
 static #$; static #_; static #\u{6F}; static #℘; static #ZW_‌_NJ; static #ZW_‍_J
 //- privateinspectionfunctions
 static $(value) {
diff --git a/src/class-elements/rs-static-privatename-identifier-alt.case b/src/class-elements/rs-static-privatename-identifier-alt.case
index 8e9afc857ba8c650dcc4ab20aab946f51e1820f2..6f4ff9e55929efc09b5dae8b9145844d9863d4ed 100644
--- a/src/class-elements/rs-static-privatename-identifier-alt.case
+++ b/src/class-elements/rs-static-privatename-identifier-alt.case
@@ -54,7 +54,7 @@ template: productions
 features: [class-static-fields-private]
 ---*/
 
-//- fields
+//- elements
 static #$; static #_; static #\u{6F}; static #℘; static #ZW_‌_NJ; static #ZW_‍_J
 //- privateinspectionfunctions
 static $(value) {
diff --git a/src/class-elements/rs-static-privatename-identifier-by-classname.case b/src/class-elements/rs-static-privatename-identifier-by-classname.case
index 7f56d1ebe69efcea7c0dc0c84a38e5b78cd45ec1..909ce79cd31fabd565d387c85cf9ef7b9da11ee6 100644
--- a/src/class-elements/rs-static-privatename-identifier-by-classname.case
+++ b/src/class-elements/rs-static-privatename-identifier-by-classname.case
@@ -54,7 +54,7 @@ template: productions
 features: [class-static-fields-private]
 ---*/
 
-//- fields
+//- elements
 static #$; static #_; static #\u{6F}; static #\u2118; static #ZW_\u200C_NJ; static #ZW_\u200D_J
 //- privateinspectionfunctions
 static $(value) {
diff --git a/src/class-elements/rs-static-privatename-identifier-initializer-alt-by-classname.case b/src/class-elements/rs-static-privatename-identifier-initializer-alt-by-classname.case
index 383839a0c3dee14d58f531c3b65bbb172387d3df..40307cd6533be1fde6af4e878c291df2dc0e2aa8 100644
--- a/src/class-elements/rs-static-privatename-identifier-initializer-alt-by-classname.case
+++ b/src/class-elements/rs-static-privatename-identifier-initializer-alt-by-classname.case
@@ -54,7 +54,7 @@ template: productions
 features: [class-static-fields-private]
 ---*/
 
-//- fields
+//- elements
 static #$ = 1; static #_ = 1; static #\u{6F} = 1; static #℘ = 1; static #ZW_‌_NJ = 1; static #ZW_‍_J = 1
 //- privateinspectionfunctions
 static $() {
diff --git a/src/class-elements/rs-static-privatename-identifier-initializer-alt.case b/src/class-elements/rs-static-privatename-identifier-initializer-alt.case
index b7d7edf3e4a55352804d882b883ec5b12cb0dc09..5c528865b8c4761b6da106b934b38bf8eb0f51fc 100644
--- a/src/class-elements/rs-static-privatename-identifier-initializer-alt.case
+++ b/src/class-elements/rs-static-privatename-identifier-initializer-alt.case
@@ -54,7 +54,7 @@ template: productions
 features: [class-static-fields-private]
 ---*/
 
-//- fields
+//- elements
 static #$ = 1; static #_ = 1; static #\u{6F} = 1; static #℘ = 1; static #ZW_‌_NJ = 1; static #ZW_‍_J = 1
 //- privateinspectionfunctions
 static $() {
diff --git a/src/class-elements/rs-static-privatename-identifier-initializer.case b/src/class-elements/rs-static-privatename-identifier-initializer.case
index ccc3a2559069c97679dfc6ccacb9d8625ea490b5..3d76b92c00a9a7ac6547e07312504315b67c64f4 100644
--- a/src/class-elements/rs-static-privatename-identifier-initializer.case
+++ b/src/class-elements/rs-static-privatename-identifier-initializer.case
@@ -54,7 +54,7 @@ template: productions
 features: [class-static-fields-private]
 ---*/
 
-//- fields
+//- elements
 static #$ = 1; static #_ = 1; static #\u{6F} = 1; static #\u2118 = 1; static #ZW_\u200C_NJ = 1; static #ZW_\u200D_J = 1
 //- privateinspectionfunctions
 static $() {
diff --git a/src/class-elements/rs-static-privatename-identifier.case b/src/class-elements/rs-static-privatename-identifier.case
index f3dd362b72ca1bb7ebcabab7fda48003ce2db16f..f77dc446ea384ac8fd0169a5ea1571d68348316a 100644
--- a/src/class-elements/rs-static-privatename-identifier.case
+++ b/src/class-elements/rs-static-privatename-identifier.case
@@ -54,7 +54,7 @@ template: productions
 features: [class-static-fields-private]
 ---*/
 
-//- fields
+//- elements
 static #$; static #_; static #\u{6F}; static #\u2118; static #ZW_\u200C_NJ; static #ZW_\u200D_J
 //- privateinspectionfunctions
 static $(value) {
diff --git a/src/class-elements/static-private-fields.case b/src/class-elements/static-private-fields.case
index 633046576b5104d91a6d7092fed6fb345e7b9f51..dad591691108a3ab5316f78436bd9ad31c1f3251 100644
--- a/src/class-elements/static-private-fields.case
+++ b/src/class-elements/static-private-fields.case
@@ -21,7 +21,7 @@ template: productions
 features: [class-static-fields-private]
 ---*/
 
-//- fields
+//- elements
 static #x; static #y
 //- privateinspectionfunctions
 static x() {
diff --git a/src/class-elements/static-private-methods-with-fields.case b/src/class-elements/static-private-methods-with-fields.case
index 6334a58c7decaec411e7e798b301ab9cf02abc25..2aebdd2737a52a3f4817314cbe272267b5c7f2fd 100644
--- a/src/class-elements/static-private-methods-with-fields.case
+++ b/src/class-elements/static-private-methods-with-fields.case
@@ -21,7 +21,7 @@ template: productions
 features: [class-static-methods-private, class-static-fields-private]
 ---*/
 
-//- fields
+//- elements
 static #xVal; static #yVal
 //- privateinspectionfunctions
 static #x(value) {
diff --git a/src/class-elements/string-literal-names.case b/src/class-elements/string-literal-names.case
index dbcb3c933cb294e6b0b6a491aeca99a1f1eee9a8..8ee06788e8dfc08c2c1bbcce7914d28290d3ac77 100644
--- a/src/class-elements/string-literal-names.case
+++ b/src/class-elements/string-literal-names.case
@@ -18,7 +18,7 @@ includes: [propertyHelper.js]
 features: [class-fields-public]
 ---*/
 
-//- fields
+//- elements
 'a'; "b"; 'c' = 39;
 "d" = 42
 //- assertions