diff --git a/test/built-ins/Atomics/notify/bad-range.js b/test/built-ins/Atomics/notify/bad-range.js
index 59a034a1cf085177e4f4866a7351638be9eca39f..50bae6f18ad5541bc7aa1e0b48338ecec61bc4a6 100644
--- a/test/built-ins/Atomics/notify/bad-range.js
+++ b/test/built-ins/Atomics/notify/bad-range.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test range checking of Atomics.wake on arrays that allow atomic operations
 info: |
diff --git a/test/built-ins/Atomics/notify/bigint/bad-range.js b/test/built-ins/Atomics/notify/bigint/bad-range.js
index ae7873733f9d177166756bce5de9f3c6f72cdbbb..4cdbbd0d026673eed2f13bb143af10b04be64cf7 100644
--- a/test/built-ins/Atomics/notify/bigint/bad-range.js
+++ b/test/built-ins/Atomics/notify/bigint/bad-range.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test range checking of Atomics.wake on arrays that allow atomic operations
 info: |
diff --git a/test/built-ins/Atomics/notify/bigint/non-bigint64-typedarray-throws.js b/test/built-ins/Atomics/notify/bigint/non-bigint64-typedarray-throws.js
index 287911c474e90cc51127f7ee41248697dd9735fe..f71ce023759cd8446a57c5dfc2026d13f7400cb9 100644
--- a/test/built-ins/Atomics/notify/bigint/non-bigint64-typedarray-throws.js
+++ b/test/built-ins/Atomics/notify/bigint/non-bigint64-typedarray-throws.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Throws a TypeError if typedArray arg is not an BigInt64Array
 info: |
diff --git a/test/built-ins/Atomics/notify/bigint/non-shared-bufferdata-throws.js b/test/built-ins/Atomics/notify/bigint/non-shared-bufferdata-throws.js
index 99bf204576d52fcadd2c195838dce2a65c7619cf..a575e9dac15c5140c5096fb3fe638c691422c552 100644
--- a/test/built-ins/Atomics/notify/bigint/non-shared-bufferdata-throws.js
+++ b/test/built-ins/Atomics/notify/bigint/non-shared-bufferdata-throws.js
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Amal Hussein. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Throws a TypeError if typedArray.buffer is not a SharedArrayBuffer
 info: |
diff --git a/test/built-ins/Atomics/notify/bigint/notify-all-on-loc.js b/test/built-ins/Atomics/notify/bigint/notify-all-on-loc.js
index f511335c68f772c8e136826c6367394702f91dd8..64a46a2ddb031cda037b3e723e00131fa458c956 100644
--- a/test/built-ins/Atomics/notify/bigint/notify-all-on-loc.js
+++ b/test/built-ins/Atomics/notify/bigint/notify-all-on-loc.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test that Atomics.wake wakes all waiters on a location, but does not
   wake waiters on other locations.
diff --git a/test/built-ins/Atomics/notify/bigint/null-bufferdata-throws.js b/test/built-ins/Atomics/notify/bigint/null-bufferdata-throws.js
index 759dd062d9d1ca80524eedfc1f9e86084d261c1f..1850e57780f00ff35beb664931af4e42ef1f5dab 100644
--- a/test/built-ins/Atomics/notify/bigint/null-bufferdata-throws.js
+++ b/test/built-ins/Atomics/notify/bigint/null-bufferdata-throws.js
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Amal Hussein. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   A null value for bufferData throws a TypeError
 info: |
diff --git a/test/built-ins/Atomics/notify/count-boundary-cases.js b/test/built-ins/Atomics/notify/count-boundary-cases.js
index 654eb4f17f8878c6af20097b09c501be9b6df8fa..7310301d43251fc90341d92268fb4588d09302e2 100644
--- a/test/built-ins/Atomics/notify/count-boundary-cases.js
+++ b/test/built-ins/Atomics/notify/count-boundary-cases.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Allowed boundary cases for 'count' argument to Atomics.wake
 info: |
diff --git a/test/built-ins/Atomics/notify/count-defaults-to-infinity-missing.js b/test/built-ins/Atomics/notify/count-defaults-to-infinity-missing.js
index d94c98055f3c0afabc6720fff30666b1eb05e0e3..0edc3c08b08fd261ff52bade86901001d39edcbb 100644
--- a/test/built-ins/Atomics/notify/count-defaults-to-infinity-missing.js
+++ b/test/built-ins/Atomics/notify/count-defaults-to-infinity-missing.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Default to +Infinity when missing 'count' argument to Atomics.wake
 info: |
diff --git a/test/built-ins/Atomics/notify/count-defaults-to-infinity-undefined.js b/test/built-ins/Atomics/notify/count-defaults-to-infinity-undefined.js
index c0d2a042d8a268f84351af642fb6d54e8a543dbe..a0f0b07c849f7d60d775580269f4ebebe54a7f8a 100644
--- a/test/built-ins/Atomics/notify/count-defaults-to-infinity-undefined.js
+++ b/test/built-ins/Atomics/notify/count-defaults-to-infinity-undefined.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Undefined count arg should result in an infinite count
 info: |
diff --git a/test/built-ins/Atomics/notify/count-from-nans.js b/test/built-ins/Atomics/notify/count-from-nans.js
index cb860e2ac53d36db68aaf461a4121f94b0f7d850..06acb6d8301e0080d6aab21406d129879a410a11 100644
--- a/test/built-ins/Atomics/notify/count-from-nans.js
+++ b/test/built-ins/Atomics/notify/count-from-nans.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   NaNs are converted to 0 for 'count' argument to Atomics.wake
 info: |
diff --git a/test/built-ins/Atomics/notify/count-symbol-throws.js b/test/built-ins/Atomics/notify/count-symbol-throws.js
index f3853f5ae28c043950aaac6766b427d126af5cea..defeacc58e639ff906408e225b6f66228902ebce 100644
--- a/test/built-ins/Atomics/notify/count-symbol-throws.js
+++ b/test/built-ins/Atomics/notify/count-symbol-throws.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Return abrupt when symbol passed for 'count' argument to Atomics.wake
 info: |
diff --git a/test/built-ins/Atomics/notify/count-tointeger-throws-then-wake-throws.js b/test/built-ins/Atomics/notify/count-tointeger-throws-then-wake-throws.js
index 690e9d7a552e3bde29e47e4a240a66cee52515ae..949373aab89bb06e596f5532aafe302ca3f981b9 100644
--- a/test/built-ins/Atomics/notify/count-tointeger-throws-then-wake-throws.js
+++ b/test/built-ins/Atomics/notify/count-tointeger-throws-then-wake-throws.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Return abrupt when ToInteger throws an exception on 'count' argument to Atomics.wake
 info: |
diff --git a/test/built-ins/Atomics/notify/descriptor.js b/test/built-ins/Atomics/notify/descriptor.js
index d22f2ebb280b64759ecaf1d74503ab6bee99e45e..9eff07cc488cce5bb369b5fa7d8cb543398c892d 100644
--- a/test/built-ins/Atomics/notify/descriptor.js
+++ b/test/built-ins/Atomics/notify/descriptor.js
@@ -2,7 +2,7 @@
 // This code is governed by the license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: Testing descriptor property of Atomics.wake
 includes: [propertyHelper.js]
 features: [Atomics]
diff --git a/test/built-ins/Atomics/notify/length.js b/test/built-ins/Atomics/notify/length.js
index a2efb99e9213c9296f728fcd13c9afaa29833774..70dcafee51af574b8098e8cc14ab89acd8e520a2 100644
--- a/test/built-ins/Atomics/notify/length.js
+++ b/test/built-ins/Atomics/notify/length.js
@@ -3,7 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Atomics.wake.length is 3.
 info: |
diff --git a/test/built-ins/Atomics/notify/name.js b/test/built-ins/Atomics/notify/name.js
index 0a2b2c956e4be85da44600ed2b84a4510b750a41..7c998c9bfc46bbed72520405c55ff3a3867bdf71 100644
--- a/test/built-ins/Atomics/notify/name.js
+++ b/test/built-ins/Atomics/notify/name.js
@@ -3,7 +3,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Atomics.wake.name is "wake".
 includes: [propertyHelper.js]
diff --git a/test/built-ins/Atomics/notify/negative-count.js b/test/built-ins/Atomics/notify/negative-count.js
index 49e3b0a752d78dcb42a42905d939dd757c571d13..26a6c255aaa6de5386704caa6cebddf52e7bc2b6 100644
--- a/test/built-ins/Atomics/notify/negative-count.js
+++ b/test/built-ins/Atomics/notify/negative-count.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test that Atomics.wake wakes zero waiters if the count is negative
 includes: [atomicsHelper.js]
diff --git a/test/built-ins/Atomics/notify/negative-index-throws.js b/test/built-ins/Atomics/notify/negative-index-throws.js
index 2e6fc1234555459ec53628d9937dc5fd47e02a29..6211fae788f5f4f314ff49e97ef24c2a4d462f8f 100644
--- a/test/built-ins/Atomics/notify/negative-index-throws.js
+++ b/test/built-ins/Atomics/notify/negative-index-throws.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Throws a RangeError is index < 0
 info: |
diff --git a/test/built-ins/Atomics/notify/non-int32-typedarray-throws.js b/test/built-ins/Atomics/notify/non-int32-typedarray-throws.js
index b949e20aeb9a9119e50e4e21636060f6663d416c..91f3602d5c1c878ec20421680d932e0248b55f62 100644
--- a/test/built-ins/Atomics/notify/non-int32-typedarray-throws.js
+++ b/test/built-ins/Atomics/notify/non-int32-typedarray-throws.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Throws a TypeError if typedArray arg is not an Int32Array
 info: |
diff --git a/test/built-ins/Atomics/notify/non-shared-bufferdata-throws.js b/test/built-ins/Atomics/notify/non-shared-bufferdata-throws.js
index 894c78efc3a92709ca94cf8d58de4e3bb05288ca..897f0e4f8b60e3d2f39f39e4128a72a289278ff5 100644
--- a/test/built-ins/Atomics/notify/non-shared-bufferdata-throws.js
+++ b/test/built-ins/Atomics/notify/non-shared-bufferdata-throws.js
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Amal Hussein. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Throws a TypeError if typedArray.buffer is not a SharedArrayBuffer
 info: |
diff --git a/test/built-ins/Atomics/notify/non-shared-bufferdatate-non-shared-int-views.js b/test/built-ins/Atomics/notify/non-shared-bufferdatate-non-shared-int-views.js
index 86a96cbd1eff44cd64818e5df9e53792e1eb8dbb..516f690d660800ca6f5accff162f254d1981c047 100644
--- a/test/built-ins/Atomics/notify/non-shared-bufferdatate-non-shared-int-views.js
+++ b/test/built-ins/Atomics/notify/non-shared-bufferdatate-non-shared-int-views.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test Atomics.wake on non-shared integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/notify/non-shared-int-views.js b/test/built-ins/Atomics/notify/non-shared-int-views.js
index 278a0762f264776ce8165dcebc477855353cf001..25269c69aaaccb8d2acc0a56b7673a9c9d0fab50 100644
--- a/test/built-ins/Atomics/notify/non-shared-int-views.js
+++ b/test/built-ins/Atomics/notify/non-shared-int-views.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test Atomics.wake on non-shared integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/notify/non-views.js b/test/built-ins/Atomics/notify/non-views.js
index 76230cc14c0fafb6f1685eb702336448a22d0ee8..2fbb7e8e96081e7685d92035f04457b18eb31703 100644
--- a/test/built-ins/Atomics/notify/non-views.js
+++ b/test/built-ins/Atomics/notify/non-views.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test Atomics.wake on view values other than TypedArrays
 includes: [testAtomics.js]
diff --git a/test/built-ins/Atomics/notify/not-a-typedarray-throws.js b/test/built-ins/Atomics/notify/not-a-typedarray-throws.js
index 2f2fe55dda4eb23812dc9235dce9303bfb418ce0..ae8af320e873c2d0ebd8d0c3dd1c53f1296c58d7 100644
--- a/test/built-ins/Atomics/notify/not-a-typedarray-throws.js
+++ b/test/built-ins/Atomics/notify/not-a-typedarray-throws.js
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Amal Hussein. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Throws a TypeError if the typedArray arg is not a TypedArray object
 info: |
diff --git a/test/built-ins/Atomics/notify/not-an-object-throws.js b/test/built-ins/Atomics/notify/not-an-object-throws.js
index ce868dc2cd7c88f34249e7227550206f6725c52e..cb356a7794cc4e44613878b16eac99d7ed5c6771 100644
--- a/test/built-ins/Atomics/notify/not-an-object-throws.js
+++ b/test/built-ins/Atomics/notify/not-an-object-throws.js
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Amal Hussein. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Throws a TypeError if typedArray arg is not an Object
 info: |
diff --git a/test/built-ins/Atomics/notify/notify-all-on-loc.js b/test/built-ins/Atomics/notify/notify-all-on-loc.js
index c874b2c4edd4691b5a24febbcda1dcf69d26fe2f..460d8aa5d4b84c85a6136a425140c90f715c313a 100644
--- a/test/built-ins/Atomics/notify/notify-all-on-loc.js
+++ b/test/built-ins/Atomics/notify/notify-all-on-loc.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test that Atomics.wake wakes all waiters on a location, but does not
   wake waiters on other locations.
diff --git a/test/built-ins/Atomics/notify/notify-all.js b/test/built-ins/Atomics/notify/notify-all.js
index dfe4c73a2b293f24d7fc22118b6239b1c7117fd2..e1500368b0d6d6438626b7076b113595de8cf95b 100644
--- a/test/built-ins/Atomics/notify/notify-all.js
+++ b/test/built-ins/Atomics/notify/notify-all.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test that Atomics.wake wakes all waiters if that's what the count is.
 includes: [atomicsHelper.js]
diff --git a/test/built-ins/Atomics/notify/notify-in-order-one-time.js b/test/built-ins/Atomics/notify/notify-in-order-one-time.js
index dcde6308ae6993c6ce0be490b4b9a5e214aa4641..2eabd3384dcede10f862edb3ad6eb7e93f99c038 100644
--- a/test/built-ins/Atomics/notify/notify-in-order-one-time.js
+++ b/test/built-ins/Atomics/notify/notify-in-order-one-time.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test that Atomics.wake wakes agents in the order they are waiting.
 includes: [atomicsHelper.js]
diff --git a/test/built-ins/Atomics/notify/notify-in-order.js b/test/built-ins/Atomics/notify/notify-in-order.js
index dcde6308ae6993c6ce0be490b4b9a5e214aa4641..2eabd3384dcede10f862edb3ad6eb7e93f99c038 100644
--- a/test/built-ins/Atomics/notify/notify-in-order.js
+++ b/test/built-ins/Atomics/notify/notify-in-order.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test that Atomics.wake wakes agents in the order they are waiting.
 includes: [atomicsHelper.js]
diff --git a/test/built-ins/Atomics/notify/notify-nan.js b/test/built-ins/Atomics/notify/notify-nan.js
index 57a5148114400e25a0093e1c8977234575ea9602..ffdb18a00ffd3413a720a3f5145193f89a612487 100644
--- a/test/built-ins/Atomics/notify/notify-nan.js
+++ b/test/built-ins/Atomics/notify/notify-nan.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test that Atomics.wake wakes zero waiters if the count is NaN
 includes: [atomicsHelper.js]
diff --git a/test/built-ins/Atomics/notify/notify-one.js b/test/built-ins/Atomics/notify/notify-one.js
index 6ed94793f1c2e3155dc72e909bafc0d25dccaf07..3bbf576ebfb425e38acb0d4c8c07f9b3d8e660d2 100644
--- a/test/built-ins/Atomics/notify/notify-one.js
+++ b/test/built-ins/Atomics/notify/notify-one.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test that Atomics.wake wakes one waiter if that's what the count is.
 includes: [atomicsHelper.js]
diff --git a/test/built-ins/Atomics/notify/notify-rewake-noop.js b/test/built-ins/Atomics/notify/notify-rewake-noop.js
index 4fd24fed9bf43c782d87a2ff79d49e173d6c49f9..7cbc80b6963ee3dc6b7e3d3b7983444bc280be5a 100644
--- a/test/built-ins/Atomics/notify/notify-rewake-noop.js
+++ b/test/built-ins/Atomics/notify/notify-rewake-noop.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test that Atomics.wake on awoken waiter is a noop.
 includes: [atomicsHelper.js]
diff --git a/test/built-ins/Atomics/notify/notify-two.js b/test/built-ins/Atomics/notify/notify-two.js
index 155e9186cc5b0a22b5b451ce1dd7aaa3cb544fc8..3d3844c34888bd31c408a2760bc7e5c135fd6c4f 100644
--- a/test/built-ins/Atomics/notify/notify-two.js
+++ b/test/built-ins/Atomics/notify/notify-two.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test that Atomics.wake wakes two waiters if that's what the count is.
 includes: [atomicsHelper.js]
diff --git a/test/built-ins/Atomics/notify/notify-with-no-agents-waiting.js b/test/built-ins/Atomics/notify/notify-with-no-agents-waiting.js
index 2c7eb375802033a2eecf1169f6cceea966f056f3..6c21831aeeed2ba414ec513c9973c09f7e1b97a3 100644
--- a/test/built-ins/Atomics/notify/notify-with-no-agents-waiting.js
+++ b/test/built-ins/Atomics/notify/notify-with-no-agents-waiting.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test that Atomics.wake wakes zero waiters if there are no agents waiting.
 includes: [atomicsHelper.js]
diff --git a/test/built-ins/Atomics/notify/notify-with-no-matching-agents-waiting.js b/test/built-ins/Atomics/notify/notify-with-no-matching-agents-waiting.js
index 3182f965e6741881b976cbc98a7837752dbbeb6a..e2a8e35d3ab0decaa6c139253f926392113ff6ae 100644
--- a/test/built-ins/Atomics/notify/notify-with-no-matching-agents-waiting.js
+++ b/test/built-ins/Atomics/notify/notify-with-no-matching-agents-waiting.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test that Atomics.wake wakes zero waiters if there are no waiters
   at the index specified.
diff --git a/test/built-ins/Atomics/notify/notify-zero.js b/test/built-ins/Atomics/notify/notify-zero.js
index 08080419595ff66341a23127b1f41f089657ed0e..73165e791e405ee74756e8e9aef393d1b8de5c85 100644
--- a/test/built-ins/Atomics/notify/notify-zero.js
+++ b/test/built-ins/Atomics/notify/notify-zero.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test that Atomics.wake wakes zero waiters if that's what the count is.
 includes: [atomicsHelper.js]
diff --git a/test/built-ins/Atomics/notify/null-bufferdata-throws.js b/test/built-ins/Atomics/notify/null-bufferdata-throws.js
index aae1a7ed47c82a9bd2c4be2418e9cdb830439b5a..5a0910bf695349879b3624eb7a76fb2dba4f369c 100644
--- a/test/built-ins/Atomics/notify/null-bufferdata-throws.js
+++ b/test/built-ins/Atomics/notify/null-bufferdata-throws.js
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Amal Hussein. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   A null value for bufferData throws a TypeError
 info: |
diff --git a/test/built-ins/Atomics/notify/out-of-range-index-throws.js b/test/built-ins/Atomics/notify/out-of-range-index-throws.js
index de390d8b96b920c78c496481c2a8c440e0a55c55..cc0214248b235d32659086b4203b96d9f83354d9 100644
--- a/test/built-ins/Atomics/notify/out-of-range-index-throws.js
+++ b/test/built-ins/Atomics/notify/out-of-range-index-throws.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Throws a RangeError if value of index arg is out of range
   info: |
diff --git a/test/built-ins/Atomics/notify/shared-nonint-views.js b/test/built-ins/Atomics/notify/shared-nonint-views.js
index 911ff3c00b379cf01ef85d61032b30cbb7cb8178..2727104ff989fd5c61e17c76f755d257df5d0bbe 100644
--- a/test/built-ins/Atomics/notify/shared-nonint-views.js
+++ b/test/built-ins/Atomics/notify/shared-nonint-views.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Test Atomics.wake on shared non-integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/notify/symbol-for-index-throws.js b/test/built-ins/Atomics/notify/symbol-for-index-throws.js
index 3c9fb1e6dfd49ebe7b2803a15b2b5df96f475227..d63e791ef2c773819cecceaa2265b3256cf0e9d6 100644
--- a/test/built-ins/Atomics/notify/symbol-for-index-throws.js
+++ b/test/built-ins/Atomics/notify/symbol-for-index-throws.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   Return abrupt when ToInteger throws for 'index' argument to Atomics.wake
 info: |
diff --git a/test/built-ins/Atomics/notify/undefined-index-defaults-to-zero.js b/test/built-ins/Atomics/notify/undefined-index-defaults-to-zero.js
index 90b0d500675e93c9f60fdc93f0047b2cd48a9ddb..fd99cd69429f3c9de80195e8fa7d349cd7636683 100644
--- a/test/built-ins/Atomics/notify/undefined-index-defaults-to-zero.js
+++ b/test/built-ins/Atomics/notify/undefined-index-defaults-to-zero.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.wake
+esid: sec-atomics.notify
 description: >
   An undefined index arg should translate to 0
 info: |