Emit imports before defined things in text format (#1715)

That is the correct order in the text format, wabt errors otherwise.

See AssemblyScript/assemblyscript#310

186 files changed, 255 insertions, 255 deletions

diff --git a/test/bad_params.fromasm.clamp.no-opts b/test/bad_params.fromasm.clamp.no-opts
index f54f08eb4..b7ed58e02 100644
--- a/test/bad_params.fromasm.clamp.no-opts
+++ b/test/bad_params.fromasm.clamp.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "ex" (func $ex))
diff --git a/test/bad_params.fromasm.imprecise.no-opts b/test/bad_params.fromasm.imprecise.no-opts
index f54f08eb4..b7ed58e02 100644
--- a/test/bad_params.fromasm.imprecise.no-opts
+++ b/test/bad_params.fromasm.imprecise.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "ex" (func $ex))
diff --git a/test/bad_params.fromasm.no-opts b/test/bad_params.fromasm.no-opts
index f54f08eb4..b7ed58e02 100644
--- a/test/bad_params.fromasm.no-opts
+++ b/test/bad_params.fromasm.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "ex" (func $ex))
diff --git a/test/badvartype.wasm.fromBinary b/test/badvartype.wasm.fromBinary
index 43e0541f1..9f4367c34 100644
--- a/test/badvartype.wasm.fromBinary
+++ b/test/badvartype.wasm.fromBinary
@@ -10,7 +10,7 @@
  (type $8 (func (param f64) (result f64)))
  (memory $0 (shared 1 1))
  (data (i32.const 0) "\00\00\00\00\00\00\00\00X\00\00\00U\00\00\0b\00\00\00\00\00\00\00k\00\00")
- (table 2 anyfunc)
+ (table $0 2 anyfunc)
  (elem (i32.const 0) $1 $5)
  (global $global$0 (mut i32) (i32.const 255))
  (global $global$1 (mut i32) (i32.const -7045592))
diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt
index da8f22989..06894d137 100644
--- a/test/binaryen.js/kitchen-sink.js.txt
+++ b/test/binaryen.js/kitchen-sink.js.txt
@@ -46,11 +46,11 @@ getExpressionInfo(f64.const)={"id":14,"type":4,"value":9.5}
  (type $fiF (func (param i32 f64) (result f32)))
  (type $v (func))
  (type $3 (func))
+ (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (memory $0 1 256)
  (data (i32.const 10) "hello, world")
- (table 1 anyfunc)
+ (table $0 1 anyfunc)
  (elem (i32.const 0) "$kitchen()sinker")
- (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (export "kitchen_sinker" (func "$kitchen()sinker"))
  (export "mem" (memory $0))
  (start $starter)
@@ -1502,11 +1502,11 @@ getExpressionInfo(f64.const)={"id":14,"type":4,"value":9.5}
  (type $fiF (func (param i32 f64) (result f32)))
  (type $v (func))
  (type $3 (func))
+ (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (memory $0 1 256)
  (data (i32.const 10) "hello, world")
- (table 1 anyfunc)
+ (table $0 1 anyfunc)
  (elem (i32.const 0) "$kitchen()sinker")
- (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (export "kitchen_sinker" (func "$kitchen()sinker"))
  (export "mem" (memory $0))
  (start $starter)
diff --git a/test/ctor-eval/bad-indirect-call.wast.out b/test/ctor-eval/bad-indirect-call.wast.out
index 33ca25915..2fa1e4c64 100644
--- a/test/ctor-eval/bad-indirect-call.wast.out
+++ b/test/ctor-eval/bad-indirect-call.wast.out
@@ -2,7 +2,7 @@
  (type $v (func))
  (memory $0 256 256)
  (data (i32.const 10) "waka waka waka waka waka")
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) $call-indirect)
  (export "test1" (func $test1))
  (func $test1 (; 0 ;) (type $v)
diff --git a/test/ctor-eval/bad-indirect-call2.wast.out b/test/ctor-eval/bad-indirect-call2.wast.out
index f302fb143..16b7627fe 100644
--- a/test/ctor-eval/bad-indirect-call2.wast.out
+++ b/test/ctor-eval/bad-indirect-call2.wast.out
@@ -1,10 +1,10 @@
 (module
  (type $FUNCSIG$v (func))
+ (import "env" "_abort" (func $_abort))
  (memory $0 256 256)
  (data (i32.const 10) "waka waka waka waka waka")
- (table 2 2 anyfunc)
+ (table $0 2 2 anyfunc)
  (elem (i32.const 0) $_abort $call-indirect)
- (import "env" "_abort" (func $_abort))
  (export "test1" (func $test1))
  (func $test1 (; 1 ;) (type $FUNCSIG$v)
   (call_indirect (type $FUNCSIG$v)
diff --git a/test/ctor-eval/indirect-call3.wast.out b/test/ctor-eval/indirect-call3.wast.out
index 561f17976..27351bcce 100644
--- a/test/ctor-eval/indirect-call3.wast.out
+++ b/test/ctor-eval/indirect-call3.wast.out
@@ -1,9 +1,9 @@
 (module
  (type $FUNCSIG$v (func))
- (memory $0 256 256)
- (data (i32.const 10) "waka waka xaka waka waka\00\00\00\00\00\00C")
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "_abort" (func $_abort))
+ (memory $0 256 256)
+ (data (i32.const 10) "waka waka xaka waka waka\00\00\00\00\00\00C")
  (func $call-indirect (; 1 ;) (type $FUNCSIG$v)
   (i32.store8
    (i32.const 40)
diff --git a/test/debugInfo.fromasm.clamp.no-opts b/test/debugInfo.fromasm.clamp.no-opts
index 33309199e..527fbc23f 100644
--- a/test/debugInfo.fromasm.clamp.no-opts
+++ b/test/debugInfo.fromasm.clamp.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (global $STACKTOP (mut i32) (i32.const 0))
diff --git a/test/debugInfo.fromasm.imprecise.no-opts b/test/debugInfo.fromasm.imprecise.no-opts
index 1985349b6..be589fd5a 100644
--- a/test/debugInfo.fromasm.imprecise.no-opts
+++ b/test/debugInfo.fromasm.imprecise.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (global $STACKTOP (mut i32) (i32.const 0))
diff --git a/test/debugInfo.fromasm.no-opts b/test/debugInfo.fromasm.no-opts
index 33309199e..527fbc23f 100644
--- a/test/debugInfo.fromasm.no-opts
+++ b/test/debugInfo.fromasm.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (global $STACKTOP (mut i32) (i32.const 0))
diff --git a/test/dylib.wasm.fromBinary b/test/dylib.wasm.fromBinary
index 7c518b28f..c528c5e0d 100644
--- a/test/dylib.wasm.fromBinary
+++ b/test/dylib.wasm.fromBinary
@@ -4,7 +4,7 @@
  (type $2 (func))
  (import "env" "memory" (memory $2 256))
  (data (get_global $gimport$0) "hello, world!")
- (import "env" "table" (table 0 anyfunc))
+ (import "env" "table" (table $timport$3 0 anyfunc))
  (import "env" "memoryBase" (global $gimport$0 i32))
  (import "env" "tableBase" (global $gimport$4 i32))
  (import "env" "_puts" (func $fimport$1 (param i32) (result i32)))
diff --git a/test/dynamicLibrary.fromasm.clamp.no-opts b/test/dynamicLibrary.fromasm.clamp.no-opts
index f2a0c5b5c..93312ae0a 100644
--- a/test/dynamicLibrary.fromasm.clamp.no-opts
+++ b/test/dynamicLibrary.fromasm.clamp.no-opts
@@ -2,7 +2,7 @@
  (type $FUNCSIG$vi (func (param i32)))
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32))
diff --git a/test/dynamicLibrary.fromasm.imprecise.no-opts b/test/dynamicLibrary.fromasm.imprecise.no-opts
index f2a0c5b5c..93312ae0a 100644
--- a/test/dynamicLibrary.fromasm.imprecise.no-opts
+++ b/test/dynamicLibrary.fromasm.imprecise.no-opts
@@ -2,7 +2,7 @@
  (type $FUNCSIG$vi (func (param i32)))
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32))
diff --git a/test/dynamicLibrary.fromasm.no-opts b/test/dynamicLibrary.fromasm.no-opts
index f2a0c5b5c..93312ae0a 100644
--- a/test/dynamicLibrary.fromasm.no-opts
+++ b/test/dynamicLibrary.fromasm.no-opts
@@ -2,7 +2,7 @@
  (type $FUNCSIG$vi (func (param i32)))
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32))
diff --git a/test/emcc_O2_hello_world.fromasm b/test/emcc_O2_hello_world.fromasm
index 3573e6bfa..91c312f7a 100644
--- a/test/emcc_O2_hello_world.fromasm
+++ b/test/emcc_O2_hello_world.fromasm
@@ -8,7 +8,7 @@
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
  (data (i32.const 1024) "emcc_O2_hello_world.asm.js")
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $table 18 18 anyfunc))
  (elem (get_global $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
diff --git a/test/emcc_O2_hello_world.fromasm.clamp b/test/emcc_O2_hello_world.fromasm.clamp
index 3573e6bfa..91c312f7a 100644
--- a/test/emcc_O2_hello_world.fromasm.clamp
+++ b/test/emcc_O2_hello_world.fromasm.clamp
@@ -8,7 +8,7 @@
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
  (data (i32.const 1024) "emcc_O2_hello_world.asm.js")
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $table 18 18 anyfunc))
  (elem (get_global $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
diff --git a/test/emcc_O2_hello_world.fromasm.clamp.no-opts b/test/emcc_O2_hello_world.fromasm.clamp.no-opts
index e7d760219..a8bb1aadd 100644
--- a/test/emcc_O2_hello_world.fromasm.clamp.no-opts
+++ b/test/emcc_O2_hello_world.fromasm.clamp.no-opts
@@ -7,7 +7,7 @@
  (type $FUNCSIG$v (func))
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $table 18 18 anyfunc))
  (elem (get_global $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/emcc_O2_hello_world.fromasm.imprecise b/test/emcc_O2_hello_world.fromasm.imprecise
index e8b1de0b1..086e05c04 100644
--- a/test/emcc_O2_hello_world.fromasm.imprecise
+++ b/test/emcc_O2_hello_world.fromasm.imprecise
@@ -7,7 +7,7 @@
  (type $FUNCSIG$v (func))
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $table 18 18 anyfunc))
  (elem (get_global $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
diff --git a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts
index ffc9cec45..8d4243b65 100644
--- a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts
+++ b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts
@@ -7,7 +7,7 @@
  (type $FUNCSIG$v (func))
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $table 18 18 anyfunc))
  (elem (get_global $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/emcc_O2_hello_world.fromasm.no-opts b/test/emcc_O2_hello_world.fromasm.no-opts
index e7d760219..a8bb1aadd 100644
--- a/test/emcc_O2_hello_world.fromasm.no-opts
+++ b/test/emcc_O2_hello_world.fromasm.no-opts
@@ -7,7 +7,7 @@
  (type $FUNCSIG$v (func))
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $table 18 18 anyfunc))
  (elem (get_global $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm
index 9c2281f57..237b1cc5e 100644
--- a/test/emcc_hello_world.fromasm
+++ b/test/emcc_hello_world.fromasm
@@ -9,7 +9,7 @@
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
  (data (i32.const 1024) "emcc_hello_world.asm.js")
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $table 18 18 anyfunc))
  (elem (get_global $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
diff --git a/test/emcc_hello_world.fromasm.clamp b/test/emcc_hello_world.fromasm.clamp
index e036feffe..05e57ff34 100644
--- a/test/emcc_hello_world.fromasm.clamp
+++ b/test/emcc_hello_world.fromasm.clamp
@@ -8,7 +8,7 @@
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
  (data (i32.const 1024) "emcc_hello_world.asm.js")
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $table 18 18 anyfunc))
  (elem (get_global $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
diff --git a/test/emcc_hello_world.fromasm.clamp.no-opts b/test/emcc_hello_world.fromasm.clamp.no-opts
index c4fbe1ec5..9f4bfc957 100644
--- a/test/emcc_hello_world.fromasm.clamp.no-opts
+++ b/test/emcc_hello_world.fromasm.clamp.no-opts
@@ -7,7 +7,7 @@
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $table 18 18 anyfunc))
  (elem (get_global $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise
index 023d58c10..26c7fb304 100644
--- a/test/emcc_hello_world.fromasm.imprecise
+++ b/test/emcc_hello_world.fromasm.imprecise
@@ -7,7 +7,7 @@
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $table 18 18 anyfunc))
  (elem (get_global $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
diff --git a/test/emcc_hello_world.fromasm.imprecise.no-opts b/test/emcc_hello_world.fromasm.imprecise.no-opts
index 1d580f542..424679fcd 100644
--- a/test/emcc_hello_world.fromasm.imprecise.no-opts
+++ b/test/emcc_hello_world.fromasm.imprecise.no-opts
@@ -7,7 +7,7 @@
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $table 18 18 anyfunc))
  (elem (get_global $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/emcc_hello_world.fromasm.no-opts b/test/emcc_hello_world.fromasm.no-opts
index 352b5fce1..9488377ab 100644
--- a/test/emcc_hello_world.fromasm.no-opts
+++ b/test/emcc_hello_world.fromasm.no-opts
@@ -8,7 +8,7 @@
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
  (type $FUNCSIG$vii (func (param i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $table 18 18 anyfunc))
  (elem (get_global $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/empty.fromasm.clamp.no-opts b/test/empty.fromasm.clamp.no-opts
index e8a74bc65..8d4b94845 100644
--- a/test/empty.fromasm.clamp.no-opts
+++ b/test/empty.fromasm.clamp.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
 )
diff --git a/test/empty.fromasm.imprecise.no-opts b/test/empty.fromasm.imprecise.no-opts
index e8a74bc65..8d4b94845 100644
--- a/test/empty.fromasm.imprecise.no-opts
+++ b/test/empty.fromasm.imprecise.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
 )
diff --git a/test/empty.fromasm.no-opts b/test/empty.fromasm.no-opts
index e8a74bc65..8d4b94845 100644
--- a/test/empty.fromasm.no-opts
+++ b/test/empty.fromasm.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
 )
diff --git a/test/empty_4GB.fromasm.clamp.no-opts b/test/empty_4GB.fromasm.clamp.no-opts
index 7f68f6564..f52e86de8 100644
--- a/test/empty_4GB.fromasm.clamp.no-opts
+++ b/test/empty_4GB.fromasm.clamp.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 65536))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
 )
diff --git a/test/empty_4GB.fromasm.imprecise.no-opts b/test/empty_4GB.fromasm.imprecise.no-opts
index 7f68f6564..f52e86de8 100644
--- a/test/empty_4GB.fromasm.imprecise.no-opts
+++ b/test/empty_4GB.fromasm.imprecise.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 65536))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
 )
diff --git a/test/empty_4GB.fromasm.no-opts b/test/empty_4GB.fromasm.no-opts
index 7f68f6564..f52e86de8 100644
--- a/test/empty_4GB.fromasm.no-opts
+++ b/test/empty_4GB.fromasm.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 65536))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
 )
diff --git a/test/empty_imported_table.wast.from-wast b/test/empty_imported_table.wast.from-wast
index 3abcf2a50..1acc53579 100644
--- a/test/empty_imported_table.wast.from-wast
+++ b/test/empty_imported_table.wast.from-wast
@@ -1,4 +1,4 @@
 (module
+ (import "env" "table" (table $0 0 0 anyfunc))
  (memory $0 0)
- (import "env" "table" (table 0 0 anyfunc))
 )
diff --git a/test/empty_imported_table.wast.fromBinary b/test/empty_imported_table.wast.fromBinary
index e8bc8835d..1e129c2a8 100644
--- a/test/empty_imported_table.wast.fromBinary
+++ b/test/empty_imported_table.wast.fromBinary
@@ -1,5 +1,5 @@
 (module
+ (import "env" "table" (table $timport$0 0 0 anyfunc))
  (memory $0 0)
- (import "env" "table" (table 0 0 anyfunc))
 )
 
diff --git a/test/empty_imported_table.wast.fromBinary.noDebugInfo b/test/empty_imported_table.wast.fromBinary.noDebugInfo
index e8bc8835d..1e129c2a8 100644
--- a/test/empty_imported_table.wast.fromBinary.noDebugInfo
+++ b/test/empty_imported_table.wast.fromBinary.noDebugInfo
@@ -1,5 +1,5 @@
 (module
+ (import "env" "table" (table $timport$0 0 0 anyfunc))
  (memory $0 0)
- (import "env" "table" (table 0 0 anyfunc))
 )
 
diff --git a/test/empty_table.wast.from-wast b/test/empty_table.wast.from-wast
index 59a78fb19..3b05fb8d5 100644
--- a/test/empty_table.wast.from-wast
+++ b/test/empty_table.wast.from-wast
@@ -1,4 +1,4 @@
 (module
  (memory $0 0)
- (table 0 0 anyfunc)
+ (table $0 0 0 anyfunc)
 )
diff --git a/test/empty_table.wast.fromBinary b/test/empty_table.wast.fromBinary
index 9d7d65c26..b5afde4a5 100644
--- a/test/empty_table.wast.fromBinary
+++ b/test/empty_table.wast.fromBinary
@@ -1,5 +1,5 @@
 (module
  (memory $0 0)
- (table 0 0 anyfunc)
+ (table $0 0 0 anyfunc)
 )
 
diff --git a/test/empty_table.wast.fromBinary.noDebugInfo b/test/empty_table.wast.fromBinary.noDebugInfo
index 9d7d65c26..b5afde4a5 100644
--- a/test/empty_table.wast.fromBinary.noDebugInfo
+++ b/test/empty_table.wast.fromBinary.noDebugInfo
@@ -1,5 +1,5 @@
 (module
  (memory $0 0)
- (table 0 0 anyfunc)
+ (table $0 0 0 anyfunc)
 )
 
diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt
index f3e114c25..afb004f81 100644
--- a/test/example/c-api-kitchen-sink.txt
+++ b/test/example/c-api-kitchen-sink.txt
@@ -13,11 +13,11 @@ BinaryenTypeAuto: -1
  (type $fiF (func (param i32 f64) (result f32)))
  (type $v (func))
  (type $3 (func))
+ (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (memory $0 1 256)
  (data (i32.const 10) "hello, world")
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) "$kitchen()sinker")
- (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (global $a-global i32 (i32.const 7))
  (global $a-mutable-global (mut f32) (f32.const 7.5))
  (export "kitchen_sinker" (func "$kitchen()sinker"))
@@ -1435,11 +1435,11 @@ int main() {
  (type $fiF (func (param i32 f64) (result f32)))
  (type $v (func))
  (type $3 (func))
+ (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (memory $0 1 256)
  (data (i32.const 10) "hello, world")
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) "$kitchen()sinker")
- (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (global $a-global i32 (i32.const 7))
  (global $a-mutable-global (mut f32) (f32.const 7.5))
  (export "kitchen_sinker" (func "$kitchen()sinker"))
diff --git a/test/example/c-api-kitchen-sink.txt.txt b/test/example/c-api-kitchen-sink.txt.txt
index 1d2fcfdda..bddf95e79 100644
--- a/test/example/c-api-kitchen-sink.txt.txt
+++ b/test/example/c-api-kitchen-sink.txt.txt
@@ -6,11 +6,11 @@
  (type $fiF (func (param i32 f64) (result f32)))
  (type $v (func))
  (type $3 (func))
+ (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (memory $0 1 256)
  (data (i32.const 10) "hello, world")
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) "$kitchen()sinker")
- (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (global $a-global i32 (i32.const 7))
  (global $a-mutable-global (mut f32) (f32.const 7.5))
  (export "kitchen_sinker" (func "$kitchen()sinker"))
diff --git a/test/example/relooper-fuzz.txt b/test/example/relooper-fuzz.txt
index 47ebcfbb0..bde48af8c 100644
--- a/test/example/relooper-fuzz.txt
+++ b/test/example/relooper-fuzz.txt
@@ -2,8 +2,8 @@
  (type $i (func (result i32)))
  (type $v (func))
  (type $vi (func (param i32)))
- (memory $0 1 1)
  (import "spectest" "print" (func $print (param i32)))
+ (memory $0 1 1)
  (export "mem" (memory $0))
  (start $main)
  (func $check (; 1 ;) (type $i) (result i32)
@@ -295,8 +295,8 @@
  (type $i (func (result i32)))
  (type $v (func))
  (type $vi (func (param i32)))
- (memory $0 1 1)
  (import "spectest" "print" (func $print (param i32)))
+ (memory $0 1 1)
  (export "mem" (memory $0))
  (start $main)
  (func $check (; 1 ;) (; has Stack IR ;) (type $i) (result i32)
diff --git a/test/example/relooper-fuzz1.txt b/test/example/relooper-fuzz1.txt
index b05da62c5..af3140f9c 100644
--- a/test/example/relooper-fuzz1.txt
+++ b/test/example/relooper-fuzz1.txt
@@ -2,8 +2,8 @@
  (type $i (func (result i32)))
  (type $v (func))
  (type $vi (func (param i32)))
- (memory $0 1 1)
  (import "spectest" "print" (func $print (param i32)))
+ (memory $0 1 1)
  (export "mem" (memory $0))
  (start $main)
  (func $check (; 1 ;) (type $i) (result i32)
@@ -271,8 +271,8 @@
  (type $i (func (result i32)))
  (type $v (func))
  (type $vi (func (param i32)))
- (memory $0 1 1)
  (import "spectest" "print" (func $print (param i32)))
+ (memory $0 1 1)
  (export "mem" (memory $0))
  (start $main)
  (func $check (; 1 ;) (; has Stack IR ;) (type $i) (result i32)
diff --git a/test/fib-dbg.wasm.fromBinary b/test/fib-dbg.wasm.fromBinary
index af51fc5a8..79116f156 100644
--- a/test/fib-dbg.wasm.fromBinary
+++ b/test/fib-dbg.wasm.fromBinary
@@ -5,7 +5,7 @@
  (type $3 (func (param i32)))
  (type $4 (func))
  (import "env" "memory" (memory $9 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $timport$10 0 0 anyfunc))
  (import "env" "DYNAMICTOP_PTR" (global $gimport$0 i32))
  (import "env" "tempDoublePtr" (global $gimport$1 i32))
  (import "env" "ABORT" (global $gimport$2 i32))
diff --git a/test/hello_world.fromasm.clamp.no-opts b/test/hello_world.fromasm.clamp.no-opts
index fa40c6e56..bd0077baa 100644
--- a/test/hello_world.fromasm.clamp.no-opts
+++ b/test/hello_world.fromasm.clamp.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "add" (func $add))
diff --git a/test/hello_world.fromasm.imprecise.no-opts b/test/hello_world.fromasm.imprecise.no-opts
index fa40c6e56..bd0077baa 100644
--- a/test/hello_world.fromasm.imprecise.no-opts
+++ b/test/hello_world.fromasm.imprecise.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "add" (func $add))
diff --git a/test/hello_world.fromasm.no-opts b/test/hello_world.fromasm.no-opts
index fa40c6e56..bd0077baa 100644
--- a/test/hello_world.fromasm.no-opts
+++ b/test/hello_world.fromasm.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "add" (func $add))
diff --git a/test/i64-setTempRet0.fromasm.clamp.no-opts b/test/i64-setTempRet0.fromasm.clamp.no-opts
index 104195277..b161dd2bf 100644
--- a/test/i64-setTempRet0.fromasm.clamp.no-opts
+++ b/test/i64-setTempRet0.fromasm.clamp.no-opts
@@ -2,7 +2,7 @@
  (type $FUNCSIG$j (func (result i64)))
  (type $legaltype$illegalImportResult (func (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32)))
diff --git a/test/i64-setTempRet0.fromasm.imprecise.no-opts b/test/i64-setTempRet0.fromasm.imprecise.no-opts
index 104195277..b161dd2bf 100644
--- a/test/i64-setTempRet0.fromasm.imprecise.no-opts
+++ b/test/i64-setTempRet0.fromasm.imprecise.no-opts
@@ -2,7 +2,7 @@
  (type $FUNCSIG$j (func (result i64)))
  (type $legaltype$illegalImportResult (func (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32)))
diff --git a/test/i64-setTempRet0.fromasm.no-opts b/test/i64-setTempRet0.fromasm.no-opts
index 104195277..b161dd2bf 100644
--- a/test/i64-setTempRet0.fromasm.no-opts
+++ b/test/i64-setTempRet0.fromasm.no-opts
@@ -2,7 +2,7 @@
  (type $FUNCSIG$j (func (result i64)))
  (type $legaltype$illegalImportResult (func (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "illegalImportResult" (func $legalimport$illegalImportResult (result i32)))
diff --git a/test/importedSignCast.fromasm b/test/importedSignCast.fromasm
index a1bdcc607..f7658ec98 100644
--- a/test/importedSignCast.fromasm
+++ b/test/importedSignCast.fromasm
@@ -2,7 +2,7 @@
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (import "env" "memory" (memory $memory 256 256))
  (data (get_global $memoryBase) "importedSignCast.asm.js")
- (import "env" "table" (table 1 1 anyfunc))
+ (import "env" "table" (table $table 1 1 anyfunc))
  (elem (get_global $tableBase) $gm)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/importedSignCast.fromasm.clamp b/test/importedSignCast.fromasm.clamp
index a1bdcc607..f7658ec98 100644
--- a/test/importedSignCast.fromasm.clamp
+++ b/test/importedSignCast.fromasm.clamp
@@ -2,7 +2,7 @@
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (import "env" "memory" (memory $memory 256 256))
  (data (get_global $memoryBase) "importedSignCast.asm.js")
- (import "env" "table" (table 1 1 anyfunc))
+ (import "env" "table" (table $table 1 1 anyfunc))
  (elem (get_global $tableBase) $gm)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/importedSignCast.fromasm.clamp.no-opts b/test/importedSignCast.fromasm.clamp.no-opts
index edf90ac9d..9b2618245 100644
--- a/test/importedSignCast.fromasm.clamp.no-opts
+++ b/test/importedSignCast.fromasm.clamp.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 1 1 anyfunc))
+ (import "env" "table" (table $table 1 1 anyfunc))
  (elem (get_global $tableBase) $gm)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/importedSignCast.fromasm.imprecise b/test/importedSignCast.fromasm.imprecise
index 9ffe55510..50e936b8a 100644
--- a/test/importedSignCast.fromasm.imprecise
+++ b/test/importedSignCast.fromasm.imprecise
@@ -1,6 +1,6 @@
 (module
  (type $FUNCSIG$ii (func (param i32) (result i32)))
- (import "env" "table" (table 1 1 anyfunc))
+ (import "env" "table" (table $table 1 1 anyfunc))
  (elem (get_global $tableBase) $gm)
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "_emscripten_glIsTexture" (func $gm (param i32) (result i32)))
diff --git a/test/importedSignCast.fromasm.imprecise.no-opts b/test/importedSignCast.fromasm.imprecise.no-opts
index edf90ac9d..9b2618245 100644
--- a/test/importedSignCast.fromasm.imprecise.no-opts
+++ b/test/importedSignCast.fromasm.imprecise.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 1 1 anyfunc))
+ (import "env" "table" (table $table 1 1 anyfunc))
  (elem (get_global $tableBase) $gm)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/importedSignCast.fromasm.no-opts b/test/importedSignCast.fromasm.no-opts
index edf90ac9d..9b2618245 100644
--- a/test/importedSignCast.fromasm.no-opts
+++ b/test/importedSignCast.fromasm.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 1 1 anyfunc))
+ (import "env" "table" (table $table 1 1 anyfunc))
  (elem (get_global $tableBase) $gm)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/imported_memory.wast.from-wast b/test/imported_memory.wast.from-wast
index ca28ac751..23edba67f 100644
--- a/test/imported_memory.wast.from-wast
+++ b/test/imported_memory.wast.from-wast
@@ -1,4 +1,4 @@
 (module
  (import "env" "memory" (memory $0 256 256))
- (import "env" "table" (table 256 256 anyfunc))
+ (import "env" "table" (table $0 256 256 anyfunc))
 )
diff --git a/test/imported_memory.wast.fromBinary b/test/imported_memory.wast.fromBinary
index 3e280b9cb..c47e6cd79 100644
--- a/test/imported_memory.wast.fromBinary
+++ b/test/imported_memory.wast.fromBinary
@@ -1,5 +1,5 @@
 (module
  (import "env" "memory" (memory $0 256 256))
- (import "env" "table" (table 256 256 anyfunc))
+ (import "env" "table" (table $timport$1 256 256 anyfunc))
 )
 
diff --git a/test/imported_memory.wast.fromBinary.noDebugInfo b/test/imported_memory.wast.fromBinary.noDebugInfo
index 3e280b9cb..c47e6cd79 100644
--- a/test/imported_memory.wast.fromBinary.noDebugInfo
+++ b/test/imported_memory.wast.fromBinary.noDebugInfo
@@ -1,5 +1,5 @@
 (module
  (import "env" "memory" (memory $0 256 256))
- (import "env" "table" (table 256 256 anyfunc))
+ (import "env" "table" (table $timport$1 256 256 anyfunc))
 )
 
diff --git a/test/imported_memory_growth.wast.from-wast b/test/imported_memory_growth.wast.from-wast
index 44c5b1644..3f8382041 100644
--- a/test/imported_memory_growth.wast.from-wast
+++ b/test/imported_memory_growth.wast.from-wast
@@ -1,4 +1,4 @@
 (module
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table 256 anyfunc))
+ (import "env" "table" (table $0 256 anyfunc))
 )
diff --git a/test/imported_memory_growth.wast.fromBinary b/test/imported_memory_growth.wast.fromBinary
index d175ff2b2..6ca719f57 100644
--- a/test/imported_memory_growth.wast.fromBinary
+++ b/test/imported_memory_growth.wast.fromBinary
@@ -1,5 +1,5 @@
 (module
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table 256 anyfunc))
+ (import "env" "table" (table $timport$1 256 anyfunc))
 )
 
diff --git a/test/imported_memory_growth.wast.fromBinary.noDebugInfo b/test/imported_memory_growth.wast.fromBinary.noDebugInfo
index d175ff2b2..6ca719f57 100644
--- a/test/imported_memory_growth.wast.fromBinary.noDebugInfo
+++ b/test/imported_memory_growth.wast.fromBinary.noDebugInfo
@@ -1,5 +1,5 @@
 (module
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table 256 anyfunc))
+ (import "env" "table" (table $timport$1 256 anyfunc))
 )
 
diff --git a/test/lld/duplicate_imports.wast.out b/test/lld/duplicate_imports.wast.out
index ccdb0b631..b9ef5599c 100644
--- a/test/lld/duplicate_imports.wast.out
+++ b/test/lld/duplicate_imports.wast.out
@@ -9,13 +9,13 @@
  (type $legaltype$puts2 (func (param i32 i32) (result i32)))
  (type $legaltype$invoke_ffd (func (param i32 f64 f64) (result f64)))
  (type $legaltype$invoke_ffd2 (func (param i32 f64 f64) (result f64)))
- (memory $0 2)
- (data (i32.const 568) "Hello, world\00")
- (table 1 1 anyfunc)
  (import "env" "puts" (func $puts1 (param i32) (result i32)))
  (import "env" "puts" (func $legalimport$puts2 (param i32 i32) (result i32)))
  (import "env" "invoke_ffd" (func $legalimport$invoke_ffd (param i32 f64 f64) (result f64)))
  (import "env" "invoke_ffd" (func $legalimport$invoke_ffd2 (param i32 f64 f64) (result f64)))
+ (memory $0 2)
+ (data (i32.const 568) "Hello, world\00")
+ (table $0 1 1 anyfunc)
  (global $global$0 (mut i32) (i32.const 66128))
  (global $global$1 i32 (i32.const 66128))
  (global $global$2 i32 (i32.const 581))
diff --git a/test/lld/em_asm.wast.out b/test/lld/em_asm.wast.out
index f9a4e8f6f..31d91316a 100644
--- a/test/lld/em_asm.wast.out
+++ b/test/lld/em_asm.wast.out
@@ -7,12 +7,12 @@
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
- (memory $0 2)
- (data (i32.const 568) "{ Module.print(\"Hello world\"); }\00{ return $0 + $1; }\00{ Module.print(\"Got \" + $0); }\00")
- (table 1 1 anyfunc)
  (import "env" "emscripten_asm_const_i" (func $emscripten_asm_const_i (param i32) (result i32)))
  (import "env" "emscripten_asm_const_iii" (func $emscripten_asm_const_iii (param i32 i32 i32) (result i32)))
  (import "env" "emscripten_asm_const_ii" (func $emscripten_asm_const_ii (param i32 i32) (result i32)))
+ (memory $0 2)
+ (data (i32.const 568) "{ Module.print(\"Hello world\"); }\00{ return $0 + $1; }\00{ Module.print(\"Got \" + $0); }\00")
+ (table $0 1 1 anyfunc)
  (global $global$0 (mut i32) (i32.const 66192))
  (global $global$1 i32 (i32.const 66192))
  (global $global$2 i32 (i32.const 652))
diff --git a/test/lld/hello_world.wast.out b/test/lld/hello_world.wast.out
index 6c67188f1..2e891cfa5 100644
--- a/test/lld/hello_world.wast.out
+++ b/test/lld/hello_world.wast.out
@@ -3,10 +3,10 @@
  (type $1 (func (result i32)))
  (type $2 (func))
  (type $FUNCSIG$ii (func (param i32) (result i32)))
+ (import "env" "puts" (func $puts (param i32) (result i32)))
  (memory $0 2)
  (data (i32.const 568) "Hello, world\00")
- (table 1 1 anyfunc)
- (import "env" "puts" (func $puts (param i32) (result i32)))
+ (table $0 1 1 anyfunc)
  (global $global$0 (mut i32) (i32.const 66128))
  (global $global$1 i32 (i32.const 66128))
  (global $global$2 i32 (i32.const 581))
diff --git a/test/lld/init.wast.out b/test/lld/init.wast.out
index 27c69a006..cdc6a55c3 100644
--- a/test/lld/init.wast.out
+++ b/test/lld/init.wast.out
@@ -3,7 +3,7 @@
  (type $1 (func (result i32)))
  (memory $0 2)
  (data (i32.const 568) "\00\00\00\00\00\00\00\00")
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (global $global$0 (mut i32) (i32.const 66112))
  (global $global$1 i32 (i32.const 66112))
  (global $global$2 i32 (i32.const 576))
diff --git a/test/lld/recursive.wast.out b/test/lld/recursive.wast.out
index b250072b0..75a907564 100644
--- a/test/lld/recursive.wast.out
+++ b/test/lld/recursive.wast.out
@@ -3,10 +3,10 @@
  (type $1 (func (result i32)))
  (type $2 (func))
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
+ (import "env" "printf" (func $printf (param i32 i32) (result i32)))
  (memory $0 2)
  (data (i32.const 568) "%d:%d\n\00Result: %d\n\00")
- (table 1 1 anyfunc)
- (import "env" "printf" (func $printf (param i32 i32) (result i32)))
+ (table $0 1 1 anyfunc)
  (global $global$0 (mut i32) (i32.const 66128))
  (global $global$1 i32 (i32.const 66128))
  (global $global$2 i32 (i32.const 587))
diff --git a/test/lld/reserved_func_ptr.wast.jscall.out b/test/lld/reserved_func_ptr.wast.jscall.out
index c261d2732..c38c60fa7 100644
--- a/test/lld/reserved_func_ptr.wast.jscall.out
+++ b/test/lld/reserved_func_ptr.wast.jscall.out
@@ -18,9 +18,6 @@
  (type $FUNCSIG$v (func))
  (type $FUNCSIG$vii (func (param i32 i32)))
  (type $FUNCSIG$viiii (func (param i32 i32 i32 i32)))
- (memory $0 2)
- (table 21 21 anyfunc)
- (elem (i32.const 1) $_Z18address_taken_funciii $_Z19address_taken_func2iii $jsCall_ddi_0 $jsCall_ddi_1 $jsCall_ddi_2 $jsCall_fffi_0 $jsCall_fffi_1 $jsCall_fffi_2 $jsCall_iii_0 $jsCall_iii_1 $jsCall_iii_2 $jsCall_v_0 $jsCall_v_1 $jsCall_v_2 $jsCall_vi_0 $jsCall_vi_1 $jsCall_vi_2 $jsCall_viii_0 $jsCall_viii_1 $jsCall_viii_2)
  (import "env" "_Z4atoiPKc" (func $_Z4atoiPKc (param i32) (result i32)))
  (import "env" "jsCall_ddi" (func $jsCall_ddi (param i32 f64 i32) (result f64)))
  (import "env" "jsCall_fffi" (func $jsCall_fffi (param i32 f32 f32 i32) (result f32)))
@@ -28,6 +25,9 @@
  (import "env" "jsCall_v" (func $jsCall_v (param i32)))
  (import "env" "jsCall_vi" (func $jsCall_vi (param i32 i32)))
  (import "env" "jsCall_viii" (func $jsCall_viii (param i32 i32 i32 i32)))
+ (memory $0 2)
+ (table $0 21 21 anyfunc)
+ (elem (i32.const 1) $_Z18address_taken_funciii $_Z19address_taken_func2iii $jsCall_ddi_0 $jsCall_ddi_1 $jsCall_ddi_2 $jsCall_fffi_0 $jsCall_fffi_1 $jsCall_fffi_2 $jsCall_iii_0 $jsCall_iii_1 $jsCall_iii_2 $jsCall_v_0 $jsCall_v_1 $jsCall_v_2 $jsCall_vi_0 $jsCall_vi_1 $jsCall_vi_2 $jsCall_viii_0 $jsCall_viii_1 $jsCall_viii_2)
  (global $global$0 (mut i32) (i32.const 66112))
  (global $global$1 i32 (i32.const 66112))
  (global $global$2 i32 (i32.const 568))
diff --git a/test/lld/reserved_func_ptr.wast.out b/test/lld/reserved_func_ptr.wast.out
index ca1704825..a7b57b04c 100644
--- a/test/lld/reserved_func_ptr.wast.out
+++ b/test/lld/reserved_func_ptr.wast.out
@@ -8,10 +8,10 @@
  (type $6 (func (param i32) (result i32)))
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (type $FUNCSIG$viii (func (param i32 i32 i32)))
+ (import "env" "_Z4atoiPKc" (func $_Z4atoiPKc (param i32) (result i32)))
  (memory $0 2)
- (table 3 3 anyfunc)
+ (table $0 3 3 anyfunc)
  (elem (i32.const 1) $_Z18address_taken_funciii $_Z19address_taken_func2iii)
- (import "env" "_Z4atoiPKc" (func $_Z4atoiPKc (param i32) (result i32)))
  (global $global$0 (mut i32) (i32.const 66112))
  (global $global$1 i32 (i32.const 66112))
  (global $global$2 i32 (i32.const 568))
diff --git a/test/memorygrowth-minimal.fromasm.clamp.no-opts b/test/memorygrowth-minimal.fromasm.clamp.no-opts
index 1a2ac576c..85664316a 100644
--- a/test/memorygrowth-minimal.fromasm.clamp.no-opts
+++ b/test/memorygrowth-minimal.fromasm.clamp.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "__growWasmMemory" (func $__growWasmMemory))
diff --git a/test/memorygrowth-minimal.fromasm.imprecise.no-opts b/test/memorygrowth-minimal.fromasm.imprecise.no-opts
index 1a2ac576c..85664316a 100644
--- a/test/memorygrowth-minimal.fromasm.imprecise.no-opts
+++ b/test/memorygrowth-minimal.fromasm.imprecise.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "__growWasmMemory" (func $__growWasmMemory))
diff --git a/test/memorygrowth-minimal.fromasm.no-opts b/test/memorygrowth-minimal.fromasm.no-opts
index 1a2ac576c..85664316a 100644
--- a/test/memorygrowth-minimal.fromasm.no-opts
+++ b/test/memorygrowth-minimal.fromasm.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "__growWasmMemory" (func $__growWasmMemory))
diff --git a/test/memorygrowth.fromasm b/test/memorygrowth.fromasm
index 96c2def4b..11f18ed1f 100644
--- a/test/memorygrowth.fromasm
+++ b/test/memorygrowth.fromasm
@@ -7,7 +7,7 @@
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
  (import "env" "memory" (memory $memory 256))
  (data (get_global $memoryBase) "memorygrowth.asm.js")
- (import "env" "table" (table 8 8 anyfunc))
+ (import "env" "table" (table $table 8 8 anyfunc))
  (elem (get_global $tableBase) $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/memorygrowth.fromasm.clamp b/test/memorygrowth.fromasm.clamp
index 96c2def4b..11f18ed1f 100644
--- a/test/memorygrowth.fromasm.clamp
+++ b/test/memorygrowth.fromasm.clamp
@@ -7,7 +7,7 @@
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
  (import "env" "memory" (memory $memory 256))
  (data (get_global $memoryBase) "memorygrowth.asm.js")
- (import "env" "table" (table 8 8 anyfunc))
+ (import "env" "table" (table $table 8 8 anyfunc))
  (elem (get_global $tableBase) $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/memorygrowth.fromasm.clamp.no-opts b/test/memorygrowth.fromasm.clamp.no-opts
index 991edc5d1..4dc2daf7b 100644
--- a/test/memorygrowth.fromasm.clamp.no-opts
+++ b/test/memorygrowth.fromasm.clamp.no-opts
@@ -6,7 +6,7 @@
  (type $FUNCSIG$vii (func (param i32 i32)))
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
  (import "env" "memory" (memory $memory 256))
- (import "env" "table" (table 8 8 anyfunc))
+ (import "env" "table" (table $table 8 8 anyfunc))
  (elem (get_global $tableBase) $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/memorygrowth.fromasm.imprecise b/test/memorygrowth.fromasm.imprecise
index f7c2a6987..2af9c3647 100644
--- a/test/memorygrowth.fromasm.imprecise
+++ b/test/memorygrowth.fromasm.imprecise
@@ -6,7 +6,7 @@
  (type $FUNCSIG$vii (func (param i32 i32)))
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
  (import "env" "memory" (memory $memory 256))
- (import "env" "table" (table 8 8 anyfunc))
+ (import "env" "table" (table $table 8 8 anyfunc))
  (elem (get_global $tableBase) $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "STACKTOP" (global $r$asm2wasm$import i32))
diff --git a/test/memorygrowth.fromasm.imprecise.no-opts b/test/memorygrowth.fromasm.imprecise.no-opts
index 59aaab6f1..ad11eb2e9 100644
--- a/test/memorygrowth.fromasm.imprecise.no-opts
+++ b/test/memorygrowth.fromasm.imprecise.no-opts
@@ -6,7 +6,7 @@
  (type $FUNCSIG$vii (func (param i32 i32)))
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
  (import "env" "memory" (memory $memory 256))
- (import "env" "table" (table 8 8 anyfunc))
+ (import "env" "table" (table $table 8 8 anyfunc))
  (elem (get_global $tableBase) $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/memorygrowth.fromasm.no-opts b/test/memorygrowth.fromasm.no-opts
index 991edc5d1..4dc2daf7b 100644
--- a/test/memorygrowth.fromasm.no-opts
+++ b/test/memorygrowth.fromasm.no-opts
@@ -6,7 +6,7 @@
  (type $FUNCSIG$vii (func (param i32 i32)))
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
  (import "env" "memory" (memory $memory 256))
- (import "env" "table" (table 8 8 anyfunc))
+ (import "env" "table" (table $table 8 8 anyfunc))
  (elem (get_global $tableBase) $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/merge/basics.wast.combined b/test/merge/basics.wast.combined
index 11ba04715..96ea89cfd 100644
--- a/test/merge/basics.wast.combined
+++ b/test/merge/basics.wast.combined
@@ -5,7 +5,7 @@
  (type $FUNCSIG$v$0 (func))
  (import "env" "memory" (memory $0 256))
  (data (get_global $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n\00\00\00\00\00\00")
- (import "env" "table" (table 10 anyfunc))
+ (import "env" "table" (table $0 10 anyfunc))
  (elem (get_global $tableBase) $only-a $willCollide $some-func $some-collide $only-a $some-func $only-b $willCollide$0 $some-func-b $some-collide$0)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/merge/basics.wast.combined.finalized b/test/merge/basics.wast.combined.finalized
index 899df6d61..d3530fe58 100644
--- a/test/merge/basics.wast.combined.finalized
+++ b/test/merge/basics.wast.combined.finalized
@@ -5,7 +5,7 @@
  (type $FUNCSIG$v$0 (func))
  (import "env" "memory" (memory $0 256))
  (data (i32.const 1024) "hello, A!\n\00\00\00\00\00\00hello, B!\n\00\00\00\00\00\00")
- (import "env" "table" (table 18 anyfunc))
+ (import "env" "table" (table $0 18 anyfunc))
  (elem (i32.const 8) $only-a $willCollide $some-func $some-collide $only-a $some-func $only-b $willCollide$0 $some-func-b $some-collide$0)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/merge/basics.wast.combined.finalized.opt b/test/merge/basics.wast.combined.finalized.opt
index 7f11954ae..bb7475c45 100644
--- a/test/merge/basics.wast.combined.finalized.opt
+++ b/test/merge/basics.wast.combined.finalized.opt
@@ -3,7 +3,7 @@
  (type $FUNCSIG$v (func))
  (import "env" "memory" (memory $0 256))
  (data (i32.const 1024) "hello, A!\n\00\00\00\00\00\00hello, B!\n")
- (import "env" "table" (table 18 anyfunc))
+ (import "env" "table" (table $0 18 anyfunc))
  (elem (i32.const 8) $only-a $willCollide $some-func $some-collide $only-a $some-func $only-b $willCollide$0 $some-func-b $some-collide$0)
  (import "env" "some-func" (func $some-func))
  (import "env" "some-collide" (func $some-collide))
diff --git a/test/merge/basics.wast.combined.opt b/test/merge/basics.wast.combined.opt
index b533d4d2f..2a83b355e 100644
--- a/test/merge/basics.wast.combined.opt
+++ b/test/merge/basics.wast.combined.opt
@@ -3,7 +3,7 @@
  (type $FUNCSIG$v (func))
  (import "env" "memory" (memory $0 256))
  (data (get_global $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n")
- (import "env" "table" (table 10 anyfunc))
+ (import "env" "table" (table $0 10 anyfunc))
  (elem (get_global $tableBase) $only-a $willCollide $some-func $some-collide $only-a $some-func $only-b $willCollide$0 $some-func-b $some-collide$0)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/merge/dylib.wasm.combined b/test/merge/dylib.wasm.combined
index 32c886d34..0b97f4af4 100644
--- a/test/merge/dylib.wasm.combined
+++ b/test/merge/dylib.wasm.combined
@@ -8,7 +8,7 @@
  (type $2$0 (func))
  (import "env" "memory" (memory $2 256))
  (data (get_global $gimport$0) "hello, world!\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00")
- (import "env" "table" (table 0 anyfunc))
+ (import "env" "table" (table $timport$3 0 anyfunc))
  (import "env" "memoryBase" (global $gimport$0 i32))
  (import "env" "tableBase" (global $gimport$4 i32))
  (import "env" "memoryBase" (global $gimport$0$0 i32))
diff --git a/test/merge/dylib.wasm.combined.finalized b/test/merge/dylib.wasm.combined.finalized
index e52c5b849..4e82b433b 100644
--- a/test/merge/dylib.wasm.combined.finalized
+++ b/test/merge/dylib.wasm.combined.finalized
@@ -8,7 +8,7 @@
  (type $2$0 (func))
  (import "env" "memory" (memory $2 256))
  (data (i32.const 1024) "hello, world!\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00")
- (import "env" "table" (table 8 anyfunc))
+ (import "env" "table" (table $timport$3 8 anyfunc))
  (import "env" "memoryBase" (global $gimport$0 i32))
  (import "env" "tableBase" (global $gimport$4 i32))
  (import "env" "memoryBase" (global $gimport$0$0 i32))
diff --git a/test/merge/dylib.wasm.combined.finalized.opt b/test/merge/dylib.wasm.combined.finalized.opt
index bac5abbc6..4598e194a 100644
--- a/test/merge/dylib.wasm.combined.finalized.opt
+++ b/test/merge/dylib.wasm.combined.finalized.opt
@@ -4,7 +4,7 @@
  (type $3 (func))
  (import "env" "memory" (memory $2 256))
  (data (i32.const 1024) "hello, world!")
- (import "env" "table" (table 8 anyfunc))
+ (import "env" "table" (table $timport$3 8 anyfunc))
  (import "env" "_puts" (func $import$1 (param i32) (result i32)))
  (global $global$0 (mut i32) (i32.const 0))
  (global $global$1 (mut i32) (i32.const 0))
diff --git a/test/merge/dylib.wasm.combined.opt b/test/merge/dylib.wasm.combined.opt
index 2aa6075be..7545510a3 100644
--- a/test/merge/dylib.wasm.combined.opt
+++ b/test/merge/dylib.wasm.combined.opt
@@ -4,7 +4,7 @@
  (type $3 (func))
  (import "env" "memory" (memory $2 256))
  (data (get_global $gimport$0) "hello, world!")
- (import "env" "table" (table 0 anyfunc))
+ (import "env" "table" (table $timport$3 0 anyfunc))
  (import "env" "memoryBase" (global $gimport$0 i32))
  (import "env" "tableBase" (global $gimport$4 i32))
  (import "env" "memoryBase" (global $gimport$0$0 i32))
diff --git a/test/merge/fusing.wast.combined b/test/merge/fusing.wast.combined
index 9510bb02e..e664a39ed 100644
--- a/test/merge/fusing.wast.combined
+++ b/test/merge/fusing.wast.combined
@@ -3,7 +3,7 @@
  (type $FUNCSIG$v$0 (func))
  (import "env" "memory" (memory $0 256))
  (data (get_global $memoryBase) "")
- (import "env" "table" (table 0 anyfunc))
+ (import "env" "table" (table $0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "memoryBase" (global $memoryBase$0 i32))
diff --git a/test/merge/fusing.wast.combined.finalized b/test/merge/fusing.wast.combined.finalized
index 658fdd716..edb5c4309 100644
--- a/test/merge/fusing.wast.combined.finalized
+++ b/test/merge/fusing.wast.combined.finalized
@@ -3,7 +3,7 @@
  (type $FUNCSIG$v$0 (func))
  (import "env" "memory" (memory $0 256))
  (data (i32.const 1024) "")
- (import "env" "table" (table 8 anyfunc))
+ (import "env" "table" (table $0 8 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "memoryBase" (global $memoryBase$0 i32))
diff --git a/test/merge/fusing.wast.combined.finalized.opt b/test/merge/fusing.wast.combined.finalized.opt
index 4d96b29fe..5b581aeb1 100644
--- a/test/merge/fusing.wast.combined.finalized.opt
+++ b/test/merge/fusing.wast.combined.finalized.opt
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$v (func))
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table 8 anyfunc))
+ (import "env" "table" (table $0 8 anyfunc))
  (global $a-global i32 (i32.const 0))
  (global $b-global$0 f64 (f64.const 2.14281428))
  (export "foo" (func $foo-func))
diff --git a/test/merge/fusing.wast.combined.opt b/test/merge/fusing.wast.combined.opt
index 903fd65e0..e8bac5d8c 100644
--- a/test/merge/fusing.wast.combined.opt
+++ b/test/merge/fusing.wast.combined.opt
@@ -2,7 +2,7 @@
  (type $FUNCSIG$v (func))
  (import "env" "memory" (memory $0 256))
  (data (get_global $memoryBase) "")
- (import "env" "table" (table 0 anyfunc))
+ (import "env" "table" (table $0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (global $a-global i32 (i32.const 0))
diff --git a/test/merge/global-init.wast.combined b/test/merge/global-init.wast.combined
index b45babeef..453de1079 100644
--- a/test/merge/global-init.wast.combined
+++ b/test/merge/global-init.wast.combined
@@ -1,7 +1,7 @@
 (module
  (import "env" "memory" (memory $0 256))
  (data (get_global $memoryBase) "")
- (import "env" "table" (table 0 anyfunc))
+ (import "env" "table" (table $0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "globally" (global $i-collide i32))
diff --git a/test/merge/global-init.wast.combined.finalized b/test/merge/global-init.wast.combined.finalized
index 87e21a05e..89c969ea4 100644
--- a/test/merge/global-init.wast.combined.finalized
+++ b/test/merge/global-init.wast.combined.finalized
@@ -1,7 +1,7 @@
 (module
  (import "env" "memory" (memory $0 256))
  (data (i32.const 1024) "")
- (import "env" "table" (table 8 anyfunc))
+ (import "env" "table" (table $0 8 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "globally" (global $i-collide i32))
diff --git a/test/merge/global-init.wast.combined.finalized.opt b/test/merge/global-init.wast.combined.finalized.opt
index f6e309c94..cd3ab7e98 100644
--- a/test/merge/global-init.wast.combined.finalized.opt
+++ b/test/merge/global-init.wast.combined.finalized.opt
@@ -1,4 +1,4 @@
 (module
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table 8 anyfunc))
+ (import "env" "table" (table $0 8 anyfunc))
 )
diff --git a/test/merge/global-init.wast.combined.opt b/test/merge/global-init.wast.combined.opt
index 3f91f9bc9..725827c88 100644
--- a/test/merge/global-init.wast.combined.opt
+++ b/test/merge/global-init.wast.combined.opt
@@ -1,7 +1,7 @@
 (module
  (import "env" "memory" (memory $0 256))
  (data (get_global $memoryBase) "")
- (import "env" "table" (table 0 anyfunc))
+ (import "env" "table" (table $0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
 )
diff --git a/test/merge/main-lacks-segments.wast.combined b/test/merge/main-lacks-segments.wast.combined
index 0bd5d2d4f..f07f75177 100644
--- a/test/merge/main-lacks-segments.wast.combined
+++ b/test/merge/main-lacks-segments.wast.combined
@@ -2,7 +2,7 @@
  (type $0 (func))
  (import "env" "memory" (memory $0 256))
  (data (get_global $memoryBase) "hello, this is some data!\00\00\00\00\00\00\00")
- (import "env" "table" (table 2 anyfunc))
+ (import "env" "table" (table $0 2 anyfunc))
  (elem (get_global $tableBase) $foo $foo)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/merge/main-lacks-segments.wast.combined.finalized b/test/merge/main-lacks-segments.wast.combined.finalized
index 65bc5f1ad..f37f9efe1 100644
--- a/test/merge/main-lacks-segments.wast.combined.finalized
+++ b/test/merge/main-lacks-segments.wast.combined.finalized
@@ -2,7 +2,7 @@
  (type $0 (func))
  (import "env" "memory" (memory $0 256))
  (data (i32.const 1024) "hello, this is some data!\00\00\00\00\00\00\00")
- (import "env" "table" (table 10 anyfunc))
+ (import "env" "table" (table $0 10 anyfunc))
  (elem (i32.const 8) $foo $foo)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/merge/main-lacks-segments.wast.combined.finalized.opt b/test/merge/main-lacks-segments.wast.combined.finalized.opt
index e3ceb0ce1..c98706332 100644
--- a/test/merge/main-lacks-segments.wast.combined.finalized.opt
+++ b/test/merge/main-lacks-segments.wast.combined.finalized.opt
@@ -2,7 +2,7 @@
  (type $0 (func))
  (import "env" "memory" (memory $0 256))
  (data (i32.const 1024) "hello, this is some data!")
- (import "env" "table" (table 10 anyfunc))
+ (import "env" "table" (table $0 10 anyfunc))
  (elem (i32.const 8) $foo $foo)
  (func $foo (; 0 ;) (type $0)
   (nop)
diff --git a/test/merge/main-lacks-segments.wast.combined.opt b/test/merge/main-lacks-segments.wast.combined.opt
index fe652d9cd..c121593c7 100644
--- a/test/merge/main-lacks-segments.wast.combined.opt
+++ b/test/merge/main-lacks-segments.wast.combined.opt
@@ -2,7 +2,7 @@
  (type $0 (func))
  (import "env" "memory" (memory $0 256))
  (data (get_global $memoryBase) "hello, this is some data!")
- (import "env" "table" (table 2 anyfunc))
+ (import "env" "table" (table $0 2 anyfunc))
  (elem (get_global $tableBase) $foo $foo)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/merge/noBases.wast.combined b/test/merge/noBases.wast.combined
index a7753043a..18c63fffc 100644
--- a/test/merge/noBases.wast.combined
+++ b/test/merge/noBases.wast.combined
@@ -7,7 +7,7 @@
  (data (i32.const 100) "hello, A!\n")
  (data (get_global $memoryBase) "")
  (data (i32.const 200) "hello, B!\n")
- (import "env" "table" (table 1000 anyfunc))
+ (import "env" "table" (table $0 1000 anyfunc))
  (elem (i32.const 10) $only-a $willCollide $some-func $some-collide $only-a)
  (elem (i32.const 20) $only-b $willCollide $some-func-b $some-collide)
  (import "env" "memoryBase" (global $memoryBase i32))
diff --git a/test/merge/noBases.wast.combined.finalized b/test/merge/noBases.wast.combined.finalized
index b31aa6909..72f221017 100644
--- a/test/merge/noBases.wast.combined.finalized
+++ b/test/merge/noBases.wast.combined.finalized
@@ -7,7 +7,7 @@
  (data (i32.const 100) "hello, A!\n")
  (data (i32.const 1024) "")
  (data (i32.const 200) "hello, B!\n")
- (import "env" "table" (table 1000 anyfunc))
+ (import "env" "table" (table $0 1000 anyfunc))
  (elem (i32.const 10) $only-a $willCollide $some-func $some-collide $only-a)
  (elem (i32.const 20) $only-b $willCollide $some-func-b $some-collide)
  (import "env" "memoryBase" (global $memoryBase i32))
diff --git a/test/merge/noBases.wast.combined.finalized.opt b/test/merge/noBases.wast.combined.finalized.opt
index 935a8f326..8504d0d98 100644
--- a/test/merge/noBases.wast.combined.finalized.opt
+++ b/test/merge/noBases.wast.combined.finalized.opt
@@ -4,7 +4,7 @@
  (import "env" "memory" (memory $0 256))
  (data (i32.const 100) "hello, A!\n")
  (data (i32.const 200) "hello, B!\n")
- (import "env" "table" (table 1000 anyfunc))
+ (import "env" "table" (table $0 1000 anyfunc))
  (elem (i32.const 10) $only-a $willCollide $some-func $some-collide $only-a)
  (elem (i32.const 20) $only-b $willCollide $some-func-b $some-collide)
  (import "env" "some-func" (func $some-func))
diff --git a/test/merge/noBases.wast.combined.opt b/test/merge/noBases.wast.combined.opt
index 106ba475e..08becc2cf 100644
--- a/test/merge/noBases.wast.combined.opt
+++ b/test/merge/noBases.wast.combined.opt
@@ -5,7 +5,7 @@
  (data (i32.const 100) "hello, A!\n")
  (data (get_global $memoryBase) "")
  (data (i32.const 200) "hello, B!\n")
- (import "env" "table" (table 1000 anyfunc))
+ (import "env" "table" (table $0 1000 anyfunc))
  (elem (i32.const 10) $only-a $willCollide $some-func $some-collide $only-a)
  (elem (i32.const 20) $only-b $willCollide $some-func-b $some-collide)
  (import "env" "memoryBase" (global $memoryBase i32))
diff --git a/test/merge/printf.wast.combined b/test/merge/printf.wast.combined
index 5183cd442..a33e63fba 100644
--- a/test/merge/printf.wast.combined
+++ b/test/merge/printf.wast.combined
@@ -4,7 +4,7 @@
  (type $1 (func))
  (import "env" "memory" (memory $0 256))
  (data (get_global $memoryBase) "")
- (import "env" "table" (table 0 anyfunc))
+ (import "env" "table" (table $0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "globally" (global $i-collide i32))
diff --git a/test/merge/printf.wast.combined.finalized b/test/merge/printf.wast.combined.finalized
index 99751c51c..a66825dbf 100644
--- a/test/merge/printf.wast.combined.finalized
+++ b/test/merge/printf.wast.combined.finalized
@@ -4,7 +4,7 @@
  (type $1 (func))
  (import "env" "memory" (memory $0 256))
  (data (i32.const 1024) "")
- (import "env" "table" (table 8 anyfunc))
+ (import "env" "table" (table $0 8 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "globally" (global $i-collide i32))
diff --git a/test/merge/printf.wast.combined.finalized.opt b/test/merge/printf.wast.combined.finalized.opt
index 8d191bb39..2eb0cbf2a 100644
--- a/test/merge/printf.wast.combined.finalized.opt
+++ b/test/merge/printf.wast.combined.finalized.opt
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table 8 anyfunc))
+ (import "env" "table" (table $0 8 anyfunc))
  (export "_printf" (func $625))
  (func $625 (; 0 ;) (type $FUNCSIG$iii) (param $var$0 i32) (param $var$1 i32) (result i32)
   (i32.const 102030)
diff --git a/test/merge/printf.wast.combined.opt b/test/merge/printf.wast.combined.opt
index da8b8fd29..7cb267ec2 100644
--- a/test/merge/printf.wast.combined.opt
+++ b/test/merge/printf.wast.combined.opt
@@ -2,7 +2,7 @@
  (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
  (import "env" "memory" (memory $0 256))
  (data (get_global $memoryBase) "")
- (import "env" "table" (table 0 anyfunc))
+ (import "env" "table" (table $0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "_printf" (func $625))
diff --git a/test/metadce/corners.wast.dced b/test/metadce/corners.wast.dced
index 5c3f4f7c2..3ef733b82 100644
--- a/test/metadce/corners.wast.dced
+++ b/test/metadce/corners.wast.dced
@@ -1,6 +1,6 @@
 (module
  (type $FUNCSIG$v (func))
- (import "env" "table" (table 10 10 anyfunc))
+ (import "env" "table" (table $0 10 10 anyfunc))
  (elem (i32.const 0) $imported_table_func)
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
  (import "env" "imported_twice" (func $imported_twice_a))
diff --git a/test/metadce/outside.wast.dced b/test/metadce/outside.wast.dced
index 986a8f9ac..689e0ac81 100644
--- a/test/metadce/outside.wast.dced
+++ b/test/metadce/outside.wast.dced
@@ -3,7 +3,7 @@
  (import "env" "memory" (memory $0 256 256))
  (data (i32.const 1024) "abcd")
  (data (get_global $from_segment) "abcd")
- (import "env" "table" (table 10 10 anyfunc))
+ (import "env" "table" (table $0 10 10 anyfunc))
  (elem (get_global $from_segment_2) $table_func)
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32))
  (import "env" "js_func" (func $a_js_func))
diff --git a/test/min.fromasm.clamp.no-opts b/test/min.fromasm.clamp.no-opts
index 6e5139079..ebe491d43 100644
--- a/test/min.fromasm.clamp.no-opts
+++ b/test/min.fromasm.clamp.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "tempDoublePtr" (global $tDP$asm2wasm$import i32))
diff --git a/test/min.fromasm.imprecise.no-opts b/test/min.fromasm.imprecise.no-opts
index 6e5139079..ebe491d43 100644
--- a/test/min.fromasm.imprecise.no-opts
+++ b/test/min.fromasm.imprecise.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "tempDoublePtr" (global $tDP$asm2wasm$import i32))
diff --git a/test/min.fromasm.no-opts b/test/min.fromasm.no-opts
index 6e5139079..ebe491d43 100644
--- a/test/min.fromasm.no-opts
+++ b/test/min.fromasm.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "tempDoublePtr" (global $tDP$asm2wasm$import i32))
diff --git a/test/noffi_f32.fromasm.clamp.no-opts b/test/noffi_f32.fromasm.clamp.no-opts
index 68440b33b..f1422fc21 100644
--- a/test/noffi_f32.fromasm.clamp.no-opts
+++ b/test/noffi_f32.fromasm.clamp.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$ff (func (param f32) (result f32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "_importf" (func $importf (param f32) (result f32)))
diff --git a/test/noffi_f32.fromasm.imprecise.no-opts b/test/noffi_f32.fromasm.imprecise.no-opts
index 68440b33b..f1422fc21 100644
--- a/test/noffi_f32.fromasm.imprecise.no-opts
+++ b/test/noffi_f32.fromasm.imprecise.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$ff (func (param f32) (result f32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "_importf" (func $importf (param f32) (result f32)))
diff --git a/test/noffi_f32.fromasm.no-opts b/test/noffi_f32.fromasm.no-opts
index 68440b33b..f1422fc21 100644
--- a/test/noffi_f32.fromasm.no-opts
+++ b/test/noffi_f32.fromasm.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$ff (func (param f32) (result f32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "_importf" (func $importf (param f32) (result f32)))
diff --git a/test/noffi_i64.fromasm.clamp.no-opts b/test/noffi_i64.fromasm.clamp.no-opts
index ba2faad13..112392cae 100644
--- a/test/noffi_i64.fromasm.clamp.no-opts
+++ b/test/noffi_i64.fromasm.clamp.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$jj (func (param i64) (result i64)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "_importll" (func $importll (param i64) (result i64)))
diff --git a/test/noffi_i64.fromasm.imprecise.no-opts b/test/noffi_i64.fromasm.imprecise.no-opts
index ba2faad13..112392cae 100644
--- a/test/noffi_i64.fromasm.imprecise.no-opts
+++ b/test/noffi_i64.fromasm.imprecise.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$jj (func (param i64) (result i64)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "_importll" (func $importll (param i64) (result i64)))
diff --git a/test/noffi_i64.fromasm.no-opts b/test/noffi_i64.fromasm.no-opts
index ba2faad13..112392cae 100644
--- a/test/noffi_i64.fromasm.no-opts
+++ b/test/noffi_i64.fromasm.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$jj (func (param i64) (result i64)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "_importll" (func $importll (param i64) (result i64)))
diff --git a/test/passes/coalesce-locals-learning.txt b/test/passes/coalesce-locals-learning.txt
index 95eb36729..ecf2f4cd7 100644
--- a/test/passes/coalesce-locals-learning.txt
+++ b/test/passes/coalesce-locals-learning.txt
@@ -4,8 +4,8 @@
  (type $2 (func))
  (type $3 (func (param i32 f32)))
  (type $4 (func (param i32)))
- (memory $0 10)
  (import "env" "_emscripten_autodebug_i32" (func $_emscripten_autodebug_i32 (param i32 i32) (result i32)))
+ (memory $0 10)
  (func $nothing-to-do (; 1 ;) (type $2)
   (local $0 i32)
   (nop)
diff --git a/test/passes/coalesce-locals.txt b/test/passes/coalesce-locals.txt
index e286135a3..4f856d0dc 100644
--- a/test/passes/coalesce-locals.txt
+++ b/test/passes/coalesce-locals.txt
@@ -10,10 +10,10 @@
  (type $8 (func (param f64 i32) (result i64)))
  (type $9 (func (param i32 i32)))
  (type $10 (func (result f64)))
- (memory $0 10)
  (import "env" "_emscripten_autodebug_i32" (func $_emscripten_autodebug_i32 (param i32 i32) (result i32)))
  (import "env" "get" (func $get (result i32)))
  (import "env" "set" (func $set (param i32)))
+ (memory $0 10)
  (func $nothing-to-do (; 3 ;) (type $2)
   (local $0 i32)
   (nop)
diff --git a/test/passes/code-folding.txt b/test/passes/code-folding.txt
index e7eeb55e3..75b9dc3c8 100644
--- a/test/passes/code-folding.txt
+++ b/test/passes/code-folding.txt
@@ -3,7 +3,7 @@
  (type $1 (func))
  (type $2 (func (result f32)))
  (memory $0 1 1)
- (table 282 282 anyfunc)
+ (table $0 282 282 anyfunc)
  (func $0 (; 0 ;) (type $1)
   (block $label$1
    (if
diff --git a/test/passes/converge_O3_metrics.bin.txt b/test/passes/converge_O3_metrics.bin.txt
index 8751bccf4..39a6c635d 100644
--- a/test/passes/converge_O3_metrics.bin.txt
+++ b/test/passes/converge_O3_metrics.bin.txt
@@ -35,7 +35,7 @@ total
  (data (i32.const 18128) ",I")
  (data (i32.const 18732) "D\1b")
  (data (i32.const 18764) "`\0b")
- (import "env" "table" (table 478 478 anyfunc))
+ (import "env" "table" (table $timport$2 478 478 anyfunc))
  (elem (i32.const 0) $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $___stdout_write $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $__ZNSt3__211__stdoutbufIcE6xsputnEPKci $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $__ZNSt3__211__stdoutbufIcE8overflowEi)
  (import "env" "___syscall146" (func $import$0 (param i32 i32) (result i32)))
  (global $global$0 (mut i32) (i32.const 1))
@@ -277,7 +277,7 @@ total
  (data (i32.const 18128) ",I")
  (data (i32.const 18732) "D\1b")
  (data (i32.const 18764) "`\0b")
- (import "env" "table" (table 478 478 anyfunc))
+ (import "env" "table" (table $timport$2 478 478 anyfunc))
  (elem (i32.const 0) $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $___stdout_write $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $__ZNSt3__211__stdoutbufIcE6xsputnEPKci $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $__ZNSt3__211__stdoutbufIcE8overflowEi)
  (import "env" "___syscall146" (func $import$0 (param i32 i32) (result i32)))
  (global $global$0 (mut i32) (i32.const 1))
@@ -519,7 +519,7 @@ total
  (data (i32.const 18128) ",I")
  (data (i32.const 18732) "D\1b")
  (data (i32.const 18764) "`\0b")
- (import "env" "table" (table 478 478 anyfunc))
+ (import "env" "table" (table $timport$2 478 478 anyfunc))
  (elem (i32.const 0) $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $___stdout_write $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $__ZNSt3__211__stdoutbufIcE6xsputnEPKci $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $b0 $__ZNSt3__211__stdoutbufIcE8overflowEi)
  (import "env" "___syscall146" (func $import$0 (param i32 i32) (result i32)))
  (global $global$0 (mut i32) (i32.const 1))
diff --git a/test/passes/dae.txt b/test/passes/dae.txt
index e62f03f5b..5bba1287d 100644
--- a/test/passes/dae.txt
+++ b/test/passes/dae.txt
@@ -2,7 +2,7 @@
  (type $0 (func (param i32)))
  (type $1 (func))
  (type $2 (func (param i32 f64)))
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) $a9)
  (export "a8" (func $a8))
  (func $a (; 0 ;)
diff --git a/test/passes/dce.txt b/test/passes/dce.txt
index 6931ef038..4c2a4cf50 100644
--- a/test/passes/dce.txt
+++ b/test/passes/dce.txt
@@ -7,7 +7,7 @@
  (type $5 (func (param f32 i64)))
  (type $6 (func (param f32 i64) (result i32)))
  (memory $0 10)
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) $call-me)
  (global $x (mut i32) (i32.const 0))
  (func $call-me (; 0 ;) (type $ii) (param $0 i32) (param $1 i32)
diff --git a/test/passes/duplicate-function-elimination_optimize-level=1.txt b/test/passes/duplicate-function-elimination_optimize-level=1.txt
index 276debca1..97e782ce6 100644
--- a/test/passes/duplicate-function-elimination_optimize-level=1.txt
+++ b/test/passes/duplicate-function-elimination_optimize-level=1.txt
@@ -43,7 +43,7 @@
 (module
  (type $0 (func))
  (memory $0 0)
- (table 3 3 anyfunc)
+ (table $0 3 3 anyfunc)
  (elem (i32.const 0) $keep2 $keep2 $caller)
  (export "keep2" (func $keep2))
  (export "other" (func $keep2))
@@ -369,18 +369,18 @@
 )
 (module
  (type $FUNCSIG$v (func))
- (memory $0 0)
  (import "env" "i" (func $i))
  (import "env" "j" (func $j))
+ (memory $0 0)
  (func $erase (; 2 ;) (type $FUNCSIG$v)
   (call $i)
  )
 )
 (module
  (type $FUNCSIG$v (func))
- (memory $0 0)
  (import "env" "i" (func $i))
  (import "env" "j" (func $j))
+ (memory $0 0)
  (func $keep2 (; 2 ;) (type $FUNCSIG$v)
   (call $i)
  )
@@ -391,7 +391,7 @@
 (module
  (type $T (func))
  (memory $0 0)
- (table 2 2 anyfunc)
+ (table $0 2 2 anyfunc)
  (elem (i32.const 0) $erase $erase)
  (func $erase (; 0 ;) (type $T)
   (call_indirect (type $T)
@@ -402,7 +402,7 @@
 (module
  (type $T (func))
  (memory $0 0)
- (table 2 2 anyfunc)
+ (table $0 2 2 anyfunc)
  (elem (i32.const 0) $keep2 $other)
  (func $keep2 (; 0 ;) (type $T)
   (call_indirect (type $T)
@@ -419,7 +419,7 @@
  (type $T (func))
  (type $S (func))
  (memory $0 0)
- (table 2 2 anyfunc)
+ (table $0 2 2 anyfunc)
  (elem (i32.const 0) $keep2 $other)
  (func $keep2 (; 0 ;) (type $T)
   (call_indirect (type $T)
diff --git a/test/passes/duplicate-function-elimination_optimize-level=2.txt b/test/passes/duplicate-function-elimination_optimize-level=2.txt
index 4294b28c4..83fff3b04 100644
--- a/test/passes/duplicate-function-elimination_optimize-level=2.txt
+++ b/test/passes/duplicate-function-elimination_optimize-level=2.txt
@@ -43,7 +43,7 @@
 (module
  (type $0 (func))
  (memory $0 0)
- (table 3 3 anyfunc)
+ (table $0 3 3 anyfunc)
  (elem (i32.const 0) $keep2 $keep2 $caller)
  (export "keep2" (func $keep2))
  (export "other" (func $keep2))
@@ -366,18 +366,18 @@
 )
 (module
  (type $FUNCSIG$v (func))
- (memory $0 0)
  (import "env" "i" (func $i))
  (import "env" "j" (func $j))
+ (memory $0 0)
  (func $erase (; 2 ;) (type $FUNCSIG$v)
   (call $i)
  )
 )
 (module
  (type $FUNCSIG$v (func))
- (memory $0 0)
  (import "env" "i" (func $i))
  (import "env" "j" (func $j))
+ (memory $0 0)
  (func $keep2 (; 2 ;) (type $FUNCSIG$v)
   (call $i)
  )
@@ -388,7 +388,7 @@
 (module
  (type $T (func))
  (memory $0 0)
- (table 2 2 anyfunc)
+ (table $0 2 2 anyfunc)
  (elem (i32.const 0) $erase $erase)
  (func $erase (; 0 ;) (type $T)
   (call_indirect (type $T)
@@ -399,7 +399,7 @@
 (module
  (type $T (func))
  (memory $0 0)
- (table 2 2 anyfunc)
+ (table $0 2 2 anyfunc)
  (elem (i32.const 0) $keep2 $other)
  (func $keep2 (; 0 ;) (type $T)
   (call_indirect (type $T)
@@ -416,7 +416,7 @@
  (type $T (func))
  (type $S (func))
  (memory $0 0)
- (table 2 2 anyfunc)
+ (table $0 2 2 anyfunc)
  (elem (i32.const 0) $keep2 $other)
  (func $keep2 (; 0 ;) (type $T)
   (call_indirect (type $T)
diff --git a/test/passes/flatten.txt b/test/passes/flatten.txt
index 90d0ab269..11f03f98e 100644
--- a/test/passes/flatten.txt
+++ b/test/passes/flatten.txt
@@ -6,7 +6,7 @@
  (type $4 (func (param i64 i64) (result i64)))
  (type $5 (func (result f32)))
  (memory $0 10)
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) $call-me)
  (global $x (mut i32) (i32.const 0))
  (func $a1 (; 0 ;) (type $1)
diff --git a/test/passes/flatten_local-cse.txt b/test/passes/flatten_local-cse.txt
index d8dd852b5..ea099db90 100644
--- a/test/passes/flatten_local-cse.txt
+++ b/test/passes/flatten_local-cse.txt
@@ -637,7 +637,7 @@
  (type $0 (func))
  (type $1 (func (param i32 f64) (result i32)))
  (type $2 (func (param i64 f32 i32)))
- (table 23 23 anyfunc)
+ (table $0 23 23 anyfunc)
  (global $global$0 (mut i32) (i32.const 10))
  (export "func_1_invoker" (func $1))
  (export "func_6" (func $2))
diff --git a/test/passes/fpcast-emu.txt b/test/passes/fpcast-emu.txt
index 8349a04f6..10e07a533 100644
--- a/test/passes/fpcast-emu.txt
+++ b/test/passes/fpcast-emu.txt
@@ -11,9 +11,9 @@
  (type $FUNCSIG$fjj (func (param i64 i64) (result f32)))
  (type $FUNCSIG$dff (func (param f32 f32) (result f64)))
  (type $FUNCSIG$idd (func (param f64 f64) (result i32)))
- (table 10 10 anyfunc)
- (elem (i32.const 0) $byn$fpcast-emu$a $byn$fpcast-emu$b $byn$fpcast-emu$c $byn$fpcast-emu$d $byn$fpcast-emu$e $byn$fpcast-emu$e $byn$fpcast-emu$imported-func)
  (import "env" "imported_func" (func $imported-func (param i32 i64 f32 f64) (result f32)))
+ (table $0 10 10 anyfunc)
+ (elem (i32.const 0) $byn$fpcast-emu$a $byn$fpcast-emu$b $byn$fpcast-emu$c $byn$fpcast-emu$d $byn$fpcast-emu$e $byn$fpcast-emu$e $byn$fpcast-emu$imported-func)
  (export "dynCall_dff" (func $dynCall_dff))
  (export "dynCall_idd" (func $dynCall_idd))
  (func $a (; 1 ;) (type $vijfd) (param $x i32) (param $y i64) (param $z f32) (param $w f64)
@@ -296,7 +296,7 @@
  (type $0 (func (param i64)))
  (type $1 (func (param f32) (result i64)))
  (type $FUNCSIG$jjjjjjjjjjjjjjjj (func (param i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64) (result i64)))
- (table 42 42 anyfunc)
+ (table $0 42 42 anyfunc)
  (global $global$0 (mut i32) (i32.const 10))
  (export "func_106" (func $0))
  (func $0 (; 0 ;) (type $1) (param $0 f32) (result i64)
diff --git a/test/passes/func-metrics.txt b/test/passes/func-metrics.txt
index 19ba9ba24..e6570fab7 100644
--- a/test/passes/func-metrics.txt
+++ b/test/passes/func-metrics.txt
@@ -30,7 +30,7 @@ func: ifs
  (type $1 (func))
  (memory $0 256 256)
  (data (i32.const 0) "\ff\ef\0f\1f 0@P\99")
- (table 256 256 anyfunc)
+ (table $0 256 256 anyfunc)
  (elem (i32.const 0) $ifs $ifs $ifs)
  (global $glob i32 (i32.const 1337))
  (func $empty (; 0 ;) (type $1)
diff --git a/test/passes/generate-stack-ir_optimize-stack-ir_print-stack-ir_optimize-level=3.txt b/test/passes/generate-stack-ir_optimize-stack-ir_print-stack-ir_optimize-level=3.txt
index 043d0deef..5ea6bf1a5 100644
--- a/test/passes/generate-stack-ir_optimize-stack-ir_print-stack-ir_optimize-level=3.txt
+++ b/test/passes/generate-stack-ir_optimize-stack-ir_print-stack-ir_optimize-level=3.txt
@@ -9,13 +9,13 @@
  (type $7 (func (param f64) (result f64)))
  (type $8 (func (result i64)))
  (type $9 (func (param i32 i64)))
- (memory $0 4096 4096)
- (data (i32.const 1026) "\14\00")
- (table 10 anyfunc)
- (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
  (import "env" "_emscripten_asm_const_vi" (func $_emscripten_asm_const_vi))
  (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32)))
  (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64)))
+ (memory $0 4096 4096)
+ (data (i32.const 1026) "\14\00")
+ (table $0 10 anyfunc)
+ (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
  (export "big_negative" (func $big_negative))
  (func $big_negative (; 3 ;) (; has Stack IR ;) (type $FUNCSIG$v)
   (local $temp f64)
@@ -639,13 +639,13 @@
  (type $7 (func (param f64) (result f64)))
  (type $8 (func (result i64)))
  (type $9 (func (param i32 i64)))
- (memory $0 4096 4096)
- (data (i32.const 1026) "\14\00")
- (table 10 anyfunc)
- (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
  (import "env" "_emscripten_asm_const_vi" (func $_emscripten_asm_const_vi))
  (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32)))
  (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64)))
+ (memory $0 4096 4096)
+ (data (i32.const 1026) "\14\00")
+ (table $0 10 anyfunc)
+ (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
  (export "big_negative" (func $big_negative))
  (func $big_negative (; 3 ;) (; has Stack IR ;) (type $FUNCSIG$v)
   (local $temp f64)
diff --git a/test/passes/inlining-optimizing.txt b/test/passes/inlining-optimizing.txt
index 036835614..c260de6b3 100644
--- a/test/passes/inlining-optimizing.txt
+++ b/test/passes/inlining-optimizing.txt
@@ -3,7 +3,7 @@
  (type $1 (func (result i32)))
  (type $2 (func (result f64)))
  (type $3 (func (param f32 i64)))
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) $tabled)
  (export "user" (func $user))
  (export "exported" (func $exported))
@@ -79,7 +79,7 @@
  (type $0 (func))
  (type $1 (func (param i32 i32) (result i32)))
  (memory $0 17)
- (table 89 89 anyfunc)
+ (table $0 89 89 anyfunc)
  (start $1)
  (func $1 (; 0 ;) (type $0)
   (i32.store
diff --git a/test/passes/inlining-optimizing_optimize-level=3.txt b/test/passes/inlining-optimizing_optimize-level=3.txt
index 6a34ac454..12675acef 100644
--- a/test/passes/inlining-optimizing_optimize-level=3.txt
+++ b/test/passes/inlining-optimizing_optimize-level=3.txt
@@ -14,7 +14,7 @@
  (type $12 (func (param i32 i32 i32 i32) (result i32)))
  (import "env" "memory" (memory $0 256 256))
  (data (i32.const 1024) "emcc_hello_world.asm.js")
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $0 18 18 anyfunc))
  (elem (get_global $tableBase) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
  (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32))
diff --git a/test/passes/inlining.txt b/test/passes/inlining.txt
index 9271de34a..5f159912c 100644
--- a/test/passes/inlining.txt
+++ b/test/passes/inlining.txt
@@ -3,7 +3,7 @@
  (type $1 (func (result i32)))
  (type $2 (func (result f64)))
  (type $3 (func (param f32 i64)))
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) $tabled)
  (export "user" (func $user))
  (export "exported" (func $exported))
@@ -235,7 +235,7 @@
 (module
  (type $T (func (param i32)))
  (type $1 (func))
- (table 10 anyfunc)
+ (table $0 10 anyfunc)
  (func $0 (; 0 ;) (type $1)
   (block $__inlined_func$1
    (call_indirect (type $T)
diff --git a/test/passes/inlining_optimize-level=3.txt b/test/passes/inlining_optimize-level=3.txt
index cbdb90e3e..2953f4ef2 100644
--- a/test/passes/inlining_optimize-level=3.txt
+++ b/test/passes/inlining_optimize-level=3.txt
@@ -1,7 +1,7 @@
 (module
  (type $0 (func (result i32)))
  (type $1 (func))
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) $no-loops-but-one-use-but-tabled)
  (export "yes" (func $yes))
  (export "no-loops-but-one-use-but-exported" (func $no-loops-but-one-use-but-exported))
diff --git a/test/passes/instrument-memory.txt b/test/passes/instrument-memory.txt
index 3e2f674b2..fc5221c3e 100644
--- a/test/passes/instrument-memory.txt
+++ b/test/passes/instrument-memory.txt
@@ -1,9 +1,9 @@
 (module
  (type $1 (func))
  (type $FUNCSIG$iiiii (func (param i32 i32 i32 i32) (result i32)))
- (memory $0 256 256)
  (import "instrument" "load" (func $load (param i32 i32 i32 i32) (result i32)))
  (import "instrument" "store" (func $store (param i32 i32 i32 i32) (result i32)))
+ (memory $0 256 256)
  (func $A (; 2 ;) (type $1)
   (drop
    (i32.load8_s
diff --git a/test/passes/metrics.txt b/test/passes/metrics.txt
index a3765585f..ece26bd0f 100644
--- a/test/passes/metrics.txt
+++ b/test/passes/metrics.txt
@@ -13,7 +13,7 @@ total
  (type $0 (func (param i32)))
  (memory $0 256 256)
  (data (i32.const 0) "\ff\ef\0f\1f 0@P\99")
- (table 256 256 anyfunc)
+ (table $0 256 256 anyfunc)
  (elem (i32.const 0) $ifs $ifs $ifs)
  (global $glob i32 (i32.const 1337))
  (func $ifs (; 0 ;) (type $0) (param $x i32)
diff --git a/test/passes/post-emscripten.txt b/test/passes/post-emscripten.txt
index c938d8174..a1bac030a 100644
--- a/test/passes/post-emscripten.txt
+++ b/test/passes/post-emscripten.txt
@@ -3,8 +3,8 @@
  (type $FUNCSIG$ddd (func (param f64 f64) (result f64)))
  (type $2 (func (param i32) (result i32)))
  (type $3 (func))
- (memory $0 256 256)
  (import "global.Math" "pow" (func $Math_pow (param f64 f64) (result f64)))
+ (memory $0 256 256)
  (export "load-off-2" (func $load-off-2))
  (func $b0 (; 1 ;) (type $0) (param $x i32)
   (drop
diff --git a/test/passes/print-call-graph.txt b/test/passes/print-call-graph.txt
index fc3927ed6..73f8ed834 100644
--- a/test/passes/print-call-graph.txt
+++ b/test/passes/print-call-graph.txt
@@ -122,7 +122,7 @@ digraph call {
  (type $7 (func (param i32 i32 i32 i32) (result i32)))
  (import "env" "memory" (memory $0 256 256))
  (data (get_global $memoryBase) "\05\00\00\00\00\00\00\00\00\00\00\00\01\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\01\00\00\00\02\00\00\00\b0\04\00\00\00\04\00\00\00\00\00\00\00\00\00\00\01\00\00\00\00\00\00\00\00\00\00\00\00\00\00\n\ff\ff\ff\ff\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\04")
- (import "env" "table" (table 9 9 anyfunc))
+ (import "env" "table" (table $0 9 9 anyfunc))
  (elem (i32.const 0) $b0 $___stdio_close $b1 $___stdout_write $___stdio_seek $___stdio_write $b2 $_cleanup_387 $b3)
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
  (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32))
diff --git a/test/passes/remove-imports.txt b/test/passes/remove-imports.txt
index 05ec5bae2..9c7444b8d 100644
--- a/test/passes/remove-imports.txt
+++ b/test/passes/remove-imports.txt
@@ -2,8 +2,8 @@
  (type $FUNCSIG$v (func))
  (type $FUNCSIG$i (func (result i32)))
  (type $FUNCSIG$d (func (result f64)))
- (memory $0 1024 1024)
  (import "env" "memBase" (global $import$global0 i32))
+ (memory $0 1024 1024)
  (func $nada (; 0 ;) (type $FUNCSIG$v)
   (nop)
   (drop
diff --git a/test/passes/remove-unused-module-elements.txt b/test/passes/remove-unused-module-elements.txt
index 077ed0b0c..d986f0b0c 100644
--- a/test/passes/remove-unused-module-elements.txt
+++ b/test/passes/remove-unused-module-elements.txt
@@ -3,7 +3,7 @@
  (type $1 (func (param i32)))
  (type $2 (func (param i32) (result i32)))
  (memory $0 0)
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) $called_indirect)
  (export "memory" (memory $0))
  (export "exported" (func $exported))
@@ -85,7 +85,7 @@
 )
 (module
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table 1 anyfunc))
+ (import "env" "table" (table $0 1 anyfunc))
  (export "mem" (memory $0))
  (export "tab" (table $0))
 )
@@ -93,7 +93,7 @@
  (type $0 (func))
  (import "env" "memory" (memory $0 256))
  (data (i32.const 1) "hello, world!")
- (import "env" "table" (table 1 anyfunc))
+ (import "env" "table" (table $0 1 anyfunc))
  (elem (i32.const 0) $waka)
  (func $waka (; 0 ;) (type $0)
   (nop)
@@ -102,7 +102,7 @@
 (module
  (type $0 (func))
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table 0 anyfunc))
+ (import "env" "table" (table $0 0 anyfunc))
  (export "user" (func $user))
  (func $user (; 0 ;) (type $0)
   (drop
@@ -208,7 +208,7 @@
  (type $0 (func))
  (import "env" "memory" (memory $0 256))
  (data (get_global $memoryBase) "hello, world!")
- (import "env" "table" (table 0 anyfunc))
+ (import "env" "table" (table $0 0 anyfunc))
  (elem (get_global $tableBase) $waka)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
@@ -265,7 +265,7 @@
 )
 (module
  (type $0 (func (param f64) (result f64)))
- (import "env" "table" (table 6 6 anyfunc))
+ (import "env" "table" (table $0 6 6 anyfunc))
  (elem (i32.const 0) $0)
  (func $0 (; 0 ;) (type $0) (param $var$0 f64) (result f64)
   (if (result f64)
diff --git a/test/passes/remove-unused-names_merge-blocks.txt b/test/passes/remove-unused-names_merge-blocks.txt
index c38ab7429..3e2755396 100644
--- a/test/passes/remove-unused-names_merge-blocks.txt
+++ b/test/passes/remove-unused-names_merge-blocks.txt
@@ -6,7 +6,7 @@
  (type $4 (func (result i32)))
  (type $5 (func (result f64)))
  (memory $0 (shared 256 256))
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) $call-i)
  (func $call-i (; 0 ;) (type $i) (param $0 i32)
   (nop)
diff --git a/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt b/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt
index fc975a788..375ff949d 100644
--- a/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt
+++ b/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt
@@ -24,7 +24,7 @@
  (type $FUNCSIG$id (func (param f64) (result i32)))
  (type $23 (func (param i32) (result i64)))
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table 18 18 anyfunc))
+ (import "env" "table" (table $0 18 18 anyfunc))
  (import "env" "DYNAMICTOP_PTR" (global $import$0 i32))
  (import "env" "tempDoublePtr" (global $import$1 i32))
  (import "env" "ABORT" (global $import$2 i32))
diff --git a/test/passes/remove-unused-nonfunction-module-elements.txt b/test/passes/remove-unused-nonfunction-module-elements.txt
index 2eb4aebba..bb1037d7a 100644
--- a/test/passes/remove-unused-nonfunction-module-elements.txt
+++ b/test/passes/remove-unused-nonfunction-module-elements.txt
@@ -3,7 +3,7 @@
  (type $1 (func (param i32)))
  (type $2 (func (param i32) (result i32)))
  (memory $0 0)
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) $called_indirect)
  (export "memory" (memory $0))
  (export "exported" (func $exported))
@@ -100,7 +100,7 @@
 )
 (module
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table 1 anyfunc))
+ (import "env" "table" (table $0 1 anyfunc))
  (export "mem" (memory $0))
  (export "tab" (table $0))
 )
@@ -108,7 +108,7 @@
  (type $0 (func))
  (import "env" "memory" (memory $0 256))
  (data (i32.const 1) "hello, world!")
- (import "env" "table" (table 1 anyfunc))
+ (import "env" "table" (table $0 1 anyfunc))
  (elem (i32.const 0) $waka)
  (func $waka (; 0 ;) (type $0)
   (nop)
@@ -117,7 +117,7 @@
 (module
  (type $0 (func))
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table 0 anyfunc))
+ (import "env" "table" (table $0 0 anyfunc))
  (export "user" (func $user))
  (func $user (; 0 ;) (type $0)
   (drop
@@ -223,7 +223,7 @@
  (type $0 (func))
  (import "env" "memory" (memory $0 256))
  (data (get_global $memoryBase) "hello, world!")
- (import "env" "table" (table 0 anyfunc))
+ (import "env" "table" (table $0 0 anyfunc))
  (elem (get_global $tableBase) $waka)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
@@ -299,7 +299,7 @@
 )
 (module
  (type $0 (func (param f64) (result f64)))
- (table 6 6 anyfunc)
+ (table $0 6 6 anyfunc)
  (func $0 (; 0 ;) (type $0) (param $var$0 f64) (result f64)
   (if (result f64)
    (f64.eq
@@ -316,7 +316,7 @@
 )
 (module
  (type $0 (func (param f64) (result f64)))
- (import "env" "table" (table 6 6 anyfunc))
+ (import "env" "table" (table $0 6 6 anyfunc))
  (elem (i32.const 0) $0)
  (func $0 (; 0 ;) (type $0) (param $var$0 f64) (result f64)
   (if (result f64)
diff --git a/test/passes/safe-heap.txt b/test/passes/safe-heap.txt
index 09b364b9f..f2513d502 100644
--- a/test/passes/safe-heap.txt
+++ b/test/passes/safe-heap.txt
@@ -1,10 +1,10 @@
 (module
  (type $0 (func))
  (type $FUNCSIG$v (func))
- (memory $0 (shared 100 100))
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32))
  (import "env" "segfault" (func $segfault))
  (import "env" "alignfault" (func $alignfault))
+ (memory $0 (shared 100 100))
  (func $loads (; 2 ;) (type $0)
   (drop
    (call $SAFE_HEAP_LOAD_i32_4_U_4
@@ -3686,10 +3686,10 @@
 (module
  (type $0 (func))
  (type $FUNCSIG$v (func))
- (memory $0 100 100)
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32))
  (import "env" "segfault" (func $segfault))
  (import "env" "alignfault" (func $alignfault))
+ (memory $0 100 100)
  (func $loads (; 2 ;) (type $0)
   (drop
    (call $SAFE_HEAP_LOAD_i32_4_U_4
@@ -6448,10 +6448,10 @@
 )
 (module
  (type $FUNCSIG$v (func))
- (memory $0 (shared 100 100))
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32))
  (import "env" "segfault" (func $segfault))
  (import "env" "alignfault" (func $alignfault))
+ (memory $0 (shared 100 100))
  (func $actions (; 2 ;) (type $FUNCSIG$v)
   (drop
    (call $SAFE_HEAP_LOAD_i32_4_U_4
diff --git a/test/passes/simplify-locals.txt b/test/passes/simplify-locals.txt
index d170315de..2e380049f 100644
--- a/test/passes/simplify-locals.txt
+++ b/test/passes/simplify-locals.txt
@@ -10,12 +10,12 @@
  (type $8 (func (param i32 i32)))
  (type $9 (func (param i32 i32 i32) (result i32)))
  (type $10 (func (param i64)))
- (memory $0 256 256)
  (import "env" "waka" (func $waka))
  (import "env" "waka_int" (func $waka_int (result i32)))
  (import "env" "i64sub" (func $_i64Subtract (param i32 i32 i32 i32) (result i32)))
  (import "env" "moddi" (func $___udivmoddi4 (param i32 i32 i32 i32 i32) (result i32)))
  (import "env" "lp" (func $lp (param i32 i32) (result i32)))
+ (memory $0 256 256)
  (func $contrast (; 5 ;) (type $FUNCSIG$v)
   (local $x i32)
   (local $y i32)
diff --git a/test/passes/spill-pointers.txt b/test/passes/spill-pointers.txt
index d8c8d96f4..7db34f89b 100644
--- a/test/passes/spill-pointers.txt
+++ b/test/passes/spill-pointers.txt
@@ -5,10 +5,10 @@
  (type $3 (func (result i32)))
  (type $4 (func (param i32) (result i32)))
  (type $5 (func (param f64)))
- (memory $0 10)
- (table 1 1 anyfunc)
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
  (import "env" "segfault" (func $segfault (param i32)))
+ (memory $0 10)
+ (table $0 1 1 anyfunc)
  (global $stack_ptr (mut i32) (get_global $STACKTOP$asm2wasm$import))
  (func $nothing (; 1 ;) (type $2)
   (nop)
diff --git a/test/passes/ssa_fuzz-exec.txt b/test/passes/ssa_fuzz-exec.txt
index 6c00c81a9..7c9c26350 100644
--- a/test/passes/ssa_fuzz-exec.txt
+++ b/test/passes/ssa_fuzz-exec.txt
@@ -4,7 +4,7 @@
  (type $0 (func (result i32)))
  (type $1 (func))
  (memory $0 (shared 1 1))
- (table 0 0 anyfunc)
+ (table $0 0 0 anyfunc)
  (export "func_0" (func $0))
  (func $0 (; 0 ;) (type $0) (result i32)
   (local $var$0 i32)
diff --git a/test/passes/translate-to-fuzz.txt b/test/passes/translate-to-fuzz.txt
index 618096286..85df534d0 100644
--- a/test/passes/translate-to-fuzz.txt
+++ b/test/passes/translate-to-fuzz.txt
@@ -4,7 +4,7 @@
  (type $FUNCSIG$ifj (func (param f32 i64) (result i32)))
  (memory $0 (shared 1 1))
  (data (i32.const 0) "n\00\05E\00\00\00\00")
- (table 4 anyfunc)
+ (table $0 4 anyfunc)
  (elem (i32.const 0) $func_2 $func_4 $func_5 $func_8)
  (global $global$0 (mut f32) (f32.const 536870912))
  (global $global$1 (mut f32) (f32.const 2147483648))
diff --git a/test/passes/vacuum.txt b/test/passes/vacuum.txt
index 85c4625bc..b8adcc11d 100644
--- a/test/passes/vacuum.txt
+++ b/test/passes/vacuum.txt
@@ -6,8 +6,8 @@
  (type $4 (func (param i32 f64 i32 i32)))
  (type $FUNCSIG$i (func (result i32)))
  (type $6 (func (result f64)))
- (memory $0 256 256)
  (import "env" "int" (func $int (result i32)))
+ (memory $0 256 256)
  (global $Int i32 (i32.const 0))
  (func $b (; 1 ;) (type $0)
   (nop)
diff --git a/test/polymorphic_stack.wast.from-wast b/test/polymorphic_stack.wast.from-wast
index a0eb1172a..5c178ee8e 100644
--- a/test/polymorphic_stack.wast.from-wast
+++ b/test/polymorphic_stack.wast.from-wast
@@ -3,7 +3,7 @@
  (type $1 (func (result i32)))
  (type $2 (func (param i32)))
  (type $3 (func))
- (import "env" "table" (table 9 9 anyfunc))
+ (import "env" "table" (table $0 9 9 anyfunc))
  (func $break-and-binary (; 0 ;) (type $1) (result i32)
   (block $x (result i32)
    (f32.add
diff --git a/test/polymorphic_stack.wast.fromBinary b/test/polymorphic_stack.wast.fromBinary
index 3a6fcec9a..3e899c4be 100644
--- a/test/polymorphic_stack.wast.fromBinary
+++ b/test/polymorphic_stack.wast.fromBinary
@@ -3,7 +3,7 @@
  (type $1 (func (result i32)))
  (type $2 (func (param i32)))
  (type $3 (func))
- (import "env" "table" (table 9 9 anyfunc))
+ (import "env" "table" (table $timport$0 9 9 anyfunc))
  (func $break-and-binary (; 0 ;) (type $1) (result i32)
   (block $label$1 (result i32)
    (unreachable)
diff --git a/test/polymorphic_stack.wast.fromBinary.noDebugInfo b/test/polymorphic_stack.wast.fromBinary.noDebugInfo
index 0b26011b8..1e22696d9 100644
--- a/test/polymorphic_stack.wast.fromBinary.noDebugInfo
+++ b/test/polymorphic_stack.wast.fromBinary.noDebugInfo
@@ -3,7 +3,7 @@
  (type $1 (func (result i32)))
  (type $2 (func (param i32)))
  (type $3 (func))
- (import "env" "table" (table 9 9 anyfunc))
+ (import "env" "table" (table $timport$0 9 9 anyfunc))
  (func $0 (; 0 ;) (type $1) (result i32)
   (block $label$1 (result i32)
    (unreachable)
diff --git a/test/reduce/memory_table.wast.txt b/test/reduce/memory_table.wast.txt
index cb1d9d6bc..5f6b3e7e1 100644
--- a/test/reduce/memory_table.wast.txt
+++ b/test/reduce/memory_table.wast.txt
@@ -2,7 +2,7 @@
  (type $0 (func (result i32)))
  (type $1 (func))
  (memory $0 256 256)
- (table 481 481 anyfunc)
+ (table $0 481 481 anyfunc)
  (elem (i32.const 0) $0 $0 $0 $2)
  (export "f1" (func $1))
  (export "f2" (func $2))
diff --git a/test/table-import.wast.from-wast b/test/table-import.wast.from-wast
index 19483094a..33c9cf7f2 100644
--- a/test/table-import.wast.from-wast
+++ b/test/table-import.wast.from-wast
@@ -1,8 +1,8 @@
 (module
  (type $0 (func))
- (memory $0 0)
- (import "env" "table" (table 1 1 anyfunc))
+ (import "env" "table" (table $0 1 1 anyfunc))
  (elem (i32.const 0) $foo)
+ (memory $0 0)
  (func $foo (; 0 ;) (type $0)
   (nop)
  )
diff --git a/test/table-import.wast.fromBinary b/test/table-import.wast.fromBinary
index 45b74a109..495ccc7dc 100644
--- a/test/table-import.wast.fromBinary
+++ b/test/table-import.wast.fromBinary
@@ -1,8 +1,8 @@
 (module
  (type $0 (func))
- (memory $0 0)
- (import "env" "table" (table 1 1 anyfunc))
+ (import "env" "table" (table $timport$0 1 1 anyfunc))
  (elem (i32.const 0) $foo)
+ (memory $0 0)
  (func $foo (; 0 ;) (type $0)
   (nop)
  )
diff --git a/test/table-import.wast.fromBinary.noDebugInfo b/test/table-import.wast.fromBinary.noDebugInfo
index 40159e6a3..1bcd48426 100644
--- a/test/table-import.wast.fromBinary.noDebugInfo
+++ b/test/table-import.wast.fromBinary.noDebugInfo
@@ -1,8 +1,8 @@
 (module
  (type $0 (func))
- (memory $0 0)
- (import "env" "table" (table 1 1 anyfunc))
+ (import "env" "table" (table $timport$0 1 1 anyfunc))
  (elem (i32.const 0) $0)
+ (memory $0 0)
  (func $0 (; 0 ;) (type $0)
   (nop)
  )
diff --git a/test/threads.fromasm.clamp.no-opts b/test/threads.fromasm.clamp.no-opts
index 630617846..78538c9c9 100644
--- a/test/threads.fromasm.clamp.no-opts
+++ b/test/threads.fromasm.clamp.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory (shared 256 256)))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32))
diff --git a/test/threads.fromasm.imprecise.no-opts b/test/threads.fromasm.imprecise.no-opts
index 630617846..78538c9c9 100644
--- a/test/threads.fromasm.imprecise.no-opts
+++ b/test/threads.fromasm.imprecise.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory (shared 256 256)))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32))
diff --git a/test/threads.fromasm.no-opts b/test/threads.fromasm.no-opts
index 630617846..78538c9c9 100644
--- a/test/threads.fromasm.no-opts
+++ b/test/threads.fromasm.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory (shared 256 256)))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32))
diff --git a/test/threads.wasm-only.fromasm.clamp.no-opts b/test/threads.wasm-only.fromasm.clamp.no-opts
index 38ce629eb..d79a41b41 100644
--- a/test/threads.wasm-only.fromasm.clamp.no-opts
+++ b/test/threads.wasm-only.fromasm.clamp.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory (shared 256 256)))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
diff --git a/test/threads.wasm-only.fromasm.imprecise.no-opts b/test/threads.wasm-only.fromasm.imprecise.no-opts
index 38ce629eb..d79a41b41 100644
--- a/test/threads.wasm-only.fromasm.imprecise.no-opts
+++ b/test/threads.wasm-only.fromasm.imprecise.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory (shared 256 256)))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
diff --git a/test/threads.wasm-only.fromasm.no-opts b/test/threads.wasm-only.fromasm.no-opts
index 38ce629eb..d79a41b41 100644
--- a/test/threads.wasm-only.fromasm.no-opts
+++ b/test/threads.wasm-only.fromasm.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory (shared 256 256)))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32))
diff --git a/test/two_sides.fromasm.clamp.no-opts b/test/two_sides.fromasm.clamp.no-opts
index 1a53ba025..8967e2ad2 100644
--- a/test/two_sides.fromasm.clamp.no-opts
+++ b/test/two_sides.fromasm.clamp.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "_test" (func $_test))
diff --git a/test/two_sides.fromasm.imprecise.no-opts b/test/two_sides.fromasm.imprecise.no-opts
index ebae808bb..01524e663 100644
--- a/test/two_sides.fromasm.imprecise.no-opts
+++ b/test/two_sides.fromasm.imprecise.no-opts
@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "_test" (func $_test))
diff --git a/test/two_sides.fromasm.no-opts b/test/two_sides.fromasm.no-opts
index 62a29ac00..e74005742 100644
--- a/test/two_sides.fromasm.no-opts
+++ b/test/two_sides.fromasm.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$id (func (param f64) (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32)))
diff --git a/test/unit.fromasm b/test/unit.fromasm
index 5f2f516c7..fa81c8bc3 100644
--- a/test/unit.fromasm
+++ b/test/unit.fromasm
@@ -10,7 +10,7 @@
  (type $FUNCSIG$i (func (result i32)))
  (import "env" "memory" (memory $memory 256 256))
  (data (get_global $memoryBase) "unit.asm.js")
- (import "env" "table" (table 25 25 anyfunc))
+ (import "env" "table" (table $table 25 25 anyfunc))
  (elem (get_global $tableBase) $big_negative $big_negative $big_negative $big_negative $w $w $importedDoubles $w $z $cneg $z $z $z $z $z $z $vi $vi $vi $vi $vi $vi $vi $vi $ii)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/unit.fromasm.clamp b/test/unit.fromasm.clamp
index 48c27a6d4..e1a1f90fa 100644
--- a/test/unit.fromasm.clamp
+++ b/test/unit.fromasm.clamp
@@ -9,7 +9,7 @@
  (type $FUNCSIG$i (func (result i32)))
  (import "env" "memory" (memory $memory 256 256))
  (data (get_global $memoryBase) "unit.asm.js")
- (import "env" "table" (table 25 25 anyfunc))
+ (import "env" "table" (table $table 25 25 anyfunc))
  (elem (get_global $tableBase) $big_negative $big_negative $big_negative $big_negative $w $w $importedDoubles $w $z $cneg $z $z $z $z $z $z $vi $vi $vi $vi $vi $vi $vi $vi $ii)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/unit.fromasm.clamp.no-opts b/test/unit.fromasm.clamp.no-opts
index be13fb2ac..21c5603dc 100644
--- a/test/unit.fromasm.clamp.no-opts
+++ b/test/unit.fromasm.clamp.no-opts
@@ -8,7 +8,7 @@
  (type $FUNCSIG$dd (func (param f64) (result f64)))
  (type $FUNCSIG$i (func (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 25 25 anyfunc))
+ (import "env" "table" (table $table 25 25 anyfunc))
  (elem (get_global $tableBase) $v $big_negative $v $v $w $w $importedDoubles $w $z $cneg $z $z $z $z $z $z $vi $vi $vi $vi $vi $vi $vi $vi $ii)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise
index 26a96c5cc..4a7e56f3a 100644
--- a/test/unit.fromasm.imprecise
+++ b/test/unit.fromasm.imprecise
@@ -8,7 +8,7 @@
  (type $FUNCSIG$dd (func (param f64) (result f64)))
  (type $FUNCSIG$i (func (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 25 25 anyfunc))
+ (import "env" "table" (table $table 25 25 anyfunc))
  (elem (get_global $tableBase) $big_negative $big_negative $big_negative $big_negative $w $w $importedDoubles $w $z $cneg $z $z $z $z $z $z $vi $vi $vi $vi $vi $vi $vi $vi $ii)
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "gb" (global $n$asm2wasm$import i32))
diff --git a/test/unit.fromasm.imprecise.no-opts b/test/unit.fromasm.imprecise.no-opts
index 391e4a852..3efad229b 100644
--- a/test/unit.fromasm.imprecise.no-opts
+++ b/test/unit.fromasm.imprecise.no-opts
@@ -8,7 +8,7 @@
  (type $FUNCSIG$dd (func (param f64) (result f64)))
  (type $FUNCSIG$i (func (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 25 25 anyfunc))
+ (import "env" "table" (table $table 25 25 anyfunc))
  (elem (get_global $tableBase) $v $big_negative $v $v $w $w $importedDoubles $w $z $cneg $z $z $z $z $z $z $vi $vi $vi $vi $vi $vi $vi $vi $ii)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/unit.fromasm.no-opts b/test/unit.fromasm.no-opts
index 1b403e258..3e8c81d34 100644
--- a/test/unit.fromasm.no-opts
+++ b/test/unit.fromasm.no-opts
@@ -9,7 +9,7 @@
  (type $FUNCSIG$dd (func (param f64) (result f64)))
  (type $FUNCSIG$i (func (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 25 25 anyfunc))
+ (import "env" "table" (table $table 25 25 anyfunc))
  (elem (get_global $tableBase) $v $big_negative $v $v $w $w $importedDoubles $w $z $cneg $z $z $z $z $z $z $vi $vi $vi $vi $vi $vi $vi $vi $ii)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/unit.wast.from-wast b/test/unit.wast.from-wast
index 01cf56c26..0b1099e47 100644
--- a/test/unit.wast.from-wast
+++ b/test/unit.wast.from-wast
@@ -9,13 +9,13 @@
  (type $7 (func (param f64) (result f64)))
  (type $8 (func (result i64)))
  (type $9 (func (param i32 i64)))
- (memory $0 4096 4096)
- (data (i32.const 1026) "\14\00")
- (table 10 anyfunc)
- (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
  (import "env" "_emscripten_asm_const_vi" (func $_emscripten_asm_const_vi))
  (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32)))
  (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64)))
+ (memory $0 4096 4096)
+ (data (i32.const 1026) "\14\00")
+ (table $0 10 anyfunc)
+ (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
  (export "big_negative" (func $big_negative))
  (func $big_negative (; 3 ;) (type $FUNCSIG$v)
   (local $temp f64)
diff --git a/test/unit.wast.fromBinary b/test/unit.wast.fromBinary
index c5f0f3009..de32fd1ee 100644
--- a/test/unit.wast.fromBinary
+++ b/test/unit.wast.fromBinary
@@ -9,13 +9,13 @@
  (type $7 (func (param f64) (result f64)))
  (type $8 (func (result i64)))
  (type $9 (func (param i32 i64)))
- (memory $0 4096 4096)
- (data (i32.const 1026) "\14\00")
- (table 10 anyfunc)
- (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
  (import "env" "_emscripten_asm_const_vi" (func $_emscripten_asm_const_vi))
  (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32)))
  (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64)))
+ (memory $0 4096 4096)
+ (data (i32.const 1026) "\14\00")
+ (table $0 10 anyfunc)
+ (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
  (export "big_negative" (func $big_negative))
  (func $big_negative (; 3 ;) (type $1)
   (local $0 f64)
diff --git a/test/unit.wast.fromBinary.noDebugInfo b/test/unit.wast.fromBinary.noDebugInfo
index 649eb39c9..498ce3a7c 100644
--- a/test/unit.wast.fromBinary.noDebugInfo
+++ b/test/unit.wast.fromBinary.noDebugInfo
@@ -9,13 +9,13 @@
  (type $7 (func (param f64) (result f64)))
  (type $8 (func (result i64)))
  (type $9 (func (param i32 i64)))
- (memory $0 4096 4096)
- (data (i32.const 1026) "\14\00")
- (table 10 anyfunc)
- (elem (i32.const 0) $17 $0 $17 $17 $18 $18 $1 $18 $17 $15)
  (import "env" "_emscripten_asm_const_vi" (func $fimport$0))
  (import "asm2wasm" "f64-to-int" (func $fimport$1 (param f64) (result i32)))
  (import "asm2wasm" "f64-rem" (func $fimport$2 (param f64 f64) (result f64)))
+ (memory $0 4096 4096)
+ (data (i32.const 1026) "\14\00")
+ (table $0 10 anyfunc)
+ (elem (i32.const 0) $17 $0 $17 $17 $18 $18 $1 $18 $17 $15)
  (export "big_negative" (func $0))
  (func $0 (; 3 ;) (type $1)
   (local $0 f64)
diff --git a/test/unreachable-import_wasm-only.fromasm.clamp.no-opts b/test/unreachable-import_wasm-only.fromasm.clamp.no-opts
index 707a65eb3..e7eecc451 100644
--- a/test/unreachable-import_wasm-only.fromasm.clamp.no-opts
+++ b/test/unreachable-import_wasm-only.fromasm.clamp.no-opts
@@ -2,7 +2,7 @@
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (type $FUNCSIG$viii (func (param i32 i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32))
diff --git a/test/unreachable-import_wasm-only.fromasm.imprecise.no-opts b/test/unreachable-import_wasm-only.fromasm.imprecise.no-opts
index 707a65eb3..e7eecc451 100644
--- a/test/unreachable-import_wasm-only.fromasm.imprecise.no-opts
+++ b/test/unreachable-import_wasm-only.fromasm.imprecise.no-opts
@@ -2,7 +2,7 @@
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (type $FUNCSIG$viii (func (param i32 i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32))
diff --git a/test/unreachable-import_wasm-only.fromasm.no-opts b/test/unreachable-import_wasm-only.fromasm.no-opts
index 707a65eb3..e7eecc451 100644
--- a/test/unreachable-import_wasm-only.fromasm.no-opts
+++ b/test/unreachable-import_wasm-only.fromasm.no-opts
@@ -2,7 +2,7 @@
  (type $FUNCSIG$ii (func (param i32) (result i32)))
  (type $FUNCSIG$viii (func (param i32 i32 i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR$asm2wasm$import i32))
diff --git a/test/use-import-and-drop.fromasm.clamp.no-opts b/test/use-import-and-drop.fromasm.clamp.no-opts
index 50b56a83e..9c813eb0e 100644
--- a/test/use-import-and-drop.fromasm.clamp.no-opts
+++ b/test/use-import-and-drop.fromasm.clamp.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$vi (func (param i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "setTempRet0" (func $setTempRet0 (param i32)))
diff --git a/test/use-import-and-drop.fromasm.imprecise.no-opts b/test/use-import-and-drop.fromasm.imprecise.no-opts
index 50b56a83e..9c813eb0e 100644
--- a/test/use-import-and-drop.fromasm.imprecise.no-opts
+++ b/test/use-import-and-drop.fromasm.imprecise.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$vi (func (param i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "setTempRet0" (func $setTempRet0 (param i32)))
diff --git a/test/use-import-and-drop.fromasm.no-opts b/test/use-import-and-drop.fromasm.no-opts
index 50b56a83e..9c813eb0e 100644
--- a/test/use-import-and-drop.fromasm.no-opts
+++ b/test/use-import-and-drop.fromasm.no-opts
@@ -1,7 +1,7 @@
 (module
  (type $FUNCSIG$vi (func (param i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "setTempRet0" (func $setTempRet0 (param i32)))
diff --git a/test/wasm-only.fromasm b/test/wasm-only.fromasm
index 59033b98d..e3b18b638 100644
--- a/test/wasm-only.fromasm
+++ b/test/wasm-only.fromasm
@@ -4,7 +4,7 @@
  (type $legaltype$_fabsf (func (param f64) (result f64)))
  (import "env" "memory" (memory $memory 256 256))
  (data (get_global $memoryBase) "wasm-only.asm.js")
- (import "env" "table" (table 3 3 anyfunc))
+ (import "env" "table" (table $table 3 3 anyfunc))
  (elem (get_global $tableBase) $legalfunc$illegalImport $legalfunc$_fabsf $legalfunc$do_i64)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/wasm-only.fromasm.clamp b/test/wasm-only.fromasm.clamp
index 59033b98d..e3b18b638 100644
--- a/test/wasm-only.fromasm.clamp
+++ b/test/wasm-only.fromasm.clamp
@@ -4,7 +4,7 @@
  (type $legaltype$_fabsf (func (param f64) (result f64)))
  (import "env" "memory" (memory $memory 256 256))
  (data (get_global $memoryBase) "wasm-only.asm.js")
- (import "env" "table" (table 3 3 anyfunc))
+ (import "env" "table" (table $table 3 3 anyfunc))
  (elem (get_global $tableBase) $legalfunc$illegalImport $legalfunc$_fabsf $legalfunc$do_i64)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/wasm-only.fromasm.clamp.no-opts b/test/wasm-only.fromasm.clamp.no-opts
index 038aedb92..272c444a4 100644
--- a/test/wasm-only.fromasm.clamp.no-opts
+++ b/test/wasm-only.fromasm.clamp.no-opts
@@ -8,7 +8,7 @@
  (type $legaltype$_fabsf (func (param f64) (result f64)))
  (type $legaltype$do_i64 (func (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 3 3 anyfunc))
+ (import "env" "table" (table $table 3 3 anyfunc))
  (elem (get_global $tableBase) $legalfunc$illegalImport $legalfunc$_fabsf $legalfunc$do_i64)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/wasm-only.fromasm.imprecise b/test/wasm-only.fromasm.imprecise
index a9e7688de..e7820953a 100644
--- a/test/wasm-only.fromasm.imprecise
+++ b/test/wasm-only.fromasm.imprecise
@@ -3,7 +3,7 @@
  (type $legaltype$illegalImportResult (func (result i32)))
  (type $legaltype$_fabsf (func (param f64) (result f64)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 3 3 anyfunc))
+ (import "env" "table" (table $table 3 3 anyfunc))
  (elem (get_global $tableBase) $legalfunc$illegalImport $legalfunc$_fabsf $legalfunc$do_i64)
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "illegalImport" (func $legalimport$illegalImport (param f64 i32 i32 i32)))
diff --git a/test/wasm-only.fromasm.imprecise.no-opts b/test/wasm-only.fromasm.imprecise.no-opts
index 66cb9e070..e1160dff0 100644
--- a/test/wasm-only.fromasm.imprecise.no-opts
+++ b/test/wasm-only.fromasm.imprecise.no-opts
@@ -8,7 +8,7 @@
  (type $legaltype$_fabsf (func (param f64) (result f64)))
  (type $legaltype$do_i64 (func (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 3 3 anyfunc))
+ (import "env" "table" (table $table 3 3 anyfunc))
  (elem (get_global $tableBase) $legalfunc$illegalImport $legalfunc$_fabsf $legalfunc$do_i64)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
diff --git a/test/wasm-only.fromasm.no-opts b/test/wasm-only.fromasm.no-opts
index 038aedb92..272c444a4 100644
--- a/test/wasm-only.fromasm.no-opts
+++ b/test/wasm-only.fromasm.no-opts
@@ -8,7 +8,7 @@
  (type $legaltype$_fabsf (func (param f64) (result f64)))
  (type $legaltype$do_i64 (func (result i32)))
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 3 3 anyfunc))
+ (import "env" "table" (table $table 3 3 anyfunc))
  (elem (get_global $tableBase) $legalfunc$illegalImport $legalfunc$_fabsf $legalfunc$do_i64)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))