diff --git a/crates/tests/tests/invalid/multi-value-0.wat b/crates/tests/tests/invalid/multi-value-0.wat
index 62d9308d..15558886 100644
--- a/crates/tests/tests/invalid/multi-value-0.wat
+++ b/crates/tests/tests/invalid/multi-value-0.wat
@@ -2,4 +2,4 @@
   (func (export "i64.dup") (param i64) (result i64 i64)
     ;; With this commented out, there's only a single i64 on the stack.
     ;; get_local 0
-    get_local 0))
+    (local.get 0)))
diff --git a/crates/tests/tests/invalid/multi-value-1.wat b/crates/tests/tests/invalid/multi-value-1.wat
index f27cfdbf..3d11a2b4 100644
--- a/crates/tests/tests/invalid/multi-value-1.wat
+++ b/crates/tests/tests/invalid/multi-value-1.wat
@@ -1,6 +1,6 @@
 (module
   (func (export "i64.dup") (param i64) (result i64 i64)
     ;; Too many i64s on the stack.
-    get_local 0
-    get_local 0
-    get_local 0))
+    (local.get 0)
+    (local.get 0)
+    (local.get 0)))
diff --git a/crates/tests/tests/round_trip/atomic.wat b/crates/tests/tests/round_trip/atomic.wat
index 67ebbde6..3a557dfb 100644
--- a/crates/tests/tests/round_trip/atomic.wat
+++ b/crates/tests/tests/round_trip/atomic.wat
@@ -11,17 +11,17 @@
       (i32.const 0)
       (i32.const 1))
 
-    (atomic.notify
+    (memory.atomic.notify
       (i32.const 0)
       (i32.const 1))
 
-    (i32.atomic.wait
+    (memory.atomic.wait32
       (i32.const 0)
       (i32.const 1)
       (i64.const 2)
       )
 
-    (i64.atomic.wait
+    (memory.atomic.wait64
       (i32.const 0)
       (i64.const 1)
       (i64.const 2)
diff --git a/crates/tests/tests/round_trip/fac-multi-value.wat b/crates/tests/tests/round_trip/fac-multi-value.wat
index 89c1b86d..583b9b53 100644
--- a/crates/tests/tests/round_trip/fac-multi-value.wat
+++ b/crates/tests/tests/round_trip/fac-multi-value.wat
@@ -1,13 +1,13 @@
 (module
   ;; Iterative factorial without locals.
   (func $pick0 (param i64) (result i64 i64)
-    (get_local 0) (get_local 0)
+    (local.get 0) (local.get 0)
   )
   (func $pick1 (param i64 i64) (result i64 i64 i64)
-    (get_local 0) (get_local 1) (get_local 0)
+    (local.get 0) (local.get 1) (local.get 0)
   )
   (func (export "fac-ssa") (param i64) (result i64)
-    (i64.const 1) (get_local 0)
+    (i64.const 1) (local.get 0)
     (loop $l (param i64 i64) (result i64)
       (call $pick1) (call $pick1) (i64.mul)
       (call $pick1) (i64.const 1) (i64.sub)
diff --git a/crates/tests/tests/round_trip/multi-0.wat b/crates/tests/tests/round_trip/multi-0.wat
index a5f31b38..cf0355f0 100644
--- a/crates/tests/tests/round_trip/multi-0.wat
+++ b/crates/tests/tests/round_trip/multi-0.wat
@@ -1,6 +1,6 @@
 (module
   (func (export "i64.dup") (param i64) (result i64 i64)
-    (get_local 0) (get_local 0)))
+    (local.get 0) (local.get 0)))
 
 (; CHECK-ALL:
   (module
diff --git a/crates/tests/tests/valid/fac-multi-value.wat b/crates/tests/tests/valid/fac-multi-value.wat
index d6db8902..d5859f77 100644
--- a/crates/tests/tests/valid/fac-multi-value.wat
+++ b/crates/tests/tests/valid/fac-multi-value.wat
@@ -3,13 +3,13 @@
 (module
   ;; Iterative factorial without locals.
   (func $pick0 (param i64) (result i64 i64)
-    (get_local 0) (get_local 0)
+    (local.get 0) (local.get 0)
   )
   (func $pick1 (param i64 i64) (result i64 i64 i64)
-    (get_local 0) (get_local 1) (get_local 0)
+    (local.get 0) (local.get 1) (local.get 0)
   )
   (func (export "fac-ssa") (param i64) (result i64)
-    (i64.const 1) (get_local 0)
+    (i64.const 1) (local.get 0)
     (loop $l (param i64 i64) (result i64)
       (call $pick1) (call $pick1) (i64.mul)
       (call $pick1) (i64.const 1) (i64.sub)