diff --git a/src/class-fields/class-evaluation-error/cls-decl.template b/src/class-fields/class-evaluation-error/cls-decl.template
index 6a77134e101f74c1c50939d6b1ca097daa1ae6be..457f6149940b310a28f2e69d7233430e9435e65c 100644
--- a/src/class-fields/class-evaluation-error/cls-decl.template
+++ b/src/class-fields/class-evaluation-error/cls-decl.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-evaluation-error-
 name: field definitions in a class declaration
-features: [class, class-fields-public]
+features: [class]
 esid: sec-runtime-semantics-classdefinitionevaluation
 ---*/
 
diff --git a/src/class-fields/class-evaluation-error/cls-expr.template b/src/class-fields/class-evaluation-error/cls-expr.template
index 55735b5974485fd2ee0ae2be26822f0b69b3e236..3a9ca73b8955e7077925410079e3deedb75ba3c7 100644
--- a/src/class-fields/class-evaluation-error/cls-expr.template
+++ b/src/class-fields/class-evaluation-error/cls-expr.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-evaluation-error-
 name: field definitions in a class expression
-features: [class, class-fields-public]
+features: [class]
 esid: sec-runtime-semantics-classdefinitionevaluation
 ---*/
 
diff --git a/src/class-fields/default/cls-decl.template b/src/class-fields/default/cls-decl.template
index 8acd1452b870fe215a415f7324b90dd605a65378..d37e18acb00c3c69990f1f2431c2d08a1ba2097d 100644
--- a/src/class-fields/default/cls-decl.template
+++ b/src/class-fields/default/cls-decl.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-
 name: field definitions in a class declaration
-features: [class, class-fields-public]
+features: [class]
 esid: prod-FieldDefinition
 ---*/
 
diff --git a/src/class-fields/default/cls-expr.template b/src/class-fields/default/cls-expr.template
index 1ea8cc02e16dbcb25efc5dbe0db6d35b45125705..fcf25c6259851654f3ca9544742343ebe51d56a9 100644
--- a/src/class-fields/default/cls-expr.template
+++ b/src/class-fields/default/cls-expr.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-
 name: field definitions in a class expression
-features: [class, class-fields-public]
+features: [class]
 esid: prod-FieldDefinition
 ---*/
 
diff --git a/src/class-fields/eval-err-contains-newtarget.case b/src/class-fields/eval-err-contains-newtarget.case
index ab0e6b4692d7b8e763c74c9867cbb4eae3572d63..c3c88f4369fdf0b865b99694728578832d139b84 100644
--- a/src/class-fields/eval-err-contains-newtarget.case
+++ b/src/class-fields/eval-err-contains-newtarget.case
@@ -16,8 +16,8 @@ info: |
   ScriptBody:StatementList
 
     It is a Syntax Error if StatementList Contains NewTarget.
-features: [class, class-fields-public]
-template: initializer-eval
+features: [class, new.target]
+template: initializer-eval-newtarget
 ---*/
 
 //- initializer