diff --git a/src/class-elements/grammar-field-classelementname-initializer-alt.case b/src/class-elements/grammar-field-classelementname-initializer-alt.case
index b132aa0dff7d0f288bdb232593af26380a182c78..ef77cecefd07136e20eb9599bd55baf9b0c150cc 100644
--- a/src/class-elements/grammar-field-classelementname-initializer-alt.case
+++ b/src/class-elements/grammar-field-classelementname-initializer-alt.case
@@ -59,7 +59,7 @@ template: syntax/valid
 features: [class-fields-public]
 ---*/
 
-//- fields
+//- elements
 $ = 1;
 _ = 2;
 \u{6F} = 3;
diff --git a/src/class-elements/grammar-field-classelementname-initializer.case b/src/class-elements/grammar-field-classelementname-initializer.case
index bdfe127a64f0e6e38a841e80a53947978746cfb4..bf62770eba205fe0c4a8b1abe8da39690ea74922 100644
--- a/src/class-elements/grammar-field-classelementname-initializer.case
+++ b/src/class-elements/grammar-field-classelementname-initializer.case
@@ -59,7 +59,7 @@ template: syntax/valid
 features: [class-fields-public]
 ---*/
 
-//- fields
+//- elements
 $ = 1;
 _ = 2;
 \u{6F} = 3;
diff --git a/src/class-elements/grammar-field-identifier-alt.case b/src/class-elements/grammar-field-identifier-alt.case
index 4721b105b5fb6d13b94b56e4c0218f604de38eed..2e38a15674566707c09e14177feffec51e4520a0 100644
--- a/src/class-elements/grammar-field-identifier-alt.case
+++ b/src/class-elements/grammar-field-identifier-alt.case
@@ -59,7 +59,7 @@ template: syntax/valid
 features: [class-fields-public]
 ---*/
 
-//- fields
+//- elements
 $;
 _;
 \u{6F};
diff --git a/src/class-elements/grammar-field-identifier-invalid-ues-error.case b/src/class-elements/grammar-field-identifier-invalid-ues-error.case
index e151beefe1cea70bb9e57fd6a8180a9c17a37a80..ac5e90715b8ba92ae1e0b990c7b668a77586400f 100644
--- a/src/class-elements/grammar-field-identifier-invalid-ues-error.case
+++ b/src/class-elements/grammar-field-identifier-invalid-ues-error.case
@@ -59,5 +59,5 @@ template: syntax/invalid
 features: [class-fields-public]
 ---*/
 
-//- fields
+//- elements
 \u0000;
diff --git a/src/class-elements/grammar-field-identifier-invalid-zwj-error.case b/src/class-elements/grammar-field-identifier-invalid-zwj-error.case
index 4c7798b6d307ce320fe3b68fd687a07b8d413ca0..455a87e17ec8901ce66d7e06e494c4a9d4e4572d 100644
--- a/src/class-elements/grammar-field-identifier-invalid-zwj-error.case
+++ b/src/class-elements/grammar-field-identifier-invalid-zwj-error.case
@@ -59,5 +59,5 @@ template: syntax/invalid
 features: [class-fields-public]
 ---*/
 
-//- fields
+//- elements
 \u200D_ZWJ;
diff --git a/src/class-elements/grammar-field-identifier-invalid-zwnj-error.case b/src/class-elements/grammar-field-identifier-invalid-zwnj-error.case
index 3aea99515c9b38e5188ecf0161d7bfa1ddfff219..1baec7eda6a346a8f8a2b3641cf1286d4b6e434b 100644
--- a/src/class-elements/grammar-field-identifier-invalid-zwnj-error.case
+++ b/src/class-elements/grammar-field-identifier-invalid-zwnj-error.case
@@ -59,5 +59,5 @@ template: syntax/invalid
 features: [class-fields-public]
 ---*/
 
-//- fields
+//- elements
 \u200C_ZWNJ;
diff --git a/src/class-elements/grammar-field-identifier.case b/src/class-elements/grammar-field-identifier.case
index f064256c674a2f71aa5f5285e4757d8fa6a0736f..f7207255afea3499197d97c978229da1f9d31741 100644
--- a/src/class-elements/grammar-field-identifier.case
+++ b/src/class-elements/grammar-field-identifier.case
@@ -59,7 +59,7 @@ template: syntax/valid
 features: [class-fields-public]
 ---*/
 
-//- fields
+//- elements
 $;
 _;
 \u{6F};
diff --git a/src/class-elements/grammar-fields-multi-line.case b/src/class-elements/grammar-fields-multi-line.case
index c8754e499c3c39a849626ed5b0c471bafaa3e78f..cd9bb5944f6e02aaa603fa4266eebaa9fcaf2c94 100644
--- a/src/class-elements/grammar-fields-multi-line.case
+++ b/src/class-elements/grammar-fields-multi-line.case
@@ -22,6 +22,6 @@ template: syntax/valid
 features: [class-fields-public]
 ---*/
 
-//- fields
+//- elements
 x
 y
diff --git a/src/class-elements/grammar-fields-same-line-error.case b/src/class-elements/grammar-fields-same-line-error.case
index 5646019930bc962b54d97c5765ed3446363acb68..28249c05a84c5a64a6fd42a1f4cfc05a70648062 100644
--- a/src/class-elements/grammar-fields-same-line-error.case
+++ b/src/class-elements/grammar-fields-same-line-error.case
@@ -22,5 +22,5 @@ template: syntax/invalid
 features: [class-fields-public]
 ---*/
 
-//- fields
+//- elements
 x y
diff --git a/src/class-elements/grammar-privatename-classelementname-initializer-alt.case b/src/class-elements/grammar-privatename-classelementname-initializer-alt.case
index 12a9fd8b3964441cf2a327041af76853d61f726d..55781001298ce713954dfcc2d3460d0cbac434a8 100644
--- a/src/class-elements/grammar-privatename-classelementname-initializer-alt.case
+++ b/src/class-elements/grammar-privatename-classelementname-initializer-alt.case
@@ -56,7 +56,7 @@ template: syntax/valid
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #$ = 1;
 #_ = 2;
 #\u{6F} = 3;
diff --git a/src/class-elements/grammar-privatename-classelementname-initializer.case b/src/class-elements/grammar-privatename-classelementname-initializer.case
index 9f2c48eb4afbd9c929e6fa60477260ec7c9e4e26..2c01dd7de0970a464bb74bbf5cd4f39c6905078d 100644
--- a/src/class-elements/grammar-privatename-classelementname-initializer.case
+++ b/src/class-elements/grammar-privatename-classelementname-initializer.case
@@ -56,7 +56,7 @@ template: syntax/valid
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #$ = 1;
 #_ = 2;
 #\u{6F} = 3;
diff --git a/src/class-elements/grammar-privatename-error.case b/src/class-elements/grammar-privatename-error.case
index 7561ed5d8acc2023a8f35eb9497a4cd4aeb23518..3a34aaae0f34324087eac906cb84a59db22d24d6 100644
--- a/src/class-elements/grammar-privatename-error.case
+++ b/src/class-elements/grammar-privatename-error.case
@@ -25,5 +25,5 @@ template: syntax/invalid
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 # x
diff --git a/src/class-elements/grammar-privatename-identifier-invalid-ues.case b/src/class-elements/grammar-privatename-identifier-invalid-ues.case
index 568eafc1387d427c27432f877b4ab4ca5bfbeef0..d5679879292fab576be2020d67901696b65ca641 100644
--- a/src/class-elements/grammar-privatename-identifier-invalid-ues.case
+++ b/src/class-elements/grammar-privatename-identifier-invalid-ues.case
@@ -53,5 +53,5 @@ template: syntax/invalid
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #\u0000;
diff --git a/src/class-elements/grammar-privatename-identifier-invalid-zwj-error.case b/src/class-elements/grammar-privatename-identifier-invalid-zwj-error.case
index 8be2fac24f5be07277f2e7233c89c4a72d0fc4d2..38c39b01eb6dca9333d9f730499c801c83008715 100644
--- a/src/class-elements/grammar-privatename-identifier-invalid-zwj-error.case
+++ b/src/class-elements/grammar-privatename-identifier-invalid-zwj-error.case
@@ -53,6 +53,6 @@ template: syntax/invalid
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #\u200D_ZWJ;
 
diff --git a/src/class-elements/grammar-privatename-identifier-invalid-zwnj-error.case b/src/class-elements/grammar-privatename-identifier-invalid-zwnj-error.case
index 3764c945e995fa0003ecd84e7052c7aaceea9af9..fa8f9b22736d6c99050e26c850a70ed90b8c55f8 100644
--- a/src/class-elements/grammar-privatename-identifier-invalid-zwnj-error.case
+++ b/src/class-elements/grammar-privatename-identifier-invalid-zwnj-error.case
@@ -53,6 +53,6 @@ template: syntax/invalid
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #\u200C_ZWNJ;
 
diff --git a/src/class-elements/grammar-privatename-identifier.case b/src/class-elements/grammar-privatename-identifier.case
index 43e817d4cb704947bff4007ba669d177247d4128..70bd745736f5540090eb6c4bc3d01bfab18e632b 100644
--- a/src/class-elements/grammar-privatename-identifier.case
+++ b/src/class-elements/grammar-privatename-identifier.case
@@ -53,7 +53,7 @@ template: syntax/valid
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #$;
 #_;
 #\u{6F};
diff --git a/src/class-elements/grammar-privatename-no-initializer-with-method.case b/src/class-elements/grammar-privatename-no-initializer-with-method.case
index 8acac18273202151f3db8bfb12e2947158b4e584..63c26ed91b461e9221bdf347b904ce1dd30fd1cd 100644
--- a/src/class-elements/grammar-privatename-no-initializer-with-method.case
+++ b/src/class-elements/grammar-privatename-no-initializer-with-method.case
@@ -25,6 +25,6 @@ template: syntax/valid
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #x
 m() {}
diff --git a/src/class-elements/grammar-privatenames-multi-line.case b/src/class-elements/grammar-privatenames-multi-line.case
index 727746c59acfb2902d605a0ce37098445d686820..12ce19c6b6e9723184df144711f88ba8d2f07756 100644
--- a/src/class-elements/grammar-privatenames-multi-line.case
+++ b/src/class-elements/grammar-privatenames-multi-line.case
@@ -25,6 +25,6 @@ template: syntax/valid
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #x
 #y
diff --git a/src/class-elements/grammar-privatenames-same-line-error.case b/src/class-elements/grammar-privatenames-same-line-error.case
index 814c761db0f4b831e3946752ff6b0b5184a70948..d403209deb75bca0ba438bd703886cbc6df5abd3 100644
--- a/src/class-elements/grammar-privatenames-same-line-error.case
+++ b/src/class-elements/grammar-privatenames-same-line-error.case
@@ -25,5 +25,5 @@ template: syntax/invalid
 features: [class-fields-private]
 ---*/
 
-//- fields
+//- elements
 #x #y
diff --git a/src/class-elements/grammar-special-meth-ctor-async-gen.case b/src/class-elements/grammar-special-meth-ctor-async-gen.case
index e21d25132a4b7c67c82b6f18635b0ce356426a21..c87d8be00dcd477ef9a6344d7dac244232a24ad0 100644
--- a/src/class-elements/grammar-special-meth-ctor-async-gen.case
+++ b/src/class-elements/grammar-special-meth-ctor-async-gen.case
@@ -12,5 +12,5 @@ template: syntax/invalid
 features: [async-iteration]
 ---*/
 
-//- fields
+//- elements
 async * constructor() {}
diff --git a/src/class-elements/grammar-special-meth-ctor-async-meth.case b/src/class-elements/grammar-special-meth-ctor-async-meth.case
index b886d0c70c9273e3452e84de459a7378eb7fbf9e..751cd78c1e50e6257a1e9bd45eee2548a5768e73 100644
--- a/src/class-elements/grammar-special-meth-ctor-async-meth.case
+++ b/src/class-elements/grammar-special-meth-ctor-async-meth.case
@@ -12,5 +12,5 @@ template: syntax/invalid
 features: [async-functions]
 ---*/
 
-//- fields
+//- elements
 async constructor() {}
diff --git a/src/class-elements/grammar-special-meth-ctor-gen.case b/src/class-elements/grammar-special-meth-ctor-gen.case
index a6199eac84ae59bb8277819e7fceb16a27a5518b..ddaacd828ce3f685f026aa659e29b63eb587b8ef 100644
--- a/src/class-elements/grammar-special-meth-ctor-gen.case
+++ b/src/class-elements/grammar-special-meth-ctor-gen.case
@@ -12,5 +12,5 @@ template: syntax/invalid
 features: [generators]
 ---*/
 
-//- fields
+//- elements
 * constructor() {}
diff --git a/src/class-elements/grammar-special-meth-ctor-get.case b/src/class-elements/grammar-special-meth-ctor-get.case
index 9fb73edf98456577af79b02b954dd73639cb77b6..509e2fc185664a4757b49d4bb97c5f4e5a6fdcb6 100644
--- a/src/class-elements/grammar-special-meth-ctor-get.case
+++ b/src/class-elements/grammar-special-meth-ctor-get.case
@@ -12,5 +12,5 @@ template: syntax/invalid
 features: [generators]
 ---*/
 
-//- fields
+//- elements
 get constructor() {}
diff --git a/src/class-elements/grammar-special-meth-ctor-set.case b/src/class-elements/grammar-special-meth-ctor-set.case
index 7a2093c824fe7870e10e0029d5145065f29a0334..c5f4709aa05cd8c2fce738b6cbf35fc66806cf06 100644
--- a/src/class-elements/grammar-special-meth-ctor-set.case
+++ b/src/class-elements/grammar-special-meth-ctor-set.case
@@ -12,5 +12,5 @@ template: syntax/invalid
 features: [generators]
 ---*/
 
-//- fields
+//- elements
 set constructor() {}
diff --git a/src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template b/src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template
index 3a3edf7981965e73a3fb2086c10fbea396c17860..016c40860adcf43021372bfdafa6ceef75e9f1d1 100644
--- a/src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template
+++ b/src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template
@@ -14,5 +14,5 @@ negative:
 throw "Test262: This statement should not be evaluated.";
 
 class C {
-  /*{ fields }*/
+  /*{ elements }*/
 }
diff --git a/src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template b/src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template
index 06e279519d546dffc9f1232619088b278b17c5d4..6061a607035fda1466becd04613987b96e2826fe 100644
--- a/src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template
+++ b/src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template
@@ -14,5 +14,5 @@ negative:
 throw "Test262: This statement should not be evaluated.";
 
 var C = class {
-  /*{ fields }*/
+  /*{ elements }*/
 };
diff --git a/src/class-elements/syntax/valid/cls-decl-elements-valid-syntax.template b/src/class-elements/syntax/valid/cls-decl-elements-valid-syntax.template
index c59480a8c54e1f9943c37bfc8461612d75110507..a1381ee76d0ed49e31540e73b2bc58cefca1d8be 100644
--- a/src/class-elements/syntax/valid/cls-decl-elements-valid-syntax.template
+++ b/src/class-elements/syntax/valid/cls-decl-elements-valid-syntax.template
@@ -9,5 +9,5 @@ features: [class]
 ---*/
 
 class C {
-  /*{ fields }*/
+  /*{ elements }*/
 }
diff --git a/src/class-elements/syntax/valid/cls-expr-elements-valid-syntax.template b/src/class-elements/syntax/valid/cls-expr-elements-valid-syntax.template
index c74bde6f942f451861c6e293d8845c15a998ac88..8cda4b14907d208ab2881302763db7e57d2f17fa 100644
--- a/src/class-elements/syntax/valid/cls-expr-elements-valid-syntax.template
+++ b/src/class-elements/syntax/valid/cls-expr-elements-valid-syntax.template
@@ -9,5 +9,5 @@ features: [class]
 ---*/
 
 var C = class {
-  /*{ fields }*/
+  /*{ elements }*/
 };