10 files changed, 25 insertions, 25 deletions
diff --git a/test/atomics.wast b/test/atomics.wast
index 4fff3b2cb..2dcad6459 100644
--- a/test/atomics.wast
+++ b/test/atomics.wast
@@ -134,24 +134,24 @@
    )
   )
  )
- (func $atomic-wait-wake (type $0)
+ (func $atomic-wait-notify (type $0)
   (local $0 i32)
   (local $1 i64)
   (drop
-   (i32.wait
+   (i32.atomic.wait
     (local.get $0)
     (local.get $0)
     (local.get $1)
    )
   )
   (drop
-   (wake
+   (atomic.notify
     (local.get $0)
     (local.get $0)
    )
   )
   (drop
-   (i64.wait
+   (i64.atomic.wait
     (local.get $0)
     (local.get $1)
     (local.get $1)
diff --git a/test/atomics.wast.from-wast b/test/atomics.wast.from-wast
index 238d81fe6..2869d5da4 100644
--- a/test/atomics.wast.from-wast
+++ b/test/atomics.wast.from-wast
@@ -134,24 +134,24 @@
    )
   )
  )
- (func $atomic-wait-wake (; 3 ;) (type $0)
+ (func $atomic-wait-notify (; 3 ;) (type $0)
   (local $0 i32)
   (local $1 i64)
   (drop
-   (i32.wait
+   (i32.atomic.wait
     (local.get $0)
     (local.get $0)
     (local.get $1)
    )
   )
   (drop
-   (wake
+   (atomic.notify
     (local.get $0)
     (local.get $0)
    )
   )
   (drop
-   (i64.wait
+   (i64.atomic.wait
     (local.get $0)
     (local.get $1)
     (local.get $1)
diff --git a/test/atomics.wast.fromBinary b/test/atomics.wast.fromBinary
index 330ca4dba..dc5cb0145 100644
--- a/test/atomics.wast.fromBinary
+++ b/test/atomics.wast.fromBinary
@@ -134,24 +134,24 @@
    )
   )
  )
- (func $atomic-wait-wake (; 3 ;) (type $0)
+ (func $atomic-wait-notify (; 3 ;) (type $0)
   (local $0 i32)
   (local $1 i64)
   (drop
-   (i32.wait
+   (i32.atomic.wait
     (local.get $0)
     (local.get $0)
     (local.get $1)
    )
   )
   (drop
-   (wake
+   (atomic.notify
     (local.get $0)
     (local.get $0)
    )
   )
   (drop
-   (i64.wait
+   (i64.atomic.wait
     (local.get $0)
     (local.get $1)
     (local.get $1)
diff --git a/test/atomics.wast.fromBinary.noDebugInfo b/test/atomics.wast.fromBinary.noDebugInfo
index 145ecfe9a..77fb51917 100644
--- a/test/atomics.wast.fromBinary.noDebugInfo
+++ b/test/atomics.wast.fromBinary.noDebugInfo
@@ -138,20 +138,20 @@
   (local $0 i32)
   (local $1 i64)
   (drop
-   (i32.wait
+   (i32.atomic.wait
     (local.get $0)
     (local.get $0)
     (local.get $1)
    )
   )
   (drop
-   (wake
+   (atomic.notify
     (local.get $0)
     (local.get $0)
    )
   )
   (drop
-   (i64.wait
+   (i64.atomic.wait
     (local.get $0)
     (local.get $1)
     (local.get $1)
diff --git a/test/binaryen.js/kitchen-sink.js b/test/binaryen.js/kitchen-sink.js
index 6c97703f9..860fdf37d 100644
--- a/test/binaryen.js/kitchen-sink.js
+++ b/test/binaryen.js/kitchen-sink.js
@@ -88,7 +88,7 @@ function test_ids() {
   console.log("BinaryenAtomicCmpxchgId: " + Binaryen.AtomicCmpxchgId);
   console.log("BinaryenAtomicRMWId: " + Binaryen.AtomicRMWId);
   console.log("BinaryenAtomicWaitId: " + Binaryen.AtomicWaitId);
-  console.log("BinaryenAtomicWakeId: " + Binaryen.AtomicWakeId);
+  console.log("BinaryenAtomicNotifyId: " + Binaryen.AtomicNotifyId);
   console.log("BinaryenSIMDExtractId: " + Binaryen.SIMDExtractId);
   console.log("BinaryenSIMDReplaceId: " + Binaryen.SIMDReplaceId);
   console.log("BinaryenSIMDShuffleId: " + Binaryen.SIMDShuffleId);
diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt
index 83e3eee20..e5eb3cf65 100644
--- a/test/binaryen.js/kitchen-sink.js.txt
+++ b/test/binaryen.js/kitchen-sink.js.txt
@@ -32,7 +32,7 @@ BinaryenUnreachableId: 22
 BinaryenAtomicCmpxchgId: 24
 BinaryenAtomicRMWId: 23
 BinaryenAtomicWaitId: 25
-BinaryenAtomicWakeId: 26
+BinaryenAtomicNotifyId: 26
 BinaryenSIMDExtractId: 27
 BinaryenSIMDReplaceId: 28
 BinaryenSIMDShuffleId: 29
diff --git a/test/passes/remove-unused-module-elements.txt b/test/passes/remove-unused-module-elements.txt
index 059a45cce..c2471e743 100644
--- a/test/passes/remove-unused-module-elements.txt
+++ b/test/passes/remove-unused-module-elements.txt
@@ -157,7 +157,7 @@
   (local $0 i32)
   (local $1 i64)
   (drop
-   (i32.wait
+   (i32.atomic.wait
     (local.get $0)
     (local.get $0)
     (local.get $1)
@@ -170,7 +170,7 @@
  (memory $0 (shared 23 256))
  (export "user" (func $user))
  (func $user (; 0 ;) (type $0) (result i32)
-  (wake
+  (atomic.notify
    (i32.const 0)
    (i32.const 0)
   )
diff --git a/test/passes/remove-unused-module-elements.wast b/test/passes/remove-unused-module-elements.wast
index aa824bded..4bd5ccf10 100644
--- a/test/passes/remove-unused-module-elements.wast
+++ b/test/passes/remove-unused-module-elements.wast
@@ -128,7 +128,7 @@
     (local $0 i32)
     (local $1 i64)
     (drop
-     (i32.wait
+     (i32.atomic.wait
       (local.get $0)
       (local.get $0)
       (local.get $1)
@@ -140,7 +140,7 @@
   (memory $0 (shared 23 256))
   (export "user" $user)
   (func $user (result i32)
-    (wake (i32.const 0) (i32.const 0))
+    (atomic.notify (i32.const 0) (i32.const 0))
   )
 )
 (module ;; more use checks
diff --git a/test/passes/remove-unused-nonfunction-module-elements.txt b/test/passes/remove-unused-nonfunction-module-elements.txt
index 556351afb..2d9609efa 100644
--- a/test/passes/remove-unused-nonfunction-module-elements.txt
+++ b/test/passes/remove-unused-nonfunction-module-elements.txt
@@ -172,7 +172,7 @@
   (local $0 i32)
   (local $1 i64)
   (drop
-   (i32.wait
+   (i32.atomic.wait
     (local.get $0)
     (local.get $0)
     (local.get $1)
@@ -185,7 +185,7 @@
  (memory $0 (shared 23 256))
  (export "user" (func $user))
  (func $user (; 0 ;) (type $0) (result i32)
-  (wake
+  (atomic.notify
    (i32.const 0)
    (i32.const 0)
   )
diff --git a/test/passes/remove-unused-nonfunction-module-elements.wast b/test/passes/remove-unused-nonfunction-module-elements.wast
index 910b99431..4370328ce 100644
--- a/test/passes/remove-unused-nonfunction-module-elements.wast
+++ b/test/passes/remove-unused-nonfunction-module-elements.wast
@@ -128,7 +128,7 @@
     (local $0 i32)
     (local $1 i64)
     (drop
-     (i32.wait
+     (i32.atomic.wait
       (local.get $0)
       (local.get $0)
       (local.get $1)
@@ -140,7 +140,7 @@
   (memory $0 (shared 23 256))
   (export "user" $user)
   (func $user (result i32)
-    (wake (i32.const 0) (i32.const 0))
+    (atomic.notify (i32.const 0) (i32.const 0))
   )
 )
 (module ;; more use checks