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 b3f7a4343cb3c5b8e43191e5dda61fc6c1fa79b4..f39190a80c3c77727c8c27c2fb27af10a8fde99d 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
@@ -4,8 +4,8 @@
 /*---
 esid: sec-atomics.notify
 description: >
-  Test that Atomics.notify wakes all waiters on a location, but does not
-  wake waiters on other locations.
+  Test that Atomics.notify notifies all waiters on a location, but does not
+  notify waiters on other locations.
 includes: [atomicsHelper.js]
 features: [Atomics, BigInt, SharedArrayBuffer, TypedArray]
 ---*/
@@ -63,10 +63,10 @@ $262.agent.broadcast(i64a.buffer);
 $262.agent.waitUntil(i64a, RUNNING, BigInt(NUMAGENT + 1));
 
 // Try to yield control to ensure the agent actually started to wait. If we
-// don't, we risk sending the wakeup before agents are sleeping, and we hang.
+// don't, we risk sending the notification before agents are sleeping, and we hang.
 $262.agent.tryYield();
 
-// Wake all waiting on WAIT_INDEX, should be 3 always, they won't time out.
+// Notify all waiting on WAIT_INDEX, should be 3 always, they won't time out.
 assert.sameValue(
   Atomics.notify(i64a, WAIT_INDEX),
   NUMAGENT,
diff --git a/test/built-ins/Atomics/notify/descriptor.js b/test/built-ins/Atomics/notify/descriptor.js
index 717810a3be8dbe3033e2f295f3ceb0edf5a89187..787ec6b93cf980770dec39efb79553041ffdbe75 100644
--- a/test/built-ins/Atomics/notify/descriptor.js
+++ b/test/built-ins/Atomics/notify/descriptor.js
@@ -8,7 +8,7 @@ includes: [propertyHelper.js]
 features: [Atomics]
 ---*/
 
-verifyProperty(Atomics, 'wake', {
+verifyProperty(Atomics, 'notify', {
   enumerable: false,
   writable: true,
   configurable: true,
diff --git a/test/built-ins/Atomics/notify/name.js b/test/built-ins/Atomics/notify/name.js
index 7d699c2b9b83eecc9e596dd28799051e38cac9e3..bcddfd34997dfaa17f2857c9bd425da2b892e8c9 100644
--- a/test/built-ins/Atomics/notify/name.js
+++ b/test/built-ins/Atomics/notify/name.js
@@ -5,13 +5,13 @@
 /*---
 esid: sec-atomics.notify
 description: >
-  Atomics.notify.name is "wake".
+  Atomics.notify.name is "notify".
 includes: [propertyHelper.js]
 features: [Atomics]
 ---*/
 
 verifyProperty(Atomics.notify, 'name', {
-  value: 'wake',
+  value: 'notify',
   enumerable: false,
   writable: false,
   configurable: true,
diff --git a/test/built-ins/Atomics/notify/negative-count.js b/test/built-ins/Atomics/notify/negative-count.js
index 29b44b70a01fb6c73cfac547f84b4a64175921a2..8cc7f0b036c8e41565b8e9a41ec051b7b30cf3d4 100644
--- a/test/built-ins/Atomics/notify/negative-count.js
+++ b/test/built-ins/Atomics/notify/negative-count.js
@@ -4,7 +4,7 @@
 /*---
 esid: sec-atomics.notify
 description: >
-  Test that Atomics.notify wakes zero waiters if the count is negative
+  Test that Atomics.notify notifies zero waiters if the count is negative
 includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
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 85c1dbf576b93ac67cf662d22ea352acec343e88..863066d23b4de41ab964d5e2198758915d134574 100644
--- a/test/built-ins/Atomics/notify/notify-all-on-loc.js
+++ b/test/built-ins/Atomics/notify/notify-all-on-loc.js
@@ -4,8 +4,8 @@
 /*---
 esid: sec-atomics.notify
 description: >
-  Test that Atomics.notify wakes all waiters on a location, but does not
-  wake waiters on other locations.
+  Test that Atomics.notify notifies all waiters on a location, but does not
+  notify waiters on other locations.
 includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
@@ -63,10 +63,10 @@ $262.agent.broadcast(i32a.buffer);
 $262.agent.waitUntil(i32a, RUNNING, NUMAGENT + 1);
 
 // Try to yield control to ensure the agent actually started to wait. If we
-// don't, we risk sending the wakeup before agents are sleeping, and we hang.
+// don't, we risk sending the notification before agents are sleeping, and we hang.
 $262.agent.tryYield();
 
-// Wake all waiting on WAIT_INDEX, should be 3 always, they won't time out.
+// Notify all waiting on WAIT_INDEX, should be 3 always, they won't time out.
 assert.sameValue(
   Atomics.notify(i32a, WAIT_INDEX),
   NUMAGENT,
diff --git a/test/built-ins/Atomics/notify/notify-all.js b/test/built-ins/Atomics/notify/notify-all.js
index 43a9d5a430e646cda64410034f7d89454d2b4e89..02fa23edf242aead5349a1c931af9ffa0ca728d4 100644
--- a/test/built-ins/Atomics/notify/notify-all.js
+++ b/test/built-ins/Atomics/notify/notify-all.js
@@ -4,7 +4,7 @@
 /*---
 esid: sec-atomics.notify
 description: >
-  Test that Atomics.notify wakes all waiters if that's what the count is.
+  Test that Atomics.notify notifies all waiters if that's what the count is.
 includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
@@ -36,10 +36,10 @@ $262.agent.broadcast(i32a.buffer);
 $262.agent.waitUntil(i32a, RUNNING, NUMAGENT);
 
 // Try to yield control to ensure the agent actually started to wait. If we
-// don't, we risk sending the wakeup before agents are sleeping, and we hang.
+// don't, we risk sending the notification before agents are sleeping, and we hang.
 $262.agent.tryYield();
 
-// Wake all waiting on WAIT_INDEX, should be 3 always, they won't time out.
+// Notify all waiting on WAIT_INDEX, should be 3 always, they won't time out.
 assert.sameValue(
   Atomics.notify(i32a, WAIT_INDEX),
   NUMAGENT,
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 b69c65330279054dd3e1dd4b188a9f363b95436e..ed968417eece88d3b7888a0cbe73542badd67d65 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
@@ -4,7 +4,7 @@
 /*---
 esid: sec-atomics.notify
 description: >
-  Test that Atomics.notify wakes agents in the order they are waiting.
+  Test that Atomics.notify notifies agents in the order they are waiting.
 includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
@@ -16,8 +16,8 @@ const RUNNING = SPIN + NUMAGENT;  // Accounting of live agents
 const BUFFER_SIZE = RUNNING + 1;
 
 // Create workers and start them all spinning.  We set atomic slots to make
-// them go into a wait, thus controlling the waiting order.  Then we wake them
-// one by one and observe the wakeup order.
+// them go into a wait, thus controlling the waiting order.  Then we notify them
+// one by one and observe the notification order.
 
 for (var i = 0; i < NUMAGENT; i++) {
   $262.agent.start(`
diff --git a/test/built-ins/Atomics/notify/notify-in-order.js b/test/built-ins/Atomics/notify/notify-in-order.js
index b69c65330279054dd3e1dd4b188a9f363b95436e..ed968417eece88d3b7888a0cbe73542badd67d65 100644
--- a/test/built-ins/Atomics/notify/notify-in-order.js
+++ b/test/built-ins/Atomics/notify/notify-in-order.js
@@ -4,7 +4,7 @@
 /*---
 esid: sec-atomics.notify
 description: >
-  Test that Atomics.notify wakes agents in the order they are waiting.
+  Test that Atomics.notify notifies agents in the order they are waiting.
 includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
@@ -16,8 +16,8 @@ const RUNNING = SPIN + NUMAGENT;  // Accounting of live agents
 const BUFFER_SIZE = RUNNING + 1;
 
 // Create workers and start them all spinning.  We set atomic slots to make
-// them go into a wait, thus controlling the waiting order.  Then we wake them
-// one by one and observe the wakeup order.
+// them go into a wait, thus controlling the waiting order.  Then we notify them
+// one by one and observe the notification order.
 
 for (var i = 0; i < NUMAGENT; i++) {
   $262.agent.start(`
diff --git a/test/built-ins/Atomics/notify/notify-one.js b/test/built-ins/Atomics/notify/notify-one.js
index f026e87a30323e717b8c9e1fab886bd41c7d7dc7..ffd29d02147785cad7d3109ace595b861acc893d 100644
--- a/test/built-ins/Atomics/notify/notify-one.js
+++ b/test/built-ins/Atomics/notify/notify-one.js
@@ -4,14 +4,14 @@
 /*---
 esid: sec-atomics.notify
 description: >
-  Test that Atomics.notify wakes one waiter if that's what the count is.
+  Test that Atomics.notify notifies one waiter if that's what the count is.
 includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
 const WAIT_INDEX = 0;             // Agents wait here
 const RUNNING = 1;                // Accounting of live agents here
-const WAKECOUNT = 1;
+const NOTIFYCOUNT = 1;
 const NUMAGENT = 3;
 const BUFFER_SIZE = 4;
 
@@ -42,13 +42,13 @@ $262.agent.waitUntil(i32a, RUNNING, NUMAGENT);
 // Try to yield control to ensure the agent actually started to wait.
 $262.agent.tryYield();
 
-// There's a slight risk we'll fail to wake the desired count, if the preceding
+// There's a slight risk we'll fail to notify the desired count, if the preceding
 // tryYield() took much longer than anticipated and workers have started timing
 // out.
 assert.sameValue(
-  Atomics.notify(i32a, 0, WAKECOUNT),
-  WAKECOUNT,
-  'Atomics.notify(i32a, 0, WAKECOUNT) returns the value of `WAKECOUNT`'
+  Atomics.notify(i32a, 0, NOTIFYCOUNT),
+  NOTIFYCOUNT,
+  'Atomics.notify(i32a, 0, NOTIFYCOUNT) returns the value of `NOTIFYCOUNT`'
 );
 
 // Try to sleep past the timeout.
@@ -61,9 +61,9 @@ for (var i = 0; i < NUMAGENT; i++) {
 }
 reports.sort();
 
-for (var i = 0; i < WAKECOUNT; i++) {
+for (var i = 0; i < NOTIFYCOUNT; i++) {
   assert.sameValue(reports[i], 'ok', 'The value of reports[i] is "ok"');
 }
-for (var i = WAKECOUNT; i < NUMAGENT; i++) {
+for (var i = NOTIFYCOUNT; i < NUMAGENT; i++) {
   assert.sameValue(reports[i], 'timed-out', 'The value of reports[i] is "timed-out"');
 }
diff --git a/test/built-ins/Atomics/notify/notify-two.js b/test/built-ins/Atomics/notify/notify-two.js
index 4d4cd8328d20cda4769801a93eb74f1ffec777cb..2a8d6fb8d1c87bc09419cf5b8d04d1186dcd53ea 100644
--- a/test/built-ins/Atomics/notify/notify-two.js
+++ b/test/built-ins/Atomics/notify/notify-two.js
@@ -4,14 +4,14 @@
 /*---
 esid: sec-atomics.notify
 description: >
-  Test that Atomics.notify wakes two waiters if that's what the count is.
+  Test that Atomics.notify notifies two waiters if that's what the count is.
 includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
 const WAIT_INDEX = 0;             // Agents wait here
 const RUNNING = 1;                // Accounting of live agents here
-const WAKECOUNT = 2;
+const NOTIFYCOUNT = 2;
 const NUMAGENT = 3;
 const BUFFER_SIZE = 4;
 
@@ -42,13 +42,13 @@ $262.agent.waitUntil(i32a, RUNNING, NUMAGENT);
 // Try to yield control to ensure the agent actually started to wait.
 $262.agent.tryYield();
 
-// There's a slight risk we'll fail to wake the desired count, if the preceding
+// There's a slight risk we'll fail to notify the desired count, if the preceding
 // tryYield() took much longer than anticipated and workers have started timing
 // out.
 assert.sameValue(
-  Atomics.notify(i32a, 0, WAKECOUNT),
-  WAKECOUNT,
-  'Atomics.notify(i32a, 0, WAKECOUNT) returns the value of `WAKECOUNT`'
+  Atomics.notify(i32a, 0, NOTIFYCOUNT),
+  NOTIFYCOUNT,
+  'Atomics.notify(i32a, 0, NOTIFYCOUNT) returns the value of `NOTIFYCOUNT`'
 );
 
 // Try to sleep past the timeout.
@@ -61,9 +61,9 @@ for (var i = 0; i < NUMAGENT; i++) {
 }
 reports.sort();
 
-for (var i = 0; i < WAKECOUNT; i++) {
+for (var i = 0; i < NOTIFYCOUNT; i++) {
   assert.sameValue(reports[i], 'ok', 'The value of reports[i] is "ok"');
 }
-for (var i = WAKECOUNT; i < NUMAGENT; i++) {
+for (var i = NOTIFYCOUNT; i < NUMAGENT; i++) {
   assert.sameValue(reports[i], 'timed-out', 'The value of reports[i] is "timed-out"');
 }
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 4a3a73412cf38cd3594ed52ecf2f87873702e9b7..747e01766b9dc79a60fbd3cbe01d1178ea11c725 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
@@ -4,7 +4,7 @@
 /*---
 esid: sec-atomics.notify
 description: >
-  Test that Atomics.notify wakes zero waiters if there are no agents waiting.
+  Test that Atomics.notify notifies zero waiters if there are no agents waiting.
 includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
@@ -27,5 +27,5 @@ const i32a = new Int32Array(
 $262.agent.broadcast(i32a.buffer);
 $262.agent.waitUntil(i32a, RUNNING, 1);
 
-// There are ZERO agents waiting to wake...
+// There are ZERO agents waiting to notify...
 assert.sameValue(Atomics.notify(i32a, 0, 1), 0, 'Atomics.notify(i32a, 0, 1) returns 0');
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 fc9523849b4f62ff747e6a4864e756ff1a5e8200..b4a247e493241284c18380f096fd204afe7f6071 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
@@ -4,7 +4,7 @@
 /*---
 esid: sec-atomics.notify
 description: >
-  Test that Atomics.notify wakes zero waiters if there are no waiters
+  Test that Atomics.notify notifies zero waiters if there are no waiters
   at the index specified.
 includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
diff --git a/test/built-ins/Atomics/notify/notify-zero.js b/test/built-ins/Atomics/notify/notify-zero.js
index e5a6cc907211822b15c8c7d193ab4ebc122a6a54..615cb6b91c1b8e98f5bf38e1c02f8bbb18db3018 100644
--- a/test/built-ins/Atomics/notify/notify-zero.js
+++ b/test/built-ins/Atomics/notify/notify-zero.js
@@ -4,14 +4,14 @@
 /*---
 esid: sec-atomics.notify
 description: >
-  Test that Atomics.notify wakes zero waiters if that's what the count is.
+  Test that Atomics.notify notifies zero waiters if that's what the count is.
 includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
 const WAIT_INDEX = 0;             // Agents wait here
 const RUNNING = 1;                // Accounting of live agents here
-const WAKECOUNT = 0;
+const NOTIFYCOUNT = 0;
 const NUMAGENT = 3;
 const BUFFER_SIZE = 4;
 
@@ -43,9 +43,9 @@ $262.agent.waitUntil(i32a, RUNNING, NUMAGENT);
 $262.agent.tryYield();
 
 assert.sameValue(
-  Atomics.notify(i32a, WAIT_INDEX, WAKECOUNT),
-  WAKECOUNT,
-  'Atomics.notify(i32a, WAIT_INDEX, WAKECOUNT) returns the value of `WAKECOUNT`'
+  Atomics.notify(i32a, WAIT_INDEX, NOTIFYCOUNT),
+  NOTIFYCOUNT,
+  'Atomics.notify(i32a, WAIT_INDEX, NOTIFYCOUNT) returns the value of `NOTIFYCOUNT`'
 );
 
 // Try to sleep past the timeout.
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 922efe4c46712879553bd2fcd3417648966bcda5..3dfe88b2e93b3eafe3adf951e3c1bfaddd16e3ce 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
@@ -58,14 +58,14 @@ $262.agent.waitUntil(i32a, RUNNING, NUMAGENT);
 // Try to yield control to ensure the agents actually started to wait.
 $262.agent.tryYield();
 
-// Wake at index 0, undefined => 0.
+// Notify at index 0, undefined => 0.
 var woken = 0;
 while ((woken = Atomics.notify(i32a, undefined, 1)) === 0) ;
 assert.sameValue(woken, 1, 'Atomics.notify(i32a, undefined, 1) returns 1');
 
 assert.sameValue($262.agent.getReport(), 'ok', '$262.agent.getReport() returns "ok"');
 
-// Wake again at index 0, default => 0.
+// Notify again at index 0, default => 0.
 var woken = 0;
 while ((woken = Atomics.notify(i32a, /*, default values used */)) === 0) ;
 assert.sameValue(woken, 1, 'Atomics.notify(i32a /*, default values used */) returns 1');