diff --git a/src/class-elements/delete-error/cls-decl-field-delete-covered.template b/src/class-elements/delete-error/cls-decl-field-delete-covered.template
index 846cb0ca304e292c87b43330c731119a4fcf8257..a398ff36a2e0e6688987d207a00d08294f88c658 100644
--- a/src/class-elements/delete-error/cls-decl-field-delete-covered.template
+++ b/src/class-elements/delete-error/cls-decl-field-delete-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/syntax/early-errors/delete/field-delete-covered-
+path: language/statements/class/fields/syntax/early-errors/delete/field-delete-covered-
 name: in field, covered
 info: |
   Static Semantics: Early Errors
diff --git a/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template b/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template
index 3c68bf39a26886fbc622cc28d1799b2820ddb8b4..97920829dd297109276b4197c8b205de1ced2c8d 100644
--- a/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-decl-field-delete-twice-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/syntax/early-errors/delete/field-delete-twice-covered-
+path: language/statements/class/fields/syntax/early-errors/delete/field-delete-twice-covered-
 name: in field, recursively covered
 info: |
   Static Semantics: Early Errors
diff --git a/src/class-elements/delete-error/cls-decl-field-delete.template b/src/class-elements/delete-error/cls-decl-field-delete.template
index 70976fd66b2a8451253cc473211797ddc7a52c01..6ec73fbf8f782a85e13760883e3d4b1e46705ee3 100644
--- a/src/class-elements/delete-error/cls-decl-field-delete.template
+++ b/src/class-elements/delete-error/cls-decl-field-delete.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/syntax/early-errors/delete/field-delete-
+path: language/statements/class/fields/syntax/early-errors/delete/field-delete-
 name: in field
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-decl-method-delete-covered.template b/src/class-elements/delete-error/cls-decl-method-delete-covered.template
index afd81451afd708308e2cbf2b69af2d9607faae42..a22ed8114ac397e4c15bb8523bb6c05587216f9d 100644
--- a/src/class-elements/delete-error/cls-decl-method-delete-covered.template
+++ b/src/class-elements/delete-error/cls-decl-method-delete-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/syntax/early-errors/delete/method-delete-covered-
+path: language/statements/class/fields/syntax/early-errors/delete/method-delete-covered-
 name: in method, covered
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template b/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template
index ac490c68586f36f2ded69d27d75756429022cc2b..5a9f126314f0722c18527eed290e53f99b9c2f07 100644
--- a/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-decl-method-delete-twice-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/syntax/early-errors/delete/method-delete-twice-covered-
+path: language/statements/class/fields/syntax/early-errors/delete/method-delete-twice-covered-
 name: in method, recursively covered
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-decl-method-delete.template b/src/class-elements/delete-error/cls-decl-method-delete.template
index d23ceea052523c84dc72ff220d774155bf0e5cb1..e7871303f97496aea7fcb1c9d128fa32813d2453 100644
--- a/src/class-elements/delete-error/cls-decl-method-delete.template
+++ b/src/class-elements/delete-error/cls-decl-method-delete.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/statements/class/syntax/early-errors/delete/method-delete-
+path: language/statements/class/fields/syntax/early-errors/delete/method-delete-
 name: in method
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-expr-field-delete-covered.template b/src/class-elements/delete-error/cls-expr-field-delete-covered.template
index 824c0d042fded7868a5d69f48d0ea3844c6cf867..07720b85549ecc7582db5a7a3e6147993ff96e02 100644
--- a/src/class-elements/delete-error/cls-expr-field-delete-covered.template
+++ b/src/class-elements/delete-error/cls-expr-field-delete-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/syntax/early-errors/delete/field-delete-covered-
+path: language/expressions/class/fields/syntax/early-errors/delete/field-delete-covered-
 name: in field, covered
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template b/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template
index a48ab245372a3b6dd358ba189f15606fc14cdcc7..de544a493669efa9931e55c4b65c975fe3aa56e4 100644
--- a/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-expr-field-delete-twice-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/syntax/early-errors/delete/field-delete-twice-covered-
+path: language/expressions/class/fields/syntax/early-errors/delete/field-delete-twice-covered-
 name: in field, recursively covered
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-expr-field-delete.template b/src/class-elements/delete-error/cls-expr-field-delete.template
index 0107722ec48fdeccaf5fb29c74adcf07e15d7d47..dca07453ede2ce7549225184611f077e91c15a63 100644
--- a/src/class-elements/delete-error/cls-expr-field-delete.template
+++ b/src/class-elements/delete-error/cls-expr-field-delete.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/syntax/early-errors/delete/field-delete-
+path: language/expressions/class/fields/syntax/early-errors/delete/field-delete-
 name: in field
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-expr-method-delete-covered.template b/src/class-elements/delete-error/cls-expr-method-delete-covered.template
index 71314dc6ba9661ff17a08a6835c4db1cfac0b360..3f4a9af7632a381671754a5edde5e35379d7bc97 100644
--- a/src/class-elements/delete-error/cls-expr-method-delete-covered.template
+++ b/src/class-elements/delete-error/cls-expr-method-delete-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/syntax/early-errors/delete/method-delete-covered-
+path: language/expressions/class/fields/syntax/early-errors/delete/method-delete-covered-
 name: in method, covered
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template b/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template
index ff69927b5214d945c5908ba66a97ca42b9527745..7baf4fdeca783c6a4064f1fb9218bdaaf5378c99 100644
--- a/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template
+++ b/src/class-elements/delete-error/cls-expr-method-delete-twice-covered.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/syntax/early-errors/delete/method-delete-twice-covered-
+path: language/expressions/class/fields/syntax/early-errors/delete/method-delete-twice-covered-
 name: in method, recursively covered
 info: |
   This file must never use the onlyStrict flag as the strict mode should always
diff --git a/src/class-elements/delete-error/cls-expr-method-delete.template b/src/class-elements/delete-error/cls-expr-method-delete.template
index 7fb9c7fc2b319b466ca86c15699936502a28d926..3875506276c92f6db545239ce45febf9241ab774 100644
--- a/src/class-elements/delete-error/cls-expr-method-delete.template
+++ b/src/class-elements/delete-error/cls-expr-method-delete.template
@@ -3,7 +3,7 @@
 
 /*---
 esid: sec-class-definitions-static-semantics-early-errors
-path: language/expressions/class/syntax/early-errors/delete/method-delete-
+path: language/expressions/class/fields/syntax/early-errors/delete/method-delete-
 name: in method
 info: |
   This file must never use the onlyStrict flag as the strict mode should always