diff --git a/test/built-ins/Atomics/and/validate-arraytype-before-index-coercion.js b/test/built-ins/Atomics/and/validate-arraytype-before-index-coercion.js
index 346070959a..bf75af6df8 100644
--- a/test/built-ins/Atomics/and/validate-arraytype-before-index-coercion.js
+++ b/test/built-ins/Atomics/and/validate-arraytype-before-index-coercion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.add
+esid: sec-atomics.and
 description: >
   TypedArray type is validated before `index` argument is coerced.
 info: |
diff --git a/test/built-ins/Atomics/and/validate-arraytype-before-value-coercion.js b/test/built-ins/Atomics/and/validate-arraytype-before-value-coercion.js
index 961ad1fa3a..d90596cd73 100644
--- a/test/built-ins/Atomics/and/validate-arraytype-before-value-coercion.js
+++ b/test/built-ins/Atomics/and/validate-arraytype-before-value-coercion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.add
+esid: sec-atomics.and
 description: >
   TypedArray type is validated before `value` argument is coerced.
 info: |
diff --git a/test/built-ins/Atomics/compareExchange/bigint/non-shared-bufferdata.js b/test/built-ins/Atomics/compareExchange/bigint/non-shared-bufferdata.js
index 9442589f7a..6c7eb7496c 100644
--- a/test/built-ins/Atomics/compareExchange/bigint/non-shared-bufferdata.js
+++ b/test/built-ins/Atomics/compareExchange/bigint/non-shared-bufferdata.js
@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-esid: sec-atomics.compareExchange
+esid: sec-atomics.compareexchange
 description: >
   Atomics.compareExchange will operate on TA when TA.buffer is not a SharedArrayBuffer
 includes: [testBigIntTypedArray.js]
diff --git a/test/built-ins/Atomics/compareExchange/expected-return-value.js b/test/built-ins/Atomics/compareExchange/expected-return-value.js
index 9af90bae7b..a13239772e 100644
--- a/test/built-ins/Atomics/compareExchange/expected-return-value.js
+++ b/test/built-ins/Atomics/compareExchange/expected-return-value.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.compareExchange
+esid: sec-atomics.compareexchange
 description: >
   Atomics.compareExchange returns the value that existed at the
   index prior to the operation.
diff --git a/test/built-ins/Atomics/compareExchange/non-shared-bufferdata.js b/test/built-ins/Atomics/compareExchange/non-shared-bufferdata.js
index 025f3e05a8..ace4b93e09 100644
--- a/test/built-ins/Atomics/compareExchange/non-shared-bufferdata.js
+++ b/test/built-ins/Atomics/compareExchange/non-shared-bufferdata.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.compareExchange
+esid: sec-atomics.compareexchange
 description: >
   Atomics.compareExchange will operate on TA when TA.buffer is not a SharedArrayBuffer
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/compareExchange/non-shared-int-views-throws.js b/test/built-ins/Atomics/compareExchange/non-shared-int-views-throws.js
index 0006a53fe9..706a18c66c 100644
--- a/test/built-ins/Atomics/compareExchange/non-shared-int-views-throws.js
+++ b/test/built-ins/Atomics/compareExchange/non-shared-int-views-throws.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.compareExchange
+esid: sec-atomics.compareexchange
 description: >
   Atomics.compareExchange throws when operating on non-sharable integer TypedArrays
 includes: [testTypedArray.js]
diff --git a/test/built-ins/Atomics/compareExchange/validate-arraytype-before-expectedValue-coercion.js b/test/built-ins/Atomics/compareExchange/validate-arraytype-before-expectedValue-coercion.js
index 319db4e2b3..dd4c900ed6 100644
--- a/test/built-ins/Atomics/compareExchange/validate-arraytype-before-expectedValue-coercion.js
+++ b/test/built-ins/Atomics/compareExchange/validate-arraytype-before-expectedValue-coercion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.compareExchange
+esid: sec-atomics.compareexchange
 description: >
   TypedArray type is validated before `expectedValue` argument is coerced.
 info: |
diff --git a/test/built-ins/Atomics/compareExchange/validate-arraytype-before-index-coercion.js b/test/built-ins/Atomics/compareExchange/validate-arraytype-before-index-coercion.js
index f73a105a94..2b6d2c2bce 100644
--- a/test/built-ins/Atomics/compareExchange/validate-arraytype-before-index-coercion.js
+++ b/test/built-ins/Atomics/compareExchange/validate-arraytype-before-index-coercion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.compareExchange
+esid: sec-atomics.compareexchange
 description: >
   TypedArray type is validated before `index` argument is coerced.
 info: |
diff --git a/test/built-ins/Atomics/compareExchange/validate-arraytype-before-replacementValue-coercion.js b/test/built-ins/Atomics/compareExchange/validate-arraytype-before-replacementValue-coercion.js
index 2547bc8541..e68be0c335 100644
--- a/test/built-ins/Atomics/compareExchange/validate-arraytype-before-replacementValue-coercion.js
+++ b/test/built-ins/Atomics/compareExchange/validate-arraytype-before-replacementValue-coercion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.compareExchange
+esid: sec-atomics.compareexchange
 description: >
   TypedArray type is validated before `replacementValue` argument is coerced.
 info: |
diff --git a/test/built-ins/Atomics/exchange/non-shared-int-views-throws.js b/test/built-ins/Atomics/exchange/non-shared-int-views-throws.js
index aca2ec627d..9af064ca9d 100644
--- a/test/built-ins/Atomics/exchange/non-shared-int-views-throws.js
+++ b/test/built-ins/Atomics/exchange/non-shared-int-views-throws.js
@@ -2,9 +2,9 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.add
+esid: sec-atomics.exchange
 description: >
-  Atomics.add throws when operating on non-sharable integer TypedArrays
+  Atomics.exchange throws when operating on non-sharable integer TypedArrays
 includes: [testTypedArray.js]
 features: [ArrayBuffer, Atomics, TypedArray]
 ---*/
@@ -12,6 +12,6 @@ testWithNonAtomicsFriendlyTypedArrayConstructors(TA => {
   const buffer = new ArrayBuffer(TA.BYTES_PER_ELEMENT * 4);
   const view = new TA(buffer);
   assert.throws(TypeError, function() {
-    Atomics.add(view, 0, 1);
-  }, `Atomics.add(new ${TA.name}(buffer), 0, 1) throws TypeError`);
+    Atomics.exchange(view, 0, 1);
+  }, `Atomics.exchange(new ${TA.name}(buffer), 0, 1) throws TypeError`);
 });
diff --git a/test/built-ins/Atomics/isLockFree/bigint/expected-return-value.js b/test/built-ins/Atomics/isLockFree/bigint/expected-return-value.js
index b73f2901c8..09377b3de1 100644
--- a/test/built-ins/Atomics/isLockFree/bigint/expected-return-value.js
+++ b/test/built-ins/Atomics/isLockFree/bigint/expected-return-value.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.isLockFree
+esid: sec-atomics.islockfree
 description: >
   Atomics.isLockFree returns a boolean that indicates whether
   operations on datum of size will be performed without the agent
diff --git a/test/built-ins/Atomics/load/validate-arraytype-before-index-coercion.js b/test/built-ins/Atomics/load/validate-arraytype-before-index-coercion.js
index 3870c1d0b7..2881f15baa 100644
--- a/test/built-ins/Atomics/load/validate-arraytype-before-index-coercion.js
+++ b/test/built-ins/Atomics/load/validate-arraytype-before-index-coercion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.store
+esid: sec-atomics.load
 description: >
   TypedArray type is validated before `index` argument is coerced.
 info: |
diff --git a/test/built-ins/Atomics/or/non-shared-int-views-throws.js b/test/built-ins/Atomics/or/non-shared-int-views-throws.js
index 8b0da10ee3..8915a25a94 100644
--- a/test/built-ins/Atomics/or/non-shared-int-views-throws.js
+++ b/test/built-ins/Atomics/or/non-shared-int-views-throws.js
@@ -2,9 +2,9 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.and
+esid: sec-atomics.or
 description: >
-  Atomics.and throws when operating on non-sharable integer TypedArrays
+  Atomics.or throws when operating on non-sharable integer TypedArrays
 includes: [testTypedArray.js]
 features: [ArrayBuffer, Atomics, TypedArray]
 ---*/
@@ -13,6 +13,6 @@ testWithNonAtomicsFriendlyTypedArrayConstructors(TA => {
   const view = new TA(buffer);
 
   assert.throws(TypeError, function() {
-    Atomics.and(view, 0, 1);
-  }, `Atomics.and(new ${TA.name}(buffer), 0, 1) throws TypeError`);
+    Atomics.or(view, 0, 1);
+  }, `Atomics.or(new ${TA.name}(buffer), 0, 1) throws TypeError`);
 });
diff --git a/test/built-ins/Atomics/wait/validate-arraytype-before-timeout-coercion.js b/test/built-ins/Atomics/wait/validate-arraytype-before-timeout-coercion.js
index 4c3d1a8ed2..464b9c5812 100644
--- a/test/built-ins/Atomics/wait/validate-arraytype-before-timeout-coercion.js
+++ b/test/built-ins/Atomics/wait/validate-arraytype-before-timeout-coercion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.notify
+esid: sec-atomics.wait
 description: >
   TypedArray type is validated before `timeout` argument is coerced.
 info: |
diff --git a/test/built-ins/Atomics/wait/validate-arraytype-before-value-coercion.js b/test/built-ins/Atomics/wait/validate-arraytype-before-value-coercion.js
index dc947b68f4..65e0c46306 100644
--- a/test/built-ins/Atomics/wait/validate-arraytype-before-value-coercion.js
+++ b/test/built-ins/Atomics/wait/validate-arraytype-before-value-coercion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.notify
+esid: sec-atomics.wait
 description: >
   TypedArray type is validated before `value` argument is coerced.
 info: |
diff --git a/test/built-ins/Atomics/waitAsync/validate-arraytype-before-value-coercion.js b/test/built-ins/Atomics/waitAsync/validate-arraytype-before-value-coercion.js
index 037814d0e1..5f7e837917 100644
--- a/test/built-ins/Atomics/waitAsync/validate-arraytype-before-value-coercion.js
+++ b/test/built-ins/Atomics/waitAsync/validate-arraytype-before-value-coercion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.notify
+esid: sec-atomics.waitasync
 description: >
   TypedArray type is validated before `value` argument is coerced.
 info: |
diff --git a/test/built-ins/Atomics/xor/non-shared-bufferdata.js b/test/built-ins/Atomics/xor/non-shared-bufferdata.js
index 3ded3c8b85..512cfeaaa3 100644
--- a/test/built-ins/Atomics/xor/non-shared-bufferdata.js
+++ b/test/built-ins/Atomics/xor/non-shared-bufferdata.js
@@ -2,9 +2,9 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.and
+esid: sec-atomics.xor
 description: >
-  Atomics.and will operate on TA when TA.buffer is not a SharedArrayBuffer
+  Atomics.xor will operate on TA when TA.buffer is not a SharedArrayBuffer
 includes: [testTypedArray.js]
 features: [ArrayBuffer, Atomics, TypedArray]
 ---*/
@@ -13,6 +13,6 @@ testWithAtomicsFriendlyTypedArrayConstructors(TA => {
     new ArrayBuffer(TA.BYTES_PER_ELEMENT * 4)
   );
 
-  assert.sameValue(Atomics.and(view, 0, 1), 0, 'Atomics.and(view, 0, 1) returns 0');
-  assert.sameValue(Atomics.load(view, 0), 0, 'Atomics.load(view, 0) returns 0');
+  assert.sameValue(Atomics.xor(view, 0, 1), 0, 'Atomics.xor(view, 0, 1) returns 0');
+  assert.sameValue(Atomics.load(view, 0), 1, 'Atomics.load(view, 0) returns 1');
 });
diff --git a/test/built-ins/Atomics/xor/non-shared-int-views-throws.js b/test/built-ins/Atomics/xor/non-shared-int-views-throws.js
index b8379deaa9..46e37d1ab4 100644
--- a/test/built-ins/Atomics/xor/non-shared-int-views-throws.js
+++ b/test/built-ins/Atomics/xor/non-shared-int-views-throws.js
@@ -2,9 +2,9 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-atomics.and
+esid: sec-atomics.xor
 description: >
-  Atomics.and throws when operating on non-sharable integer TypedArrays
+  Atomics.xor throws when operating on non-sharable integer TypedArrays
 includes: [testTypedArray.js]
 features: [ArrayBuffer, Atomics, TypedArray]
 ---*/
@@ -13,6 +13,6 @@ testWithNonAtomicsFriendlyTypedArrayConstructors(TA => {
   const view = new TA(buffer);
 
   assert.throws(TypeError, function() {
-    Atomics.and(view, 0, 1);
-  }, `Atomics.and(new ${TA.name}(buffer), 0, 1) throws TypeError`);
+    Atomics.xor(view, 0, 1);
+  }, `Atomics.xor(new ${TA.name}(buffer), 0, 1) throws TypeError`);
 });