diff --git a/test/language/eval-code/export.js b/test/language/eval-code/export.js
index 0b6b6094edfd99390a42c0c6589a724b5141b1f3..c89a7ef1fb33f8c594f1a7fd3c2544daf4682e42 100644
--- a/test/language/eval-code/export.js
+++ b/test/language/eval-code/export.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: The `export` declaration may not appear within eval code
-id: sec-scripts
+esid: sec-scripts
 flags: [module]
 info: |
      Eval code is the source text supplied to the built-in eval function. More
diff --git a/test/language/eval-code/import.js b/test/language/eval-code/import.js
index d1ffb7a31de982f800cdab0c0725beba25347d62..f3bd7b47dd0d452a500e4d645ed5fdd1b9973376 100644
--- a/test/language/eval-code/import.js
+++ b/test/language/eval-code/import.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: The `import` declaration may not appear within eval code
-id: sec-scripts
+esid: sec-scripts
 flags: [module]
 info: |
      Eval code is the source text supplied to the built-in eval function. More
diff --git a/test/language/global-code/export.js b/test/language/global-code/export.js
index 5b80e1b446f9888320ac47400cf1c1db8e703033..b41c5396945567221149688158167d7d37455c93 100644
--- a/test/language/global-code/export.js
+++ b/test/language/global-code/export.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: The `export` declaration may not appear within a ScriptBody
-id: sec-scripts
+esid: sec-scripts
 negative: SyntaxError
 info: |
      A.5 Scripts and Modules
diff --git a/test/language/global-code/import.js b/test/language/global-code/import.js
index f0c43cab0cbd7bb658c2b619588b27a7459601f0..d0332f127b6563d5aaa4cb47f90f5ab708b4da09 100644
--- a/test/language/global-code/import.js
+++ b/test/language/global-code/import.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: The `import` declaration may not appear within a ScriptBody
-id: sec-scripts
+esid: sec-scripts
 negative: SyntaxError
 info: |
      A.5 Scripts and Modules
diff --git a/test/language/module-code/decl-pos-export-arrow-function.js b/test/language/module-code/decl-pos-export-arrow-function.js
index e17a600e5c805e1119fed7cad5f1701443df0058..ddc41e401fb0b522b7b827d202c8074dfdd5cf47 100644
--- a/test/language/module-code/decl-pos-export-arrow-function.js
+++ b/test/language/module-code/decl-pos-export-arrow-function.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-block-stmt-list.js b/test/language/module-code/decl-pos-export-block-stmt-list.js
index 135d2cad3f21a04aca06c56b98d6fb2decdee1f3..6af476be1b2838322301b22603695f2ac8e8c20a 100644
--- a/test/language/module-code/decl-pos-export-block-stmt-list.js
+++ b/test/language/module-code/decl-pos-export-block-stmt-list.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-block-stmt.js b/test/language/module-code/decl-pos-export-block-stmt.js
index b4da0a7eaca2d34af7aac0f921aeb74d91074867..b263b7bcdc16913615d276b62f0b6da12a5f48f1 100644
--- a/test/language/module-code/decl-pos-export-block-stmt.js
+++ b/test/language/module-code/decl-pos-export-block-stmt.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-class-decl-meth-static.js b/test/language/module-code/decl-pos-export-class-decl-meth-static.js
index 4d1105989931120094f4725be6ffde4916d7d5a2..b4d16fc1373b62b8c6d3a7d1a5653d55b6950d69 100644
--- a/test/language/module-code/decl-pos-export-class-decl-meth-static.js
+++ b/test/language/module-code/decl-pos-export-class-decl-meth-static.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-class-decl-meth.js b/test/language/module-code/decl-pos-export-class-decl-meth.js
index c94dc220d877ce66bfaae6b6fe72d003aa314682..40f20daa3fa591defaa4fe8d5975e4e698af8032 100644
--- a/test/language/module-code/decl-pos-export-class-decl-meth.js
+++ b/test/language/module-code/decl-pos-export-class-decl-meth.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-class-decl-method-gen-static.js b/test/language/module-code/decl-pos-export-class-decl-method-gen-static.js
index 02d76661d0d80cdb5daef91dcbb5d808fa6f4453..f72b71335e414c07424e93f87b72f7fd6a5f6a90 100644
--- a/test/language/module-code/decl-pos-export-class-decl-method-gen-static.js
+++ b/test/language/module-code/decl-pos-export-class-decl-method-gen-static.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-class-decl-method-gen.js b/test/language/module-code/decl-pos-export-class-decl-method-gen.js
index 4568bf8e5f4dd7d4a395db3b35f87c835929920d..31e9e6a1812e0318b96cdbeb08d936877a98698a 100644
--- a/test/language/module-code/decl-pos-export-class-decl-method-gen.js
+++ b/test/language/module-code/decl-pos-export-class-decl-method-gen.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-class-expr-meth-gen-static.js b/test/language/module-code/decl-pos-export-class-expr-meth-gen-static.js
index 0fbb9e4194be218357ba9fff48ca1b8a685f5422..d588a06dc19fcb8dcc3baeef225467ad3a187707 100644
--- a/test/language/module-code/decl-pos-export-class-expr-meth-gen-static.js
+++ b/test/language/module-code/decl-pos-export-class-expr-meth-gen-static.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-class-expr-meth-gen.js b/test/language/module-code/decl-pos-export-class-expr-meth-gen.js
index 97c1fe067d301451eee1d7d608c643f033a94d4e..d70d683164f4dd6d20b649583ee70a0e91dae473 100644
--- a/test/language/module-code/decl-pos-export-class-expr-meth-gen.js
+++ b/test/language/module-code/decl-pos-export-class-expr-meth-gen.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-class-expr-meth-static.js b/test/language/module-code/decl-pos-export-class-expr-meth-static.js
index 228abe0cd6385c5f53bdb081c1774390e9674c09..cbf0c6b6c637abca6e2af395190a17cb7de50753 100644
--- a/test/language/module-code/decl-pos-export-class-expr-meth-static.js
+++ b/test/language/module-code/decl-pos-export-class-expr-meth-static.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-class-expr-meth.js b/test/language/module-code/decl-pos-export-class-expr-meth.js
index 2f8bc61b9bcd013d3cd72c9963873c53eb41692b..84121167b8d52d18e329ef4f0093f33d81380beb 100644
--- a/test/language/module-code/decl-pos-export-class-expr-meth.js
+++ b/test/language/module-code/decl-pos-export-class-expr-meth.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-do-while.js b/test/language/module-code/decl-pos-export-do-while.js
index 65417fe6d7d463fd51facaf3a8a5a3fc22d07ecd..f480d8ff6b8c982fe7f4820b11b5818a72335640 100644
--- a/test/language/module-code/decl-pos-export-do-while.js
+++ b/test/language/module-code/decl-pos-export-do-while.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-for-const.js b/test/language/module-code/decl-pos-export-for-const.js
index 51866046edd6a7b8e93e3f3599b33c7392566e20..7399befe3c820b390ec30d70e60a7cf79ee6c994 100644
--- a/test/language/module-code/decl-pos-export-for-const.js
+++ b/test/language/module-code/decl-pos-export-for-const.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-for-in-const.js b/test/language/module-code/decl-pos-export-for-in-const.js
index 39756d89380a91eff2891531b519f2b9f2f3318b..e75fd81bd998dca07837bdd805b616d88812d198 100644
--- a/test/language/module-code/decl-pos-export-for-in-const.js
+++ b/test/language/module-code/decl-pos-export-for-in-const.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-for-in-let.js b/test/language/module-code/decl-pos-export-for-in-let.js
index dc530b1b8ad09d3b41b735f2ec0effe30ee4ca30..b89a175eb85b6b559a9d656e331ff0068eacb4fe 100644
--- a/test/language/module-code/decl-pos-export-for-in-let.js
+++ b/test/language/module-code/decl-pos-export-for-in-let.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-for-in-lhs.js b/test/language/module-code/decl-pos-export-for-in-lhs.js
index e77cd8d3f21b17fb6d18bad0a86c6617afe34112..65e73a0c23918104049052bce17a490cc472ad10 100644
--- a/test/language/module-code/decl-pos-export-for-in-lhs.js
+++ b/test/language/module-code/decl-pos-export-for-in-lhs.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-for-in-var.js b/test/language/module-code/decl-pos-export-for-in-var.js
index e28d918b4a892f51f4db1d42f754850a6c3cd656..bbf1b26c2f3bdfc44c2150372f19e5e12743c1b8 100644
--- a/test/language/module-code/decl-pos-export-for-in-var.js
+++ b/test/language/module-code/decl-pos-export-for-in-var.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-for-let.js b/test/language/module-code/decl-pos-export-for-let.js
index 94cc8419b806cb84ab8f4cef2fc1827ee97a686b..5873f7bcd3abe61c00fb41fcd9e800b5508b7fc1 100644
--- a/test/language/module-code/decl-pos-export-for-let.js
+++ b/test/language/module-code/decl-pos-export-for-let.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-for-lhs.js b/test/language/module-code/decl-pos-export-for-lhs.js
index 6b5b4b8ddcf7cf5b266036c2fe95acbd60e88c55..62f7ce6ed7cc30f327ac1ed50d6472bfde73d2c1 100644
--- a/test/language/module-code/decl-pos-export-for-lhs.js
+++ b/test/language/module-code/decl-pos-export-for-lhs.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-for-of-const.js b/test/language/module-code/decl-pos-export-for-of-const.js
index 865c3f8efdd507912361bf581a222179454dfb90..70ea0b75e1f5ddb86984bfdccbb1ba531364f67f 100644
--- a/test/language/module-code/decl-pos-export-for-of-const.js
+++ b/test/language/module-code/decl-pos-export-for-of-const.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-for-of-let.js b/test/language/module-code/decl-pos-export-for-of-let.js
index 8b3538e091e00a7d587cccfdb4ec3d4a5e97a848..109bd992ba191bbcd7849b0127e7b6fb42460654 100644
--- a/test/language/module-code/decl-pos-export-for-of-let.js
+++ b/test/language/module-code/decl-pos-export-for-of-let.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-for-of-lhs.js b/test/language/module-code/decl-pos-export-for-of-lhs.js
index d1b7028738518860657efbffb18ad26473042e4f..83f9af25a5d48be2d7366adb3803eb0c9c4501b8 100644
--- a/test/language/module-code/decl-pos-export-for-of-lhs.js
+++ b/test/language/module-code/decl-pos-export-for-of-lhs.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-for-of-var.js b/test/language/module-code/decl-pos-export-for-of-var.js
index a6f77c0409b464e002d83151c15122b3b768dd64..96391d83895f6ade46d0b0293dd26dc2c0dff07d 100644
--- a/test/language/module-code/decl-pos-export-for-of-var.js
+++ b/test/language/module-code/decl-pos-export-for-of-var.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-for-var.js b/test/language/module-code/decl-pos-export-for-var.js
index f98efec954e84bb9b20c057865f813cc19c2e85e..040126bcfd556c79a3385bd45c530f460b25c869 100644
--- a/test/language/module-code/decl-pos-export-for-var.js
+++ b/test/language/module-code/decl-pos-export-for-var.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-function-decl.js b/test/language/module-code/decl-pos-export-function-decl.js
index 8be6dc1d968ed12791717d32186662320440c5d2..fe8995b749111716e12a90040c34f50dd97ad8eb 100644
--- a/test/language/module-code/decl-pos-export-function-decl.js
+++ b/test/language/module-code/decl-pos-export-function-decl.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-function-expr.js b/test/language/module-code/decl-pos-export-function-expr.js
index aaa9546f961d2f86dc33fddae8e539fb7ecbe266..4024793eea4dbf42d0407f6b5dc5562444d89b95 100644
--- a/test/language/module-code/decl-pos-export-function-expr.js
+++ b/test/language/module-code/decl-pos-export-function-expr.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-generator-decl.js b/test/language/module-code/decl-pos-export-generator-decl.js
index 0bc329f146cf002ebd41a9aebdfdf076efffb7ec..0fdd413db236689535de9add4c4498913fa36ed6 100644
--- a/test/language/module-code/decl-pos-export-generator-decl.js
+++ b/test/language/module-code/decl-pos-export-generator-decl.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-generator-expr.js b/test/language/module-code/decl-pos-export-generator-expr.js
index 8737b1842098ea54919dc6baee7790ea3a019d11..a9d1eb3c7a306832ba6fcd51bb76944d6fe25ae6 100644
--- a/test/language/module-code/decl-pos-export-generator-expr.js
+++ b/test/language/module-code/decl-pos-export-generator-expr.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-if-else.js b/test/language/module-code/decl-pos-export-if-else.js
index cb14fe46b34aa0d04f0ea8df9eaa35e95567b9db..8d401b1bc7cf131416323e15fe4351e8f50fdb42 100644
--- a/test/language/module-code/decl-pos-export-if-else.js
+++ b/test/language/module-code/decl-pos-export-if-else.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-if-if.js b/test/language/module-code/decl-pos-export-if-if.js
index 4c223f01424bf6bb944394ed599b7b574300cab5..44112ddcbb554599f933322f6cb957e63b2bfbe8 100644
--- a/test/language/module-code/decl-pos-export-if-if.js
+++ b/test/language/module-code/decl-pos-export-if-if.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-labeled.js b/test/language/module-code/decl-pos-export-labeled.js
index 36851d263d41106651c8123cf2a9987fc0fa3aaa..d9bcae028605ac03ea1226937f5baa4e205b7bcb 100644
--- a/test/language/module-code/decl-pos-export-labeled.js
+++ b/test/language/module-code/decl-pos-export-labeled.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-object-gen-method.js b/test/language/module-code/decl-pos-export-object-gen-method.js
index d03390a3a1df1b5b913b526d61f96f643dfacf72..1718d525fd27b2e75955c97d36e299508954d492 100644
--- a/test/language/module-code/decl-pos-export-object-gen-method.js
+++ b/test/language/module-code/decl-pos-export-object-gen-method.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-object-getter.js b/test/language/module-code/decl-pos-export-object-getter.js
index 7dce8c98c74f61af40786e0b6e3f7fe08f59847e..3e75cc5b7eb8d4f9ccfac85ea6d4aff1dc6a4eeb 100644
--- a/test/language/module-code/decl-pos-export-object-getter.js
+++ b/test/language/module-code/decl-pos-export-object-getter.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-object-method.js b/test/language/module-code/decl-pos-export-object-method.js
index 4cd5fa6e21ccd2bd758b7decdd14555cfa58ac73..a6d1426b3a990a683e4792e5971b803d64c82574 100644
--- a/test/language/module-code/decl-pos-export-object-method.js
+++ b/test/language/module-code/decl-pos-export-object-method.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-object-setter.js b/test/language/module-code/decl-pos-export-object-setter.js
index f76af99e5568c0d42e1637fb6fc7ce9794d16972..2c24a418fad3542339e83ea48d8fee31d5de6a04 100644
--- a/test/language/module-code/decl-pos-export-object-setter.js
+++ b/test/language/module-code/decl-pos-export-object-setter.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-switch-case-dflt.js b/test/language/module-code/decl-pos-export-switch-case-dflt.js
index af7361ebaad894351597ceaecfd5b330cafb6f69..2cfd81fda07a286bb05f0cc1d2b67edc0c5beef2 100644
--- a/test/language/module-code/decl-pos-export-switch-case-dflt.js
+++ b/test/language/module-code/decl-pos-export-switch-case-dflt.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-switch-case.js b/test/language/module-code/decl-pos-export-switch-case.js
index 40d4427519ffa63246b0902db0d980dc9d7a87af..9df8088f1b8d194ef294e03389d674ac10a4ed84 100644
--- a/test/language/module-code/decl-pos-export-switch-case.js
+++ b/test/language/module-code/decl-pos-export-switch-case.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-switch-dftl.js b/test/language/module-code/decl-pos-export-switch-dftl.js
index f0a1610500237d564b2be5e5432d4dda908e683c..78e98b03559f3724e9461a8764c868a772286e89 100644
--- a/test/language/module-code/decl-pos-export-switch-dftl.js
+++ b/test/language/module-code/decl-pos-export-switch-dftl.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-try-catch-finally.js b/test/language/module-code/decl-pos-export-try-catch-finally.js
index 33d46e9c6d0bdc92138a8265e959d19bc9c21ca1..929f12b5cbb2bc9fdfc188585e07f19668eda7e1 100644
--- a/test/language/module-code/decl-pos-export-try-catch-finally.js
+++ b/test/language/module-code/decl-pos-export-try-catch-finally.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-try-catch.js b/test/language/module-code/decl-pos-export-try-catch.js
index 07a776f8d8129bf037c327821cac0e557989ab8c..2376cfe34901d17e2431885af0f40af8e0e13e27 100644
--- a/test/language/module-code/decl-pos-export-try-catch.js
+++ b/test/language/module-code/decl-pos-export-try-catch.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-try-finally.js b/test/language/module-code/decl-pos-export-try-finally.js
index 4389d013a82b3128add9015f5e0053c35c5e0ff4..529f15f58fb356bbe1488c57f79e6aa79f532d33 100644
--- a/test/language/module-code/decl-pos-export-try-finally.js
+++ b/test/language/module-code/decl-pos-export-try-finally.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-try-try.js b/test/language/module-code/decl-pos-export-try-try.js
index 338f2fd42915ea2e10c93f33db6ac5ad067f633d..202e0794692f114c58d1467d5596e03ab219b4f3 100644
--- a/test/language/module-code/decl-pos-export-try-try.js
+++ b/test/language/module-code/decl-pos-export-try-try.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-export-while.js b/test/language/module-code/decl-pos-export-while.js
index b6c7999b43f9f52aac5ed4b6809549543a4945bb..c828f9b284c1a450b6be2f7727e36b72a57ed55b 100644
--- a/test/language/module-code/decl-pos-export-while.js
+++ b/test/language/module-code/decl-pos-export-while.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `export` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-arrow-function.js b/test/language/module-code/decl-pos-import-arrow-function.js
index ffb82404cf3aac02fbc3c4ec864154d45080f3b4..9bd081d19bb577b4752298a7a2437ac36e7e4b5b 100644
--- a/test/language/module-code/decl-pos-import-arrow-function.js
+++ b/test/language/module-code/decl-pos-import-arrow-function.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-block-stmt-list.js b/test/language/module-code/decl-pos-import-block-stmt-list.js
index 5f96d3cab63dbb139d972d7a2a249a33ca048497..72452f50e2f2c49953fbd64e7497a6de3c4862e3 100644
--- a/test/language/module-code/decl-pos-import-block-stmt-list.js
+++ b/test/language/module-code/decl-pos-import-block-stmt-list.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-block-stmt.js b/test/language/module-code/decl-pos-import-block-stmt.js
index c0bcc64ee68d994befc378509f44d3f2e799c924..d0d7fb561383f319f89636fb7366d26ee21099db 100644
--- a/test/language/module-code/decl-pos-import-block-stmt.js
+++ b/test/language/module-code/decl-pos-import-block-stmt.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-class-decl-meth-static.js b/test/language/module-code/decl-pos-import-class-decl-meth-static.js
index 09827efdd9a6719d39ec83ed1f8ac23e590bcb0f..32baf075b24cc493a6c7ac0af167edf08e612a92 100644
--- a/test/language/module-code/decl-pos-import-class-decl-meth-static.js
+++ b/test/language/module-code/decl-pos-import-class-decl-meth-static.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-class-decl-meth.js b/test/language/module-code/decl-pos-import-class-decl-meth.js
index e20faa0e6d67cefaf3086d0c994fb208caa23be3..6feebfd3879d4e610c6a412e3df98dd3a03a9ac6 100644
--- a/test/language/module-code/decl-pos-import-class-decl-meth.js
+++ b/test/language/module-code/decl-pos-import-class-decl-meth.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-class-decl-method-gen-static.js b/test/language/module-code/decl-pos-import-class-decl-method-gen-static.js
index 37c133ba44089f845088ab7c013118a1e4d0c5ed..9989c819cf0552dea729035205c0071068ad9f0c 100644
--- a/test/language/module-code/decl-pos-import-class-decl-method-gen-static.js
+++ b/test/language/module-code/decl-pos-import-class-decl-method-gen-static.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-class-decl-method-gen.js b/test/language/module-code/decl-pos-import-class-decl-method-gen.js
index d178f0e07141f2c107702fa0879c5a181328db88..3b365375114a23a8ed2074e85230711059f4f791 100644
--- a/test/language/module-code/decl-pos-import-class-decl-method-gen.js
+++ b/test/language/module-code/decl-pos-import-class-decl-method-gen.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-class-expr-meth-gen-static.js b/test/language/module-code/decl-pos-import-class-expr-meth-gen-static.js
index c4598c63c2d59bb29d41194362c940909a42cd37..b795945208f395f9b01d1461e296af8328a44c1c 100644
--- a/test/language/module-code/decl-pos-import-class-expr-meth-gen-static.js
+++ b/test/language/module-code/decl-pos-import-class-expr-meth-gen-static.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-class-expr-meth-gen.js b/test/language/module-code/decl-pos-import-class-expr-meth-gen.js
index aeafdf93c7a3a92a7fd8be604d3016b5b1dbcd8b..bc6a6954b38043a8935eac32696b7765e9f1215d 100644
--- a/test/language/module-code/decl-pos-import-class-expr-meth-gen.js
+++ b/test/language/module-code/decl-pos-import-class-expr-meth-gen.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-class-expr-meth-static.js b/test/language/module-code/decl-pos-import-class-expr-meth-static.js
index 59ba70dc4f6a07b225b5b0a184071e28e237f4fb..f43d5db5ace175cfeeb490c53405869b4b960b6e 100644
--- a/test/language/module-code/decl-pos-import-class-expr-meth-static.js
+++ b/test/language/module-code/decl-pos-import-class-expr-meth-static.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-class-expr-meth.js b/test/language/module-code/decl-pos-import-class-expr-meth.js
index 57965c47f9abd03b585c5c7d172f1c0897b7b9c9..845ab4ee740392c566a40eecf371ab6ea62646da 100644
--- a/test/language/module-code/decl-pos-import-class-expr-meth.js
+++ b/test/language/module-code/decl-pos-import-class-expr-meth.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-do-while.js b/test/language/module-code/decl-pos-import-do-while.js
index 80ba3e2ba4da6dfba1d6fb76106e2543e65afe47..06200b07af9fa20e8bb037366bff76b47d5852f3 100644
--- a/test/language/module-code/decl-pos-import-do-while.js
+++ b/test/language/module-code/decl-pos-import-do-while.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-for-const.js b/test/language/module-code/decl-pos-import-for-const.js
index 8c86c28c820e9c6bb6e44f8d12a58e07f986527a..4911d418416e7a407c788d24c695a209d2d66182 100644
--- a/test/language/module-code/decl-pos-import-for-const.js
+++ b/test/language/module-code/decl-pos-import-for-const.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-for-in-const.js b/test/language/module-code/decl-pos-import-for-in-const.js
index e492ddb2a765b1281dac4204277da190e17dd902..ad42e3ac9f6c69d113038fc1ca639ffe381c2e59 100644
--- a/test/language/module-code/decl-pos-import-for-in-const.js
+++ b/test/language/module-code/decl-pos-import-for-in-const.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-for-in-let.js b/test/language/module-code/decl-pos-import-for-in-let.js
index abadc3c96fe298458a0f149df6d3ada87fa61f83..01080d302274eb99de9fba03a0399013e74cbaf4 100644
--- a/test/language/module-code/decl-pos-import-for-in-let.js
+++ b/test/language/module-code/decl-pos-import-for-in-let.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-for-in-lhs.js b/test/language/module-code/decl-pos-import-for-in-lhs.js
index f75a2af51c97b7f97de9bc04815426fcd447ab34..24d6159c17c2be9a8121ef67ab935623900dddee 100644
--- a/test/language/module-code/decl-pos-import-for-in-lhs.js
+++ b/test/language/module-code/decl-pos-import-for-in-lhs.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-for-in-var.js b/test/language/module-code/decl-pos-import-for-in-var.js
index 365e1a8c07a8804f9db940a443b293e88bfb1d68..ea0f9ebe49358e31f47f14b10c9647af75402065 100644
--- a/test/language/module-code/decl-pos-import-for-in-var.js
+++ b/test/language/module-code/decl-pos-import-for-in-var.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-for-let.js b/test/language/module-code/decl-pos-import-for-let.js
index b95c90d7fd8a4b652dd5fe6d2bae98d9eb8ddc5d..1fee0012e7983927e90c31ea5542b0fc54ea98a4 100644
--- a/test/language/module-code/decl-pos-import-for-let.js
+++ b/test/language/module-code/decl-pos-import-for-let.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-for-lhs.js b/test/language/module-code/decl-pos-import-for-lhs.js
index 419fcf7f958812203aaa589eb53b9906aa522ed2..9d7407396007bd2adc20ffe0ad75e2803b74b5ca 100644
--- a/test/language/module-code/decl-pos-import-for-lhs.js
+++ b/test/language/module-code/decl-pos-import-for-lhs.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-for-of-const.js b/test/language/module-code/decl-pos-import-for-of-const.js
index 0dbc347bc68b41a67b0826494b3b56dba2f5501f..7fabfe2ff0ace42bb08777dabab776c28fae3b04 100644
--- a/test/language/module-code/decl-pos-import-for-of-const.js
+++ b/test/language/module-code/decl-pos-import-for-of-const.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-for-of-let.js b/test/language/module-code/decl-pos-import-for-of-let.js
index 408ac54da7b02130359dcc922ceee2f905ccbf38..b42b677e0dc9f7c0f8b9a966178e9c951ab691e7 100644
--- a/test/language/module-code/decl-pos-import-for-of-let.js
+++ b/test/language/module-code/decl-pos-import-for-of-let.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-for-of-lhs.js b/test/language/module-code/decl-pos-import-for-of-lhs.js
index 166ca9f6b7c82c853ce144d609fe5544743c1b55..6bdad656f1dc73d36ddc11d2eb5b745cd60c5805 100644
--- a/test/language/module-code/decl-pos-import-for-of-lhs.js
+++ b/test/language/module-code/decl-pos-import-for-of-lhs.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-for-of-var.js b/test/language/module-code/decl-pos-import-for-of-var.js
index de1c6a1ac69bed24af026ad373abe3230cab3a70..00d31771cc21e9a28d3baafa6d61e1289d63da12 100644
--- a/test/language/module-code/decl-pos-import-for-of-var.js
+++ b/test/language/module-code/decl-pos-import-for-of-var.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-for-var.js b/test/language/module-code/decl-pos-import-for-var.js
index f527a78485ffd7f4caef484711a1831176d7015c..51bbc3954d0acc1d7375965cc6bb47255474cda4 100644
--- a/test/language/module-code/decl-pos-import-for-var.js
+++ b/test/language/module-code/decl-pos-import-for-var.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-function-decl.js b/test/language/module-code/decl-pos-import-function-decl.js
index 82f39eaf81a91eea86f1b3fe7e73c9e2891c5c67..ae20168b6bb38f3468a43fe31df431604e941644 100644
--- a/test/language/module-code/decl-pos-import-function-decl.js
+++ b/test/language/module-code/decl-pos-import-function-decl.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-function-expr.js b/test/language/module-code/decl-pos-import-function-expr.js
index dbbacbd017b2699b5bab170dbdb6999ef6ad18b0..371c726c886d869a2ad77252da77f1d917babe16 100644
--- a/test/language/module-code/decl-pos-import-function-expr.js
+++ b/test/language/module-code/decl-pos-import-function-expr.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-generator-decl.js b/test/language/module-code/decl-pos-import-generator-decl.js
index daa2903bc63760f9ce853e9d063472b032b43e09..b41a01ecb6d71c7612128e06e095b1a0e9679035 100644
--- a/test/language/module-code/decl-pos-import-generator-decl.js
+++ b/test/language/module-code/decl-pos-import-generator-decl.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-generator-expr.js b/test/language/module-code/decl-pos-import-generator-expr.js
index b9c7a6b7e3952e4c7d5c7ee2b2b3b2c153d1e4d1..52044a39bd4c6906446abfbda5497b60247913cd 100644
--- a/test/language/module-code/decl-pos-import-generator-expr.js
+++ b/test/language/module-code/decl-pos-import-generator-expr.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-if-else.js b/test/language/module-code/decl-pos-import-if-else.js
index 3b6744242b8ebfa3391ecfb74bae80b43cbb567c..ce5b02398dc7f507cb6aa88268fb583585247e99 100644
--- a/test/language/module-code/decl-pos-import-if-else.js
+++ b/test/language/module-code/decl-pos-import-if-else.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-if-if.js b/test/language/module-code/decl-pos-import-if-if.js
index 8a186880b8c8c9cf1acf11926a1d4ea3a8fd37eb..7975a9b2533cbd05c01d1ca28126f9b988c54535 100644
--- a/test/language/module-code/decl-pos-import-if-if.js
+++ b/test/language/module-code/decl-pos-import-if-if.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-labeled.js b/test/language/module-code/decl-pos-import-labeled.js
index b76f5ccbd4947304fccb11caebd4a92c5757bf86..8ed78ae2d7622e139c2887644523eaf4369d1493 100644
--- a/test/language/module-code/decl-pos-import-labeled.js
+++ b/test/language/module-code/decl-pos-import-labeled.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-object-gen-method.js b/test/language/module-code/decl-pos-import-object-gen-method.js
index 49b2bd006e3d4754e85b1c174fb3ed8656d29f91..fe6e583401c910c6c138267039fcdfd596daf64b 100644
--- a/test/language/module-code/decl-pos-import-object-gen-method.js
+++ b/test/language/module-code/decl-pos-import-object-gen-method.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-object-getter.js b/test/language/module-code/decl-pos-import-object-getter.js
index e99a4947fd17ee496a25494a152488ac5b2475e2..74aca8c3930fa34aa70d062a55d049abf5f76ed1 100644
--- a/test/language/module-code/decl-pos-import-object-getter.js
+++ b/test/language/module-code/decl-pos-import-object-getter.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-object-method.js b/test/language/module-code/decl-pos-import-object-method.js
index 5d4b0e5eedb8599001ba4c7ec1bb8c0f2a623e01..fdf7cccfe8794f292f8d176131452b9c52b400a9 100644
--- a/test/language/module-code/decl-pos-import-object-method.js
+++ b/test/language/module-code/decl-pos-import-object-method.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-object-setter.js b/test/language/module-code/decl-pos-import-object-setter.js
index 5764040689b598ca0e349a6fe759287c9f5427be..a3dd23a29c3477464cfd8de8d7704ba796b0ba00 100644
--- a/test/language/module-code/decl-pos-import-object-setter.js
+++ b/test/language/module-code/decl-pos-import-object-setter.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-switch-case-dflt.js b/test/language/module-code/decl-pos-import-switch-case-dflt.js
index 7bf60cdea6383ad97481fb81084f109518178cf9..1a56b8e84fbe1b40b85e98929b5d0325c7295b12 100644
--- a/test/language/module-code/decl-pos-import-switch-case-dflt.js
+++ b/test/language/module-code/decl-pos-import-switch-case-dflt.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-switch-case.js b/test/language/module-code/decl-pos-import-switch-case.js
index bf86fbad25d5f9b1f580a793adf0240154357b6d..e8efe29ef77e41916e866e84e220b9451eafa526 100644
--- a/test/language/module-code/decl-pos-import-switch-case.js
+++ b/test/language/module-code/decl-pos-import-switch-case.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-switch-dftl.js b/test/language/module-code/decl-pos-import-switch-dftl.js
index f99e3a2e424898877ffab2b476ef04b59db81f25..8a855a97ea3204c110318b3b0f6b35422e3fb436 100644
--- a/test/language/module-code/decl-pos-import-switch-dftl.js
+++ b/test/language/module-code/decl-pos-import-switch-dftl.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-try-catch-finally.js b/test/language/module-code/decl-pos-import-try-catch-finally.js
index 522ca2d4443aa9c94d3cddc56cc3a978d7d2fe5a..f0212bd37b672faabc8e63f816b1e28f7ee333b7 100644
--- a/test/language/module-code/decl-pos-import-try-catch-finally.js
+++ b/test/language/module-code/decl-pos-import-try-catch-finally.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-try-catch.js b/test/language/module-code/decl-pos-import-try-catch.js
index 3c103b490ff5532a1ca46d73ae2d1e6192cca413..e0d4f944f84d4a748d0699cb5896d9635da9d562 100644
--- a/test/language/module-code/decl-pos-import-try-catch.js
+++ b/test/language/module-code/decl-pos-import-try-catch.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-try-finally.js b/test/language/module-code/decl-pos-import-try-finally.js
index 71c69c4468254846d4057ededf7f1452f5125934..76db6fd4c5ef3522d570ecc7e30bb44ad5b13a50 100644
--- a/test/language/module-code/decl-pos-import-try-finally.js
+++ b/test/language/module-code/decl-pos-import-try-finally.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-try-try.js b/test/language/module-code/decl-pos-import-try-try.js
index 814a9a08125be18afe97d31f6609242d075fc7f1..39ed0e805352e8d8bc2cf2dac8e7f796a76b16e1 100644
--- a/test/language/module-code/decl-pos-import-try-try.js
+++ b/test/language/module-code/decl-pos-import-try-try.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/decl-pos-import-while.js b/test/language/module-code/decl-pos-import-while.js
index 23a2a6cea75d1fe899177df6957dc1cbece0afb3..add8e60a110ba122f7d01c5e173904870576e3d2 100644
--- a/test/language/module-code/decl-pos-import-while.js
+++ b/test/language/module-code/decl-pos-import-while.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement cannot contain an `import` declaration
-id: sec-modules
+esid: sec-modules
 negative: SyntaxError
 flags: [module]
 ---*/
diff --git a/test/language/module-code/strict-mode.js b/test/language/module-code/strict-mode.js
index 7b31b38b0f5e8b87a34455c0bd8621291b2db8d5..baa5324782116d8088488f4021b85e6536f0b07b 100644
--- a/test/language/module-code/strict-mode.js
+++ b/test/language/module-code/strict-mode.js
@@ -3,7 +3,7 @@
 /*---
 description: Module code is always strict mode code.
 es6id: 10.2.1
-id: sec-strict-mode-code
+esid: sec-strict-mode-code
 flags: [module]
 negative: SyntaxError
 ---*/
diff --git a/test/language/reserved-words/await-module.js b/test/language/reserved-words/await-module.js
index 14d3e25721e78e7b8ac8c5833cebcfd3c4589386..1f822edc3416fa9643dfa8b546bd930c6128e820 100644
--- a/test/language/reserved-words/await-module.js
+++ b/test/language/reserved-words/await-module.js
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-id: sec-reserved-words
+esid: sec-reserved-words
 es6id: 11.6.2
 description: The `await` token is not permitted as an identifier in module code
 flags: [module]
diff --git a/test/language/reserved-words/await-script.js b/test/language/reserved-words/await-script.js
index bae9067072bc260e7b37243ee156745718948bc1..fa4d7916e0a2ea0e5380fdcbdb65b542931a7bf2 100644
--- a/test/language/reserved-words/await-script.js
+++ b/test/language/reserved-words/await-script.js
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-id: sec-reserved-words
+esid: sec-reserved-words
 es6id: 11.6.2
 description: The `await` token is permitted as an identifier in script code
 ---*/