diff --git a/test/language/expressions/class/fields-initializer-static-private-fields-forbidden.js b/test/language/expressions/class/fields-initializer-static-private-fields-forbidden.js
index f281edb46831f194c87b0ff0a8fdf3d86cde921f..5cf724211f118c4f392c12febf632b0c32111ab4 100644
--- a/test/language/expressions/class/fields-initializer-static-private-fields-forbidden.js
+++ b/test/language/expressions/class/fields-initializer-static-private-fields-forbidden.js
@@ -6,7 +6,7 @@ description: static private class fields forbidden (early error -- static ClassE
 features: [class, class-fields-private]
 flags: [generated]
 negative:
-  phase: early
+  phase: parse
   type: SyntaxError
 ---*/
 
diff --git a/test/language/expressions/class/fields-initializer-static-public-fields-forbidden.js b/test/language/expressions/class/fields-initializer-static-public-fields-forbidden.js
index e43ac4dae91c8f1863df8b27d47e539d8df7aa4a..fa196f43eadb50ced66933096dcf7a1a4f8b1986 100644
--- a/test/language/expressions/class/fields-initializer-static-public-fields-forbidden.js
+++ b/test/language/expressions/class/fields-initializer-static-public-fields-forbidden.js
@@ -6,7 +6,7 @@ description: static public class fields forbidden (early error -- static ClassEl
 features: [class, class-fields-public]
 flags: [generated]
 negative:
-  phase: early
+  phase: parse
   type: SyntaxError
 ---*/
 
diff --git a/test/language/expressions/class/fields-prop-name-static-private-fields-forbidden.js b/test/language/expressions/class/fields-literal-name-static-private-fields-forbidden.js
similarity index 80%
rename from test/language/expressions/class/fields-prop-name-static-private-fields-forbidden.js
rename to test/language/expressions/class/fields-literal-name-static-private-fields-forbidden.js
index 164f489f9fe2db5d6e5eab0347cddde23144b971..39187062ca00b2983a951f36c8a1a14bd027e6b6 100644
--- a/test/language/expressions/class/fields-prop-name-static-private-fields-forbidden.js
+++ b/test/language/expressions/class/fields-literal-name-static-private-fields-forbidden.js
@@ -2,11 +2,12 @@
 // - src/class-fields/static-private-fields-forbidden.case
 // - src/class-fields/propname-error-static/cls-expr-static-literal-name.template
 /*---
-description: static private class fields forbidden (early error -- static ClassElementName)
+description: static private class fields forbidden (early error -- PropName of IdentifierName is forbidden)
+esid: sec-class-definitions-static-semantics-early-errors
 features: [class, class-fields-private]
 flags: [generated]
 negative:
-  phase: early
+  phase: parse
   type: SyntaxError
 ---*/
 
diff --git a/test/language/expressions/class/fields-prop-name-static-public-fields-forbidden.js b/test/language/expressions/class/fields-literal-name-static-public-fields-forbidden.js
similarity index 80%
rename from test/language/expressions/class/fields-prop-name-static-public-fields-forbidden.js
rename to test/language/expressions/class/fields-literal-name-static-public-fields-forbidden.js
index 83cd633c55fd112deec46b0ce35514beea6df4b0..ebb0e0aff65dae272de959ed101d8c098e605fd2 100644
--- a/test/language/expressions/class/fields-prop-name-static-public-fields-forbidden.js
+++ b/test/language/expressions/class/fields-literal-name-static-public-fields-forbidden.js
@@ -2,11 +2,12 @@
 // - src/class-fields/static-public-fields-forbidden.case
 // - src/class-fields/propname-error-static/cls-expr-static-literal-name.template
 /*---
-description: static public class fields forbidden (early error -- static ClassElementName)
+description: static public class fields forbidden (early error -- PropName of IdentifierName is forbidden)
+esid: sec-class-definitions-static-semantics-early-errors
 features: [class, class-fields-public]
 flags: [generated]
 negative:
-  phase: early
+  phase: parse
   type: SyntaxError
 ---*/
 
diff --git a/test/language/statements/class/fields-initializer-static-private-fields-forbidden.js b/test/language/statements/class/fields-initializer-static-private-fields-forbidden.js
index a4f1bea6e500bf59b2287581dbe1200980c45705..6d5e48bd327df1a852849bc409382c1f538ad0ea 100644
--- a/test/language/statements/class/fields-initializer-static-private-fields-forbidden.js
+++ b/test/language/statements/class/fields-initializer-static-private-fields-forbidden.js
@@ -6,7 +6,7 @@ description: static private class fields forbidden (early error -- static ClassE
 features: [class, class-fields-private]
 flags: [generated]
 negative:
-  phase: early
+  phase: parse
   type: SyntaxError
 ---*/
 
diff --git a/test/language/statements/class/fields-initializer-static-public-fields-forbidden.js b/test/language/statements/class/fields-initializer-static-public-fields-forbidden.js
index 1271f0caa156374a9a70200b092448e18f32d438..074e54b90680e731a73bb4e9b1f477434c60fd98 100644
--- a/test/language/statements/class/fields-initializer-static-public-fields-forbidden.js
+++ b/test/language/statements/class/fields-initializer-static-public-fields-forbidden.js
@@ -6,7 +6,7 @@ description: static public class fields forbidden (early error -- static ClassEl
 features: [class, class-fields-public]
 flags: [generated]
 negative:
-  phase: early
+  phase: parse
   type: SyntaxError
 ---*/
 
diff --git a/test/language/statements/class/fields-prop-name-static-private-fields-forbidden.js b/test/language/statements/class/fields-literal-name-static-private-fields-forbidden.js
similarity index 79%
rename from test/language/statements/class/fields-prop-name-static-private-fields-forbidden.js
rename to test/language/statements/class/fields-literal-name-static-private-fields-forbidden.js
index 2f3a55741e32df17832407c5e17bed6e5c18b37e..3af387c9fa9765e80231270661b52b5cf5e00cda 100644
--- a/test/language/statements/class/fields-prop-name-static-private-fields-forbidden.js
+++ b/test/language/statements/class/fields-literal-name-static-private-fields-forbidden.js
@@ -2,11 +2,12 @@
 // - src/class-fields/static-private-fields-forbidden.case
 // - src/class-fields/propname-error-static/cls-decl-static-literal-name.template
 /*---
-description: static private class fields forbidden (early error -- static ClassElementName)
+description: static private class fields forbidden (early error -- PropName of IdentifierName is forbidden value)
+esid: sec-class-definitions-static-semantics-early-errors
 features: [class, class-fields-private]
 flags: [generated]
 negative:
-  phase: early
+  phase: parse
   type: SyntaxError
 ---*/
 
diff --git a/test/language/statements/class/fields-prop-name-static-public-fields-forbidden.js b/test/language/statements/class/fields-literal-name-static-public-fields-forbidden.js
similarity index 79%
rename from test/language/statements/class/fields-prop-name-static-public-fields-forbidden.js
rename to test/language/statements/class/fields-literal-name-static-public-fields-forbidden.js
index 056dd443b0d9fcf0dadb375650e4d37e0d323367..c4c57408ca0189453317c6688a4c09b157f5b48b 100644
--- a/test/language/statements/class/fields-prop-name-static-public-fields-forbidden.js
+++ b/test/language/statements/class/fields-literal-name-static-public-fields-forbidden.js
@@ -2,11 +2,12 @@
 // - src/class-fields/static-public-fields-forbidden.case
 // - src/class-fields/propname-error-static/cls-decl-static-literal-name.template
 /*---
-description: static public class fields forbidden (early error -- static ClassElementName)
+description: static public class fields forbidden (early error -- PropName of IdentifierName is forbidden value)
+esid: sec-class-definitions-static-semantics-early-errors
 features: [class, class-fields-public]
 flags: [generated]
 negative:
-  phase: early
+  phase: parse
   type: SyntaxError
 ---*/