diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index da3971ea5f448264b4b4b1a325d9946d8272baae..9788b58302db2e20b7c73659e4f57276a7787a39 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -45,7 +45,7 @@ Test262 supports the following tags:
  - [**negative**](#negative)
  - [**es5id**](#es5id)
  - [**es6id**](#es6id)
- - [**id**](#id)
+ - [**esid**](#esid)
  - [**includes**](#includes)
  - [**timeout**](#timeout)
  - [**author**](#author)
@@ -90,10 +90,10 @@ When writing a new test for ES6, it is only necessary to include this tag when t
 
 This tag identifies the section number from the portion of the ECMAScript 6 standard that is tested by this test.
 
-#### id
-**id**: [spec-id]
+#### esid
+**esid**: [spec-id]
 
-This tag identifies the hash ID from the portion of the ECMAScript draft which is most recent to the date the test was added. It represents the anchors on the generated HTML version of the specs. E.g.: `id: sec-typedarray-length`. This tag might be used to replace a `es6id` or further.
+This tag identifies the hash ID from the portion of the ECMAScript draft which is most recent to the date the test was added. It represents the anchors on the generated HTML version of the specs. E.g.: `esid: sec-typedarray-length`. This tag might be used to replace a `es6id` or further.
 
 When writing a new test for a Stage 3+ spec not yet published on the draft, the `pending` value can be used while a hash ID is not available.
 
diff --git a/test/built-ins/Array/prototype/indexOf/fromindex-zero-conversion.js b/test/built-ins/Array/prototype/indexOf/fromindex-zero-conversion.js
index 0336ee6acdb5e8828ff785fe6fae309b6a797e11..1d2d1e96c5dba72a116ff5e15c0555b6a8a4bfae 100644
--- a/test/built-ins/Array/prototype/indexOf/fromindex-zero-conversion.js
+++ b/test/built-ins/Array/prototype/indexOf/fromindex-zero-conversion.js
@@ -1,7 +1,7 @@
 // Copyright 2016 The V8 project authors. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 /*---
-id: sec-array.prototype.indexof
+esid: sec-array.prototype.indexof
 description: >
   Return +0 when fromIndex is -0 and return index refers to the first position
 info: >
diff --git a/test/built-ins/Array/prototype/lastIndexOf/fromindex-zero-conversion.js b/test/built-ins/Array/prototype/lastIndexOf/fromindex-zero-conversion.js
index 4ad11f3cc53e24859357218a44dbafac3aa442f7..792522a482141e3d7a087b28a1575ea4575134d5 100644
--- a/test/built-ins/Array/prototype/lastIndexOf/fromindex-zero-conversion.js
+++ b/test/built-ins/Array/prototype/lastIndexOf/fromindex-zero-conversion.js
@@ -1,7 +1,7 @@
 // Copyright 2016 The V8 project authors. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 /*---
-id: sec-array.prototype.lastindexof
+esid: sec-array.prototype.lastindexof
 description: >
   Return +0 when fromIndex is -0 and return index refers to the first position
 info: >
diff --git a/test/built-ins/DataView/prototype/getFloat32/length.js b/test/built-ins/DataView/prototype/getFloat32/length.js
index 9d1795d00ae0c042af2c8998a712b3f042b14097..5efb7428071394ff0dd573174432572005bbf1b3 100755
--- a/test/built-ins/DataView/prototype/getFloat32/length.js
+++ b/test/built-ins/DataView/prototype/getFloat32/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.getfloat32
+esid: sec-dataview.prototype.getfloat32
 description: >
   DataView.prototype.getFloat32.length is 1.
 info: >
diff --git a/test/built-ins/DataView/prototype/getFloat64/length.js b/test/built-ins/DataView/prototype/getFloat64/length.js
index 0bac50622a2f1fbdb8fd17f9c151d972cd9aa2fd..88254a9298202d6c4817d8b358d398ae64f03706 100755
--- a/test/built-ins/DataView/prototype/getFloat64/length.js
+++ b/test/built-ins/DataView/prototype/getFloat64/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.getfloat64
+esid: sec-dataview.prototype.getfloat64
 description: >
   DataView.prototype.getFloat64.length is 1.
 info: >
diff --git a/test/built-ins/DataView/prototype/getInt16/length.js b/test/built-ins/DataView/prototype/getInt16/length.js
index 5cd9bb5b9123ec3e37ba854c415bd48bf802f2f7..1d70860aa4e86a6fc3728ffddf7e7a2ab2dd7e46 100755
--- a/test/built-ins/DataView/prototype/getInt16/length.js
+++ b/test/built-ins/DataView/prototype/getInt16/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.getint16
+esid: sec-dataview.prototype.getint16
 description: >
   DataView.prototype.getInt16.length is 1.
 info: >
diff --git a/test/built-ins/DataView/prototype/getInt32/length.js b/test/built-ins/DataView/prototype/getInt32/length.js
index e6058929f80a581baa0ff6d2b090a1bcc1cf6d0f..2aef5f04646461f7805b48620e162987940ed554 100755
--- a/test/built-ins/DataView/prototype/getInt32/length.js
+++ b/test/built-ins/DataView/prototype/getInt32/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.getint32
+esid: sec-dataview.prototype.getint32
 description: >
   DataView.prototype.getInt32.length is 1.
 info: >
diff --git a/test/built-ins/DataView/prototype/getUint16/length.js b/test/built-ins/DataView/prototype/getUint16/length.js
index 307e4d568a74288013eb4213813f0e6552a751b1..15e83a3ef36884e5416c9abb773eaacf1aa01bd7 100755
--- a/test/built-ins/DataView/prototype/getUint16/length.js
+++ b/test/built-ins/DataView/prototype/getUint16/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.getuint16
+esid: sec-dataview.prototype.getuint16
 description: >
   DataView.prototype.getUint16.length is 1.
 info: >
diff --git a/test/built-ins/DataView/prototype/getUint32/length.js b/test/built-ins/DataView/prototype/getUint32/length.js
index 6a022fa9e3320a9197cd0ebc2b926d822cd07510..ddf6fa9860f4f4b9714e2265a3f0e14c648a0f87 100755
--- a/test/built-ins/DataView/prototype/getUint32/length.js
+++ b/test/built-ins/DataView/prototype/getUint32/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.getuint32
+esid: sec-dataview.prototype.getuint32
 description: >
   DataView.prototype.getUint32.length is 1.
 info: >
diff --git a/test/built-ins/DataView/prototype/setFloat32/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setFloat32/index-check-before-value-conversion.js
index 32d29e559381826b62e00fd32397b21e21d5eefd..6c2edbbfc229a8bfcd45368b89a4dd4ff9095692 100755
--- a/test/built-ins/DataView/prototype/setFloat32/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setFloat32/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setfloat32
+esid: sec-dataview.prototype.setfloat32
 description: >
   Throws a RangeError if the index is negative or non-integral number.
 info: >
diff --git a/test/built-ins/DataView/prototype/setFloat32/length.js b/test/built-ins/DataView/prototype/setFloat32/length.js
index 63f7d4d51474ba09cd09da85b3f30b05efa0b55e..07bbb3ce6eb3e584d71e14a7682ee345d7f10c65 100755
--- a/test/built-ins/DataView/prototype/setFloat32/length.js
+++ b/test/built-ins/DataView/prototype/setFloat32/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setfloat32
+esid: sec-dataview.prototype.setfloat32
 description: >
   DataView.prototype.setFloat32.length is 2.
 info: >
diff --git a/test/built-ins/DataView/prototype/setFloat32/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setFloat32/range-check-after-value-conversion.js
index 5bbd3a02a7f6d0122de0df78f2eaaa91e98fc5f2..edb596f7094162db4f63f44c2c9f45486cf9eba8 100755
--- a/test/built-ins/DataView/prototype/setFloat32/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setFloat32/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setfloat32
+esid: sec-dataview.prototype.setfloat32
 description: >
   Index bounds checks are performed after value conversion.
 info: >
diff --git a/test/built-ins/DataView/prototype/setFloat64/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setFloat64/index-check-before-value-conversion.js
index 0d5aee7e6729f7181aa3ead4c84adf54ff4774d6..cc3016f405dc67bae2e9de30c740f929cfee445f 100755
--- a/test/built-ins/DataView/prototype/setFloat64/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setFloat64/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setfloat64
+esid: sec-dataview.prototype.setfloat64
 description: >
   Throws a RangeError if the index is negative or non-integral number.
 info: >
diff --git a/test/built-ins/DataView/prototype/setFloat64/length.js b/test/built-ins/DataView/prototype/setFloat64/length.js
index cbe15b0edf2b24293226a7c33ccdf7c556ce2db6..f71d6567eb2270c50a5ff98729e9ace23ee47b61 100755
--- a/test/built-ins/DataView/prototype/setFloat64/length.js
+++ b/test/built-ins/DataView/prototype/setFloat64/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setfloat64
+esid: sec-dataview.prototype.setfloat64
 description: >
   DataView.prototype.setFloat64.length is 2.
 info: >
diff --git a/test/built-ins/DataView/prototype/setFloat64/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setFloat64/range-check-after-value-conversion.js
index 3d02fa21d1d23f32a3c3ca12210db941cb060dc8..0e0355ebf428ee26722b0f3060bcbf897772ce9e 100755
--- a/test/built-ins/DataView/prototype/setFloat64/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setFloat64/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setfloat64
+esid: sec-dataview.prototype.setfloat64
 description: >
   Index bounds checks are performed after value conversion.
 info: >
diff --git a/test/built-ins/DataView/prototype/setInt16/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setInt16/index-check-before-value-conversion.js
index 1d6e3431294fa87df116e6bb2a730ceaa2b0c8f5..3888ae3593b750f03a4f010d3704274fed0c1f55 100755
--- a/test/built-ins/DataView/prototype/setInt16/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt16/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setint16
+esid: sec-dataview.prototype.setint16
 description: >
   Throws a RangeError if the index is negative or non-integral number.
 info: >
diff --git a/test/built-ins/DataView/prototype/setInt16/length.js b/test/built-ins/DataView/prototype/setInt16/length.js
index e4e2f7abb8b339d66b7241d908593365d10e3a36..738facaaec717c4fb0b3c1756b312084fc2b32bb 100755
--- a/test/built-ins/DataView/prototype/setInt16/length.js
+++ b/test/built-ins/DataView/prototype/setInt16/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setint16
+esid: sec-dataview.prototype.setint16
 description: >
   DataView.prototype.setInt16.length is 2.
 info: >
diff --git a/test/built-ins/DataView/prototype/setInt16/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setInt16/range-check-after-value-conversion.js
index 5a8feb030925828b045ce69c5450d998ab732d4e..fa34b2712e64406a83f405e2f70412fbecf495b4 100755
--- a/test/built-ins/DataView/prototype/setInt16/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt16/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setint16
+esid: sec-dataview.prototype.setint16
 description: >
   Index bounds checks are performed after value conversion.
 info: >
diff --git a/test/built-ins/DataView/prototype/setInt32/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setInt32/index-check-before-value-conversion.js
index 0e12094e784bc3567c05e5daa64bc3c902f45bef..f24e39a486bc26fbb002b2b03416dcc66dc1f826 100755
--- a/test/built-ins/DataView/prototype/setInt32/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt32/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setint32
+esid: sec-dataview.prototype.setint32
 description: >
   Throws a RangeError if the index is negative or non-integral number.
 info: >
diff --git a/test/built-ins/DataView/prototype/setInt32/length.js b/test/built-ins/DataView/prototype/setInt32/length.js
index 3da8d320b30aedb7721d9a3e984f884dd6993f65..4250fba98569272f8f4a02f613638305150b438f 100755
--- a/test/built-ins/DataView/prototype/setInt32/length.js
+++ b/test/built-ins/DataView/prototype/setInt32/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setint32
+esid: sec-dataview.prototype.setint32
 description: >
   DataView.prototype.setInt32.length is 2.
 info: >
diff --git a/test/built-ins/DataView/prototype/setInt32/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setInt32/range-check-after-value-conversion.js
index 5b8b4b7e46186a2c933438656a008b10428d5962..cccdd844d48ac69fd332dbd79d0d234dd45305db 100755
--- a/test/built-ins/DataView/prototype/setInt32/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt32/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setint32
+esid: sec-dataview.prototype.setint32
 description: >
   Index bounds checks are performed after value conversion.
 info: >
diff --git a/test/built-ins/DataView/prototype/setInt8/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setInt8/index-check-before-value-conversion.js
index 3eaa58c2075f7ecea41230dc222a7362f2bbd431..3dc06e669fef7bfdc98875159354bbb310b11b63 100755
--- a/test/built-ins/DataView/prototype/setInt8/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt8/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setint8
+esid: sec-dataview.prototype.setint8
 description: >
   Throws a RangeError if the index is negative or non-integral number.
 info: >
diff --git a/test/built-ins/DataView/prototype/setInt8/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setInt8/range-check-after-value-conversion.js
index 7ef98eefb6cbe1ec6fae31af00b742a71cccc71f..15a2c27e6af992e9856d4a8e26abbb650d2a8915 100755
--- a/test/built-ins/DataView/prototype/setInt8/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setInt8/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setint8
+esid: sec-dataview.prototype.setint8
 description: >
   Index bounds checks are performed after value conversion.
 info: >
diff --git a/test/built-ins/DataView/prototype/setUint16/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setUint16/index-check-before-value-conversion.js
index 6b1f7049e4aa9b64a8d6de2963b03783d672ee2f..264a1321dc898b789877d57ce41b4d5095facd3d 100755
--- a/test/built-ins/DataView/prototype/setUint16/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint16/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setuint16
+esid: sec-dataview.prototype.setuint16
 description: >
   Throws a RangeError if the index is negative or non-integral number.
 info: >
diff --git a/test/built-ins/DataView/prototype/setUint16/length.js b/test/built-ins/DataView/prototype/setUint16/length.js
index 4720121d295257819354489a02618c270a898d9a..a5cdc1373c96c8b91880eab0602d022d80ed32b0 100755
--- a/test/built-ins/DataView/prototype/setUint16/length.js
+++ b/test/built-ins/DataView/prototype/setUint16/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setuint16
+esid: sec-dataview.prototype.setuint16
 description: >
   DataView.prototype.setUint16.length is 2.
 info: >
diff --git a/test/built-ins/DataView/prototype/setUint16/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setUint16/range-check-after-value-conversion.js
index 16492a26e1a3d8bdf6d3a4b640b5be71811fd515..f541134aae9ee121e037de211b9e2d79650864da 100755
--- a/test/built-ins/DataView/prototype/setUint16/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint16/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setuint16
+esid: sec-dataview.prototype.setuint16
 description: >
   Index bounds checks are performed after value conversion.
 info: >
diff --git a/test/built-ins/DataView/prototype/setUint32/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setUint32/index-check-before-value-conversion.js
index ccbcb4dd184d9e93fb1f08142b4569f69924f08b..59c9ed55d1e179d3621b9681cb774eeec0357d39 100755
--- a/test/built-ins/DataView/prototype/setUint32/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint32/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setuint32
+esid: sec-dataview.prototype.setuint32
 description: >
   Throws a RangeError if the index is negative or non-integral number.
 info: >
diff --git a/test/built-ins/DataView/prototype/setUint32/length.js b/test/built-ins/DataView/prototype/setUint32/length.js
index 0017fd1b6f7eb2ec586adf5fbfe7d3abf249a966..64d1e54afe726abf1a02e4f98949ad3d84ca1d52 100755
--- a/test/built-ins/DataView/prototype/setUint32/length.js
+++ b/test/built-ins/DataView/prototype/setUint32/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setuint32
+esid: sec-dataview.prototype.setuint32
 description: >
   DataView.prototype.setUint32.length is 2.
 info: >
diff --git a/test/built-ins/DataView/prototype/setUint32/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setUint32/range-check-after-value-conversion.js
index b9afbbb46163cb0ee9100d96971af2d11b91090d..09effdc332ef87458678bccb5ee54c72bda6fce7 100755
--- a/test/built-ins/DataView/prototype/setUint32/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint32/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setuint32
+esid: sec-dataview.prototype.setuint32
 description: >
   Index bounds checks are performed after value conversion.
 info: >
diff --git a/test/built-ins/DataView/prototype/setUint8/index-check-before-value-conversion.js b/test/built-ins/DataView/prototype/setUint8/index-check-before-value-conversion.js
index 5992764a4894a4d1894d0d24fd0ddd3c1cf2e741..7f796c374b1a6124b1234288d269cde1020016bb 100755
--- a/test/built-ins/DataView/prototype/setUint8/index-check-before-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint8/index-check-before-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setuint8
+esid: sec-dataview.prototype.setuint8
 description: >
   Throws a RangeError if the index is negative or non-integral number.
 info: >
diff --git a/test/built-ins/DataView/prototype/setUint8/range-check-after-value-conversion.js b/test/built-ins/DataView/prototype/setUint8/range-check-after-value-conversion.js
index 6ee93d1daf5fb8d5727a2aaece3de66c8d045430..c6c2598dcace7383e0adcf8ea376182a939ab198 100755
--- a/test/built-ins/DataView/prototype/setUint8/range-check-after-value-conversion.js
+++ b/test/built-ins/DataView/prototype/setUint8/range-check-after-value-conversion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-dataview.prototype.setuint8
+esid: sec-dataview.prototype.setuint8
 description: >
   Index bounds checks are performed after value conversion.
 info: >
diff --git a/test/built-ins/Object/entries/exception-during-enumeration.js b/test/built-ins/Object/entries/exception-during-enumeration.js
index 9848e8b1ba657e9add139c2cf1d379f3488eecf3..0720a47f0f60be4eaa58268c11052d36af1af6d4 100644
--- a/test/built-ins/Object/entries/exception-during-enumeration.js
+++ b/test/built-ins/Object/entries/exception-during-enumeration.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries should terminate if getting a value throws an exception
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/entries/exception-not-object-coercible.js b/test/built-ins/Object/entries/exception-not-object-coercible.js
index abd03977e9cf1339f68b46fe40c9203d44153d97..de90d9d6c52781824972f333142c1e37d7024679 100644
--- a/test/built-ins/Object/entries/exception-not-object-coercible.js
+++ b/test/built-ins/Object/entries/exception-not-object-coercible.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries should fail if given a null or undefined value
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/entries/function-length.js b/test/built-ins/Object/entries/function-length.js
index a140f33d2d5fcba4cae1e9d5c87140902632ab09..f186c09a5bbf5d4da5336b6d8568df7f30bad6e0 100644
--- a/test/built-ins/Object/entries/function-length.js
+++ b/test/built-ins/Object/entries/function-length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries should have length 1
 author: Jordan Harband
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Object/entries/function-name.js b/test/built-ins/Object/entries/function-name.js
index 1a56db9ed87d474d850b89252b4682fb8c95fdc8..ec6db2ffce7a5ce209d4e5b52f6e5ebf70a1bf5e 100644
--- a/test/built-ins/Object/entries/function-name.js
+++ b/test/built-ins/Object/entries/function-name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries should have name property with value 'entries'
 author: Jordan Harband
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Object/entries/function-property-descriptor.js b/test/built-ins/Object/entries/function-property-descriptor.js
index be146e648b6d8cdaf7052fcc774a3f040065df02..9efe4bd81abe78a053eb746d4452d139c9a8a12f 100644
--- a/test/built-ins/Object/entries/function-property-descriptor.js
+++ b/test/built-ins/Object/entries/function-property-descriptor.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries should be writable, non-enumerable, and configurable
 author: Jordan Harband
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Object/entries/getter-adding-key.js b/test/built-ins/Object/entries/getter-adding-key.js
index cec77a4f6a6cd90dace7dcad556200b9a79fac57..09eca7b1639ba0284a0d24e989aa9a3da86e625e 100644
--- a/test/built-ins/Object/entries/getter-adding-key.js
+++ b/test/built-ins/Object/entries/getter-adding-key.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries does not see a new element added by a getter that is hit during iteration
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/entries/getter-making-future-key-nonenumerable.js b/test/built-ins/Object/entries/getter-making-future-key-nonenumerable.js
index 2be311b01a74228a9f9626f660a8599cc48b0cd5..c3e3cc721c6b4d25fd0891cfb60ffbe2c4d68a61 100644
--- a/test/built-ins/Object/entries/getter-making-future-key-nonenumerable.js
+++ b/test/built-ins/Object/entries/getter-making-future-key-nonenumerable.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries does not see an element made non-enumerable by a getter that is hit during iteration
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/entries/getter-removing-future-key.js b/test/built-ins/Object/entries/getter-removing-future-key.js
index 83206cfb46a53c175e06d436c10a412e9d2d652f..05ef0d512f48926164bb9a6e81b51119645b9d6f 100644
--- a/test/built-ins/Object/entries/getter-removing-future-key.js
+++ b/test/built-ins/Object/entries/getter-removing-future-key.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries does not see an element removed by a getter that is hit during iteration
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/entries/inherited-properties-omitted.js b/test/built-ins/Object/entries/inherited-properties-omitted.js
index 5d0f3cd1eff378f45e4ad4fb9df16a57bff84ecf..0d7d01815ae3054767242a67b10c2de953dd9ca7 100644
--- a/test/built-ins/Object/entries/inherited-properties-omitted.js
+++ b/test/built-ins/Object/entries/inherited-properties-omitted.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries does not see inherited properties.
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/entries/observable-operations.js b/test/built-ins/Object/entries/observable-operations.js
index f1c4b41b2e26c9c32d373a576a66ed9f2b8bb230..d80b50651316bdeaf3b712f262f2d0785dd25d06 100644
--- a/test/built-ins/Object/entries/observable-operations.js
+++ b/test/built-ins/Object/entries/observable-operations.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries should perform observable operations in the correct order
 author: Jordan Harband
 features: [Proxy]
diff --git a/test/built-ins/Object/entries/primitive-booleans.js b/test/built-ins/Object/entries/primitive-booleans.js
index fec6d5c80da281762e9ef8226e88d50e4f546f4b..f9380fa904d69f853b5ba9ecf643392db8bf35a3 100644
--- a/test/built-ins/Object/entries/primitive-booleans.js
+++ b/test/built-ins/Object/entries/primitive-booleans.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries accepts boolean primitives.
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/entries/primitive-numbers.js b/test/built-ins/Object/entries/primitive-numbers.js
index 84032ae0b52caf594fadf89178f69fe384429ed6..4d2743f16282bd1e0bbf4db330e329c74fdb5fea 100644
--- a/test/built-ins/Object/entries/primitive-numbers.js
+++ b/test/built-ins/Object/entries/primitive-numbers.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries accepts number primitives.
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/entries/primitive-strings.js b/test/built-ins/Object/entries/primitive-strings.js
index 440ff0666f3e3c45cd568188fa73638e15afb59d..a237bf740126b9e52b7c1b60dc44d0bf4c7e62cc 100644
--- a/test/built-ins/Object/entries/primitive-strings.js
+++ b/test/built-ins/Object/entries/primitive-strings.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries accepts string primitives.
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/entries/primitive-symbols.js b/test/built-ins/Object/entries/primitive-symbols.js
index 4ab366bd5a59e12fa8acf4ba14b47a7d699be478..4948a515aed2357c9adaf73f29188795803f9224 100644
--- a/test/built-ins/Object/entries/primitive-symbols.js
+++ b/test/built-ins/Object/entries/primitive-symbols.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries accepts Symbol primitives.
 author: Jordan Harband
 features: [Symbol]
diff --git a/test/built-ins/Object/entries/symbols-omitted.js b/test/built-ins/Object/entries/symbols-omitted.js
index 97e7a5a225ecc94ed1b16e7338cd687506de558d..076c16777118bddb2dcbc62e1e29935c080a167b 100644
--- a/test/built-ins/Object/entries/symbols-omitted.js
+++ b/test/built-ins/Object/entries/symbols-omitted.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: Object.entries does not include Symbol keys.
 author: Jordan Harband
 features: [Symbol]
diff --git a/test/built-ins/Object/entries/tamper-with-global-object.js b/test/built-ins/Object/entries/tamper-with-global-object.js
index 6e17a287d7f7ebf55b549168aeff70929482d220..1ad4e18a2f38e42cc37a7a7e96b1682efe9e020e 100644
--- a/test/built-ins/Object/entries/tamper-with-global-object.js
+++ b/test/built-ins/Object/entries/tamper-with-global-object.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: >
     Object.entries should not have its behavior impacted by modifications to the global property Object
 author: Jordan Harband
diff --git a/test/built-ins/Object/entries/tamper-with-object-keys.js b/test/built-ins/Object/entries/tamper-with-object-keys.js
index 4170bf382cf9ce6ce9f8503436578dc7aac61abc..10e8a6d5f000b3313d244e56217ffd264fd1c80e 100644
--- a/test/built-ins/Object/entries/tamper-with-object-keys.js
+++ b/test/built-ins/Object/entries/tamper-with-object-keys.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.entries
+esid: sec-object.entries
 description: >
     Object.entries should not have its behavior impacted by modifications to Object.keys
 author: Jordan Harband
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/duplicate-keys.js b/test/built-ins/Object/getOwnPropertyDescriptors/duplicate-keys.js
index c272fe0a958850bf5f1e4b63b133292213d1f861..7960a2759f35516977161dad9c038de73a283e5f 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/duplicate-keys.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/duplicate-keys.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors on a proxy with duplicate ownKeys should work
-id: pending
+esid: pending
 author: Jordan Harband
 features: [Proxy]
 ---*/
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/exception-not-object-coercible.js b/test/built-ins/Object/getOwnPropertyDescriptors/exception-not-object-coercible.js
index 301be92bbc92784c5e68f57be865fb8317c2b697..0bfc62bd4c3a5a326757fd9730db90fb0c406feb 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/exception-not-object-coercible.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/exception-not-object-coercible.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors should fail if given a null or undefined value
-id: pending
+esid: pending
 author: Jordan Harband
 ---*/
 
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/function-length.js b/test/built-ins/Object/getOwnPropertyDescriptors/function-length.js
index d6ac0ad77dbe95cfb4eddce301e5307b5db432e3..91e531bf06d6acd7c549b77cccb96ec49ad1609d 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/function-length.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/function-length.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors should have length 1
-id: pending
+esid: pending
 author: Jordan Harband
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/function-name.js b/test/built-ins/Object/getOwnPropertyDescriptors/function-name.js
index db48946476fdd5cfbac31b8e498dd05fa10103d1..ef16cf4d6df22ff482564c7864672f3299db0350 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/function-name.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/function-name.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors should have name property with value 'getOwnPropertyDescriptors'
-id: pending
+esid: pending
 author: Jordan Harband
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/function-property-descriptor.js b/test/built-ins/Object/getOwnPropertyDescriptors/function-property-descriptor.js
index 9a94c083d78bb937561e5e5e5d4aa81cac8c6c37..170b1cb9e033fb8a7d31f36b37619a2bff074435 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/function-property-descriptor.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/function-property-descriptor.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors should be writable, non-enumerable, and configurable
-id: pending
+esid: pending
 author: Jordan Harband
 includes: [propertyHelper.js]
 ---*/
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/inherited-properties-omitted.js b/test/built-ins/Object/getOwnPropertyDescriptors/inherited-properties-omitted.js
index b981e7461459fa5b08e35679c7be5817e9f42a1d..c19d40c59ab80830872b18080ce34fb7f443521c 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/inherited-properties-omitted.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/inherited-properties-omitted.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors does not see inherited properties.
-id: pending
+esid: pending
 author: Jordan Harband
 ---*/
 
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/normal-object.js b/test/built-ins/Object/getOwnPropertyDescriptors/normal-object.js
index cfad4a9d7c8d3eee8c71e7d08d9310c3bc082303..8ef7f8c5c20e21c6ac0de501a60cfd91fb2ca3ca 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/normal-object.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/normal-object.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors should produce a normal object inheriting from Object.prototype
-id: pending
+esid: pending
 author: Jordan Harband
 ---*/
 
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/observable-operations.js b/test/built-ins/Object/getOwnPropertyDescriptors/observable-operations.js
index c5af08299865fdb2e14278e4c13e12c9c58219c2..66411ab16376620a4490c3eb0770367bdb00fc4f 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/observable-operations.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/observable-operations.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors should perform observable operations in the correct order
-id: pending
+esid: pending
 author: Jordan Harband
 features: [Proxy]
 includes: [proxyTrapsHelper.js]
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-booleans.js b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-booleans.js
index b105f4ad975f15e11bd3801ec613aa82f6689876..899aaa0e5872dbd8c9498e7d79a9c2cf836e9a8d 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-booleans.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-booleans.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors accepts boolean primitives.
-id: pending
+esid: pending
 author: Jordan Harband
 ---*/
 
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-numbers.js b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-numbers.js
index 2ed6bc68f15145cc840826a31f9dac107a1fd2cf..495796ae4d7777283f75dac674c0b8939357197e 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-numbers.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-numbers.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors accepts number primitives.
-id: pending
+esid: pending
 author: Jordan Harband
 ---*/
 
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-strings.js b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-strings.js
index ac44ef2b6dd9c2a8552a008e856b5b315f088ad2..c8d3be9ec7f260ea5bc760a003970f826d135426 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-strings.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-strings.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors accepts string primitives.
-id: pending
+esid: pending
 author: Jordan Harband
 ---*/
 
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-symbols.js b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-symbols.js
index ea7b27b331cb4a1f293a6e93a741cfd1d26640cb..d30fa3f464354f8ca5042751993a432dfde09b0e 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/primitive-symbols.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/primitive-symbols.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors accepts Symbol primitives.
-id: pending
+esid: pending
 author: Jordan Harband
 features: [Symbol]
 ---*/
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/symbols-included.js b/test/built-ins/Object/getOwnPropertyDescriptors/symbols-included.js
index 97d8b2ac5e005ba9113cd001a220ab386c659aa7..61c067629cba1ff89be75c87b40f2214eaf4d6c9 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/symbols-included.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/symbols-included.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Object.getOwnPropertyDescriptors includes Symbol keys.
-id: pending
+esid: pending
 author: Jordan Harband
 features: [Symbol]
 ---*/
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-global-object.js b/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-global-object.js
index a68a534745579ceae379bba2dffa172aa84476b5..e344e3e994143e2dcad71099dbc21c7ff9ccbf4b 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-global-object.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-global-object.js
@@ -4,7 +4,7 @@
 /*---
 description: >
     Object.getOwnPropertyDescriptors should not have its behavior impacted by modifications to the global property Object
-id: pending
+esid: pending
 author: Jordan Harband
 includes: [fnGlobalObject.js]
 ---*/
diff --git a/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-object-keys.js b/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-object-keys.js
index 588298ed2504b08eb1e6b84ba4f30a72ca3d398b..1f4d6989368c3bbfd6534d70ebb8625e75ecd395 100644
--- a/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-object-keys.js
+++ b/test/built-ins/Object/getOwnPropertyDescriptors/tamper-with-object-keys.js
@@ -4,7 +4,7 @@
 /*---
 description: >
     Object.getOwnPropertyDescriptors should not have its behavior impacted by modifications to Object.getOwnPropertyDescriptor
-id: pending
+esid: pending
 author: Jordan Harband
 ---*/
 
diff --git a/test/built-ins/Object/prototype/extensibility.js b/test/built-ins/Object/prototype/extensibility.js
index e8a2fd2a8eedca5dc5f4e57e1ab2a20f9ad38a84..956c5be1bf815eea0cfb3b8c9719befe8f40b0d9 100644
--- a/test/built-ins/Object/prototype/extensibility.js
+++ b/test/built-ins/Object/prototype/extensibility.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-properties-of-the-object-prototype-object
+esid: sec-properties-of-the-object-prototype-object
 description: >
   Object.prototype is still extensible and may have extensions prevented
 info: >
diff --git a/test/built-ins/Object/prototype/proto.js b/test/built-ins/Object/prototype/proto.js
index 8e75d586e982149e914cead9c097eabae3d8d33f..9cbee4793c177529d7de41b52c91cbde1ec8d2d9 100644
--- a/test/built-ins/Object/prototype/proto.js
+++ b/test/built-ins/Object/prototype/proto.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-properties-of-the-object-prototype-object
+esid: sec-properties-of-the-object-prototype-object
 description: >
   The value of the [[Prototype]] internal slot of Object.prototype is null
 info: >
diff --git a/test/built-ins/Object/prototype/setPrototypeOf-with-different-values.js b/test/built-ins/Object/prototype/setPrototypeOf-with-different-values.js
index 999a247a1f09216a8b50aa275f1738cda14fc1a9..83fb1f647db55ad322a7f4b81e2749038270ab03 100644
--- a/test/built-ins/Object/prototype/setPrototypeOf-with-different-values.js
+++ b/test/built-ins/Object/prototype/setPrototypeOf-with-different-values.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-immutable-prototype-exotic-objects-setprototypeof-v
+esid: sec-immutable-prototype-exotic-objects-setprototypeof-v
 description: >
   Object.prototype's [[SetPrototypeOf]] returns false if value is not the same
 info: >
diff --git a/test/built-ins/Object/prototype/setPrototypeOf-with-same-value.js b/test/built-ins/Object/prototype/setPrototypeOf-with-same-value.js
index 4822e4795583922a8b5db6bc7b33eb47b9ce8b1e..6265e94768db0f50ab93f1da1a8d6f7431093dc0 100644
--- a/test/built-ins/Object/prototype/setPrototypeOf-with-same-value.js
+++ b/test/built-ins/Object/prototype/setPrototypeOf-with-same-value.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-immutable-prototype-exotic-objects-setprototypeof-v
+esid: sec-immutable-prototype-exotic-objects-setprototypeof-v
 description: >
   Object.prototype's [[SetPrototypeOf]] returns true if value is same
 info: >
diff --git a/test/built-ins/Object/values/exception-during-enumeration.js b/test/built-ins/Object/values/exception-during-enumeration.js
index b4d201fa907a5eafad97ddfcf90df37384343ebf..a11b20e69d9bf12020332f2c3597443918cb423b 100644
--- a/test/built-ins/Object/values/exception-during-enumeration.js
+++ b/test/built-ins/Object/values/exception-during-enumeration.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values should terminate if getting a value throws an exception
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/values/exception-not-object-coercible.js b/test/built-ins/Object/values/exception-not-object-coercible.js
index 83a7ab9b29e268a3351ca0934154fbc3e3e56da2..35dce7a18a8b103403f25f450cf60614faac7ec4 100644
--- a/test/built-ins/Object/values/exception-not-object-coercible.js
+++ b/test/built-ins/Object/values/exception-not-object-coercible.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values should fail if given a null or undefined value
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/values/function-length.js b/test/built-ins/Object/values/function-length.js
index 58a57200186e838c805e47946eeb09ca68b6e6dc..62bc2a6f12b41ddbf2378bd3db1ffc62015f6044 100644
--- a/test/built-ins/Object/values/function-length.js
+++ b/test/built-ins/Object/values/function-length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values should have length 1
 author: Jordan Harband
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Object/values/function-name.js b/test/built-ins/Object/values/function-name.js
index 33b7a097509d4f76a530824c46438825e64d5317..7f730f14152ac8467f203c6e40cec663109dc9a6 100644
--- a/test/built-ins/Object/values/function-name.js
+++ b/test/built-ins/Object/values/function-name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values should have name property with value 'values'
 author: Jordan Harband
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Object/values/function-property-descriptor.js b/test/built-ins/Object/values/function-property-descriptor.js
index a421d40c57d003bff0616b1fbd5046ec7aa620fd..ae8f3f3a91a5950d091f04dbd616551ee07e0b71 100644
--- a/test/built-ins/Object/values/function-property-descriptor.js
+++ b/test/built-ins/Object/values/function-property-descriptor.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values should be writable, non-enumerable, and configurable
 author: Jordan Harband
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Object/values/getter-adding-key.js b/test/built-ins/Object/values/getter-adding-key.js
index 01a5a41615376c0f3de314109577ba48a4ab54cc..a2fc70242b6477add09774fca71d174177eb12e8 100644
--- a/test/built-ins/Object/values/getter-adding-key.js
+++ b/test/built-ins/Object/values/getter-adding-key.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values does not see a new element added by a getter that is hit during iteration
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/values/getter-making-future-key-nonenumerable.js b/test/built-ins/Object/values/getter-making-future-key-nonenumerable.js
index d7943655abc4a5717b53db431ca9852e547f3a27..d54ae30278dc9a0384daecc90875ae06971f959e 100644
--- a/test/built-ins/Object/values/getter-making-future-key-nonenumerable.js
+++ b/test/built-ins/Object/values/getter-making-future-key-nonenumerable.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values does not see an element made non-enumerable by a getter that is hit during iteration
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/values/getter-removing-future-key.js b/test/built-ins/Object/values/getter-removing-future-key.js
index 53b7d6b43ab11e5be75bd04e6eeb0581a56a2a16..6893bf8589e847e315e510a27c8189c359738ca6 100644
--- a/test/built-ins/Object/values/getter-removing-future-key.js
+++ b/test/built-ins/Object/values/getter-removing-future-key.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values does not see an element removed by a getter that is hit during iteration
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/values/inherited-properties-omitted.js b/test/built-ins/Object/values/inherited-properties-omitted.js
index a5ad2170450f66b59d4f0aaa77e315801c68ce3c..9559bc131f63813d519263138475de38034d9e9c 100644
--- a/test/built-ins/Object/values/inherited-properties-omitted.js
+++ b/test/built-ins/Object/values/inherited-properties-omitted.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values does not see inherited properties.
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/values/observable-operations.js b/test/built-ins/Object/values/observable-operations.js
index b3f0ab4581bdb07c998a789ea05523128acbef3c..d6068d714a63ccf6258301711216431df25ae057 100644
--- a/test/built-ins/Object/values/observable-operations.js
+++ b/test/built-ins/Object/values/observable-operations.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values should perform observable operations in the correct order
 author: Jordan Harband
 features: [Proxy]
diff --git a/test/built-ins/Object/values/primitive-booleans.js b/test/built-ins/Object/values/primitive-booleans.js
index b4d81f06832e54b1ac985ee34b2b40a53272bb82..46e32357aa2c928b076083c9d2cc639d28ca21e0 100644
--- a/test/built-ins/Object/values/primitive-booleans.js
+++ b/test/built-ins/Object/values/primitive-booleans.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values accepts boolean primitives.
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/values/primitive-numbers.js b/test/built-ins/Object/values/primitive-numbers.js
index 48a41cb162cee41f49a4d91ed35edf4c84aecd88..025c798abeb7975dd33303a6228d0c51923a3ddd 100644
--- a/test/built-ins/Object/values/primitive-numbers.js
+++ b/test/built-ins/Object/values/primitive-numbers.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values accepts number primitives.
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/values/primitive-strings.js b/test/built-ins/Object/values/primitive-strings.js
index 77cf35d01e98eca7d2cd1dc6668c1996b2affc00..848df3330f78caf72dd56f7fee7aa07dab6b2239 100644
--- a/test/built-ins/Object/values/primitive-strings.js
+++ b/test/built-ins/Object/values/primitive-strings.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values accepts string primitives.
 author: Jordan Harband
 ---*/
diff --git a/test/built-ins/Object/values/primitive-symbols.js b/test/built-ins/Object/values/primitive-symbols.js
index 2325eacaac0e5bbd5fd7986276e2d397a3f591d9..967fcd2025326ad99123f3ece54d2c894d00c6fe 100644
--- a/test/built-ins/Object/values/primitive-symbols.js
+++ b/test/built-ins/Object/values/primitive-symbols.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values accepts Symbol primitives.
 author: Jordan Harband
 features: [Symbol]
diff --git a/test/built-ins/Object/values/symbols-omitted.js b/test/built-ins/Object/values/symbols-omitted.js
index b8c8c655f0f8c1cbff24cbb775c6e9dc363c2292..080b183e9f90d18bf61426ee9dd71f5c49b8c9cd 100644
--- a/test/built-ins/Object/values/symbols-omitted.js
+++ b/test/built-ins/Object/values/symbols-omitted.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: Object.values does not include Symbol keys.
 author: Jordan Harband
 features: [Symbol]
diff --git a/test/built-ins/Object/values/tamper-with-global-object.js b/test/built-ins/Object/values/tamper-with-global-object.js
index a0c704eb2fa767b7e55987a0f286677eb3f5d98c..e0a038ff9fd4e63e3ca3abbbeb3ae1d217dcf7e1 100644
--- a/test/built-ins/Object/values/tamper-with-global-object.js
+++ b/test/built-ins/Object/values/tamper-with-global-object.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: >
     Object.values should not have its behavior impacted by modifications to the global property Object
 author: Jordan Harband
diff --git a/test/built-ins/Object/values/tamper-with-object-keys.js b/test/built-ins/Object/values/tamper-with-object-keys.js
index 9158fd11f80786b63397a9489f45f5ff6c118927..bdc955011178bef3fba3d3a3a0f46db80cbb8b55 100644
--- a/test/built-ins/Object/values/tamper-with-object-keys.js
+++ b/test/built-ins/Object/values/tamper-with-object-keys.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-object.values
+esid: sec-object.values
 description: >
     Object.values should not have its behavior impacted by modifications to Object.keys
 author: Jordan Harband
diff --git a/test/built-ins/Proxy/enumerate/removed-does-not-trigger.js b/test/built-ins/Proxy/enumerate/removed-does-not-trigger.js
index d4e32e402aef0ea9f077def8eb069351249cb762..c4cc879db8cba9ff6ca11dd95bfbc630c5874a47 100644
--- a/test/built-ins/Proxy/enumerate/removed-does-not-trigger.js
+++ b/test/built-ins/Proxy/enumerate/removed-does-not-trigger.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-proxy-object-internal-methods-and-internal-slots
+esid: sec-proxy-object-internal-methods-and-internal-slots
 description: >
   Enumerate trap was removed and it should not be triggered anymore.
 includes: [compareArray.js]
diff --git a/test/built-ins/Reflect/enumerate/undefined.js b/test/built-ins/Reflect/enumerate/undefined.js
index 3d51c2453d20ba8b0df0374d96eaac745866fbd3..e981cf70302eec237b18767f33490006d9ecfb26 100644
--- a/test/built-ins/Reflect/enumerate/undefined.js
+++ b/test/built-ins/Reflect/enumerate/undefined.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-reflect-object
+esid: sec-reflect-object
 description: >
   Reflect.enumerate was removed and it's not a function anymore
 ---*/
diff --git a/test/built-ins/RegExp/prototype/Symbol.split/last-index-exceeds-str-size.js b/test/built-ins/RegExp/prototype/Symbol.split/last-index-exceeds-str-size.js
index f8609d320557dedb722c4f2aebe5c200aa6518c6..748eefab81cfdcdccf45a82de77115da2d398ae9 100755
--- a/test/built-ins/RegExp/prototype/Symbol.split/last-index-exceeds-str-size.js
+++ b/test/built-ins/RegExp/prototype/Symbol.split/last-index-exceeds-str-size.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-regexp.prototype-@@split
+esid: sec-regexp.prototype-@@split
 description: The `lastIndex` property is clamped to the string size.
 info: >
   RegExp.prototype [ @@split ] ( string, limit )
diff --git a/test/built-ins/TypedArray/from/arylk-get-length-error.js b/test/built-ins/TypedArray/from/arylk-get-length-error.js
index f3b09d0c352dc5331ab1921364db3d54344f5664..68199c8b0f0fee365d904328c559de56258d4cf6 100644
--- a/test/built-ins/TypedArray/from/arylk-get-length-error.js
+++ b/test/built-ins/TypedArray/from/arylk-get-length-error.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Returns error produced by accessing array-like's length
 info: >
   22.2.2.1 %TypedArray%.from ( source [ , mapfn [ , thisArg ] ] )
diff --git a/test/built-ins/TypedArray/from/arylk-to-length-error.js b/test/built-ins/TypedArray/from/arylk-to-length-error.js
index 857a279a0670a0d4f41ca757f9078ae030b90207..69773affc6143d0a351c28557b7d189362c9c1ef 100644
--- a/test/built-ins/TypedArray/from/arylk-to-length-error.js
+++ b/test/built-ins/TypedArray/from/arylk-to-length-error.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Returns error produced by interpreting length property as a length
 info: >
   22.2.2.1 %TypedArray%.from ( source [ , mapfn [ , thisArg ] ] )
diff --git a/test/built-ins/TypedArray/from/invoked-as-func.js b/test/built-ins/TypedArray/from/invoked-as-func.js
index 2fc2000dd2ff2872e0006feb4a6082265f3730c2..99ae9a1700feed61ea3364b0523ffe09efa7e509 100644
--- a/test/built-ins/TypedArray/from/invoked-as-func.js
+++ b/test/built-ins/TypedArray/from/invoked-as-func.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   "from" cannot be invoked as a function
 info: >
diff --git a/test/built-ins/TypedArray/from/invoked-as-method.js b/test/built-ins/TypedArray/from/invoked-as-method.js
index ca880ec2596bbe7f75ef281524fe776698a87bc3..0a870e5774031da1e99b8180429501aac3df6f08 100644
--- a/test/built-ins/TypedArray/from/invoked-as-method.js
+++ b/test/built-ins/TypedArray/from/invoked-as-method.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   "from" cannot be invoked as a method of %TypedArray%
 info: >
diff --git a/test/built-ins/TypedArray/from/iter-access-error.js b/test/built-ins/TypedArray/from/iter-access-error.js
index 036be68b67409b4aa1b3ed3747c0babf5674847a..38621e6603fb4c9b6ce0381e2109375206686fe4 100644
--- a/test/built-ins/TypedArray/from/iter-access-error.js
+++ b/test/built-ins/TypedArray/from/iter-access-error.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Returns error produced by accessing @@iterator
 info: >
   22.2.2.1 %TypedArray%.from ( source [ , mapfn [ , thisArg ] ] )
diff --git a/test/built-ins/TypedArray/from/iter-invoke-error.js b/test/built-ins/TypedArray/from/iter-invoke-error.js
index 40f4088dc3ed7a190ff3f27dd69fa4ed53fdb5e2..0f19f161a58b5e51adc1d670fe59d1f42bf5fb5b 100644
--- a/test/built-ins/TypedArray/from/iter-invoke-error.js
+++ b/test/built-ins/TypedArray/from/iter-invoke-error.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Returns error produced by invoking @@iterator
 info: >
   22.2.2.1 %TypedArray%.from ( source [ , mapfn [ , thisArg ] ] )
diff --git a/test/built-ins/TypedArray/from/iter-next-error.js b/test/built-ins/TypedArray/from/iter-next-error.js
index 45ea827b7aebafd625810a36a0844735a9a25b77..f4ab9e4fb3d40b6789d0e45b86180429987a6b3d 100644
--- a/test/built-ins/TypedArray/from/iter-next-error.js
+++ b/test/built-ins/TypedArray/from/iter-next-error.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Returns error produced by advancing the iterator
 info: >
   22.2.2.1.1 Runtime Semantics: IterableToArrayLike( items )
diff --git a/test/built-ins/TypedArray/from/iter-next-value-error.js b/test/built-ins/TypedArray/from/iter-next-value-error.js
index 8d0a4d82151c43cb406c86050d0c28e1026b7241..0e3d4a6930dce69761e285d3ab06dc791a5eddb3 100644
--- a/test/built-ins/TypedArray/from/iter-next-value-error.js
+++ b/test/built-ins/TypedArray/from/iter-next-value-error.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Returns error produced by accessing iterated value
 info: >
   22.2.2.1.1 Runtime Semantics: IterableToArrayLike( items )
diff --git a/test/built-ins/TypedArray/from/length.js b/test/built-ins/TypedArray/from/length.js
index a6c95808f5fa3a16ca171c683310b9e2306bfd73..55bb5fa379af06dc1235725d290fe517f5d857da 100755
--- a/test/built-ins/TypedArray/from/length.js
+++ b/test/built-ins/TypedArray/from/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   %TypedArray%.from.length is 1.
 info: >
diff --git a/test/built-ins/TypedArray/from/mapfn-is-not-callable.js b/test/built-ins/TypedArray/from/mapfn-is-not-callable.js
index 4e410b730320f2559935cc4f296a7ed8b1bbb653..6fec5938220b0e0ea1844a525441a3c5c67d80b3 100644
--- a/test/built-ins/TypedArray/from/mapfn-is-not-callable.js
+++ b/test/built-ins/TypedArray/from/mapfn-is-not-callable.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Throw a TypeError exception is mapfn is not callable
 info: >
   22.2.2.1 %TypedArray%.from ( source [ , mapfn [ , thisArg ] ] )
diff --git a/test/built-ins/TypedArray/from/this-is-not-constructor.js b/test/built-ins/TypedArray/from/this-is-not-constructor.js
index 2a60584734b5f2a414dd55d2de32cbfc46ccc781..5928ed046c65181ca736c9928530c4c82886fd97 100644
--- a/test/built-ins/TypedArray/from/this-is-not-constructor.js
+++ b/test/built-ins/TypedArray/from/this-is-not-constructor.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Throws a TypeError exception if this is not a constructor
 info: >
diff --git a/test/built-ins/TypedArray/invoked.js b/test/built-ins/TypedArray/invoked.js
index 2f26eaaba1782d34a01689600ccc21e127537542..c87e2d92541ef769275d0f090e658d33f23d142c 100644
--- a/test/built-ins/TypedArray/invoked.js
+++ b/test/built-ins/TypedArray/invoked.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: pending
+esid: pending
 description: Throw a TypeError exception if directly invoked.
 info: >
   22.2.1.1 %TypedArray% ( )
diff --git a/test/built-ins/TypedArray/length.js b/test/built-ins/TypedArray/length.js
index c010cf984208c4c2e9b1082f4c7bd92f93b21d78..6a354af853fb5582c8b1f603b75350a571e10315 100644
--- a/test/built-ins/TypedArray/length.js
+++ b/test/built-ins/TypedArray/length.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: pending
+esid: pending
 description: >
   TypedArray has a "length" property whose value is 0.
 info: >
diff --git a/test/built-ins/TypedArray/of/invoked-as-method.js b/test/built-ins/TypedArray/of/invoked-as-method.js
index 71ad8c195f68ee4cc7f17cd326d0f599c840eade..46aa68b2e3cbec8fdec23ca1e5c55836796e1b52 100644
--- a/test/built-ins/TypedArray/of/invoked-as-method.js
+++ b/test/built-ins/TypedArray/of/invoked-as-method.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-%typedarray%.of
+esid: sec-%typedarray%.of
 description: >
   "of" cannot be invoked as a method of %TypedArray%
 info: >
diff --git a/test/built-ins/TypedArray/of/length.js b/test/built-ins/TypedArray/of/length.js
index ffe86c0c68d98e58630dc301bd48d001bb7e5425..c32c030dc78c858234116bfc03d00111a13fcb8a 100755
--- a/test/built-ins/TypedArray/of/length.js
+++ b/test/built-ins/TypedArray/of/length.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-%typedarray%-of
+esid: sec-%typedarray%-of
 description: >
   %TypedArray%.of.length is 0.
 info: >
diff --git a/test/built-ins/TypedArray/of/this-is-not-constructor.js b/test/built-ins/TypedArray/of/this-is-not-constructor.js
index 262469ef924d8154c8241b7db06cd4e620d00f66..604af80e7a50570ad6b2891f887a2a808391318e 100644
--- a/test/built-ins/TypedArray/of/this-is-not-constructor.js
+++ b/test/built-ins/TypedArray/of/this-is-not-constructor.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-%typedarray%.of
+esid: sec-%typedarray%.of
 description: >
   Throws a TypeError exception if this is not a constructor
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-bufferbyteoffset-throws-from-modulo-element-size.js b/test/built-ins/TypedArrays/buffer-arg-bufferbyteoffset-throws-from-modulo-element-size.js
index 5bf697b6ef4b0eb14aeee94c5f10a6c2eaee438c..f51ffaf19aa0c4a4b8676e415f2c09560a27edf1 100644
--- a/test/built-ins/TypedArrays/buffer-arg-bufferbyteoffset-throws-from-modulo-element-size.js
+++ b/test/built-ins/TypedArrays/buffer-arg-bufferbyteoffset-throws-from-modulo-element-size.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Throws a RangeError if bufferByteLength modulo elementSize ≠ 0
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-byteoffset-is-negative-throws.js b/test/built-ins/TypedArrays/buffer-arg-byteoffset-is-negative-throws.js
index a566ad061239f59aca5180ca41e07948e86caf6f..36b3104147f5269b49c3c7b1703a81d8c635f55b 100644
--- a/test/built-ins/TypedArrays/buffer-arg-byteoffset-is-negative-throws.js
+++ b/test/built-ins/TypedArrays/buffer-arg-byteoffset-is-negative-throws.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Throws a RangeError if ToInteger(byteOffset) is < 0
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-byteoffset-is-negative-zero.js b/test/built-ins/TypedArrays/buffer-arg-byteoffset-is-negative-zero.js
index cb39c5c95e19794c28dd4585ec14ef2f9c731cf1..3694f65a2928dc700febc7df90fd9dcfb292e18a 100755
--- a/test/built-ins/TypedArrays/buffer-arg-byteoffset-is-negative-zero.js
+++ b/test/built-ins/TypedArrays/buffer-arg-byteoffset-is-negative-zero.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: pending
+esid: pending
 description: >
   TypedArray's [[ByteOffset]] internal slot is always a positive number, test with negative zero.
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-byteoffset-is-symbol-throws.js b/test/built-ins/TypedArrays/buffer-arg-byteoffset-is-symbol-throws.js
index 0b11674b607c8585d5da6672f8cdc1782ca9e287..6a0c49899c7b020a34120e672fc51490981933c8 100644
--- a/test/built-ins/TypedArrays/buffer-arg-byteoffset-is-symbol-throws.js
+++ b/test/built-ins/TypedArrays/buffer-arg-byteoffset-is-symbol-throws.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Return abrupt from parsing integer value from byteOffset as a symbol
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-byteoffset-throws-from-modulo-element-size.js b/test/built-ins/TypedArrays/buffer-arg-byteoffset-throws-from-modulo-element-size.js
index 0f0819e0cef17cae31b6423d8aef4b09dd73d59b..b6a0fae8c975febd3c8aa5fa4a8eda0d9b2a9421 100644
--- a/test/built-ins/TypedArrays/buffer-arg-byteoffset-throws-from-modulo-element-size.js
+++ b/test/built-ins/TypedArrays/buffer-arg-byteoffset-throws-from-modulo-element-size.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Throws a RangeError if ToInteger(byteOffset) modulo elementSize is not 0
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-byteoffset-to-number-throws.js b/test/built-ins/TypedArrays/buffer-arg-byteoffset-to-number-throws.js
index f04bdce84c2f2a4d24f6dc70ffc5dc7bf2f85ab5..8bcfcecef9b05dc0dbaa10b1398fe58344c31e61 100644
--- a/test/built-ins/TypedArrays/buffer-arg-byteoffset-to-number-throws.js
+++ b/test/built-ins/TypedArrays/buffer-arg-byteoffset-to-number-throws.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Return abrupt from parsing integer value from byteOffset
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-custom-proto-access-throws.js b/test/built-ins/TypedArrays/buffer-arg-custom-proto-access-throws.js
index e4864356d1d30eba8ebaa4aed3aab3e2c8b9a311..de1bc65a37a76ed1ff91f8b2d273f9fc7cb6c316 100644
--- a/test/built-ins/TypedArrays/buffer-arg-custom-proto-access-throws.js
+++ b/test/built-ins/TypedArrays/buffer-arg-custom-proto-access-throws.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Return abrupt completion getting newTarget's prototype
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-defined-length-and-offset.js b/test/built-ins/TypedArrays/buffer-arg-defined-length-and-offset.js
index 0b8f5ff0cded67370866d83bfbd40dc0e63b7b66..60d60699e9569497b7e8b763091dabf8214a66dc 100644
--- a/test/built-ins/TypedArrays/buffer-arg-defined-length-and-offset.js
+++ b/test/built-ins/TypedArrays/buffer-arg-defined-length-and-offset.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Return new typedArray from defined length and offset
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-defined-length.js b/test/built-ins/TypedArrays/buffer-arg-defined-length.js
index f30447bec79889d2b7aad0ee9d22a5d43cba0815..af018652f4ac4b57f3477347049cb84f7cae0016 100644
--- a/test/built-ins/TypedArrays/buffer-arg-defined-length.js
+++ b/test/built-ins/TypedArrays/buffer-arg-defined-length.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Return new typedArray from defined length
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-defined-negative-length.js b/test/built-ins/TypedArrays/buffer-arg-defined-negative-length.js
index c1cfec4afc527ec097c05d259a1b07543341458e..9e70c220f3dd6b26be2ccb2b0d4ee75c62bc6cc9 100644
--- a/test/built-ins/TypedArrays/buffer-arg-defined-negative-length.js
+++ b/test/built-ins/TypedArrays/buffer-arg-defined-negative-length.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Return new typedArray from negative defined length
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-defined-offset.js b/test/built-ins/TypedArrays/buffer-arg-defined-offset.js
index 82d28924bd12518827ed446f3ea7f148949560f1..aa363bd1ef0705a0833d2c0f8b19adadd76b1575 100644
--- a/test/built-ins/TypedArrays/buffer-arg-defined-offset.js
+++ b/test/built-ins/TypedArrays/buffer-arg-defined-offset.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Return new typedArray from defined offset
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-excessive-length-throws.js b/test/built-ins/TypedArrays/buffer-arg-excessive-length-throws.js
index 7313edf2b1299b65f6c8aba15b7134bbd2d38e91..2babb3f69886b73f7d1c7c3a5e0a9f5d62be3531 100644
--- a/test/built-ins/TypedArrays/buffer-arg-excessive-length-throws.js
+++ b/test/built-ins/TypedArrays/buffer-arg-excessive-length-throws.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   If offset + newByteLength > bufferByteLength, throw a RangeError exception.
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-excessive-offset-throws.js b/test/built-ins/TypedArrays/buffer-arg-excessive-offset-throws.js
index 26c12c27eff260e738776c5b9fe5ffba17600206..6e98b23ff9d8248009e222875c32da18b78da54c 100644
--- a/test/built-ins/TypedArrays/buffer-arg-excessive-offset-throws.js
+++ b/test/built-ins/TypedArrays/buffer-arg-excessive-offset-throws.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Throws a RangeError if bufferByteLength - ToInteger(byteOffset) < 0
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-invoked-with-undefined-newtarget.js b/test/built-ins/TypedArrays/buffer-arg-invoked-with-undefined-newtarget.js
index 33bd136ace93cb5ae2e39ff9354ee44786ced904..1eaf6be2d0551c0786ac4237bbc4942f55fc7b6d 100644
--- a/test/built-ins/TypedArrays/buffer-arg-invoked-with-undefined-newtarget.js
+++ b/test/built-ins/TypedArrays/buffer-arg-invoked-with-undefined-newtarget.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Throws a TypeError if NewTarget is undefined.
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-is-referenced.js b/test/built-ins/TypedArrays/buffer-arg-is-referenced.js
index d9fbc5ead51927957772cd69a50a6f9e46d173e3..046c541ec7233250632ca0d985aa6d3c8cac796e 100644
--- a/test/built-ins/TypedArrays/buffer-arg-is-referenced.js
+++ b/test/built-ins/TypedArrays/buffer-arg-is-referenced.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Reuse buffer argument instead of making a new clone
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-length-access-throws.js b/test/built-ins/TypedArrays/buffer-arg-length-access-throws.js
index 76a5a160b578ce62b8150515a3afc18ef3aaf06b..843a5cd173a39dcfdad7f1a12a26c9d01be6a413 100644
--- a/test/built-ins/TypedArrays/buffer-arg-length-access-throws.js
+++ b/test/built-ins/TypedArrays/buffer-arg-length-access-throws.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Returns abrupt from ToLength(length)
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-length-is-symbol-throws.js b/test/built-ins/TypedArrays/buffer-arg-length-is-symbol-throws.js
index 8b08b8b5ce868029c3a5357bf0831337c30f3453..c0e15301d25c901ec714d37d5e405c5ce9f1c9e3 100644
--- a/test/built-ins/TypedArrays/buffer-arg-length-is-symbol-throws.js
+++ b/test/built-ins/TypedArrays/buffer-arg-length-is-symbol-throws.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Throws a TypeError if length is a Symbol
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-returns-new-instance.js b/test/built-ins/TypedArrays/buffer-arg-returns-new-instance.js
index 2fcbf0a6fae0bd7d985f54af9909d469a07ce333..4e274f5362b32c04b305c6dacd651b3155d4cc31 100644
--- a/test/built-ins/TypedArrays/buffer-arg-returns-new-instance.js
+++ b/test/built-ins/TypedArrays/buffer-arg-returns-new-instance.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Return new typedArray from undefined offset and length
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-use-custom-proto-if-object.js b/test/built-ins/TypedArrays/buffer-arg-use-custom-proto-if-object.js
index 2dc855cd9ca1c209f032513f29550072237586aa..33f91e8559f1d343f43ddc2213cc5a5ffdb875ab 100644
--- a/test/built-ins/TypedArrays/buffer-arg-use-custom-proto-if-object.js
+++ b/test/built-ins/TypedArrays/buffer-arg-use-custom-proto-if-object.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Use prototype from new target if it's an Object
 info: >
diff --git a/test/built-ins/TypedArrays/buffer-arg-use-default-proto-if-custom-proto-is-not-object.js b/test/built-ins/TypedArrays/buffer-arg-use-default-proto-if-custom-proto-is-not-object.js
index ea90fbd350a96554f1435af2fcdaecfa5d7117b2..463d395b550b2a29e3c1f438e928a9c5a3ef2b1e 100644
--- a/test/built-ins/TypedArrays/buffer-arg-use-default-proto-if-custom-proto-is-not-object.js
+++ b/test/built-ins/TypedArrays/buffer-arg-use-default-proto-if-custom-proto-is-not-object.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-typedarray-buffer-byteoffset-length
+esid: sec-typedarray-buffer-byteoffset-length
 description: >
   Use prototype from %TypedArray% if newTarget's prototype is not an Object
 info: >
diff --git a/test/built-ins/TypedArrays/from/arylk-get-length-error.js b/test/built-ins/TypedArrays/from/arylk-get-length-error.js
index 3f330ca8e0ed97ff9891f4459a424dc15169deea..5cf6e7b33b3179b67853963e6f4c9c1c039ce121 100644
--- a/test/built-ins/TypedArrays/from/arylk-get-length-error.js
+++ b/test/built-ins/TypedArrays/from/arylk-get-length-error.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Returns error produced by accessing array-like's length
 info: >
   22.2.2.1 %TypedArray%.from ( source [ , mapfn [ , thisArg ] ] )
diff --git a/test/built-ins/TypedArrays/from/arylk-to-length-error.js b/test/built-ins/TypedArrays/from/arylk-to-length-error.js
index f9b9fc9d63ddd025cd8cc7b87da25e8578d7457d..73a404f3d2c8614d615d967fcf6d7e832e737cb2 100644
--- a/test/built-ins/TypedArrays/from/arylk-to-length-error.js
+++ b/test/built-ins/TypedArrays/from/arylk-to-length-error.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Returns error produced by interpreting length property as a length
 info: >
   22.2.2.1 %TypedArray%.from ( source [ , mapfn [ , thisArg ] ] )
diff --git a/test/built-ins/TypedArrays/from/custom-ctor-does-not-instantiate-ta-throws.js b/test/built-ins/TypedArrays/from/custom-ctor-does-not-instantiate-ta-throws.js
index 8eecdf78d243200c72b6b4d5491e6f2fd9f9137e..16e40b7391fe19627aa9236751745f4e4a1238d8 100644
--- a/test/built-ins/TypedArrays/from/custom-ctor-does-not-instantiate-ta-throws.js
+++ b/test/built-ins/TypedArrays/from/custom-ctor-does-not-instantiate-ta-throws.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Custom constructor needs to instantiate a TypedArray
 info: >
diff --git a/test/built-ins/TypedArrays/from/custom-ctor.js b/test/built-ins/TypedArrays/from/custom-ctor.js
index 339e1e83c61328c0ac326520d096d02546f0f97b..ce9081475c28b46f9b849f7d745999b499aaa8ea 100644
--- a/test/built-ins/TypedArrays/from/custom-ctor.js
+++ b/test/built-ins/TypedArrays/from/custom-ctor.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Calls and return abrupt completion from custom constructor
 info: >
diff --git a/test/built-ins/TypedArrays/from/inherited.js b/test/built-ins/TypedArrays/from/inherited.js
index 325dbd6e4f10340511cfe42786c750ac22b22d9c..879ebabf1edbeec34866cea9030b1cdf704abb41 100644
--- a/test/built-ins/TypedArrays/from/inherited.js
+++ b/test/built-ins/TypedArrays/from/inherited.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   `from` is %TypedArray%.from
 info: >
diff --git a/test/built-ins/TypedArrays/from/invoked-as-func.js b/test/built-ins/TypedArrays/from/invoked-as-func.js
index cd66378e2d8abd3514ba0a806f1738f107548691..291fe50e00d167cef5678f567fd90f1189f83432 100644
--- a/test/built-ins/TypedArrays/from/invoked-as-func.js
+++ b/test/built-ins/TypedArrays/from/invoked-as-func.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   "from" cannot be invoked as a function
 info: >
diff --git a/test/built-ins/TypedArrays/from/iter-access-error.js b/test/built-ins/TypedArrays/from/iter-access-error.js
index edf3c3dacd9afee89b64609ccc5e1bf4084bebc7..6affe9fb20658a1cc31a96e1c3484e9956af75f5 100644
--- a/test/built-ins/TypedArrays/from/iter-access-error.js
+++ b/test/built-ins/TypedArrays/from/iter-access-error.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Returns error produced by accessing @@iterator
 info: >
   22.2.2.1 %TypedArray%.from ( source [ , mapfn [ , thisArg ] ] )
diff --git a/test/built-ins/TypedArrays/from/iter-invoke-error.js b/test/built-ins/TypedArrays/from/iter-invoke-error.js
index a4255fce097d47ddeb92665b6d08a508069ee7a0..daaed4ec41c419006c600e6d3e690d5d65f79e41 100644
--- a/test/built-ins/TypedArrays/from/iter-invoke-error.js
+++ b/test/built-ins/TypedArrays/from/iter-invoke-error.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Returns error produced by invoking @@iterator
 info: >
   22.2.2.1 %TypedArray%.from ( source [ , mapfn [ , thisArg ] ] )
diff --git a/test/built-ins/TypedArrays/from/iter-next-error.js b/test/built-ins/TypedArrays/from/iter-next-error.js
index 7b472262958f07f512d9a41d9f287d2aca72cad4..e56139386a072cf674e7b4287c891ae8183e8ec3 100644
--- a/test/built-ins/TypedArrays/from/iter-next-error.js
+++ b/test/built-ins/TypedArrays/from/iter-next-error.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Returns error produced by advancing the iterator
 info: >
   22.2.2.1.1 Runtime Semantics: IterableToArrayLike( items )
diff --git a/test/built-ins/TypedArrays/from/iter-next-value-error.js b/test/built-ins/TypedArrays/from/iter-next-value-error.js
index 37e4a665660859ac4e54e6f01d18dbfdd86e0c49..ba7a9e3f1bca693e9598743da3ab28bea3b7423d 100644
--- a/test/built-ins/TypedArrays/from/iter-next-value-error.js
+++ b/test/built-ins/TypedArrays/from/iter-next-value-error.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Returns error produced by accessing iterated value
 info: >
   22.2.2.1.1 Runtime Semantics: IterableToArrayLike( items )
diff --git a/test/built-ins/TypedArrays/from/mapfn-abrupt-completion.js b/test/built-ins/TypedArrays/from/mapfn-abrupt-completion.js
index 5c13d4a65348ddb1cd31a30b258b589e76d98d18..98c45feb4afb01a2053a9c0e48f0a50e6acd6f82 100644
--- a/test/built-ins/TypedArrays/from/mapfn-abrupt-completion.js
+++ b/test/built-ins/TypedArrays/from/mapfn-abrupt-completion.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Return abrupt from mapfn
 info: >
diff --git a/test/built-ins/TypedArrays/from/mapfn-arguments.js b/test/built-ins/TypedArrays/from/mapfn-arguments.js
index f244bce15f310afa0c93449e6910119093a8fb57..fefa9863549b30fc1da23ddfacc75c0bfa6c67bf 100644
--- a/test/built-ins/TypedArrays/from/mapfn-arguments.js
+++ b/test/built-ins/TypedArrays/from/mapfn-arguments.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Assert mapfn arguments
 info: >
diff --git a/test/built-ins/TypedArrays/from/mapfn-is-not-callable.js b/test/built-ins/TypedArrays/from/mapfn-is-not-callable.js
index 7f0493650d5751f3f37dc1ce14387512ad44cace..3816ec3d05e86007e953edb6eee3bddb0ad7cf3c 100644
--- a/test/built-ins/TypedArrays/from/mapfn-is-not-callable.js
+++ b/test/built-ins/TypedArrays/from/mapfn-is-not-callable.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: Throw a TypeError exception is mapfn is not callable
 info: >
   22.2.2.1 %TypedArray%.from ( source [ , mapfn [ , thisArg ] ] )
diff --git a/test/built-ins/TypedArrays/from/mapfn-this-with-thisarg.js b/test/built-ins/TypedArrays/from/mapfn-this-with-thisarg.js
index 67071d7d7328f3eb93e52e6032fd0db07dcc729d..0e169de8ef1d9a52b68ea3b0de128545ea68774e 100644
--- a/test/built-ins/TypedArrays/from/mapfn-this-with-thisarg.js
+++ b/test/built-ins/TypedArrays/from/mapfn-this-with-thisarg.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Assert mapfn `this` with thisArg
 info: >
diff --git a/test/built-ins/TypedArrays/from/mapfn-this-without-thisarg-non-strict.js b/test/built-ins/TypedArrays/from/mapfn-this-without-thisarg-non-strict.js
index 325505a81988cb57a3f1e575a94732a016536f1b..e5d4d5ac1c0cff187972e2bd0aaaed5446c47f3c 100644
--- a/test/built-ins/TypedArrays/from/mapfn-this-without-thisarg-non-strict.js
+++ b/test/built-ins/TypedArrays/from/mapfn-this-without-thisarg-non-strict.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Assert mapfn `this` without thisArg
 info: >
diff --git a/test/built-ins/TypedArrays/from/mapfn-this-without-thisarg-strict.js b/test/built-ins/TypedArrays/from/mapfn-this-without-thisarg-strict.js
index cdf0f784348f9b686d361635398b2bf4a8fab7ea..26c8018601ef48ff983d53cc305e7d4f0aa7313b 100644
--- a/test/built-ins/TypedArrays/from/mapfn-this-without-thisarg-strict.js
+++ b/test/built-ins/TypedArrays/from/mapfn-this-without-thisarg-strict.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Assert mapfn `this` without thisArg
 info: >
diff --git a/test/built-ins/TypedArrays/from/nan-conversion.js b/test/built-ins/TypedArrays/from/nan-conversion.js
index fb43f2516ec377617f0558d1436e4e1dee1a4c06..658ed6c427d9a6c620bfe2d4bf444fdb1479687b 100644
--- a/test/built-ins/TypedArrays/from/nan-conversion.js
+++ b/test/built-ins/TypedArrays/from/nan-conversion.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Test NaN conversions
 info: >
diff --git a/test/built-ins/TypedArrays/from/new-instance-empty.js b/test/built-ins/TypedArrays/from/new-instance-empty.js
index d33f7afce7092e826ac5ff9c9bc6e6071998004f..9d6ba8d62e630af5a70b2521fd744ac489b29abb 100644
--- a/test/built-ins/TypedArrays/from/new-instance-empty.js
+++ b/test/built-ins/TypedArrays/from/new-instance-empty.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Return a new empty TypedArray
 includes: [testTypedArray.js]
diff --git a/test/built-ins/TypedArrays/from/new-instance-from-ordinary-object.js b/test/built-ins/TypedArrays/from/new-instance-from-ordinary-object.js
index 57df0d74167fcef4b60b047faeac545afd5c160a..f3551729a23691e69abd8101e001b92ae30cf729 100644
--- a/test/built-ins/TypedArrays/from/new-instance-from-ordinary-object.js
+++ b/test/built-ins/TypedArrays/from/new-instance-from-ordinary-object.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Return a new TypedArray from an ordinary object
 includes: [testTypedArray.js]
diff --git a/test/built-ins/TypedArrays/from/new-instance-from-sparse-array.js b/test/built-ins/TypedArrays/from/new-instance-from-sparse-array.js
index 7bfb3f6041ca60b782e00fdeebc14e21e104c6eb..3fd0e4289b7a39aff5b3d1fd0f98299db49c60e8 100644
--- a/test/built-ins/TypedArrays/from/new-instance-from-sparse-array.js
+++ b/test/built-ins/TypedArrays/from/new-instance-from-sparse-array.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Return a new TypedArray from a sparse array
 includes: [testTypedArray.js]
diff --git a/test/built-ins/TypedArrays/from/new-instance-from-zero.js b/test/built-ins/TypedArrays/from/new-instance-from-zero.js
index 8ee2f23dc0b2db7d91360dcd5b2f342d6798038b..2d34338399203e888f09544d87c94661c10bdc4e 100644
--- a/test/built-ins/TypedArrays/from/new-instance-from-zero.js
+++ b/test/built-ins/TypedArrays/from/new-instance-from-zero.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Return a new TypedArray using -0 and +0
 includes: [testTypedArray.js]
diff --git a/test/built-ins/TypedArrays/from/new-instance-using-custom-ctor.js b/test/built-ins/TypedArrays/from/new-instance-using-custom-ctor.js
index d2f3830849139466c43568da87931f76b1ba0c00..c4df9f2fb32fc8a53d75f6c88554092a186ef4ef 100644
--- a/test/built-ins/TypedArrays/from/new-instance-using-custom-ctor.js
+++ b/test/built-ins/TypedArrays/from/new-instance-using-custom-ctor.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Return a new TypedArray using a custom Constructor
 includes: [testTypedArray.js]
diff --git a/test/built-ins/TypedArrays/from/new-instance-with-mapfn.js b/test/built-ins/TypedArrays/from/new-instance-with-mapfn.js
index 8836d02be89b81350b5e450d9064a718300e26ef..6cd785477666e09ee17561598e2562103fc8d0b8 100644
--- a/test/built-ins/TypedArrays/from/new-instance-with-mapfn.js
+++ b/test/built-ins/TypedArrays/from/new-instance-with-mapfn.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Return a new TypedArray using mapfn
 includes: [testTypedArray.js]
diff --git a/test/built-ins/TypedArrays/from/new-instance-without-mapfn.js b/test/built-ins/TypedArrays/from/new-instance-without-mapfn.js
index e49df07fe5a89518ab3e6f727f9b701f893a0a57..e43864aa318d7da2460c2901b3c17b4db0ba60a3 100644
--- a/test/built-ins/TypedArrays/from/new-instance-without-mapfn.js
+++ b/test/built-ins/TypedArrays/from/new-instance-without-mapfn.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Return a new TypedArray
 includes: [testTypedArray.js]
diff --git a/test/built-ins/TypedArrays/from/property-abrupt-completion.js b/test/built-ins/TypedArrays/from/property-abrupt-completion.js
index 5e98feb230a8dc81423d643bf3ab92f468c57106..c50d9c1327f77b98ff7167eef2e05fa48987a301 100644
--- a/test/built-ins/TypedArrays/from/property-abrupt-completion.js
+++ b/test/built-ins/TypedArrays/from/property-abrupt-completion.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Return abrupt from source property
 info: >
diff --git a/test/built-ins/TypedArrays/from/set-value-abrupt-completion.js b/test/built-ins/TypedArrays/from/set-value-abrupt-completion.js
index 2ae0ecb1013a8a585c8e75958a99b5d55463f43e..af9a3ecc05ef82042da4deddf12d722ea9b0d27c 100644
--- a/test/built-ins/TypedArrays/from/set-value-abrupt-completion.js
+++ b/test/built-ins/TypedArrays/from/set-value-abrupt-completion.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Return abrupt from setting a value on the new typedarray
 info: >
diff --git a/test/built-ins/TypedArrays/from/source-value-is-symbol-throws.js b/test/built-ins/TypedArrays/from/source-value-is-symbol-throws.js
index d863e31d261d0d151966f7f111711d8c5d0752b5..53212679ed6eff0b4b1907a6168f2aa19c2cc08c 100644
--- a/test/built-ins/TypedArrays/from/source-value-is-symbol-throws.js
+++ b/test/built-ins/TypedArrays/from/source-value-is-symbol-throws.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Throws a TypeError if argument is a Symbol
 info: >
diff --git a/test/built-ins/TypedArrays/from/this-is-not-constructor.js b/test/built-ins/TypedArrays/from/this-is-not-constructor.js
index 1136fb3b763f808d188629e48653cfb2243224df..9cbe2670f56d35adf741447863d695741ea7556d 100644
--- a/test/built-ins/TypedArrays/from/this-is-not-constructor.js
+++ b/test/built-ins/TypedArrays/from/this-is-not-constructor.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-%typedarray%.from
+esid: sec-%typedarray%.from
 description: >
   Throws a TypeError exception if this is not a constructor
 info: >
diff --git a/test/built-ins/TypedArrays/length-arg-custom-proto-access-throws.js b/test/built-ins/TypedArrays/length-arg-custom-proto-access-throws.js
index 3c34d9f1b490d3a35286c7a11a2b670791907b7b..9996262651cc805b12ef392e6bb38ebe5587ec12 100644
--- a/test/built-ins/TypedArrays/length-arg-custom-proto-access-throws.js
+++ b/test/built-ins/TypedArrays/length-arg-custom-proto-access-throws.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-typedarray-length
+esid: sec-typedarray-length
 description: >
   Return abrupt completion getting newTarget's prototype
 info: >
diff --git a/test/built-ins/TypedArrays/length-arg-is-float-throws-rangeerror.js b/test/built-ins/TypedArrays/length-arg-is-float-throws-rangeerror.js
index 689dac6af0566c51d25bd056e390e5f3ccd3adcd..22eb44956f2d11e3d10ed536698341bc964fc349 100644
--- a/test/built-ins/TypedArrays/length-arg-is-float-throws-rangeerror.js
+++ b/test/built-ins/TypedArrays/length-arg-is-float-throws-rangeerror.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-typedarray-length
+esid: sec-typedarray-length
 description: >
   Throws a RangeError if length is a float number
 info: >
diff --git a/test/built-ins/TypedArrays/length-arg-is-infinity-throws-rangeerror.js b/test/built-ins/TypedArrays/length-arg-is-infinity-throws-rangeerror.js
index 523a03616de163a652bc978a1b63c6b94157060c..aeb96dc94a09a90214f6c31656c8bac025601ef7 100644
--- a/test/built-ins/TypedArrays/length-arg-is-infinity-throws-rangeerror.js
+++ b/test/built-ins/TypedArrays/length-arg-is-infinity-throws-rangeerror.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-typedarray-length
+esid: sec-typedarray-length
 description: >
   Throws a RangeError if length is a Infinity value
 info: >
diff --git a/test/built-ins/TypedArrays/length-arg-is-nan-throws-rangeerror.js b/test/built-ins/TypedArrays/length-arg-is-nan-throws-rangeerror.js
index 8d71bb0167e5b8d4b5f14f6a8fc8f12f3dcb34ca..67e6e9cc8374211a4daf31c94449eb9366c60719 100644
--- a/test/built-ins/TypedArrays/length-arg-is-nan-throws-rangeerror.js
+++ b/test/built-ins/TypedArrays/length-arg-is-nan-throws-rangeerror.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-typedarray-length
+esid: sec-typedarray-length
 description: >
   Throws a RangeError if length is NaN
 info: >
diff --git a/test/built-ins/TypedArrays/length-arg-is-negative-number-throws-rangeerror.js b/test/built-ins/TypedArrays/length-arg-is-negative-number-throws-rangeerror.js
index 0e3cc803fa4faae0cdf7844734f7c3699ecaa5fa..13929cf65daabd436c3a12efdfca86be83b72db5 100644
--- a/test/built-ins/TypedArrays/length-arg-is-negative-number-throws-rangeerror.js
+++ b/test/built-ins/TypedArrays/length-arg-is-negative-number-throws-rangeerror.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-typedarray-length
+esid: sec-typedarray-length
 description: >
   Throws a RangeError if length is a negative value
 info: >
diff --git a/test/built-ins/TypedArrays/length-arg-is-not-valid-buffer-size-throws-rangeerror.js b/test/built-ins/TypedArrays/length-arg-is-not-valid-buffer-size-throws-rangeerror.js
index 0ec0daa8f1fc681ae84e9235b3d13712709be051..fb56100684971352adeb2b26729ec7c394940f9b 100644
--- a/test/built-ins/TypedArrays/length-arg-is-not-valid-buffer-size-throws-rangeerror.js
+++ b/test/built-ins/TypedArrays/length-arg-is-not-valid-buffer-size-throws-rangeerror.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-typedarray-length
+esid: sec-typedarray-length
 description: >
   Throws a RangeError when length argument is not a valid buffer size
 info: >
diff --git a/test/built-ins/TypedArrays/length-arg-is-symbol-throws.js b/test/built-ins/TypedArrays/length-arg-is-symbol-throws.js
index 8aba0022384e9b6644ef294a49359702c2c69ad7..72f0972ec315dab33bdd3f058cd0969d482ecf37 100644
--- a/test/built-ins/TypedArrays/length-arg-is-symbol-throws.js
+++ b/test/built-ins/TypedArrays/length-arg-is-symbol-throws.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-typedarray-length
+esid: sec-typedarray-length
 description: >
   If length is a Symbol, throw a TypeError exception.
 info: >
diff --git a/test/built-ins/TypedArrays/length-arg-is-undefined-throws.js b/test/built-ins/TypedArrays/length-arg-is-undefined-throws.js
index dff4229e3cf6cb7d02a1157fa173c3b1f65cb78d..7ec83c73b2f0a156f8fe787599ba466200628a82 100644
--- a/test/built-ins/TypedArrays/length-arg-is-undefined-throws.js
+++ b/test/built-ins/TypedArrays/length-arg-is-undefined-throws.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-typedarray-length
+esid: sec-typedarray-length
 description: >
   If length is undefined, throw a TypeError exception.
 info: >
diff --git a/test/built-ins/TypedArrays/length-arg-minus-signal-zero.js b/test/built-ins/TypedArrays/length-arg-minus-signal-zero.js
index 56e685150fc86f56fe4ef55973dd6aed5e38d3c4..63b5bed7d6f097749b5638c23174857f5ac43064 100644
--- a/test/built-ins/TypedArrays/length-arg-minus-signal-zero.js
+++ b/test/built-ins/TypedArrays/length-arg-minus-signal-zero.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-typedarray-length
+esid: sec-typedarray-length
 description: >
   Does not throw when length is -0
 info: >
diff --git a/test/built-ins/TypedArrays/length-arg-returns-object.js b/test/built-ins/TypedArrays/length-arg-returns-object.js
index 0b12fc0c72af6cd8bc67c7e6b926df2dde1fc50d..2c5cdc772bc9325aaa6170d11ee3a73338d658bf 100644
--- a/test/built-ins/TypedArrays/length-arg-returns-object.js
+++ b/test/built-ins/TypedArrays/length-arg-returns-object.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-typedarray-length
+esid: sec-typedarray-length
 description: >
   Return a TypedArray object
 info: >
diff --git a/test/built-ins/TypedArrays/length-arg-undefined-newtarget-throws.js b/test/built-ins/TypedArrays/length-arg-undefined-newtarget-throws.js
index 7ff0af50271fa625a464e829ae22ff2a5e236f60..6308500747d689b0115e69314bae87d216723d8f 100644
--- a/test/built-ins/TypedArrays/length-arg-undefined-newtarget-throws.js
+++ b/test/built-ins/TypedArrays/length-arg-undefined-newtarget-throws.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-typedarray-length
+esid: sec-typedarray-length
 description: >
   Throws a TypeError if NewTarget is undefined.
 info: >
diff --git a/test/built-ins/TypedArrays/length-arg-use-custom-proto-if-object.js b/test/built-ins/TypedArrays/length-arg-use-custom-proto-if-object.js
index 23689ffd025e9c47d5d3191b4d773c595e79a6aa..d0e4df8c6f830217adac48fc38905caae9fac899 100644
--- a/test/built-ins/TypedArrays/length-arg-use-custom-proto-if-object.js
+++ b/test/built-ins/TypedArrays/length-arg-use-custom-proto-if-object.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-typedarray-length
+esid: sec-typedarray-length
 description: >
   Use prototype from new target if it's an Object
 info: >
diff --git a/test/built-ins/TypedArrays/length-arg-use-default-proto-if-custom-proto-is-not-object.js b/test/built-ins/TypedArrays/length-arg-use-default-proto-if-custom-proto-is-not-object.js
index b805c76599f5b544ff96f99686036f7dfb93aa34..3500a7ab07e5892426c2a27be7b5ca675d299e6d 100644
--- a/test/built-ins/TypedArrays/length-arg-use-default-proto-if-custom-proto-is-not-object.js
+++ b/test/built-ins/TypedArrays/length-arg-use-default-proto-if-custom-proto-is-not-object.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-typedarray-length
+esid: sec-typedarray-length
 description: >
   Use prototype from %TypedArray% if newTarget's prototype is not an Object
 info: >
diff --git a/test/built-ins/TypedArrays/no-args-custom-proto-access-throws.js b/test/built-ins/TypedArrays/no-args-custom-proto-access-throws.js
index 48c489da4fa71f9dddf7cb91192129ff904a70c4..5dd91222e04d9ff7d102bd4f8462632bcd64c19c 100644
--- a/test/built-ins/TypedArrays/no-args-custom-proto-access-throws.js
+++ b/test/built-ins/TypedArrays/no-args-custom-proto-access-throws.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-typedarray
+esid: sec-typedarray
 description: >
   Return abrupt completion getting newTarget's prototype
 info: >
diff --git a/test/built-ins/TypedArrays/no-args-returns-object.js b/test/built-ins/TypedArrays/no-args-returns-object.js
index d9e7d91318154b458b07441dbfd6e1516c82cd74..12c6ff5ef842054ae9b56010ac2a323d37a8b2a9 100644
--- a/test/built-ins/TypedArrays/no-args-returns-object.js
+++ b/test/built-ins/TypedArrays/no-args-returns-object.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-typedarray
+esid: sec-typedarray
 description: >
   Return a TypedArray object
 info: >
diff --git a/test/built-ins/TypedArrays/no-args-undefined-newtarget-throws.js b/test/built-ins/TypedArrays/no-args-undefined-newtarget-throws.js
index 4f76cb35200c709aa345481e25640295c0f4eb95..026997337b9788fd120f05047ff6788b6c665dd8 100755
--- a/test/built-ins/TypedArrays/no-args-undefined-newtarget-throws.js
+++ b/test/built-ins/TypedArrays/no-args-undefined-newtarget-throws.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-typedarray
+esid: sec-typedarray
 description: >
   Throws a TypeError if NewTarget is undefined.
 info: >
diff --git a/test/built-ins/TypedArrays/no-args-use-custom-proto-if-object.js b/test/built-ins/TypedArrays/no-args-use-custom-proto-if-object.js
index a2a645fa6bff923ce520dd59740fe140c32f3280..19806323fb651be4c76b8207d37c9c0e2958b588 100644
--- a/test/built-ins/TypedArrays/no-args-use-custom-proto-if-object.js
+++ b/test/built-ins/TypedArrays/no-args-use-custom-proto-if-object.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-typedarray
+esid: sec-typedarray
 description: >
   Use prototype from new target if it's an Object
 info: >
diff --git a/test/built-ins/TypedArrays/no-args-use-default-proto-if-custom-proto-is-not-object.js b/test/built-ins/TypedArrays/no-args-use-default-proto-if-custom-proto-is-not-object.js
index c56e8f20a0bd16a58d6386e4b3546e09dfe2ceb0..2c1ebfdf89a7fb93e631ef7b758344270405ff42 100644
--- a/test/built-ins/TypedArrays/no-args-use-default-proto-if-custom-proto-is-not-object.js
+++ b/test/built-ins/TypedArrays/no-args-use-default-proto-if-custom-proto-is-not-object.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-typedarray
+esid: sec-typedarray
 description: >
   Use prototype from %TypedArray% if newTarget's prototype is not an Object
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-as-array-returns.js b/test/built-ins/TypedArrays/object-arg-as-array-returns.js
index 8c532e2b7b01c4327f5b1ab004d40b9a385a3928..af72c32fbc77541006a3faf9bdbd4ac5cbe50384 100644
--- a/test/built-ins/TypedArrays/object-arg-as-array-returns.js
+++ b/test/built-ins/TypedArrays/object-arg-as-array-returns.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return typedArray from array argument
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-as-generator-iterable-returns.js b/test/built-ins/TypedArrays/object-arg-as-generator-iterable-returns.js
index 2837e91e5aec654b6bf6dd2f31d4eeb99cfc0b95..7ab6f498f33173dca3e95b6d44672903460b4a63 100644
--- a/test/built-ins/TypedArrays/object-arg-as-generator-iterable-returns.js
+++ b/test/built-ins/TypedArrays/object-arg-as-generator-iterable-returns.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return typedArray from iterable argument
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-custom-proto-access-throws.js b/test/built-ins/TypedArrays/object-arg-custom-proto-access-throws.js
index 201a41c184f007f09b10fff3da895faaf9292859..c40635a9dd98102f3992e61ee5e837d13383ec9b 100644
--- a/test/built-ins/TypedArrays/object-arg-custom-proto-access-throws.js
+++ b/test/built-ins/TypedArrays/object-arg-custom-proto-access-throws.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt completion getting newTarget's prototype
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-iterating-throws.js b/test/built-ins/TypedArrays/object-arg-iterating-throws.js
index 8f70545a90eabcc89c9e98803ed92134f821c49b..b6eb625febe63b26786a9fcb337d999a2e3ae169 100644
--- a/test/built-ins/TypedArrays/object-arg-iterating-throws.js
+++ b/test/built-ins/TypedArrays/object-arg-iterating-throws.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt from iterating object argument
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-iterator-not-callable-throws.js b/test/built-ins/TypedArrays/object-arg-iterator-not-callable-throws.js
index dc6ed9ac468f77ce4a1e0311df8bd49850acc5b9..a500207070f231aa48d558c3fd40a9b1e02043bc 100644
--- a/test/built-ins/TypedArrays/object-arg-iterator-not-callable-throws.js
+++ b/test/built-ins/TypedArrays/object-arg-iterator-not-callable-throws.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt when object @@iterator is not callable
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-iterator-throws.js b/test/built-ins/TypedArrays/object-arg-iterator-throws.js
index b21043fe17b4c269909c584e0e01615464297ccb..c04b75326212fcefe63c43e8e906290562eb0d72 100644
--- a/test/built-ins/TypedArrays/object-arg-iterator-throws.js
+++ b/test/built-ins/TypedArrays/object-arg-iterator-throws.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt from getting object @@iterator
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-length-excessive-throws.js b/test/built-ins/TypedArrays/object-arg-length-excessive-throws.js
index f1d30341553b7a8820203e2bec8e63ebf1257ea0..590931e40bfeb831445ce52f8b58f4d778d323d4 100644
--- a/test/built-ins/TypedArrays/object-arg-length-excessive-throws.js
+++ b/test/built-ins/TypedArrays/object-arg-length-excessive-throws.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt from allocating array buffer with excessive length
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-length-is-symbol-throws.js b/test/built-ins/TypedArrays/object-arg-length-is-symbol-throws.js
index 757a861e1b04725a141ce7c04fc766a84b753902..b2f89cf3395ca02f422f14895abbbb9d5dfee90f 100644
--- a/test/built-ins/TypedArrays/object-arg-length-is-symbol-throws.js
+++ b/test/built-ins/TypedArrays/object-arg-length-is-symbol-throws.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt from length property as a Symbol on the object argument
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-length-throws.js b/test/built-ins/TypedArrays/object-arg-length-throws.js
index 88bb9340e1b014aca710afcd5c80ff09763f476d..eba1292f24d4eae490f1c283a659cf83b3cd08f5 100644
--- a/test/built-ins/TypedArrays/object-arg-length-throws.js
+++ b/test/built-ins/TypedArrays/object-arg-length-throws.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt from getting length property on the object argument
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-returns.js b/test/built-ins/TypedArrays/object-arg-returns.js
index 6ac5b219a8338f6eb303e5903085711412f3fbcd..3e3fbe5c3b82f2e21b101054cbfe59b761b6cff7 100644
--- a/test/built-ins/TypedArrays/object-arg-returns.js
+++ b/test/built-ins/TypedArrays/object-arg-returns.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return typedArray from object argument
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-throws-from-property.js b/test/built-ins/TypedArrays/object-arg-throws-from-property.js
index 2816f8f4391bfab01d2d617510d2f84ee54e00f5..99fa6437897253f31c3962a5327228c91b5b0c2d 100644
--- a/test/built-ins/TypedArrays/object-arg-throws-from-property.js
+++ b/test/built-ins/TypedArrays/object-arg-throws-from-property.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt from getting object property
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-throws-setting-obj-to-primitive-typeerror.js b/test/built-ins/TypedArrays/object-arg-throws-setting-obj-to-primitive-typeerror.js
index 3f16fa5019450f993f2d6fdb1294f2680983ac26..677e18fb14fc7c930a2e1cc19efb151fffdfefca 100644
--- a/test/built-ins/TypedArrays/object-arg-throws-setting-obj-to-primitive-typeerror.js
+++ b/test/built-ins/TypedArrays/object-arg-throws-setting-obj-to-primitive-typeerror.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Throw TypeError from @@toPrimitive returning an Object when setting a property
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-throws-setting-obj-to-primitive.js b/test/built-ins/TypedArrays/object-arg-throws-setting-obj-to-primitive.js
index 8227dadf54097518c62a6f5eab1efb08f94bf9ad..d83fe19ca26c6e492e5ed4ecce9f14b6b3f65e98 100644
--- a/test/built-ins/TypedArrays/object-arg-throws-setting-obj-to-primitive.js
+++ b/test/built-ins/TypedArrays/object-arg-throws-setting-obj-to-primitive.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt from @@toPrimitive when setting a property
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-throws-setting-obj-tostring.js b/test/built-ins/TypedArrays/object-arg-throws-setting-obj-tostring.js
index 32a8405c7f612f215d38ad9a56dff29934f1243c..73f0757414070c3673c74263fc3cab9c518878e3 100644
--- a/test/built-ins/TypedArrays/object-arg-throws-setting-obj-tostring.js
+++ b/test/built-ins/TypedArrays/object-arg-throws-setting-obj-tostring.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt from toString() when setting a property
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-throws-setting-obj-valueof-typeerror.js b/test/built-ins/TypedArrays/object-arg-throws-setting-obj-valueof-typeerror.js
index e4b3f9adc44724757d9b146208346538bb407b3d..fe899122ecd69c4986cbdc3ff9f9a5999c95b625 100644
--- a/test/built-ins/TypedArrays/object-arg-throws-setting-obj-valueof-typeerror.js
+++ b/test/built-ins/TypedArrays/object-arg-throws-setting-obj-valueof-typeerror.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Throw TypeError from OrdinaryToPrimitive when setting a property
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-throws-setting-obj-valueof.js b/test/built-ins/TypedArrays/object-arg-throws-setting-obj-valueof.js
index 33e81ec5fd9fd9db1145b4fc58c563d23eaa8410..c336f956e2c8dc0b30897789bf57995e2d66b98e 100644
--- a/test/built-ins/TypedArrays/object-arg-throws-setting-obj-valueof.js
+++ b/test/built-ins/TypedArrays/object-arg-throws-setting-obj-valueof.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt from valueOf() when setting a property
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-throws-setting-property.js b/test/built-ins/TypedArrays/object-arg-throws-setting-property.js
index ee3f7c4c07ba4c5cfd400d55a9f7696125ae8010..dd8ef19bcb42530f5f33616a34b92e22b86f6e55 100644
--- a/test/built-ins/TypedArrays/object-arg-throws-setting-property.js
+++ b/test/built-ins/TypedArrays/object-arg-throws-setting-property.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt from setting property
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-throws-setting-symbol-property.js b/test/built-ins/TypedArrays/object-arg-throws-setting-symbol-property.js
index c71516d2092ed08cc2bdea4f5a1bb4796b1b697c..c797b688ccbad4489a1f0e401520fe6d00d15f73 100644
--- a/test/built-ins/TypedArrays/object-arg-throws-setting-symbol-property.js
+++ b/test/built-ins/TypedArrays/object-arg-throws-setting-symbol-property.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt from setting property
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-throws-setting-typedarray-property.js b/test/built-ins/TypedArrays/object-arg-throws-setting-typedarray-property.js
index c4b7a9a9b65c74b7868a5a593841d284432e42f7..86eb8ee1f551ca85d85aa9b4ec4701f95e1bcef5 100644
--- a/test/built-ins/TypedArrays/object-arg-throws-setting-typedarray-property.js
+++ b/test/built-ins/TypedArrays/object-arg-throws-setting-typedarray-property.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Return abrupt from setting a TypedArray instance property
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-undefined-newtarget-throws.js b/test/built-ins/TypedArrays/object-arg-undefined-newtarget-throws.js
index 3c2db157b68b0e2db89d77fab4c96a7b78bd5619..05517b1c279053383da19a806fb70efd52c6ea80 100644
--- a/test/built-ins/TypedArrays/object-arg-undefined-newtarget-throws.js
+++ b/test/built-ins/TypedArrays/object-arg-undefined-newtarget-throws.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Throws a TypeError if NewTarget is undefined.
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-use-custom-proto-if-object.js b/test/built-ins/TypedArrays/object-arg-use-custom-proto-if-object.js
index 1596d8d08ed69e4349a4abbb3e5f8739a74a87fb..3244a697ff6ebba477fd04e321ab215b44a64fd3 100644
--- a/test/built-ins/TypedArrays/object-arg-use-custom-proto-if-object.js
+++ b/test/built-ins/TypedArrays/object-arg-use-custom-proto-if-object.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Use prototype from new target if it's an Object
 info: >
diff --git a/test/built-ins/TypedArrays/object-arg-use-default-proto-if-custom-proto-is-not-object.js b/test/built-ins/TypedArrays/object-arg-use-default-proto-if-custom-proto-is-not-object.js
index c8c7acfc42bc6b63140cc12ba889fb97462c7671..b52ffa653d91972b970d1715463692840b310c3f 100644
--- a/test/built-ins/TypedArrays/object-arg-use-default-proto-if-custom-proto-is-not-object.js
+++ b/test/built-ins/TypedArrays/object-arg-use-default-proto-if-custom-proto-is-not-object.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-typedarray-object
+esid: sec-typedarray-object
 description: >
   Use prototype from %TypedArray% if newTarget's prototype is not an Object
 info: >
diff --git a/test/built-ins/TypedArrays/of/argument-is-symbol-throws.js b/test/built-ins/TypedArrays/of/argument-is-symbol-throws.js
index 9ccb26d535ac5cc71df768af64d92f8c25451ba1..d8a4fc6ff31296c19d243709459674058992364a 100644
--- a/test/built-ins/TypedArrays/of/argument-is-symbol-throws.js
+++ b/test/built-ins/TypedArrays/of/argument-is-symbol-throws.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-%typedarray%.of
+esid: sec-%typedarray%.of
 description: >
   Throws a TypeError if argument is a Symbol
 info: >
diff --git a/test/built-ins/TypedArrays/of/argument-number-value-throws.js b/test/built-ins/TypedArrays/of/argument-number-value-throws.js
index c0ef535546e6c86a51e52882f0b65b01f064abdf..c284e3a4ab8f813cb47934711739921233f1992e 100644
--- a/test/built-ins/TypedArrays/of/argument-number-value-throws.js
+++ b/test/built-ins/TypedArrays/of/argument-number-value-throws.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-%typedarray%.of
+esid: sec-%typedarray%.of
 description: >
   Return abrupt from object value
 info: >
diff --git a/test/built-ins/TypedArrays/of/custom-ctor-does-not-instantiate-ta-throws.js b/test/built-ins/TypedArrays/of/custom-ctor-does-not-instantiate-ta-throws.js
index 4b0cec382ab9ff7ef9a1fd21d72f0f724d6ef47e..2df428f274acac5b887c7e8fa409a1bf785ecbf0 100644
--- a/test/built-ins/TypedArrays/of/custom-ctor-does-not-instantiate-ta-throws.js
+++ b/test/built-ins/TypedArrays/of/custom-ctor-does-not-instantiate-ta-throws.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-%typedarray%.of
+esid: sec-%typedarray%.of
 description: >
   Custom constructor needs to instantiate a TypedArray
 info: >
diff --git a/test/built-ins/TypedArrays/of/custom-ctor.js b/test/built-ins/TypedArrays/of/custom-ctor.js
index a351ce73d07ee8f0fa310a3d7a8bc79019a5065c..988804b39546108742db0d19447e5499829140ad 100644
--- a/test/built-ins/TypedArrays/of/custom-ctor.js
+++ b/test/built-ins/TypedArrays/of/custom-ctor.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-%typedarray%.of
+esid: sec-%typedarray%.of
 description: >
   Calls and return abrupt from custom constructor
 info: >
diff --git a/test/built-ins/TypedArrays/of/inherited.js b/test/built-ins/TypedArrays/of/inherited.js
index 4b43cfd48b82e7a2d9982196f5593b59716d396d..378b7cbf0e969450c1aa6061eede3fb0e95cb932 100644
--- a/test/built-ins/TypedArrays/of/inherited.js
+++ b/test/built-ins/TypedArrays/of/inherited.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-%typedarray%.of
+esid: sec-%typedarray%.of
 description: >
   `of` is %TypedArray%.of
 info: >
diff --git a/test/built-ins/TypedArrays/of/nan-conversion.js b/test/built-ins/TypedArrays/of/nan-conversion.js
index 5b34fe0651e553d60cccd13ecd1030c23431c588..2a25a25397e7286eb0243a84a132917b342409d9 100644
--- a/test/built-ins/TypedArrays/of/nan-conversion.js
+++ b/test/built-ins/TypedArrays/of/nan-conversion.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-%typedarray%.of
+esid: sec-%typedarray%.of
 description: >
   Test NaN conversions
 info: >
diff --git a/test/built-ins/TypedArrays/of/new-instance-empty.js b/test/built-ins/TypedArrays/of/new-instance-empty.js
index 80d658422f291b8aca0b5881d912330a020a3b27..9d88426d5d1634c73bbe43d4adb2da707eb95154 100644
--- a/test/built-ins/TypedArrays/of/new-instance-empty.js
+++ b/test/built-ins/TypedArrays/of/new-instance-empty.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-%typedarray%.of
+esid: sec-%typedarray%.of
 description: >
   Return a new empty TypedArray
 includes: [testTypedArray.js]
diff --git a/test/built-ins/TypedArrays/of/new-instance-from-zero.js b/test/built-ins/TypedArrays/of/new-instance-from-zero.js
index d5a5904993b183290a389462535e8671f526772f..0e17656ceb72f40d93a876a8fb77b415a887e96f 100644
--- a/test/built-ins/TypedArrays/of/new-instance-from-zero.js
+++ b/test/built-ins/TypedArrays/of/new-instance-from-zero.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-%typedarray%.of
+esid: sec-%typedarray%.of
 description: >
   Return a new TypedArray using -0 and +0 values
 includes: [testTypedArray.js]
diff --git a/test/built-ins/TypedArrays/of/new-instance-using-custom-ctor.js b/test/built-ins/TypedArrays/of/new-instance-using-custom-ctor.js
index a3069917d3dde91d0283133ebd4e279bbb0b2be8..b3d93f8657ec53d2bb4c89e48f338679cbc01861 100644
--- a/test/built-ins/TypedArrays/of/new-instance-using-custom-ctor.js
+++ b/test/built-ins/TypedArrays/of/new-instance-using-custom-ctor.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-%typedarray%.of
+esid: sec-%typedarray%.of
 description: >
   Return a new TypedArray using a custom Constructor
 includes: [testTypedArray.js]
diff --git a/test/built-ins/TypedArrays/of/new-instance.js b/test/built-ins/TypedArrays/of/new-instance.js
index a2f5f88cb050cba36819ba8e1f6ab507880480b8..dc05fda2eb07ec11a823b743e5c79967992bd1ce 100644
--- a/test/built-ins/TypedArrays/of/new-instance.js
+++ b/test/built-ins/TypedArrays/of/new-instance.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-%typedarray%.of
+esid: sec-%typedarray%.of
 description: >
   Return a new TypedArray
 info: >
diff --git a/test/built-ins/TypedArrays/of/this-is-not-constructor.js b/test/built-ins/TypedArrays/of/this-is-not-constructor.js
index de7caf27ae26b8177189fa5a084eaa500ce12ecf..acd86f13a27ddad6870631160e201b1f6c5a7a20 100644
--- a/test/built-ins/TypedArrays/of/this-is-not-constructor.js
+++ b/test/built-ins/TypedArrays/of/this-is-not-constructor.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-%typedarray%.of
+esid: sec-%typedarray%.of
 description: >
   Throws a TypeError exception if this is not a constructor
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-custom-proto-access-throws.js b/test/built-ins/TypedArrays/typedarray-arg-custom-proto-access-throws.js
index e94b1d0569fe823b3771584bee5572271422d006..67ae7c2222a06aa3fe64771b12126f8f80f8678f 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-custom-proto-access-throws.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-custom-proto-access-throws.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Return abrupt completion getting newTarget's prototype
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-access-throws.js b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-access-throws.js
index 06ccdda33d8fca843bdcb01e8c83241e2eb34ffb..aaad50a4b40b6df18f1ec20cdf3437d0236a9090 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-access-throws.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-access-throws.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Return abrupt completion from getting typedArray argument's buffer.constructor
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-custom-species.js b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-custom-species.js
index 14436bf552bf8b0830370681082a736a263a14c0..2b69cd2991c4d3040f5bef73e993d973c61ef08b 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-custom-species.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-custom-species.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Use default ArrayBuffer constructor on undefined buffer.constructor.@@species
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-not-object-throws.js b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-not-object-throws.js
index 5ceb8d36869ebc40ce82190d7807751c340a8c73..e4fec62421d962f87d5ca467d7264006105c2e41 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-not-object-throws.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-not-object-throws.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Return abrupt completion from typedArray argument's buffer.constructor's value
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-access-throws.js b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-access-throws.js
index 26a3178a8c8b0304c61bc4540956fa3986f8a52b..3a9ea9805ea526edab3c60c2714446d24fcfd80d 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-access-throws.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-access-throws.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Return abrupt from getting typedArray argument's buffer.constructor.@@species
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-not-ctor-throws.js b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-not-ctor-throws.js
index b082b0439d4373afda7f02c6954b3f265d3329d5..5ee3a5201c0d96ac127b4e85826ef043b3a0c2b6 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-not-ctor-throws.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-not-ctor-throws.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Return abrupt from buffer.constructor.@@species.prototype
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-null.js b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-null.js
index 895a2ea9f2cf024dc74c41ff9ac4e87be7457182..78e12443c904d6670642c8c588d3010ca93ff3a9 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-null.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-null.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Use default ArrayBuffer constructor on null buffer.constructor.@@species
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-prototype-throws.js b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-prototype-throws.js
index 12a2316d0064294cf8beddc07340bed2ef31c787..1455403e7d9b718254ecdeba71ca2b117454b08b 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-prototype-throws.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-prototype-throws.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Return abrupt from buffer.constructor.@@species.prototype
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-undefined.js b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-undefined.js
index bf8d3a4b8a993949749d957432d62bcf616a9646..739375c361bf4f9d609257810efdac45b350b758 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-undefined.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-buffer-ctor-species-undefined.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Use default ArrayBuffer constructor on undefined buffer.constructor.@@species
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-returns-new-typedarray.js b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-returns-new-typedarray.js
index 6c0ba821e318c6b1beae402967c2742c6da248a6..4aa247424ddd8b6b9c812fd29832ca250c2aeac7 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-other-ctor-returns-new-typedarray.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-other-ctor-returns-new-typedarray.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Return abrupt from getting typedArray argument's buffer.constructor.@@species
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-returns-new-instance.js b/test/built-ins/TypedArrays/typedarray-arg-returns-new-instance.js
index 6971dfcb180df830294e1781701ecfac436963cc..ea1ed5500dc22fe03e784358b7a39af68520230e 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-returns-new-instance.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-returns-new-instance.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Return a TypedArray object
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-access-throws.js b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-access-throws.js
index f1d0afb65c349c5a56a579333ce284dbffc19c02..24452ca69525699432679617783992687e4c4ab8 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-access-throws.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-access-throws.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Return abrupt completion from getting typedArray argument's buffer.constructor
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-custom.js b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-custom.js
index 09053c47d0badf6e4cf12715a65af20e5a598d27..6d815444c49a4e5784717ea9d446aee2eead580a 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-custom.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-custom.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Use default ArrayBuffer constructor on undefined buffer.constructor.@@species
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-not-ctor.js b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-not-ctor.js
index 163c155e96e8e4e43c00881068b0562bd89b914b..2fb42c30259ef9993c8095d9b375565a86bf6df5 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-not-ctor.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-not-ctor.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Return abrupt from buffer.constructor.@@species.prototype
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-null.js b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-null.js
index b3c461b1c53a44d40391e7710b7a2be37952eb55..85d3b2ef18b081802a01fc519241e68598ec2945 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-null.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-null.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Use default ArrayBuffer constructor on null buffer.constructor.@@species
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-prototype-throws.js b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-prototype-throws.js
index fa60b0d58c69998fe1d21810902ff71b6d1cba82..bdc0122cee5737c7eabe3ebbed9ea38ba8fa1fe8 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-prototype-throws.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-prototype-throws.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Return abrupt from buffer.constructor.@@species.prototype
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-throws.js b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-throws.js
index 1ed0a514611939f1c7a94fb48d3077a4a3843dfc..ff1193cb5f9032c557f7d5cbb9e505a15ef73c8b 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-throws.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-throws.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Return abrupt from getting typedArray argument's buffer.constructor.@@species
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-undefined.js b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-undefined.js
index 4fbdb7dce4a350b2f8b9ade13c582fd1c37a5bcf..a5c8edc687ab74788412f8bbfdddf32e67f4339b 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-undefined.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-species-undefined.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Use default ArrayBuffer constructor on undefined buffer.constructor.@@species
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-value-not-obj-throws.js b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-value-not-obj-throws.js
index 6309a97ef34649a1dbf2866fa87503d23b1c18f0..e671ea56db620214517694eab9d96849ab5387d7 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-value-not-obj-throws.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-buffer-ctor-value-not-obj-throws.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Return abrupt completion from typedArray argument's buffer.constructor's value
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-returns-new-cloned-typedarray.js b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-returns-new-cloned-typedarray.js
index 5d78db9db2bb984537f19ffaf0e09f9354b4f2bc..071b71b8a8ffebf440809d604aaef0be9f981a3a 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-same-ctor-returns-new-cloned-typedarray.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-same-ctor-returns-new-cloned-typedarray.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Same typedArray ctor argument returns a new cloned typedArray
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-undefined-newtarget-throws.js b/test/built-ins/TypedArrays/typedarray-arg-undefined-newtarget-throws.js
index 22f444cdc4868c5ba7b7ba71486a99294eea9151..7786a0e7b6bb5979cd6766c6143b60a5fe12b5f8 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-undefined-newtarget-throws.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-undefined-newtarget-throws.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Throws a TypeError if NewTarget is undefined.
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-use-custom-proto-if-object.js b/test/built-ins/TypedArrays/typedarray-arg-use-custom-proto-if-object.js
index 9a558e875f446d7cbff6edd9259d8b1f3bbcf8c5..eb09fe1fc3d014069e6382ad8cfa46b49ce375aa 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-use-custom-proto-if-object.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-use-custom-proto-if-object.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Use prototype from new target if it's an Object
 info: >
diff --git a/test/built-ins/TypedArrays/typedarray-arg-use-default-proto-if-custom-proto-is-not-object.js b/test/built-ins/TypedArrays/typedarray-arg-use-default-proto-if-custom-proto-is-not-object.js
index f8248f39d80a292550068ba20504f34ef97fb1c3..46bc9ebf53d53704813e469880a317b41865a4c1 100644
--- a/test/built-ins/TypedArrays/typedarray-arg-use-default-proto-if-custom-proto-is-not-object.js
+++ b/test/built-ins/TypedArrays/typedarray-arg-use-default-proto-if-custom-proto-is-not-object.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-typedarray-typedarray
+esid: sec-typedarray-typedarray
 description: >
   Use prototype from %TypedArray% if newTarget's prototype is not an Object
 info: >
diff --git a/test/harness/proxytrapshelper-default.js b/test/harness/proxytrapshelper-default.js
index a4613f6824bd1e60d9468a9535d763192a7b29b9..773604c41852f327ebd31623fe333d05d1c8929b 100644
--- a/test/harness/proxytrapshelper-default.js
+++ b/test/harness/proxytrapshelper-default.js
@@ -3,7 +3,7 @@
 
 /*---
 description: allowProxyTraps helper should default throw on all the proxy trap named methods being invoked
-id: pending
+esid: pending
 author: Jordan Harband
 includes: [proxyTrapsHelper.js]
 ---*/
diff --git a/test/harness/proxytrapshelper-overrides.js b/test/harness/proxytrapshelper-overrides.js
index 4abf5730e51fd2c287592d9e279b0a1efad62986..e1b73d5e504889fee41b0cbf906a229c8c79b086 100644
--- a/test/harness/proxytrapshelper-overrides.js
+++ b/test/harness/proxytrapshelper-overrides.js
@@ -3,7 +3,7 @@
 
 /*---
 description: allowProxyTraps helper should default throw on all the proxy trap named methods being invoked
-id: pending
+esid: pending
 author: Jordan Harband
 includes: [proxyTrapsHelper.js]
 ---*/
diff --git a/test/intl402/Collator/name.js b/test/intl402/Collator/name.js
index c1b94b2abeb7f093c990960d9aa1bf8694463663..e319f19ac1065cac3b33df23b84c8e3ba2bdbe56 100755
--- a/test/intl402/Collator/name.js
+++ b/test/intl402/Collator/name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.Collator
+esid: sec-Intl.Collator
 description: >
   Intl.Collator.name is "Collator".
 info: >
diff --git a/test/intl402/Collator/prototype/compare/compare-function-name.js b/test/intl402/Collator/prototype/compare/compare-function-name.js
index 53f334fd86166b0428be61e1159b49a756428bfd..d92e92dbe10da1d929e47c945f480ee809b3bdba 100755
--- a/test/intl402/Collator/prototype/compare/compare-function-name.js
+++ b/test/intl402/Collator/prototype/compare/compare-function-name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.Collator.prototype.compare
+esid: sec-Intl.Collator.prototype.compare
 description: >
   The bound Collator compare function is an anonymous function.
 info: >
diff --git a/test/intl402/Collator/prototype/compare/name.js b/test/intl402/Collator/prototype/compare/name.js
index 7b161a87a0925793bddf1efb2aa2e60c9e9af4a6..115678c6bf71fcf7cde06db60ce24cb3abac58e1 100755
--- a/test/intl402/Collator/prototype/compare/name.js
+++ b/test/intl402/Collator/prototype/compare/name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.Collator.prototype.compare
+esid: sec-Intl.Collator.prototype.compare
 description: >
   get Intl.Collator.prototype.compare.name is "get compare".
 info: >
diff --git a/test/intl402/Collator/prototype/resolvedOptions/name.js b/test/intl402/Collator/prototype/resolvedOptions/name.js
index 9736e5135a21dcdb81cc485ab2af75e013df10eb..000570f968ab1e080cb95b638ab781fe3b624ac6 100755
--- a/test/intl402/Collator/prototype/resolvedOptions/name.js
+++ b/test/intl402/Collator/prototype/resolvedOptions/name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.Collator.prototype.resolvedOptions
+esid: sec-Intl.Collator.prototype.resolvedOptions
 description: >
   Intl.Collator.prototype.resolvedOptions.name is "resolvedOptions".
 info: >
diff --git a/test/intl402/Collator/supportedLocalesOf/name.js b/test/intl402/Collator/supportedLocalesOf/name.js
index b5695c77670318c45d325d56397ee7e9cb67a40c..dcefdae97b54182f60a3d57d1224798991aa54f7 100755
--- a/test/intl402/Collator/supportedLocalesOf/name.js
+++ b/test/intl402/Collator/supportedLocalesOf/name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.Collator.supportedLocalesOf
+esid: sec-Intl.Collator.supportedLocalesOf
 description: >
   Intl.Collator.supportedLocalesOf.name is "supportedLocalesOf".
 info: >
diff --git a/test/intl402/DateTimeFormat/name.js b/test/intl402/DateTimeFormat/name.js
index 621cc4297d2a72e1eab24f85804ce71512bba6a2..f3b8f8ad389f82de212cac1c0183fe9e20213744 100755
--- a/test/intl402/DateTimeFormat/name.js
+++ b/test/intl402/DateTimeFormat/name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.DateTimeFormat
+esid: sec-Intl.DateTimeFormat
 description: >
   Intl.DateTimeFormat.name is "DateTimeFormat".
 info: >
diff --git a/test/intl402/DateTimeFormat/prototype/format/format-function-name.js b/test/intl402/DateTimeFormat/prototype/format/format-function-name.js
index d07cec8c034bb0a9fe33b5c40b3eab85ed0c3fb8..4006305db0e88418b31968da417778125cac9bae 100755
--- a/test/intl402/DateTimeFormat/prototype/format/format-function-name.js
+++ b/test/intl402/DateTimeFormat/prototype/format/format-function-name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.DateTimeFormat.prototype.format
+esid: sec-Intl.DateTimeFormat.prototype.format
 description: >
   The bound DateTimeFormat format function is an anonymous function.
 info: >
diff --git a/test/intl402/DateTimeFormat/prototype/format/name.js b/test/intl402/DateTimeFormat/prototype/format/name.js
index 76a8979b2e83a05d391346a5577804ee04a2c785..3ea060d5706fd7caa9e67d0e45a235e95e5a8926 100755
--- a/test/intl402/DateTimeFormat/prototype/format/name.js
+++ b/test/intl402/DateTimeFormat/prototype/format/name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.DateTimeFormat.prototype.format
+esid: sec-Intl.DateTimeFormat.prototype.format
 description: >
   get Intl.DateTimeFormat.prototype.format.name is "get format".
 info: >
diff --git a/test/intl402/DateTimeFormat/prototype/resolvedOptions/name.js b/test/intl402/DateTimeFormat/prototype/resolvedOptions/name.js
index 17898da9ac32d43af90599ab43574bdedcb55f59..5a5f9e79dc2441b8ab641b130c9f2a4a9e04e14f 100755
--- a/test/intl402/DateTimeFormat/prototype/resolvedOptions/name.js
+++ b/test/intl402/DateTimeFormat/prototype/resolvedOptions/name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.DateTimeFormat.prototype.resolvedOptions
+esid: sec-Intl.DateTimeFormat.prototype.resolvedOptions
 description: >
   Intl.DateTimeFormat.prototype.resolvedOptions.name is "resolvedOptions".
 info: >
diff --git a/test/intl402/DateTimeFormat/supportedLocalesOf/name.js b/test/intl402/DateTimeFormat/supportedLocalesOf/name.js
index 865d16b6b7a42ea55874438a2f2095d7757ede6d..5ccbf4d5b329be233e188e501ead4b932788842b 100755
--- a/test/intl402/DateTimeFormat/supportedLocalesOf/name.js
+++ b/test/intl402/DateTimeFormat/supportedLocalesOf/name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.DateTimeFormat.supportedLocalesOf
+esid: sec-Intl.DateTimeFormat.supportedLocalesOf
 description: >
   Intl.DateTimeFormat.supportedLocalesOf.name is "supportedLocalesOf".
 info: >
diff --git a/test/intl402/NumberFormat/name.js b/test/intl402/NumberFormat/name.js
index 3106dda170195c46a0346d74ec61b43dc2d6b916..ec88e1f14b1f2f7d87f40d5817949318e85d4742 100755
--- a/test/intl402/NumberFormat/name.js
+++ b/test/intl402/NumberFormat/name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.NumberFormat
+esid: sec-Intl.NumberFormat
 description: >
   Intl.NumberFormat.name is "NumberFormat".
 info: >
diff --git a/test/intl402/NumberFormat/prototype/format/format-function-name.js b/test/intl402/NumberFormat/prototype/format/format-function-name.js
index babad9279812f11217ffd99498242f35b5132430..6ab26e6d222c5caf6ac4341af817b6b4d20e6444 100755
--- a/test/intl402/NumberFormat/prototype/format/format-function-name.js
+++ b/test/intl402/NumberFormat/prototype/format/format-function-name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.NumberFormat.prototype.format
+esid: sec-Intl.NumberFormat.prototype.format
 description: >
   The bound NumberFormat format function is an anonymous function.
 info: >
diff --git a/test/intl402/NumberFormat/prototype/format/name.js b/test/intl402/NumberFormat/prototype/format/name.js
index 0d77eb2a87a2b552dbde92fa24847469377633d0..dd5c37577d73c163caed2ff568589a416e26dea7 100755
--- a/test/intl402/NumberFormat/prototype/format/name.js
+++ b/test/intl402/NumberFormat/prototype/format/name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.NumberFormat.prototype.format
+esid: sec-Intl.NumberFormat.prototype.format
 description: >
   get Intl.NumberFormat.prototype.format.name is "get format".
 info: >
diff --git a/test/intl402/NumberFormat/prototype/resolvedOptions/name.js b/test/intl402/NumberFormat/prototype/resolvedOptions/name.js
index c078448d49c61d807b7eab97aba13d94b8f7c003..a8b62f178040e29022d3da97b95254a7c953dd95 100755
--- a/test/intl402/NumberFormat/prototype/resolvedOptions/name.js
+++ b/test/intl402/NumberFormat/prototype/resolvedOptions/name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.NumberFormat.prototype.resolvedOptions
+esid: sec-Intl.NumberFormat.prototype.resolvedOptions
 description: >
   Intl.NumberFormat.prototype.resolvedOptions.name is "resolvedOptions".
 info: >
diff --git a/test/intl402/NumberFormat/supportedLocalesOf/name.js b/test/intl402/NumberFormat/supportedLocalesOf/name.js
index f3cdd82efb60e1c3eb43150217fe177a83edfab3..37e5fcc43fac171e87a5e2a8ab306aa650605a19 100755
--- a/test/intl402/NumberFormat/supportedLocalesOf/name.js
+++ b/test/intl402/NumberFormat/supportedLocalesOf/name.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-Intl.NumberFormat.supportedLocalesOf
+esid: sec-Intl.NumberFormat.supportedLocalesOf
 description: >
   Intl.NumberFormat.supportedLocalesOf.name is "supportedLocalesOf".
 info: >
diff --git a/test/language/expressions/arrow-function/syntax/early-errors/use-strict-with-non-simple-param.js b/test/language/expressions/arrow-function/syntax/early-errors/use-strict-with-non-simple-param.js
index 26469455633e0ba2e4b1c66583c6f2948600ff34..b7b5d06bf635c8be0f91d6a50f70a23089da947f 100755
--- a/test/language/expressions/arrow-function/syntax/early-errors/use-strict-with-non-simple-param.js
+++ b/test/language/expressions/arrow-function/syntax/early-errors/use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-arrow-function-definitions-static-semantics-early-errors
+esid: sec-arrow-function-definitions-static-semantics-early-errors
 description: >
   A SyntaxError is thrown if an arrow function contains a non-simple parameter list and a UseStrict directive.
 info: >
diff --git a/test/language/expressions/call/tco-call-args.js b/test/language/expressions/call/tco-call-args.js
index 586c06ddac3b52b1717511f27e25feb57ae41de0..a522abf526145d31a111bd9cf2001f81ff8babba 100644
--- a/test/language/expressions/call/tco-call-args.js
+++ b/test/language/expressions/call/tco-call-args.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/expressions/call/tco-member-args.js b/test/language/expressions/call/tco-member-args.js
index 4db0c9d180c182216eab4d2f12b806dcd2064b1d..40d89c17600c87fe764acb5ebc475911f18915f8 100644
--- a/test/language/expressions/call/tco-member-args.js
+++ b/test/language/expressions/call/tco-member-args.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/expressions/comma/tco-final.js b/test/language/expressions/comma/tco-final.js
index a47bebbe2bc630223e92d70faa64dc3067bf21f3..9a892d13762611ca97c790d7c2d681f908a09c16 100644
--- a/test/language/expressions/comma/tco-final.js
+++ b/test/language/expressions/comma/tco-final.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/expressions/conditional/tco-cond.js b/test/language/expressions/conditional/tco-cond.js
index 910746f002c8453e88f0292f88c53c017495a751..cfad71245dba8f187268889c28f4309b9d7befea 100644
--- a/test/language/expressions/conditional/tco-cond.js
+++ b/test/language/expressions/conditional/tco-cond.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/expressions/conditional/tco-pos.js b/test/language/expressions/conditional/tco-pos.js
index 55cd30016a5dc4e6623510d470bd8c89b1f3cbb1..8fc828a111171783651a42455ca63823a624437c 100644
--- a/test/language/expressions/conditional/tco-pos.js
+++ b/test/language/expressions/conditional/tco-pos.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/expressions/function/use-strict-with-non-simple-param.js b/test/language/expressions/function/use-strict-with-non-simple-param.js
index 83e6a2d0f895c3cd0094d58258be16ebb2d65c4c..facf58bd5da4b9a0171671d4e5d4361103d3b967 100755
--- a/test/language/expressions/function/use-strict-with-non-simple-param.js
+++ b/test/language/expressions/function/use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-definitions-static-semantics-early-errors
+esid: sec-function-definitions-static-semantics-early-errors
 description: >
   A SyntaxError is thrown if a function contains a non-simple parameter list and a UseStrict directive.
 info: >
diff --git a/test/language/expressions/generators/use-strict-with-non-simple-param.js b/test/language/expressions/generators/use-strict-with-non-simple-param.js
index 6212aa4dbfe6312e49e6f9b5074f0ba327c9e034..f6fdefd3beb1277f08e1b41820db02215e2dcfd8 100755
--- a/test/language/expressions/generators/use-strict-with-non-simple-param.js
+++ b/test/language/expressions/generators/use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-generator-function-definitions-static-semantics-early-errors
+esid: sec-generator-function-definitions-static-semantics-early-errors
 description: >
   A SyntaxError is thrown if a generator contains a non-simple parameter list and a UseStrict directive.
 info: >
diff --git a/test/language/expressions/logical-and/tco-right.js b/test/language/expressions/logical-and/tco-right.js
index f4c34e71b800270e774c2684c785b0555736a7d4..6570ae03afc04bc29954597b700ee20c099e6e7b 100644
--- a/test/language/expressions/logical-and/tco-right.js
+++ b/test/language/expressions/logical-and/tco-right.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/expressions/logical-or/tco-right.js b/test/language/expressions/logical-or/tco-right.js
index 035218ffe37f92b67143d1be32fe8a255e53f029..7e8608c5e3f8916f768db4acb44aa4921bcad52c 100644
--- a/test/language/expressions/logical-or/tco-right.js
+++ b/test/language/expressions/logical-or/tco-right.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js b/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js
index 4fbf4da1121fbc8e6a2c1792d42084970a893b60..2bb13df664b7d9c0e0564dbd4ea8c9ffeb9748d7 100755
--- a/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js
+++ b/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-generator-function-definitions-static-semantics-early-errors
+esid: sec-generator-function-definitions-static-semantics-early-errors
 description: >
   A SyntaxError is thrown if a generator method contains a non-simple parameter list and a UseStrict directive.
 info: >
diff --git a/test/language/expressions/object/method-definition/setter-use-strict-with-non-simple-param.js b/test/language/expressions/object/method-definition/setter-use-strict-with-non-simple-param.js
index 14e738e27e03840714287f17bcf8c2f1595179a2..cb95f17a29fa30b363b52bcead607ae562653b5d 100755
--- a/test/language/expressions/object/method-definition/setter-use-strict-with-non-simple-param.js
+++ b/test/language/expressions/object/method-definition/setter-use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-method-definitions-static-semantics-early-errors
+esid: sec-method-definitions-static-semantics-early-errors
 description: >
   A SyntaxError is thrown if a setter method contains a non-simple parameter list and a UseStrict directive.
 info: >
diff --git a/test/language/expressions/object/method-definition/use-strict-with-non-simple-param.js b/test/language/expressions/object/method-definition/use-strict-with-non-simple-param.js
index 886b395d9d692a8ae64c724ff0e2d55b6d8ba8bb..17b9ed9cb5f670bc5ba5e2650b9b77b2c456cab7 100755
--- a/test/language/expressions/object/method-definition/use-strict-with-non-simple-param.js
+++ b/test/language/expressions/object/method-definition/use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-method-definitions-static-semantics-early-errors
+esid: sec-method-definitions-static-semantics-early-errors
 description: >
   A SyntaxError is thrown if a method contains a non-simple parameter list and a UseStrict directive.
 info: >
diff --git a/test/language/expressions/tagged-template/tco-call.js b/test/language/expressions/tagged-template/tco-call.js
index bcd50bcbf83e22a5886bbbb3ad7c62cf2e586a14..05b29e2275359886d246bc5f4f7a0fcd75a20bbd 100644
--- a/test/language/expressions/tagged-template/tco-call.js
+++ b/test/language/expressions/tagged-template/tco-call.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/expressions/tagged-template/tco-member.js b/test/language/expressions/tagged-template/tco-member.js
index c1148b9ff7682df0c3c82a0d043f62e188296f3d..2a1d252891de07b476125b822745030278215c00 100644
--- a/test/language/expressions/tagged-template/tco-member.js
+++ b/test/language/expressions/tagged-template/tco-member.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/expressions/tco-pos.js b/test/language/expressions/tco-pos.js
index 652c1b54bc001b26994dee10a1a045c22a999b56..00cdb885270f7e93133c54ceb783d9e66534270d 100644
--- a/test/language/expressions/tco-pos.js
+++ b/test/language/expressions/tco-pos.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/function-code/eval-param-env-with-computed-key.js b/test/language/function-code/eval-param-env-with-computed-key.js
index c16630431beff7ee5698b203c8d7a4df2d24e4c2..fcf80e361c006f8cd205645ca806505ca3132aec 100755
--- a/test/language/function-code/eval-param-env-with-computed-key.js
+++ b/test/language/function-code/eval-param-env-with-computed-key.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-definitions-runtime-semantics-iteratorbindinginitialization
+esid: sec-function-definitions-runtime-semantics-iteratorbindinginitialization
 description: If a computed property key contains a direct eval call, a new declarative environment is created.
 info: >
   Runtime Semantics: IteratorBindingInitialization
diff --git a/test/language/function-code/eval-param-env-with-prop-initializer.js b/test/language/function-code/eval-param-env-with-prop-initializer.js
index 60bb5c2a8ffa42eb3ad1e38742e2be6045e52e33..35110524c64ef0a26be5f7cf111c53af3c6a8bfc 100755
--- a/test/language/function-code/eval-param-env-with-prop-initializer.js
+++ b/test/language/function-code/eval-param-env-with-prop-initializer.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-definitions-runtime-semantics-iteratorbindinginitialization
+esid: sec-function-definitions-runtime-semantics-iteratorbindinginitialization
 description: If a property initializer contains a direct eval call, a new declarative environment is created.
 info: >
   Runtime Semantics: IteratorBindingInitialization
diff --git a/test/language/rest-parameters/array-pattern.js b/test/language/rest-parameters/array-pattern.js
index 9f02ee73cbd9a024e9ce59e1a4c159faf4b907ba..8cb48cce58512c051d7830977c2b68f25b0efdbc 100755
--- a/test/language/rest-parameters/array-pattern.js
+++ b/test/language/rest-parameters/array-pattern.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-destructuring-binding-patterns
+esid: sec-destructuring-binding-patterns
 description: >
   The rest parameter can be a binding pattern.
 info: >
diff --git a/test/language/rest-parameters/object-pattern.js b/test/language/rest-parameters/object-pattern.js
index d474b338be2e57dd3b3a9e5d94c7d3bbc0be8d2f..af73f6f1e340b6ab48bb8775d2fde7c7083bf33e 100755
--- a/test/language/rest-parameters/object-pattern.js
+++ b/test/language/rest-parameters/object-pattern.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-destructuring-binding-patterns
+esid: sec-destructuring-binding-patterns
 description: >
   The rest parameter can be a binding pattern.
 info: >
diff --git a/test/language/statements/block/tco-stmt-list.js b/test/language/statements/block/tco-stmt-list.js
index f60ac5fb0a1cea237db6f0abd43ae98c6bd95dbc..8a04d86c5965e59e00f3a8fb1e959b826c470c0a 100644
--- a/test/language/statements/block/tco-stmt-list.js
+++ b/test/language/statements/block/tco-stmt-list.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/block/tco-stmt.js b/test/language/statements/block/tco-stmt.js
index 2bfdbdd1e2e36863637d136833d9dd5ec093e081..a8883559521e0f859c5c2f46df7bbff8589132bf 100644
--- a/test/language/statements/block/tco-stmt.js
+++ b/test/language/statements/block/tco-stmt.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/do-while/tco-body.js b/test/language/statements/do-while/tco-body.js
index 5de287bb9792dbbb5e5f131f711dc89f05ce52dd..664a05ee5753554b53ef0744dee75c6f78f3f051 100644
--- a/test/language/statements/do-while/tco-body.js
+++ b/test/language/statements/do-while/tco-body.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/for/tco-const-body.js b/test/language/statements/for/tco-const-body.js
index d9c2c8427e7e65325bfe691f006f3dc4781fb0ae..238ad15a57891cfc3d730579167b8dc25a252724 100644
--- a/test/language/statements/for/tco-const-body.js
+++ b/test/language/statements/for/tco-const-body.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/for/tco-let-body.js b/test/language/statements/for/tco-let-body.js
index fb4dd5e5d193860c3ec13977d67d785bc79c6239..614b3f08b4535ef50c53f0c427c5736b3d073326 100644
--- a/test/language/statements/for/tco-let-body.js
+++ b/test/language/statements/for/tco-let-body.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/for/tco-lhs-body.js b/test/language/statements/for/tco-lhs-body.js
index f6e04dc74a7e2fdb79a9ba423a03f8e175551421..b6a05b290aca1b5daf6a1a986d7bbe5e85345c96 100644
--- a/test/language/statements/for/tco-lhs-body.js
+++ b/test/language/statements/for/tco-lhs-body.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/for/tco-var-body.js b/test/language/statements/for/tco-var-body.js
index 836b38ac9213396d18949b9538634f4d22e97c80..c4c8032c9be4cad4fcd87a8cfbc662ac2b0bf1c0 100644
--- a/test/language/statements/for/tco-var-body.js
+++ b/test/language/statements/for/tco-var-body.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/function/use-strict-with-non-simple-param.js b/test/language/statements/function/use-strict-with-non-simple-param.js
index 8ca9bef3a422cf8341b48b9afaa1f55fefb081fe..91efcc18e32ac7674455c5bf7183c6b0bb477ca1 100755
--- a/test/language/statements/function/use-strict-with-non-simple-param.js
+++ b/test/language/statements/function/use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-function-definitions-static-semantics-early-errors
+esid: sec-function-definitions-static-semantics-early-errors
 description: >
   A SyntaxError is thrown if a function contains a non-simple parameter list and a UseStrict directive.
 info: >
diff --git a/test/language/statements/generators/use-strict-with-non-simple-param.js b/test/language/statements/generators/use-strict-with-non-simple-param.js
index 64de8d767ab5ff521e8fac718f8429def534b060..1fc9b13ef76e1a574fc3d75061a6df1f1d3b4c13 100755
--- a/test/language/statements/generators/use-strict-with-non-simple-param.js
+++ b/test/language/statements/generators/use-strict-with-non-simple-param.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-id: sec-generator-function-definitions-static-semantics-early-errors
+esid: sec-generator-function-definitions-static-semantics-early-errors
 description: >
   A SyntaxError is thrown if a generator contains a non-simple parameter list and a UseStrict directive.
 info: >
diff --git a/test/language/statements/if/cptn-else-false-abrupt-empty.js b/test/language/statements/if/cptn-else-false-abrupt-empty.js
index ab98eb81fee6a437c1a9d8290b9baf592be7a0ba..5c86ebee9dae2356be89b41adcbac0333858e315 100644
--- a/test/language/statements/if/cptn-else-false-abrupt-empty.js
+++ b/test/language/statements/if/cptn-else-false-abrupt-empty.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-if-statement-runtime-semantics-evaluation
+esid: sec-if-statement-runtime-semantics-evaluation
 description:
     Completion value when expression is false with an `else` clause and body
     returns an empty abrupt completion
diff --git a/test/language/statements/if/cptn-else-true-abrupt-empty.js b/test/language/statements/if/cptn-else-true-abrupt-empty.js
index f360d91b99a82e4e1840264f486679fab22cf18c..401fbef2e06dfba1704d6ac8b3e67473374f95ca 100644
--- a/test/language/statements/if/cptn-else-true-abrupt-empty.js
+++ b/test/language/statements/if/cptn-else-true-abrupt-empty.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-if-statement-runtime-semantics-evaluation
+esid: sec-if-statement-runtime-semantics-evaluation
 description: >
     Completion value when expression is true with an `else` clause and body
     returns an abrupt completion
diff --git a/test/language/statements/if/cptn-no-else-true-abrupt-empty.js b/test/language/statements/if/cptn-no-else-true-abrupt-empty.js
index 2f40684184eb3d1ed0b58c91c331a527a6bc169a..71bbb3e3d74a3b2ae272399263ba6b157e10a085 100644
--- a/test/language/statements/if/cptn-no-else-true-abrupt-empty.js
+++ b/test/language/statements/if/cptn-no-else-true-abrupt-empty.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-if-statement-runtime-semantics-evaluation
+esid: sec-if-statement-runtime-semantics-evaluation
 description: >
     Completion value when expression is true without an `else` clause and body
     returns an empty abrupt completion
diff --git a/test/language/statements/if/tco-else-body.js b/test/language/statements/if/tco-else-body.js
index 52472eed49e59f95cb5f78b8c163f86ef79be5f7..93f6573b03496fe245d298509956b862a0dd6b41 100644
--- a/test/language/statements/if/tco-else-body.js
+++ b/test/language/statements/if/tco-else-body.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/if/tco-if-body.js b/test/language/statements/if/tco-if-body.js
index 07178b1fa29eb4712dfd4f7a6b59958e29154bad..a1d9f962262e137d09a084bba5385188201a68e0 100644
--- a/test/language/statements/if/tco-if-body.js
+++ b/test/language/statements/if/tco-if-body.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/labeled/tco.js b/test/language/statements/labeled/tco.js
index 2935d4c044d0ec0600c49f255aff18fe35638d1f..2c5ba79499157d788e4731cba97ef35d8802a136 100644
--- a/test/language/statements/labeled/tco.js
+++ b/test/language/statements/labeled/tco.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/return/tco.js b/test/language/statements/return/tco.js
index 89aa0670f88dec36ddae89380caf6d0fed1a6a9a..fadaaa1dfa19cbfc7a4bd31e31295e94e237a5c9 100644
--- a/test/language/statements/return/tco.js
+++ b/test/language/statements/return/tco.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Expression within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/switch/tco-case-body-dflt.js b/test/language/statements/switch/tco-case-body-dflt.js
index e4edf2f663688b1db49b44b9b7592b305bcdb68a..d4d51b725f329dba5910fd6c4379c90f74e19a2d 100644
--- a/test/language/statements/switch/tco-case-body-dflt.js
+++ b/test/language/statements/switch/tco-case-body-dflt.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/switch/tco-case-body.js b/test/language/statements/switch/tco-case-body.js
index 834bb49ee4b357569dab682e76b00b58dbb5c9f3..aa0a7a6e40347fb1f2a0c1db6d62116259bb1cef 100644
--- a/test/language/statements/switch/tco-case-body.js
+++ b/test/language/statements/switch/tco-case-body.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/switch/tco-dftl-body.js b/test/language/statements/switch/tco-dftl-body.js
index edeec48ea92530285f4a45c52d39a53264acb0e9..f7df595bf6cd9abcf8a5e637635e7fadb4d05fa3 100644
--- a/test/language/statements/switch/tco-dftl-body.js
+++ b/test/language/statements/switch/tco-dftl-body.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/try/tco-catch-finally.js b/test/language/statements/try/tco-catch-finally.js
index 74117563f111d92a54d8a97cb3ef0d5acabbabf9..0bfc33f3d8c3b6b10ec64ec57a5f19d7f02d8912 100644
--- a/test/language/statements/try/tco-catch-finally.js
+++ b/test/language/statements/try/tco-catch-finally.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/try/tco-catch.js b/test/language/statements/try/tco-catch.js
index e653703a9b08f93161e30335521f879a7293d2df..ed5fe2479673ca6a5198ae9798daef6376fdb028 100644
--- a/test/language/statements/try/tco-catch.js
+++ b/test/language/statements/try/tco-catch.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/try/tco-finally.js b/test/language/statements/try/tco-finally.js
index 95ded7f3ca2ec42f7483d763bd7e3de5e56fb506..2cc0836d85ab0c4267f1bc1e8e78e0bd06ded68b 100644
--- a/test/language/statements/try/tco-finally.js
+++ b/test/language/statements/try/tco-finally.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/while/tco-body.js b/test/language/statements/while/tco-body.js
index c2d882bd4ce42aa6d9cad931f5eb22fd0633f2d5..b897c8087a909203759b026c2ed0996efe947923 100644
--- a/test/language/statements/while/tco-body.js
+++ b/test/language/statements/while/tco-body.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 description: Statement within statement is a candidate for tail-call optimization.
-id: static-semantics-hasproductionintailposition
+esid: static-semantics-hasproductionintailposition
 flags: [onlyStrict]
 features: [tail-call-optimization]
 includes: [tco-helper.js]
diff --git a/test/language/statements/with/cptn-abrupt-empty.js b/test/language/statements/with/cptn-abrupt-empty.js
index 4a00fcbd2aae6284b68510bcf18606b15b94f97d..321f6b25bd6da6fb55ff8be2d77330325f9b796d 100644
--- a/test/language/statements/with/cptn-abrupt-empty.js
+++ b/test/language/statements/with/cptn-abrupt-empty.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-with-statement-runtime-semantics-evaluation
+esid: sec-with-statement-runtime-semantics-evaluation
 description: >
     Statement completion value when body returns an empty abrupt completion
 info: >