diff --git a/tests/binary-parsing/import-func.wast.out b/tests/binary-parsing/import-func.wast.out
index c27ad3fe5..6d974f116 100644
--- a/tests/binary-parsing/import-func.wast.out
+++ b/tests/binary-parsing/import-func.wast.out
@@ -1,6 +1,6 @@
 <generatedTop>
   <k>
-    #module (... types: #type (... type: [ .ValTypes ] -> [ .ValTypes ] , metadata:  )  .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( env , managedSignalError , #funcDesc (... id:  , type: 0 ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
+    #module (... types: #type (... type: [ .ValTypes ] -> [ .ValTypes ] , metadata:  )  .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( "env" , "managedSignalError" , #funcDesc (... id:  , type: 0 ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
   </k>
   <wasm>
     <instrs>
diff --git a/tests/binary-parsing/import-global-const.wast.out b/tests/binary-parsing/import-global-const.wast.out
index 37a320b9b..361a5fa3b 100644
--- a/tests/binary-parsing/import-global-const.wast.out
+++ b/tests/binary-parsing/import-global-const.wast.out
@@ -1,6 +1,6 @@
 <generatedTop>
   <k>
-    #module (... types: .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( env , myGlobal , #globalDesc (... id:  , type: const i32 ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
+    #module (... types: .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( "env" , "myGlobal" , #globalDesc (... id:  , type: const i32 ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
   </k>
   <wasm>
     <instrs>
diff --git a/tests/binary-parsing/import-global-var.wast.out b/tests/binary-parsing/import-global-var.wast.out
index 853f00de0..9197b2f8f 100644
--- a/tests/binary-parsing/import-global-var.wast.out
+++ b/tests/binary-parsing/import-global-var.wast.out
@@ -1,6 +1,6 @@
 <generatedTop>
   <k>
-    #module (... types: .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( env , myGlobal , #globalDesc (... id:  , type: var i32 ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
+    #module (... types: .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( "env" , "myGlobal" , #globalDesc (... id:  , type: var i32 ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
   </k>
   <wasm>
     <instrs>
diff --git a/tests/binary-parsing/import-memory.wast.out b/tests/binary-parsing/import-memory.wast.out
index 908cbc1e2..db7403081 100644
--- a/tests/binary-parsing/import-memory.wast.out
+++ b/tests/binary-parsing/import-memory.wast.out
@@ -1,6 +1,6 @@
 <generatedTop>
   <k>
-    #module (... types: .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( env , myMem , #memoryDesc (... id:  , type: #limits ( 10 , 20 ) ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
+    #module (... types: .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( "env" , "myMem" , #memoryDesc (... id:  , type: #limits ( 10 , 20 ) ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
   </k>
   <wasm>
     <instrs>
diff --git a/tests/binary-parsing/import-table-lim.wast.out b/tests/binary-parsing/import-table-lim.wast.out
index 309325858..443c76c6f 100644
--- a/tests/binary-parsing/import-table-lim.wast.out
+++ b/tests/binary-parsing/import-table-lim.wast.out
@@ -1,6 +1,6 @@
 <generatedTop>
   <k>
-    #module (... types: .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( env , myTable , #tableDesc (... id:  , type: #limits ( 10 , 20 ) ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
+    #module (... types: .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( "env" , "myTable" , #tableDesc (... id:  , type: #limits ( 10 , 20 ) ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
   </k>
   <wasm>
     <instrs>
diff --git a/tests/binary-parsing/import-table-minlim.wast.out b/tests/binary-parsing/import-table-minlim.wast.out
index cac9460db..b4becfd9a 100644
--- a/tests/binary-parsing/import-table-minlim.wast.out
+++ b/tests/binary-parsing/import-table-minlim.wast.out
@@ -1,6 +1,6 @@
 <generatedTop>
   <k>
-    #module (... types: .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( env , myTable , #tableDesc (... id:  , type: #limitsMin ( 10 ) ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
+    #module (... types: .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( "env" , "myTable" , #tableDesc (... id:  , type: #limitsMin ( 10 ) ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
   </k>
   <wasm>
     <instrs>
diff --git a/tests/binary-parsing/imports.wast.out b/tests/binary-parsing/imports.wast.out
index 273f67e7d..6fb94b8dc 100644
--- a/tests/binary-parsing/imports.wast.out
+++ b/tests/binary-parsing/imports.wast.out
@@ -1,6 +1,6 @@
 <generatedTop>
   <k>
-    #module (... types: #type (... type: [ .ValTypes ] -> [ .ValTypes ] , metadata:  )  .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( env , managedSignalError , #funcDesc (... id:  , type: 0 ) )  #import ( env , myFunc , #funcDesc (... id:  , type: 0 ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
+    #module (... types: #type (... type: [ .ValTypes ] -> [ .ValTypes ] , metadata:  )  .EmptyStmts , funcs: .EmptyStmts , tables: .EmptyStmts , mems: .EmptyStmts , globals: .EmptyStmts , elem: .EmptyStmts , data: .EmptyStmts , start: .EmptyStmts , importDefns: #import ( "env" , "managedSignalError" , #funcDesc (... id:  , type: 0 ) )  #import ( "env" , "myFunc" , #funcDesc (... id:  , type: 0 ) )  .EmptyStmts , exports: .EmptyStmts , metadata: #meta (... id:  , funcIds: .Map , filename: .String ) ) ~> .K
   </k>
   <wasm>
     <instrs>