Finish instruction renaming (#1792)

This finishes #985. This
- replaces the old names in the tests with the new names
- drops support for the deprecated names
- renames test files to match new instruction names

I don't think dropping support for the old names will be a problem at
this point. #985 says the old names are supported for convenience but we
should remove those too at some point; that "some point" may have well
arrived given that three years have passed.

The lists of names updated are in #933, #1564, WebAssembly/spec#720.

29 files changed, 153 insertions, 153 deletions

diff --git a/test/interp/basic-tracing.txt b/test/interp/basic-tracing.txt
index 945fae0d..5a5e20fd 100644
--- a/test/interp/basic-tracing.txt
+++ b/test/interp/basic-tracing.txt
@@ -2,17 +2,17 @@
 ;;; ARGS: --trace
 (module
   (func $fib (param $n i32) (result i32)
-    get_local $n
+    local.get $n
     i32.const 1
     i32.le_s
     if (result i32)
       i32.const 1
     else
-      get_local $n
+      local.get $n
       i32.const 1
       i32.sub
       call $fib
-      get_local $n
+      local.get $n
       i32.mul
     end)
 
diff --git a/test/interp/block-multi.txt b/test/interp/block-multi.txt
index be71a75d..155b26f1 100644
--- a/test/interp/block-multi.txt
+++ b/test/interp/block-multi.txt
@@ -23,7 +23,7 @@
   (func (export "block-param") (result f32)
     i32.const 2
     block (param i32) (result f32)
-      f32.convert_s/i32
+      f32.convert_i32_s
     end
   )
 )
diff --git a/test/interp/br.txt b/test/interp/br.txt
index 0731eb61..0a892b9f 100644
--- a/test/interp/br.txt
+++ b/test/interp/br.txt
@@ -9,14 +9,14 @@
         br 1     ;; if branches introduce blocks
       end
       i32.const 1
-      set_local 0    ;; not executed
+      local.set 0    ;; not executed
     end
     i32.const 1  
-    set_local 1
-    get_local 0
+    local.set 1
+    local.get 0
     i32.const 0
     i32.eq
-    get_local 1
+    local.get 1
     i32.const 1
     i32.eq
     i32.add
@@ -32,21 +32,21 @@
           br 2
         end     ;; if branches introduce blocks
         i32.const 1
-        set_local 0    ;; not executed
+        local.set 0    ;; not executed
       end
       i32.const 1
-      set_local 1    ;; not executed
+      local.set 1    ;; not executed
     end
     i32.const 1
-    set_local 2
-    get_local 0
+    local.set 2
+    local.get 0
     i32.const 0
     i32.eq
-    get_local 1
+    local.get 1
     i32.const 0
     i32.eq
     i32.add
-    get_local 2
+    local.get 2
     i32.const 1
     i32.eq
     i32.add
@@ -72,28 +72,28 @@
     (local i32 i32)
     block $exit
       loop $cont
-        get_local 0
+        local.get 0
         i32.const 1
         i32.add
-        set_local 0
-        get_local 0
+        local.set 0
+        local.get 0
         i32.const 5
         i32.ge_s
         if
           br $exit
         end
-        get_local 0
+        local.get 0
         i32.const 4
         i32.eq 
         if 
           (br $cont)
         end
-        get_local 0
-        set_local 1
+        local.get 0
+        local.set 1
         br $cont
       end
     end
-    get_local 1
+    local.get 1
     return)
 )
 (;; STDOUT ;;;
diff --git a/test/interp/brif-loop.txt b/test/interp/brif-loop.txt
index cfab76e5..ef311473 100644
--- a/test/interp/brif-loop.txt
+++ b/test/interp/brif-loop.txt
@@ -3,16 +3,16 @@
   (func $f (param i32) (result i32)
     (local i32)
     loop $cont
-      get_local 1
+      local.get 1
       i32.const 1
       i32.add
-      set_local 1
-      get_local 1
-      get_local 0
+      local.set 1
+      local.get 1
+      local.get 0
       i32.lt_s
       br_if $cont
     end
-    get_local 1
+    local.get 1
     return)
 
   (func (export "test1") (result i32)
diff --git a/test/interp/brif.txt b/test/interp/brif.txt
index efcc3404..67d2a584 100644
--- a/test/interp/brif.txt
+++ b/test/interp/brif.txt
@@ -2,7 +2,7 @@
 (module
   (func $f (param i32) (result i32)
     block $exit
-      get_local 0
+      local.get 0
       br_if $exit
       i32.const 1
       return
diff --git a/test/interp/brtable.txt b/test/interp/brtable.txt
index 2a3b137f..85d8c440 100644
--- a/test/interp/brtable.txt
+++ b/test/interp/brtable.txt
@@ -5,7 +5,7 @@
       block $2
         block $1
           block $0
-            get_local 0
+            local.get 0
             br_table $0 $1 $2 $default
           end
           ;; 0
diff --git a/test/interp/call-multi-result.txt b/test/interp/call-multi-result.txt
index fd9de3b5..584bd9de 100644
--- a/test/interp/call-multi-result.txt
+++ b/test/interp/call-multi-result.txt
@@ -6,13 +6,13 @@
 
   (func (export "call-multi-result") (result i32)
     call $i32_i64
-    i32.wrap/i64
+    i32.wrap_i64
     i32.add)
 
   (func $rot_f32_3 (param f32 f32 f32) (result f32 f32 f32)
-    get_local 1
-    get_local 2
-    get_local 0)
+    local.get 1
+    local.get 2
+    local.get 0)
 
   (func (export "call-multi-param-result") (result i32)
     block $fail
diff --git a/test/interp/call-zero-args.txt b/test/interp/call-zero-args.txt
index b6ffd4a9..15ef0d8c 100644
--- a/test/interp/call-zero-args.txt
+++ b/test/interp/call-zero-args.txt
@@ -4,8 +4,8 @@
     i32.const 42)
 
   (func $g (param i32 i32) (result i32)
-    get_local 0
-    get_local 1
+    local.get 0
+    local.get 1
     i32.add)
 
   (func (export "h") (result i32)
diff --git a/test/interp/call.txt b/test/interp/call.txt
index 7c0df054..04a3fa19 100644
--- a/test/interp/call.txt
+++ b/test/interp/call.txt
@@ -8,15 +8,15 @@
     call $helper)
 
   (func $helper (param i32 i64 f32 f64) (result i32)
-    get_local 1
-    i32.wrap/i64
-    get_local 0
+    local.get 1
+    i32.wrap_i64
+    local.get 0
     i32.add
-    get_local 2
-    i32.trunc_s/f32
+    local.get 2
+    i32.trunc_f32_s
     i32.add
-    get_local 3
-    i32.trunc_s/f64
+    local.get 3
+    i32.trunc_f64_s
     i32.add
     return)
 
@@ -26,12 +26,12 @@
 
 
   (func $fac (param i32) (result i32)
-    get_local 0
+    local.get 0
     i32.const 0
     i32.gt_s 
     if (result i32)
-      get_local 0
-      get_local 0
+      local.get 0
+      local.get 0
       i32.const 1
       i32.sub
       call $fac
diff --git a/test/interp/callindirect.txt b/test/interp/callindirect.txt
index b12e6d26..5a930bbc 100644
--- a/test/interp/callindirect.txt
+++ b/test/interp/callindirect.txt
@@ -7,26 +7,26 @@
      i32.const 1)
 
   (func $nullary (param i32) (result i32)
-    get_local 0
+    local.get 0
     call_indirect (type $v_i))
 
   (type $ii_i (func (param i32 i32) (result i32)))
   (func $add (type $ii_i)
-    get_local 0 
-    get_local 1
+    local.get 0 
+    local.get 1
     i32.add)
   (func $sub (type $ii_i)
-     get_local 0
-     get_local 1 
+     local.get 0
+     local.get 1 
      i32.sub)
 
   (func $binary (param i32 i32 i32) (result i32)
-    get_local 0
-    get_local 1
-    get_local 2
+    local.get 0
+    local.get 1
+    local.get 2
     call_indirect (type $ii_i))
 
-  (table anyfunc (elem $zero $one $add $sub))
+  (table funcref (elem $zero $one $add $sub))
 
   (func (export "test_zero") (result i32)
     i32.const 0
diff --git a/test/interp/cast.txt b/test/interp/cast.txt
index 423f09b9..ec9a17c7 100644
--- a/test/interp/cast.txt
+++ b/test/interp/cast.txt
@@ -2,19 +2,19 @@
 (module
   (func (export "f32_reinterpret_i32") (result f32)
     i32.const 0x40900000
-    f32.reinterpret/i32)
+    f32.reinterpret_i32)
 
   (func (export "i32_reinterpret_f32") (result i32)
     f32.const -3.5
-    i32.reinterpret/f32)
+    i32.reinterpret_f32)
 
   (func (export "f64_reinterpret_i64") (result f64)
     i64.const 0x405f480000000000
-    f64.reinterpret/i64)
+    f64.reinterpret_i64)
 
   (func (export "i64_reinterpret_f64") (result i64)
     f64.const 1.375e10
-    i64.reinterpret/f64))
+    i64.reinterpret_f64))
 (;; STDOUT ;;;
 f32_reinterpret_i32() => f32:4.500000
 i32_reinterpret_f32() => i32:3227516928
diff --git a/test/interp/convert-sat.txt b/test/interp/convert-sat.txt
index 70119c07..b2127d48 100644
--- a/test/interp/convert-sat.txt
+++ b/test/interp/convert-sat.txt
@@ -1,43 +1,43 @@
 ;;; TOOL: run-interp
 (module
-  (func (export "i32.trunc_s:sat/f32") (result i32)
+  (func (export "i32.trunc_sat_f32_s") (result i32)
     f32.const -100.12345
-    i32.trunc_s:sat/f32)
+    i32.trunc_sat_f32_s)
 
-  (func (export "i32.trunc_u:sat/f32") (result i32)
+  (func (export "i32.trunc_sat_f32_u") (result i32)
     f32.const 3e9
-    i32.trunc_u:sat/f32)
+    i32.trunc_sat_f32_u)
 
-  (func (export "i32.trunc_s:sat/f64") (result i32)
+  (func (export "i32.trunc_sat_f64_s") (result i32)
     f64.const -100.12345
-    i32.trunc_s:sat/f64)
+    i32.trunc_sat_f64_s)
 
-  (func (export "i32.trunc_u:sat/f64") (result i32)
+  (func (export "i32.trunc_sat_f64_u") (result i32)
     f64.const 3e9
-    i32.trunc_u:sat/f64)
+    i32.trunc_sat_f64_u)
 
-  (func (export "i64.trunc_s:sat/f32") (result i64)
+  (func (export "i64.trunc_sat_f32_s") (result i64)
     f32.const -100.12345
-    i64.trunc_s:sat/f32)
+    i64.trunc_sat_f32_s)
 
-  (func (export "i64.trunc_u:sat/f32") (result i64)
+  (func (export "i64.trunc_sat_f32_u") (result i64)
     f32.const 3e9
-    i64.trunc_u:sat/f32)
+    i64.trunc_sat_f32_u)
 
-  (func (export "i64.trunc_s:sat/f64") (result i64)
+  (func (export "i64.trunc_sat_f64_s") (result i64)
     f64.const -100.12345
-    i64.trunc_s:sat/f64)
+    i64.trunc_sat_f64_s)
 
-  (func (export "i64.trunc_u:sat/f64") (result i64)
+  (func (export "i64.trunc_sat_f64_u") (result i64)
     f64.const 3e9
-    i64.trunc_u:sat/f64))
+    i64.trunc_sat_f64_u))
 (;; STDOUT ;;;
-i32.trunc_s:sat/f32() => i32:4294967196
-i32.trunc_u:sat/f32() => i32:3000000000
-i32.trunc_s:sat/f64() => i32:4294967196
-i32.trunc_u:sat/f64() => i32:3000000000
-i64.trunc_s:sat/f32() => i64:18446744073709551516
-i64.trunc_u:sat/f32() => i64:3000000000
-i64.trunc_s:sat/f64() => i64:18446744073709551516
-i64.trunc_u:sat/f64() => i64:3000000000
+i32.trunc_sat_f32_s() => i32:4294967196
+i32.trunc_sat_f32_u() => i32:3000000000
+i32.trunc_sat_f64_s() => i32:4294967196
+i32.trunc_sat_f64_u() => i32:3000000000
+i64.trunc_sat_f32_s() => i64:18446744073709551516
+i64.trunc_sat_f32_u() => i64:3000000000
+i64.trunc_sat_f64_s() => i64:18446744073709551516
+i64.trunc_sat_f64_u() => i64:3000000000
 ;;; STDOUT ;;)
diff --git a/test/interp/convert.txt b/test/interp/convert.txt
index 49d59843..141a1ad4 100644
--- a/test/interp/convert.txt
+++ b/test/interp/convert.txt
@@ -3,83 +3,83 @@
   ;; i32
   (func (export "i32_wrap_i64") (result i32) 
     i64.const -1
-    i32.wrap/i64)
+    i32.wrap_i64)
   ;; TODO(binji): how best to distinguish _s from _u?
   (func (export "i32_trunc_s_f32") (result i32)
     f32.const -100.12345 
-    i32.trunc_s/f32)
+    i32.trunc_f32_s)
   (func (export "i32_trunc_u_f32") (result i32)
     f32.const 3e9 
-    i32.trunc_u/f32)
+    i32.trunc_f32_u)
   (func (export "i32_trunc_s_f64") (result i32)
     f64.const -100.12345 
-    i32.trunc_s/f64)
+    i32.trunc_f64_s)
   (func (export "i32_trunc_u_f64") (result i32)
     f64.const 3e9 
-    i32.trunc_u/f64)
+    i32.trunc_f64_u)
 
   ;; i64
   (func (export "i64_extend_u_i32") (result i64) 
     i32.const -1
-    i64.extend_u/i32)
+    i64.extend_i32_u)
   (func (export "i64_extend_s_i32") (result i64)
     i32.const -1 
-    i64.extend_s/i32)
+    i64.extend_i32_s)
 
   (func (export "i64_trunc_s_f32") (result i32)
      f32.const -100.12345
-     i64.trunc_s/f32 
+     i64.trunc_f32_s 
      i64.const -100
      i64.eq)
   (func (export "i64_trunc_u_f32") (result i32)
      f32.const 3e9
-     i64.trunc_u/f32
+     i64.trunc_f32_u
      i64.const 3000000000
      i64.eq)
   (func (export "i64_trunc_s_f64") (result i32)
      f64.const -100.12345
-     i64.trunc_s/f64
+     i64.trunc_f64_s
      i64.const -100
      i64.eq)
   (func (export "i64_trunc_u_f64") (result i32)
      f64.const 3e9
-     i64.trunc_u/f64
+     i64.trunc_f64_u
      i64.const 3000000000
      i64.eq)
 
   ;; f32
   (func (export "f32_convert_s_i32") (result f32)
     i32.const -1 
-    f32.convert_s/i32)
+    f32.convert_i32_s)
   (func (export "f32_convert_u_i32") (result f32) 
     i32.const -1
-    f32.convert_u/i32)
+    f32.convert_i32_u)
   (func (export "f32_demote_f64") (result f32)
     f64.const 12345678.9 
-    f32.demote/f64)
+    f32.demote_f64)
   (func (export "f32_convert_s_i64") (result f32) 
     i64.const 0
-    f32.convert_s/i64)
+    f32.convert_i64_s)
   (func (export "f32_convert_u_i64") (result f32) 
     i64.const 0
-    f32.convert_u/i64)
+    f32.convert_i64_u)
 
   ;; f64
   (func (export "f64_convert_s_i32") (result f64)
     i32.const -1 
-    f64.convert_s/i32)
+    f64.convert_i32_s)
   (func (export "f64_convert_u_i32") (result f64) 
     i32.const -1
-    f64.convert_u/i32)
+    f64.convert_i32_u)
   (func (export "f64_demote_f32") (result f64)
     f32.const 12345678.9 
-    f64.promote/f32)
+    f64.promote_f32)
   (func (export "f64_convert_s_i64") (result f64) 
     i64.const 0
-    f64.convert_s/i64)
+    f64.convert_i64_s)
   (func (export "f64_convert_u_i64") (result f64) 
     i64.const 0
-    f64.convert_u/i64)
+    f64.convert_i64_u)
 )
 (;; STDOUT ;;;
 i32_wrap_i64() => i32:4294967295
diff --git a/test/interp/expr-br.txt b/test/interp/expr-br.txt
index f5d2d4bc..55f20e0e 100644
--- a/test/interp/expr-br.txt
+++ b/test/interp/expr-br.txt
@@ -2,7 +2,7 @@
 (module
   (func $f (param i32) (result i32)
     block (result i32)
-      get_local 0
+      local.get 0
       i32.const 0
       i32.eq
       if
diff --git a/test/interp/expr-brif.txt b/test/interp/expr-brif.txt
index 219d9a87..0207dffd 100644
--- a/test/interp/expr-brif.txt
+++ b/test/interp/expr-brif.txt
@@ -3,7 +3,7 @@
   (func (param i32) (result i32)
     (block $exit (result i32)
       (i32.sub
-        (br_if $exit (i32.const 42) (get_local 0))
+        (br_if $exit (i32.const 42) (local.get 0))
         (i32.const 13))))
 
   (func (export "test1") (result i32)
diff --git a/test/interp/expr-if.txt b/test/interp/expr-if.txt
index 98b0a95b..ae44efc9 100644
--- a/test/interp/expr-if.txt
+++ b/test/interp/expr-if.txt
@@ -1,7 +1,7 @@
 ;;; TOOL: run-interp
 (module
   (func (param i32) (result i32)
-    get_local 0
+    local.get 0
     i32.const 0
     i32.eq
     if (result i32)
diff --git a/test/interp/if-multi.txt b/test/interp/if-multi.txt
index d8e291c0..c53f6e3b 100644
--- a/test/interp/if-multi.txt
+++ b/test/interp/if-multi.txt
@@ -8,7 +8,7 @@
     else
       unreachable
     end
-    i32.trunc_s/f32
+    i32.trunc_f32_s
     i32.add)
 
   (func (export "if-param") (result f32)
diff --git a/test/interp/if.txt b/test/interp/if.txt
index 46a2c758..7e85424c 100644
--- a/test/interp/if.txt
+++ b/test/interp/if.txt
@@ -2,43 +2,43 @@
 (module
   (func (export "if1") (result i32) (local i32)
     i32.const 0
-    set_local 0
+    local.set 0
     i32.const 1
     if
-      get_local 0
+      local.get 0
       i32.const 1
       i32.add
-      set_local 0 
+      local.set 0 
     end
     i32.const 0
     if
-      get_local 0
+      local.get 0
       i32.const 1
       i32.add
-      set_local 0 
+      local.set 0 
     end
-    get_local 0
+    local.get 0
     return)
 
   (func (export "if2") (result i32) (local i32 i32)
     i32.const 1
     if
       i32.const 1 
-      set_local 0
+      local.set 0
     else
       i32.const 2
-      set_local 0
+      local.set 0
     end
     i32.const 0
     if
       i32.const 4
-      set_local 1
+      local.set 1
     else
       i32.const 8
-      set_local 1
+      local.set 1
     end
-    get_local 0
-    get_local 1
+    local.get 0
+    local.get 1
     i32.add
     return)
 )
diff --git a/test/interp/loop-multi.txt b/test/interp/loop-multi.txt
index 7b6aea56..1e118c15 100644
--- a/test/interp/loop-multi.txt
+++ b/test/interp/loop-multi.txt
@@ -14,8 +14,8 @@
       i32.const 3
       i32.add       ;; +3 to TOS (loop param)
 
-      tee_local $l
-      get_local $l  ;; dup TOS
+      local.tee $l
+      local.get $l  ;; dup TOS
 
       i32.const 10
       i32.lt_s
diff --git a/test/interp/loop.txt b/test/interp/loop.txt
index 446bc605..3a7c0e03 100644
--- a/test/interp/loop.txt
+++ b/test/interp/loop.txt
@@ -4,22 +4,22 @@
     (local i32 i32)
     ;; loop statements now require an explicit branch to the top
     loop $cont
-      get_local 1
-      get_local 0
+      local.get 1
+      local.get 0
       i32.add
-      set_local 1
-      get_local 0
+      local.set 1
+      local.get 0
       i32.const 1
       i32.add 
-      set_local 0
-      get_local 0
+      local.set 0
+      local.get 0
       i32.const 5
       i32.lt_s
       if
         br $cont
       end
     end
-    get_local 1))
+    local.get 1))
 (;; STDOUT ;;;
 loop() => i32:10
 ;;; STDOUT ;;)
diff --git a/test/interp/rethrow-and-br.txt b/test/interp/rethrow-and-br.txt
index 3ed2f1eb..705351cd 100644
--- a/test/interp/rethrow-and-br.txt
+++ b/test/interp/rethrow-and-br.txt
@@ -4,7 +4,7 @@
   (tag $e1)
   (tag $e2)
   (type $helper-type (func (result i32)))
-  (table anyfunc (elem $helper))
+  (table funcref (elem $helper))
   (func (export "rethrow-br") (result i32)
     (try (result i32)
       (do
diff --git a/test/interp/return-call-indirect-import.txt b/test/interp/return-call-indirect-import.txt
index 8913f0b2..6233ff78 100644
--- a/test/interp/return-call-indirect-import.txt
+++ b/test/interp/return-call-indirect-import.txt
@@ -4,7 +4,7 @@
 (module
   (import "host" "print" (func $imported (param i32) (result i32)))
   (type $i_i (func (param i32)(result i32)))
-  (table anyfunc (elem $imported))
+  (table funcref (elem $imported))
 
   (func (export "f") (result i32)
     i32.const 42
diff --git a/test/interp/return-call-indirect.txt b/test/interp/return-call-indirect.txt
index 1e386b0e..cca47171 100644
--- a/test/interp/return-call-indirect.txt
+++ b/test/interp/return-call-indirect.txt
@@ -2,7 +2,7 @@
 ;;; ARGS*: --enable-tail-call
 (module
   (type $iii_i (func (param i32 i32 i32)(result i32)))
-  (table anyfunc (elem $facInd))
+  (table funcref (elem $facInd))
 
   (func (export "facInd10") (result i32)
     i32.const 10
@@ -14,22 +14,22 @@
 (;; Tail call version of factorial, using indirect call ;;)
 (;; fac(Ix,So) => Ix==0?So:fac(Ix-1,So*Ix) ;;)
   (func $facInd (type $iii_i)
-    get_local 0
+    local.get 0
     i32.const 0
     i32.gt_s
     if (result i32)
-      get_local 0
+      local.get 0
       i32.const 1
       i32.sub
-      get_local 1
-      get_local 0
+      local.get 1
+      local.get 0
       i32.mul
-      get_local 2
-      get_local 2
+      local.get 2
+      local.get 2
       return_call_indirect (type $iii_i)
       unreachable
     else
-      get_local 1
+      local.get 1
       return
     end)
 )
diff --git a/test/interp/return-call-set-local.txt b/test/interp/return-call-local-set.txt
index 5b566361..5b566361 100644
--- a/test/interp/return-call-set-local.txt
+++ b/test/interp/return-call-local-set.txt
diff --git a/test/interp/return-call.txt b/test/interp/return-call.txt
index 54ed9286..ced413ff 100644
--- a/test/interp/return-call.txt
+++ b/test/interp/return-call.txt
@@ -10,19 +10,19 @@
 (;; Tail call version of factorial ;;)
 (;; fac(Ix,So) => Ix==0?So:fac(Ix-1,So*Ix) ;;)
   (func $fac (param i32 i32) (result i32)
-    get_local 0
+    local.get 0
     i32.const 0
     i32.gt_s
     if (result i32)
-      get_local 0
+      local.get 0
       i32.const 1
       i32.sub
-      get_local 1
-      get_local 0
+      local.get 1
+      local.get 0
       i32.mul
       return_call $fac
     else
-      get_local 1
+      local.get 1
       return
     end)
 )
diff --git a/test/interp/return-void.txt b/test/interp/return-void.txt
index 728600ef..704aedda 100644
--- a/test/interp/return-void.txt
+++ b/test/interp/return-void.txt
@@ -2,7 +2,7 @@
 (module
   (memory 1)
   (func $store_unless (param i32)
-    get_local 0
+    local.get 0
     i32.const 0
     i32.eq
     if
diff --git a/test/interp/return.txt b/test/interp/return.txt
index b3159250..dbdd1fd0 100644
--- a/test/interp/return.txt
+++ b/test/interp/return.txt
@@ -1,14 +1,14 @@
 ;;; TOOL: run-interp
 (module
   (func $f (param i32) (result i32)
-    get_local 0
+    local.get 0
     i32.const 0
     i32.eq
     if
       i32.const 1
       return
     end
-    get_local 0
+    local.get 0
     i32.const 1
     i32.eq
     if
diff --git a/test/interp/select.txt b/test/interp/select.txt
index 45dc4bd9..81e72172 100644
--- a/test/interp/select.txt
+++ b/test/interp/select.txt
@@ -3,22 +3,22 @@
   (func $i32 (param i32) (result i32)
     i32.const 1
     i32.const 2
-    get_local 0
+    local.get 0
     select)
   (func $i64 (param i32) (result i64)
     i64.const 1
     i64.const 2
-    get_local 0
+    local.get 0
     select)
   (func $f32 (param i32) (result f32)
     f32.const 1
     f32.const 2
-    get_local 0
+    local.get 0
     select)
   (func $f64 (param i32) (result f64)
     f64.const 1
     f64.const 2
-    get_local 0
+    local.get 0
     select)
 
   (func (export "test_i32_l") (result i32)
diff --git a/test/interp/unary.txt b/test/interp/unary.txt
index d6300cf5..b0e94e8f 100644
--- a/test/interp/unary.txt
+++ b/test/interp/unary.txt
@@ -1,12 +1,12 @@
 ;;; TOOL: run-interp
 (module
   (func $f32_is_nan (param f32) (result i32)
-    get_local 0
-    get_local 0
+    local.get 0
+    local.get 0
     f32.ne)
   (func $f64_is_nan (param f64) (result i32)
-    get_local 0
-    get_local 0
+    local.get 0
+    local.get 0
     f64.ne)
 
   ;; i32