diff --git a/scripts/fuzz_opt.py b/scripts/fuzz_opt.py
index 953668d3fd2..19a2892fa29 100755
--- a/scripts/fuzz_opt.py
+++ b/scripts/fuzz_opt.py
@@ -423,8 +423,8 @@ def pick_initial_contents():
 # Host limits are reported as [host limit REASON]
 HOST_LIMIT_PREFIX = '[host limit '
 
-# --fuzz-exec reports calls as [fuzz-exec] calling foo
-FUZZ_EXEC_CALL_PREFIX = '[fuzz-exec] calling'
+# --fuzz-exec reports calls as [fuzz-exec] export foo
+FUZZ_EXEC_EXPORT_PREFIX = '[fuzz-exec] export'
 
 # --fuzz-exec reports a stack limit using this notation
 STACK_LIMIT = '[trap stack limit]'
@@ -440,11 +440,11 @@ def pick_initial_contents():
 EXCEPTION_PREFIX = 'exception thrown: '
 
 
-# given a call line that includes FUZZ_EXEC_CALL_PREFIX, return the export that
-# is called
-def get_export_from_call_line(call_line):
-    assert FUZZ_EXEC_CALL_PREFIX in call_line
-    return call_line.split(FUZZ_EXEC_CALL_PREFIX)[1].strip()
+# given an export line that includes FUZZ_EXEC_EXPORT_PREFIX, return the export
+# that is called
+def get_export_from_export_line(export_line):
+    assert FUZZ_EXEC_EXPORT_PREFIX in export_line
+    return export_line.split(FUZZ_EXEC_EXPORT_PREFIX)[1].strip()
 
 
 # compare two strings, strictly
@@ -786,7 +786,7 @@ class BinaryenInterpreter:
             def run(self, wasm):
                 output = run_bynterp(wasm, ['--fuzz-exec-before'])
                 if output != IGNORE:
-                    calls = output.count(FUZZ_EXEC_CALL_PREFIX)
+                    calls = output.count(FUZZ_EXEC_EXPORT_PREFIX)
                     errors = output.count(TRAP_PREFIX) + output.count(HOST_LIMIT_PREFIX)
                     if errors > calls / 2:
                         # A significant amount of execution on this testcase
@@ -1131,14 +1131,14 @@ def fix_number(x):
             # we can't test this function, which the trap is in the middle of.
             # erase everything from this function's output and onward, so we
             # only compare the previous trap-free code
-            call_start = interpreter.rindex(FUZZ_EXEC_CALL_PREFIX, 0, trap_index)
+            call_start = interpreter.rindex(FUZZ_EXEC_EXPORT_PREFIX, 0, trap_index)
             call_end = interpreter.index('\n', call_start)
-            call_line = interpreter[call_start:call_end]
+            export_line = interpreter[call_start:call_end]
             # fix up the call line so it matches the JS
-            fixed_call_line = fix_output_for_js(call_line)
-            before = before[:before.index(fixed_call_line)]
-            after = after[:after.index(fixed_call_line)]
-            interpreter = interpreter[:interpreter.index(call_line)]
+            fixed_export_line = fix_output_for_js(export_line)
+            before = before[:before.index(fixed_export_line)]
+            after = after[:after.index(fixed_export_line)]
+            interpreter = interpreter[:interpreter.index(export_line)]
 
         if compare_before_to_after:
             compare_between_vms(before, after, 'Wasm2JS (before/after)')
@@ -1293,14 +1293,14 @@ def handle_pair(self, input, before_wasm, after_wasm, opts):
             # finding the call line right before us. that is, the output looks
             # like this:
             #
-            #   [fuzz-exec] calling foo
+            #   [fuzz-exec] export foo
             #   .. stuff happening during foo ..
-            #   [fuzz-exec] calling bar
+            #   [fuzz-exec] export bar
             #   .. stuff happening during bar ..
             #
             # if the trap happened during bar, the relevant call line is
-            # "[fuzz-exec] calling bar".
-            call_start = before.rfind(FUZZ_EXEC_CALL_PREFIX, 0, trap_index)
+            # "[fuzz-exec] export bar".
+            call_start = before.rfind(FUZZ_EXEC_EXPORT_PREFIX, 0, trap_index)
             if call_start < 0:
                 # the trap happened before we called an export, so it occured
                 # during startup (the start function, or memory segment
@@ -1311,17 +1311,17 @@ def handle_pair(self, input, before_wasm, after_wasm, opts):
             # be prefixes of each other
             call_end = before.index(os.linesep, call_start) + 1
             # we now know the contents of the call line after which the trap
-            # happens, which is something like "[fuzz-exec] calling bar", and
+            # happens, which is something like "[fuzz-exec] export bar", and
             # it is unique since it contains the function being called.
-            call_line = before[call_start:call_end]
-            trapping_export = get_export_from_call_line(call_line)
+            export_line = before[call_start:call_end]
+            trapping_export = get_export_from_export_line(export_line)
 
             # now that we know the trapping export, we can leave only the safe
             # ones that are before it
             safe_exports = []
             for line in before.splitlines():
-                if FUZZ_EXEC_CALL_PREFIX in line:
-                    export = get_export_from_call_line(line)
+                if FUZZ_EXEC_EXPORT_PREFIX in line:
+                    export = get_export_from_export_line(line)
                     if export == trapping_export:
                         break
                     safe_exports.append(export)
@@ -1437,10 +1437,10 @@ def traps_in_instantiation(output):
         trap_index = output.find('*exception*')
         if trap_index == -1:
             return False
-    call_index = output.find(FUZZ_EXEC_CALL_PREFIX)
-    if call_index == -1:
+    export_index = output.find(FUZZ_EXEC_EXPORT_PREFIX)
+    if export_index == -1:
         return True
-    return trap_index < call_index
+    return trap_index < export_index
 
 
 # Tests wasm-merge
@@ -1575,8 +1575,8 @@ def handle(self, wasm):
         # primary module, but only the original ones.
         exports = []
         for line in output.splitlines():
-            if FUZZ_EXEC_CALL_PREFIX in line:
-                exports.append(get_export_from_call_line(line))
+            if FUZZ_EXEC_EXPORT_PREFIX in line:
+                exports.append(get_export_from_export_line(line))
 
         # pick which to split out, with a random rate of picking (biased towards
         # 0.5).
@@ -1770,7 +1770,7 @@ def handle_pair(self, input, before_wasm, after_wasm, opts):
                  fuzz_file,
                  'extracted'])
             if get_exports('extracted.0.wasm', ['func']):
-                assert FUZZ_EXEC_CALL_PREFIX in output
+                assert FUZZ_EXEC_EXPORT_PREFIX in output
 
     def ensure(self):
         # The first time we actually run, set things up: make a bundle like the
@@ -1883,7 +1883,7 @@ def handle(self, wasm):
         # wasm files.
         exports = get_exports(wasm, ['func', 'global'])
         exports += get_exports(second_wasm, ['func', 'global'])
-        calls_in_output = output.count(FUZZ_EXEC_CALL_PREFIX)
+        calls_in_output = output.count(FUZZ_EXEC_EXPORT_PREFIX)
         if calls_in_output == 0:
             print(f'warning: no calls in output. output:\n{output}')
         assert calls_in_output == len(exports), exports
@@ -2000,11 +2000,11 @@ def compare_to_merged_output(self, output, merged_output):
             b = merged_output_lines[i]
             if a == b:
                 continue
-            if a.startswith(FUZZ_EXEC_CALL_PREFIX):
+            if a.startswith(FUZZ_EXEC_EXPORT_PREFIX):
                 # Fix up
-                #   [fuzz-exec] calling foo/bar
+                #   [fuzz-exec] export foo/bar
                 # for different foo/bar. Just copy the original.
-                assert b.startswith(FUZZ_EXEC_CALL_PREFIX)
+                assert b.startswith(FUZZ_EXEC_EXPORT_PREFIX)
                 merged_output_lines[i] = output_lines[i]
             elif a.startswith(FUZZ_EXEC_NOTE_RESULT):
                 # Fix up
@@ -2263,7 +2263,7 @@ def handle(self, wasm):
         # any logging before the first call.)
         line_groups = [['before calls']]
         for line in out.splitlines():
-            if line.startswith(FUZZ_EXEC_CALL_PREFIX):
+            if line.startswith(FUZZ_EXEC_EXPORT_PREFIX):
                 line_groups.append([line])
             else:
                 line_groups[-1].append(line)
diff --git a/scripts/fuzz_shell.js b/scripts/fuzz_shell.js
index ada5768b54f..59cc992eb29 100644
--- a/scripts/fuzz_shell.js
+++ b/scripts/fuzz_shell.js
@@ -630,7 +630,7 @@ function build(binary, isSecond) {
     }
 
     // Execute the task.
-    console.log(`[fuzz-exec] calling ${task.name}${task.deferred ? ' (after defer)' : ''}`);
+    console.log(`[fuzz-exec] export ${task.name}${task.deferred ? ' (after defer)' : ''}`);
     let result;
     try {
       result = task.func();
diff --git a/scripts/update_lit_checks.py b/scripts/update_lit_checks.py
index bb3accd4515..0444b51eca7 100755
--- a/scripts/update_lit_checks.py
+++ b/scripts/update_lit_checks.py
@@ -55,7 +55,7 @@
 ITEM_RE = re.compile(r'(?:^\s*\(rec\s*)?(^\s*)\((' + ALL_ITEMS + r')\s+(' + ITEM_NAME + ').*$',
                      re.MULTILINE)
 
-FUZZ_EXEC_FUNC = re.compile(r'^\[fuzz-exec\] calling (?P<name>\S*)$')
+FUZZ_EXEC_FUNC = re.compile(r'^\[fuzz-exec\] export (?P<name>\S*)$')
 
 ANNOTATION_RE = re.compile(r'^\s*\(\@.*')
 
diff --git a/src/tools/execution-results.h b/src/tools/execution-results.h
index 1161d47cf78..58613a66aaf 100644
--- a/src/tools/execution-results.h
+++ b/src/tools/execution-results.h
@@ -488,7 +488,7 @@ struct ExecutionResults {
     // opts)
     for (auto& exp : wasm.exports) {
       if (exp->kind == ExternalKind::Function) {
-        std::cout << "[fuzz-exec] calling " << exp->name << "\n";
+        std::cout << "[fuzz-exec] export " << exp->name << "\n";
         auto* func = wasm.getFunction(*exp->getInternalName());
         FunctionResult ret = run(func, wasm, instance);
         results[exp->name] = ret;
@@ -503,9 +503,8 @@ struct ExecutionResults {
           }
         }
       } else if (exp->kind == ExternalKind::Global) {
-        // Log the global's value. (We use "calling" here to match the output
-        // for calls, which simplifies the fuzzer.)
-        std::cout << "[fuzz-exec] calling " << exp->name << "\n";
+        // Log the global's value.
+        std::cout << "[fuzz-exec] export " << exp->name << "\n";
         Literals* value = instance.getExportedGlobalOrNull(exp->name);
         assert(value);
         assert(value->size() == 1);
diff --git a/src/tools/wasm2c-wrapper.h b/src/tools/wasm2c-wrapper.h
index 38c924b47aa..242442a1d8a 100644
--- a/src/tools/wasm2c-wrapper.h
+++ b/src/tools/wasm2c-wrapper.h
@@ -159,7 +159,7 @@ int main(int argc, char** argv) {
 
     auto* func = wasm.getFunction(*exp->getInternalName());
 
-    ret += std::string("          puts(\"[fuzz-exec] calling ") +
+    ret += std::string("          puts(\"[fuzz-exec] export ") +
            exp->name.toString() + "\");\n";
     auto result = func->getResults();
 
diff --git a/test/lit/d8/fuzz_shell.wast b/test/lit/d8/fuzz_shell.wast
index 99d8ea989c6..40b2ad1329a 100644
--- a/test/lit/d8/fuzz_shell.wast
+++ b/test/lit/d8/fuzz_shell.wast
@@ -14,6 +14,6 @@
 ;;
 ;; RUN: v8 %S/../../../scripts/fuzz_shell.js -- %t.wasm | filecheck %s
 ;;
-;; CHECK: [fuzz-exec] calling test
+;; CHECK: [fuzz-exec] export test
 ;; CHECK: [fuzz-exec] note result: test => 42
 
diff --git a/test/lit/d8/fuzz_shell_exceptions.wast b/test/lit/d8/fuzz_shell_exceptions.wast
index dc835469536..9bad7bf6117 100644
--- a/test/lit/d8/fuzz_shell_exceptions.wast
+++ b/test/lit/d8/fuzz_shell_exceptions.wast
@@ -39,11 +39,11 @@
 ;;
 ;; RUN: v8 %S/../../../scripts/fuzz_shell.js -- %t.wasm | filecheck %s
 ;;
-;; CHECK: [fuzz-exec] calling throwing-js
+;; CHECK: [fuzz-exec] export throwing-js
 ;; CHECK: exception thrown: Error: js exception
-;; CHECK: [fuzz-exec] calling throwing-tag
+;; CHECK: [fuzz-exec] export throwing-tag
 ;; CHECK: exception thrown: [object WebAssembly.Exception]
-;; CHECK: [fuzz-exec] calling throwing-jstag-null
+;; CHECK: [fuzz-exec] export throwing-jstag-null
 ;; CHECK: exception thrown: null
 
 
diff --git a/test/lit/d8/fuzz_shell_jspi.wast b/test/lit/d8/fuzz_shell_jspi.wast
index cc1e35f0274..eb105483766 100644
--- a/test/lit/d8/fuzz_shell_jspi.wast
+++ b/test/lit/d8/fuzz_shell_jspi.wast
@@ -49,32 +49,32 @@
 ;; we get a random-like ordering, which includes some defers (each of which has
 ;; a later finish), showing that we interleave stacks.
 ;;
-;; CHECK: [fuzz-exec] calling a
-;; CHECK: [fuzz-exec] calling b
+;; CHECK: [fuzz-exec] export a
+;; CHECK: [fuzz-exec] export b
 ;; CHECK: [fuzz-exec] note result: a => 10
-;; CHECK: [fuzz-exec] calling b
+;; CHECK: [fuzz-exec] export b
 ;; CHECK: [fuzz-exec] note result: b => 20
-;; CHECK: [fuzz-exec] calling a
+;; CHECK: [fuzz-exec] export a
 ;; CHECK: (jspi: defer a)
-;; CHECK: [fuzz-exec] calling d
+;; CHECK: [fuzz-exec] export d
 ;; CHECK: (jspi: defer d)
-;; CHECK: [fuzz-exec] calling e
+;; CHECK: [fuzz-exec] export e
 ;; CHECK: [fuzz-exec] note result: b => 20
-;; CHECK: [fuzz-exec] calling c
+;; CHECK: [fuzz-exec] export c
 ;; CHECK: [fuzz-exec] note result: e => 50
-;; CHECK: [fuzz-exec] calling c
+;; CHECK: [fuzz-exec] export c
 ;; CHECK: (jspi: defer c)
-;; CHECK: [fuzz-exec] calling c
+;; CHECK: [fuzz-exec] export c
 ;; CHECK: (jspi: finish c)
 ;; CHECK: [fuzz-exec] note result: c => 30
-;; CHECK: [fuzz-exec] calling d
+;; CHECK: [fuzz-exec] export d
 ;; CHECK: [fuzz-exec] note result: c => 30
-;; CHECK: [fuzz-exec] calling d
+;; CHECK: [fuzz-exec] export d
 ;; CHECK: (jspi: finish d)
 ;; CHECK: [fuzz-exec] note result: d => 40
-;; CHECK: [fuzz-exec] calling e
+;; CHECK: [fuzz-exec] export e
 ;; CHECK: [fuzz-exec] note result: d => 40
-;; CHECK: [fuzz-exec] calling a
+;; CHECK: [fuzz-exec] export a
 ;; CHECK: (jspi: finish a)
 ;; CHECK: [fuzz-exec] note result: a => 10
 ;; CHECK: [fuzz-exec] note result: e => 50
diff --git a/test/lit/d8/fuzz_shell_sleep.wast b/test/lit/d8/fuzz_shell_sleep.wast
index 40bbb6e8289..6243b21d326 100644
--- a/test/lit/d8/fuzz_shell_sleep.wast
+++ b/test/lit/d8/fuzz_shell_sleep.wast
@@ -53,20 +53,20 @@
 ;; func2 is more because we do not have a toplevel await, see comment in
 ;; fuzz_shell_jspi.wast.)
 ;;
-;; CHECK: [fuzz-exec] calling func2
+;; CHECK: [fuzz-exec] export func2
 ;; CHECK: [fuzz-exec] note result: func2 => 2
-;; CHECK: [fuzz-exec] calling func1
+;; CHECK: [fuzz-exec] export func1
 ;; CHECK: (jspi: defer func1)
-;; CHECK: [fuzz-exec] calling func3
+;; CHECK: [fuzz-exec] export func3
 ;; CHECK: [fuzz-exec] note result: func3 => 3
-;; CHECK: [fuzz-exec] calling func1 (after defer)
+;; CHECK: [fuzz-exec] export func1 (after defer)
 ;; CHECK: (jspi: finish func1)
 ;; CHECK: [fuzz-exec] note result: func1 => 1
-;; CHECK: [fuzz-exec] calling func5
+;; CHECK: [fuzz-exec] export func5
 ;; CHECK: (jspi: defer func5)
-;; CHECK: [fuzz-exec] calling func4
+;; CHECK: [fuzz-exec] export func4
 ;; CHECK: [fuzz-exec] note result: func4 => 4
-;; CHECK: [fuzz-exec] calling func5 (after defer)
+;; CHECK: [fuzz-exec] export func5 (after defer)
 ;; CHECK: (jspi: finish func5)
 ;; CHECK: [fuzz-exec] note result: func5 => 5
 
diff --git a/test/lit/exec/array.wast b/test/lit/exec/array.wast
index d70af1ddc99..f3ea0ecabdd 100644
--- a/test/lit/exec/array.wast
+++ b/test/lit/exec/array.wast
@@ -15,7 +15,7 @@
 
  (data $data "a")
 
- ;; CHECK:      [fuzz-exec] calling func
+ ;; CHECK:      [fuzz-exec] export func
  ;; CHECK-NEXT: [fuzz-exec] note result: func => 1
  (func $func (export "func") (result i32)
   ;; Verifies the order of execution is correct - we should return 1, not 2.
@@ -25,7 +25,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling new_active
+ ;; CHECK:      [fuzz-exec] export new_active
  ;; CHECK-NEXT: [trap out of bounds segment access in array.new_elem]
  (func $new_active (export "new_active")
   ;; Even though this is reading 0 items, offset 1 is out of bounds in that
@@ -38,7 +38,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling new_active_in_bounds
+ ;; CHECK:      [fuzz-exec] export new_active_in_bounds
  (func $new_active_in_bounds (export "new_active_in_bounds")
   ;; Even though this is dropped, we read 0 from offset 0, which is ok.
   (drop
@@ -49,7 +49,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling new_passive
+ ;; CHECK:      [fuzz-exec] export new_passive
  (func $new_passive (export "new_passive")
   ;; Using the passive segment here works.
   (drop
@@ -60,7 +60,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling init_active
+ ;; CHECK:      [fuzz-exec] export init_active
  ;; CHECK-NEXT: [trap out of bounds segment access in array.init_elem]
  (func $init_active (export "init_active")
   ;; Even though this is reading 0 items, offset 1 is out of bounds in that
@@ -75,7 +75,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling init_active_in_bounds
+ ;; CHECK:      [fuzz-exec] export init_active_in_bounds
  (func $init_active_in_bounds (export "init_active_in_bounds")
   ;; Even though this is dropped, we read 0 from offset 0, which is ok.
   (array.init_elem $array-func $active
@@ -88,7 +88,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling init_passive
+ ;; CHECK:      [fuzz-exec] export init_passive
  (func $init_passive (export "init_passive")
   ;; This works ok.
   (array.init_elem $array-func $passive
@@ -101,7 +101,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling drop_array.new_data
+ ;; CHECK:      [fuzz-exec] export drop_array.new_data
  ;; CHECK-NEXT: [trap dropped segment access in array.new_data]
  (func $drop_array.new_data (export "drop_array.new_data")
   ;; Dropping the data segment causes the next instruction to trap, even though
@@ -116,24 +116,24 @@
  )
 
 )
-;; CHECK:      [fuzz-exec] calling func
+;; CHECK:      [fuzz-exec] export func
 ;; CHECK-NEXT: [fuzz-exec] note result: func => 1
 
-;; CHECK:      [fuzz-exec] calling new_active
+;; CHECK:      [fuzz-exec] export new_active
 ;; CHECK-NEXT: [trap out of bounds segment access in array.new_elem]
 
-;; CHECK:      [fuzz-exec] calling new_active_in_bounds
+;; CHECK:      [fuzz-exec] export new_active_in_bounds
 
-;; CHECK:      [fuzz-exec] calling new_passive
+;; CHECK:      [fuzz-exec] export new_passive
 
-;; CHECK:      [fuzz-exec] calling init_active
+;; CHECK:      [fuzz-exec] export init_active
 ;; CHECK-NEXT: [trap out of bounds segment access in array.init_elem]
 
-;; CHECK:      [fuzz-exec] calling init_active_in_bounds
+;; CHECK:      [fuzz-exec] export init_active_in_bounds
 
-;; CHECK:      [fuzz-exec] calling init_passive
+;; CHECK:      [fuzz-exec] export init_passive
 
-;; CHECK:      [fuzz-exec] calling drop_array.new_data
+;; CHECK:      [fuzz-exec] export drop_array.new_data
 ;; CHECK-NEXT: [trap dropped segment access in array.new_data]
 ;; CHECK-NEXT: [fuzz-exec] comparing drop_array.new_data
 ;; CHECK-NEXT: [fuzz-exec] comparing func
diff --git a/test/lit/exec/atomic.wast b/test/lit/exec/atomic.wast
index 631bdd53174..771d0c691ff 100644
--- a/test/lit/exec/atomic.wast
+++ b/test/lit/exec/atomic.wast
@@ -7,7 +7,7 @@
 
  (memory $0 23 256 shared)
 
- ;; CHECK:      [fuzz-exec] calling wait_and_log
+ ;; CHECK:      [fuzz-exec] export wait_and_log
  ;; CHECK-NEXT: [LoggingExternalInterface logging 2]
  (func $wait_and_log (export "wait_and_log")
   (call $log
diff --git a/test/lit/exec/call_ref-import-cross-module.wast b/test/lit/exec/call_ref-import-cross-module.wast
index 2a59b718520..d990e645e41 100644
--- a/test/lit/exec/call_ref-import-cross-module.wast
+++ b/test/lit/exec/call_ref-import-cross-module.wast
@@ -16,11 +16,11 @@
 ;; First we call $get from this module. When we run the second module, we call
 ;; it once to get a ref to itself, then call_ref it, logging 10 twice.
 
-;; CHECK: [fuzz-exec] calling get
+;; CHECK: [fuzz-exec] export get
 ;; CHECK-NEXT: [LoggingExternalInterface logging 10]
 ;; CHECK-NEXT: [fuzz-exec] note result: get => function
 ;; CHECK-NEXT: [fuzz-exec] running second module
-;; CHECK-NEXT: [fuzz-exec] calling run
+;; CHECK-NEXT: [fuzz-exec] export run
 ;; CHECK-NEXT: [LoggingExternalInterface logging 10]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 10]
 
diff --git a/test/lit/exec/cont_bindings.wast b/test/lit/exec/cont_bindings.wast
index c6e4b75572a..0b12d42a481 100644
--- a/test/lit/exec/cont_bindings.wast
+++ b/test/lit/exec/cont_bindings.wast
@@ -25,7 +25,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling bindings
+ ;; CHECK:      [fuzz-exec] export bindings
  ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
  (func $bindings (export "bindings")
@@ -44,7 +44,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling null-binding
+ ;; CHECK:      [fuzz-exec] export null-binding
  ;; CHECK-NEXT: [trap null ref]
  (func $null-binding (export "null-binding")
   (drop
diff --git a/test/lit/exec/cont_export.wast b/test/lit/exec/cont_export.wast
index ba5d653e279..8adc8cd2a9f 100644
--- a/test/lit/exec/cont_export.wast
+++ b/test/lit/exec/cont_export.wast
@@ -12,7 +12,7 @@
 
   (tag $tag (type $none))
 
-  ;; CHECK:      [fuzz-exec] calling suspend
+  ;; CHECK:      [fuzz-exec] export suspend
   ;; CHECK-NEXT: [LoggingExternalInterface logging 10]
   ;; CHECK-NEXT: [exception thrown: unhandled suspend]
   (func $suspend (export "suspend")
@@ -22,7 +22,7 @@
     (call $log (i32.const 20))
   )
 
-  ;; CHECK:      [fuzz-exec] calling call-call-export
+  ;; CHECK:      [fuzz-exec] export call-call-export
   ;; CHECK-NEXT: [LoggingExternalInterface logging 10]
   ;; CHECK-NEXT: [trap suspend through JS]
   (func $call-call-export (export "call-call-export")
@@ -33,7 +33,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling handled
+  ;; CHECK:      [fuzz-exec] export handled
   ;; CHECK-NEXT: [LoggingExternalInterface logging 10]
   ;; CHECK-NEXT: [trap suspend through JS]
   (func $handled (export "handled")
diff --git a/test/lit/exec/cont_export_throw.wast b/test/lit/exec/cont_export_throw.wast
index b6a34fb66dd..60abf93e11e 100644
--- a/test/lit/exec/cont_export_throw.wast
+++ b/test/lit/exec/cont_export_throw.wast
@@ -15,13 +15,13 @@
 
  (tag $tag (type $none))
 
- ;; CHECK:      [fuzz-exec] calling suspend
+ ;; CHECK:      [fuzz-exec] export suspend
  ;; CHECK-NEXT: [exception thrown: unhandled suspend]
  (func $suspend (export "suspend")
   (suspend $tag)
  )
 
- ;; CHECK:      [fuzz-exec] calling handled
+ ;; CHECK:      [fuzz-exec] export handled
  ;; CHECK-NEXT: [trap suspend through JS]
  (func $handled (export "handled")
   (drop
@@ -36,7 +36,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling suspend2
+ ;; CHECK:      [fuzz-exec] export suspend2
  ;; CHECK-NEXT: [exception thrown: unhandled suspend]
  (func $suspend2 (export "suspend2")
   (suspend $tag)
diff --git a/test/lit/exec/cont_external_funcref.wast b/test/lit/exec/cont_external_funcref.wast
index b94de188c1c..cd865d3979c 100644
--- a/test/lit/exec/cont_external_funcref.wast
+++ b/test/lit/exec/cont_external_funcref.wast
@@ -17,6 +17,6 @@
 )
 
 ;; CHECK:      [fuzz-exec] running second module
-;; CHECK-NEXT: [fuzz-exec] calling export
+;; CHECK-NEXT: [fuzz-exec] export export
 ;; CHECK-NEXT: [fuzz-exec] note result: export => 42
 
diff --git a/test/lit/exec/cont_many_unhandled.wast b/test/lit/exec/cont_many_unhandled.wast
index 6bb71c6eb16..18d5ad98c0d 100644
--- a/test/lit/exec/cont_many_unhandled.wast
+++ b/test/lit/exec/cont_many_unhandled.wast
@@ -15,7 +15,7 @@
   (func $empty
   )
 
-  ;; CHECK:      [fuzz-exec] calling a
+  ;; CHECK:      [fuzz-exec] export a
   ;; CHECK-NEXT: [exception thrown: tag ()]
   (func $a (export "a")
     (resume_throw $cont $tag
@@ -25,13 +25,13 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling b
+  ;; CHECK:      [fuzz-exec] export b
   ;; CHECK-NEXT: [exception thrown: unhandled suspend]
   (func $b (export "b")
     (suspend $tag)
   )
 
-  ;; CHECK:      [fuzz-exec] calling c
+  ;; CHECK:      [fuzz-exec] export c
   ;; CHECK-NEXT: [exception thrown: unhandled suspend]
   (func $c (export "c")
     (suspend $tag)
diff --git a/test/lit/exec/cont_many_unhandled_2.wast b/test/lit/exec/cont_many_unhandled_2.wast
index 9eca16da0e3..9b7f65f3947 100644
--- a/test/lit/exec/cont_many_unhandled_2.wast
+++ b/test/lit/exec/cont_many_unhandled_2.wast
@@ -15,13 +15,13 @@
 
  (tag $tag (type $func))
 
- ;; CHECK:      [fuzz-exec] calling suspend
+ ;; CHECK:      [fuzz-exec] export suspend
  ;; CHECK-NEXT: [exception thrown: unhandled suspend]
  (func $suspend (export "suspend")
   (suspend $tag)
  )
 
- ;; CHECK:      [fuzz-exec] calling try-resume
+ ;; CHECK:      [fuzz-exec] export try-resume
  (func $try-resume (export "try-resume")
   (block $block
    (try_table (catch_all $block)
@@ -34,7 +34,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling call-suspend
+ ;; CHECK:      [fuzz-exec] export call-suspend
  ;; CHECK-NEXT: [trap suspend through JS]
  (func $call-suspend (export "call-suspend")
   (drop
diff --git a/test/lit/exec/cont_return_call.wast b/test/lit/exec/cont_return_call.wast
index 1fde47c2a6a..5e8087ec2f6 100644
--- a/test/lit/exec/cont_return_call.wast
+++ b/test/lit/exec/cont_return_call.wast
@@ -15,7 +15,7 @@
 
  (tag $tag (type $none))
 
- ;; CHECK:      [fuzz-exec] calling main
+ ;; CHECK:      [fuzz-exec] export main
  ;; CHECK-NEXT: [LoggingExternalInterface logging 50]
  ;; CHECK-NEXT: [LoggingExternalInterface logging -1]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
diff --git a/test/lit/exec/cont_simple.wast b/test/lit/exec/cont_simple.wast
index cbd99019a46..b5d958fab7f 100644
--- a/test/lit/exec/cont_simple.wast
+++ b/test/lit/exec/cont_simple.wast
@@ -49,7 +49,7 @@
     (call $log (i32.const -3))
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-block
+  ;; CHECK:      [fuzz-exec] export run-block
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging -1]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
@@ -84,7 +84,7 @@
     (call $log (i32.const -6))
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-block-nested
+  ;; CHECK:      [fuzz-exec] export run-block-nested
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging -1]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
@@ -114,7 +114,7 @@
     (call $log (local.get $x))
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-local
+  ;; CHECK:      [fuzz-exec] export run-local
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
@@ -143,7 +143,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-multi-locals
+  ;; CHECK:      [fuzz-exec] export run-multi-locals
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
@@ -174,7 +174,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-loop
+  ;; CHECK:      [fuzz-exec] export run-loop
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 3]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
@@ -238,7 +238,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-if
+  ;; CHECK:      [fuzz-exec] export run-if
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging -1]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
@@ -269,7 +269,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-if-condition
+  ;; CHECK:      [fuzz-exec] export run-if-condition
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging -1]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
@@ -320,7 +320,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-value-stack
+  ;; CHECK:      [fuzz-exec] export run-value-stack
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
   ;; CHECK-NEXT: [LoggingExternalInterface logging -1]
@@ -374,7 +374,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-nested-unary
+  ;; CHECK:      [fuzz-exec] export run-nested-unary
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
@@ -407,7 +407,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-nested-unary-more
+  ;; CHECK:      [fuzz-exec] export run-nested-unary-more
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
@@ -475,7 +475,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-nested-binary
+  ;; CHECK:      [fuzz-exec] export run-nested-binary
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
@@ -543,7 +543,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-trinary
+  ;; CHECK:      [fuzz-exec] export run-trinary
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
@@ -585,7 +585,7 @@
     (i32.const 42)
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-ret-i32
+  ;; CHECK:      [fuzz-exec] export run-ret-i32
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 300]
   ;; CHECK-NEXT: [fuzz-exec] note result: run-ret-i32 => 42
@@ -608,7 +608,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-pause-i32
+  ;; CHECK:      [fuzz-exec] export run-pause-i32
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 300]
@@ -658,7 +658,7 @@
     (call $log (suspend $more-i32))
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-param
+  ;; CHECK:      [fuzz-exec] export run-param
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
@@ -701,7 +701,7 @@
     (suspend $more)
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-calls
+  ;; CHECK:      [fuzz-exec] export run-calls
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
@@ -763,7 +763,7 @@
     (suspend $more)
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-call_indirect
+  ;; CHECK:      [fuzz-exec] export run-call_indirect
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging -1]
   ;; CHECK-NEXT: [LoggingExternalInterface logging -10]
@@ -794,7 +794,7 @@
     (suspend $more)
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-call_ref
+  ;; CHECK:      [fuzz-exec] export run-call_ref
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
@@ -826,7 +826,7 @@
     (suspend $more)
   )
 
-  ;; CHECK:      [fuzz-exec] calling run-bind
+  ;; CHECK:      [fuzz-exec] export run-bind
   ;; CHECK-NEXT: [LoggingExternalInterface logging 100]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 200]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
@@ -851,7 +851,7 @@
     (call $log (i32.const 1337))
   )
 
-  ;; CHECK:      [fuzz-exec] calling resume_throw-never
+  ;; CHECK:      [fuzz-exec] export resume_throw-never
   ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
   (func $resume_throw-never (export "resume_throw-never")
     (block $more
@@ -865,7 +865,7 @@
     (call $log (i32.const 42))
   )
 
-  ;; CHECK:      [fuzz-exec] calling suspend-unhandled-block
+  ;; CHECK:      [fuzz-exec] export suspend-unhandled-block
   ;; CHECK-NEXT: [exception thrown: unhandled suspend]
   (func $suspend-unhandled-block (export "suspend-unhandled-block")
     ;; The nop here means that we are inside a block. The block will try to save
diff --git a/test/lit/exec/cont_through_js.wast b/test/lit/exec/cont_through_js.wast
index dca92283f80..65d3402d8d9 100644
--- a/test/lit/exec/cont_through_js.wast
+++ b/test/lit/exec/cont_through_js.wast
@@ -15,13 +15,13 @@
 
  (tag $e)
 
- ;; CHECK:      [fuzz-exec] calling suspend
+ ;; CHECK:      [fuzz-exec] export suspend
  ;; CHECK-NEXT: [exception thrown: unhandled suspend]
  (func $suspend (export "suspend")
   (suspend $e)
  )
 
- ;; CHECK:      [fuzz-exec] calling handle
+ ;; CHECK:      [fuzz-exec] export handle
  ;; CHECK-NEXT: [trap suspend through JS]
  (func $handle (export "handle")
   (drop
@@ -43,7 +43,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling test
+ ;; CHECK:      [fuzz-exec] export test
  ;; CHECK-NEXT: [trap suspend through JS]
  (func $test (export "test")
   (drop
diff --git a/test/lit/exec/delegate-vacuum.wast b/test/lit/exec/delegate-vacuum.wast
index 084113c2bbe..90436fe309e 100644
--- a/test/lit/exec/delegate-vacuum.wast
+++ b/test/lit/exec/delegate-vacuum.wast
@@ -7,7 +7,7 @@
 
 (module
  (tag $tag$0 (param i32))
- ;; CHECK:      [fuzz-exec] calling export-1
+ ;; CHECK:      [fuzz-exec] export export-1
  ;; CHECK-NEXT: [exception thrown: tag$0 0]
  (func $export-1 (export "export-1")
   (try
@@ -28,7 +28,7 @@
    )
   )
  )
- ;; CHECK:      [fuzz-exec] calling export-2
+ ;; CHECK:      [fuzz-exec] export export-2
  ;; CHECK-NEXT: [trap unreachable]
  (func $export-2 (export "export-2")
   (call $inner)
@@ -51,10 +51,10 @@
   )
  )
 )
-;; CHECK:      [fuzz-exec] calling export-1
+;; CHECK:      [fuzz-exec] export export-1
 ;; CHECK-NEXT: [exception thrown: tag$0 0]
 
-;; CHECK:      [fuzz-exec] calling export-2
+;; CHECK:      [fuzz-exec] export export-2
 ;; CHECK-NEXT: [trap unreachable]
 ;; CHECK-NEXT: [fuzz-exec] comparing export-1
 ;; CHECK-NEXT: [fuzz-exec] comparing export-2
diff --git a/test/lit/exec/eh-gc.wast b/test/lit/exec/eh-gc.wast
index 6f97f44f849..68014cb8852 100644
--- a/test/lit/exec/eh-gc.wast
+++ b/test/lit/exec/eh-gc.wast
@@ -5,7 +5,7 @@
 (module
  (tag $tag (param externref))
 
- ;; CHECK:      [fuzz-exec] calling catch-null
+ ;; CHECK:      [fuzz-exec] export catch-null
  (func $catch-null (export "catch-null")
   (block $tryend
    ;; The actual resulting value type is more refined than externref (it is a
@@ -23,5 +23,5 @@
   )
  )
 )
-;; CHECK:      [fuzz-exec] calling catch-null
+;; CHECK:      [fuzz-exec] export catch-null
 ;; CHECK-NEXT: [fuzz-exec] comparing catch-null
diff --git a/test/lit/exec/eh-legacy-gc.wast b/test/lit/exec/eh-legacy-gc.wast
index f10a27c5765..eed46f70054 100644
--- a/test/lit/exec/eh-legacy-gc.wast
+++ b/test/lit/exec/eh-legacy-gc.wast
@@ -5,7 +5,7 @@
 (module
  (tag $tag (param externref))
 
- ;; CHECK:      [fuzz-exec] calling catch-null
+ ;; CHECK:      [fuzz-exec] export catch-null
  (func $catch-null (export "catch-null")
   (try $label$3
    (do
@@ -24,5 +24,5 @@
   )
  )
 )
-;; CHECK:      [fuzz-exec] calling catch-null
+;; CHECK:      [fuzz-exec] export catch-null
 ;; CHECK-NEXT: [fuzz-exec] comparing catch-null
diff --git a/test/lit/exec/eh-legacy.wast b/test/lit/exec/eh-legacy.wast
index 930e57c202f..6a956527e39 100644
--- a/test/lit/exec/eh-legacy.wast
+++ b/test/lit/exec/eh-legacy.wast
@@ -5,13 +5,13 @@
 (module
   (tag $e-i32 (param i32))
 
-  ;; CHECK:      [fuzz-exec] calling throw
+  ;; CHECK:      [fuzz-exec] export throw
   ;; CHECK-NEXT: [exception thrown: e-i32 1]
   (func $throw (export "throw")
     (throw $e-i32 (i32.const 1))
   )
 
-  ;; CHECK:      [fuzz-exec] calling try-catch
+  ;; CHECK:      [fuzz-exec] export try-catch
   (func $try-catch (export "try-catch")
     (try
       (do
@@ -23,7 +23,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling catchless-try
+  ;; CHECK:      [fuzz-exec] export catchless-try
   ;; CHECK-NEXT: [exception thrown: e-i32 3]
   (func $catchless-try (export "catchless-try")
     (try
@@ -33,7 +33,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling try-delegate
+  ;; CHECK:      [fuzz-exec] export try-delegate
   ;; CHECK-NEXT: [exception thrown: e-i32 4]
   (func $try-delegate (export "try-delegate")
     (try $l0
@@ -48,15 +48,15 @@
     )
   )
 )
-;; CHECK:      [fuzz-exec] calling throw
+;; CHECK:      [fuzz-exec] export throw
 ;; CHECK-NEXT: [exception thrown: e-i32 1]
 
-;; CHECK:      [fuzz-exec] calling try-catch
+;; CHECK:      [fuzz-exec] export try-catch
 
-;; CHECK:      [fuzz-exec] calling catchless-try
+;; CHECK:      [fuzz-exec] export catchless-try
 ;; CHECK-NEXT: [exception thrown: e-i32 3]
 
-;; CHECK:      [fuzz-exec] calling try-delegate
+;; CHECK:      [fuzz-exec] export try-delegate
 ;; CHECK-NEXT: [exception thrown: e-i32 4]
 ;; CHECK-NEXT: [fuzz-exec] comparing catchless-try
 ;; CHECK-NEXT: [fuzz-exec] comparing throw
diff --git a/test/lit/exec/eh-print.wast b/test/lit/exec/eh-print.wast
index f501646313f..c8ff0d0ffec 100644
--- a/test/lit/exec/eh-print.wast
+++ b/test/lit/exec/eh-print.wast
@@ -10,7 +10,7 @@
 
  (type $B (struct (field (mut anyref))))
 
- ;; CHECK:      [fuzz-exec] calling array
+ ;; CHECK:      [fuzz-exec] export array
  ;; CHECK-NEXT: [exception thrown: A [ref (type $array.0 (array (mut i32))) (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0[..])]]
  (func $array (export "array") (result (ref $A))
   ;; Throw a very large array. We should not print all 12K items in it, as that
@@ -23,7 +23,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling struct
+ ;; CHECK:      [fuzz-exec] export struct
  ;; CHECK-NEXT: [exception thrown: B [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [ref (type $struct.0 (struct (field (mut anyref)))) [..]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
  (func $struct (export "struct") (result (ref $B))
   (local $x (ref $B))
diff --git a/test/lit/exec/eh.wast b/test/lit/exec/eh.wast
index 45215b04868..f7d5d4efb8d 100644
--- a/test/lit/exec/eh.wast
+++ b/test/lit/exec/eh.wast
@@ -5,13 +5,13 @@
 (module
   (tag $e-i32 (param i32))
 
-  ;; CHECK:      [fuzz-exec] calling throw
+  ;; CHECK:      [fuzz-exec] export throw
   ;; CHECK-NEXT: [exception thrown: e-i32 1]
   (func $throw (export "throw")
     (throw $e-i32 (i32.const 1))
   )
 
-  ;; CHECK:      [fuzz-exec] calling try_table-catch
+  ;; CHECK:      [fuzz-exec] export try_table-catch
   (func $try_table-catch (export "try_table-catch")
     (block $tryend
       (drop
@@ -25,7 +25,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling catchless-try_table
+  ;; CHECK:      [fuzz-exec] export catchless-try_table
   ;; CHECK-NEXT: [exception thrown: e-i32 3]
   (func $catchless-try_table (export "catchless-try_table")
     (try_table
@@ -33,12 +33,12 @@
     )
   )
 )
-;; CHECK:      [fuzz-exec] calling throw
+;; CHECK:      [fuzz-exec] export throw
 ;; CHECK-NEXT: [exception thrown: e-i32 1]
 
-;; CHECK:      [fuzz-exec] calling try_table-catch
+;; CHECK:      [fuzz-exec] export try_table-catch
 
-;; CHECK:      [fuzz-exec] calling catchless-try_table
+;; CHECK:      [fuzz-exec] export catchless-try_table
 ;; CHECK-NEXT: [exception thrown: e-i32 3]
 ;; CHECK-NEXT: [fuzz-exec] comparing catchless-try_table
 ;; CHECK-NEXT: [fuzz-exec] comparing throw
diff --git a/test/lit/exec/exported-import.wast b/test/lit/exec/exported-import.wast
index 5264e9e00cb..0b4d5aeb995 100644
--- a/test/lit/exec/exported-import.wast
+++ b/test/lit/exec/exported-import.wast
@@ -11,4 +11,4 @@
 ;; Note this file does not use automatic updating as that only works for
 ;; defined functions at the moment, and this module has none of those.
 
-;; CHECK: [fuzz-exec] calling __wasm_call_ctors
+;; CHECK: [fuzz-exec] export __wasm_call_ctors
diff --git a/test/lit/exec/fuzzing-api-globals.wast b/test/lit/exec/fuzzing-api-globals.wast
index 6f5e1f5d446..8db04320569 100644
--- a/test/lit/exec/fuzzing-api-globals.wast
+++ b/test/lit/exec/fuzzing-api-globals.wast
@@ -15,10 +15,10 @@
 
 ;; RUN: wasm-opt %s -all --fuzz-exec -o /dev/null 2>&1 | filecheck %s
 
-;; CHECK:      [fuzz-exec] calling global
+;; CHECK:      [fuzz-exec] export global
 ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
-;; CHECK-NEXT: [fuzz-exec] calling global-immref
+;; CHECK-NEXT: [fuzz-exec] export global-immref
 ;; CHECK-NEXT: [LoggingExternalInterface logging object]
-;; CHECK-NEXT: [fuzz-exec] calling global-v128
+;; CHECK-NEXT: [fuzz-exec] export global-v128
 ;; CHECK-NEXT: [LoggingExternalInterface logging i32x4 0x0000000c 0x00000000 0x00000022 0x00000000]
 
diff --git a/test/lit/exec/fuzzing-api.wast b/test/lit/exec/fuzzing-api.wast
index ee394ec5bfb..c02728106dc 100644
--- a/test/lit/exec/fuzzing-api.wast
+++ b/test/lit/exec/fuzzing-api.wast
@@ -35,7 +35,7 @@
  ;; the IR it is actually last, as we always add function exports first.
  (export "table" (table $table))
 
- ;; CHECK:      [fuzz-exec] calling logging
+ ;; CHECK:      [fuzz-exec] export logging
  ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
  ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -67,7 +67,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling throwing
+ ;; CHECK:      [fuzz-exec] export throwing
  ;; CHECK-NEXT: [exception thrown: imported-js-tag externref(0)]
  (func $throwing (export "throwing")
   ;; Throwing 0 throws a JS ("private") exception.
@@ -76,7 +76,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling throwing-tag
+ ;; CHECK:      [fuzz-exec] export throwing-tag
  ;; CHECK-NEXT: [exception thrown: imported-wasm-tag 42]
  (func $throwing-tag (export "throwing-tag")
   ;; Throwing non-0 throws using the tag we imported.
@@ -85,7 +85,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling table.setting
+ ;; CHECK:      [fuzz-exec] export table.setting
  ;; CHECK-NEXT: [exception thrown: imported-js-tag externref(0)]
  (func $table.setting (export "table.setting")
   (call $table.set
@@ -99,7 +99,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling table.getting
+ ;; CHECK:      [fuzz-exec] export table.getting
  ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
  ;; CHECK-NEXT: [exception thrown: imported-js-tag externref(0)]
@@ -127,7 +127,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling export.calling
+ ;; CHECK:      [fuzz-exec] export export.calling
  ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
  ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -149,7 +149,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling export.calling.rethrow
+ ;; CHECK:      [fuzz-exec] export export.calling.rethrow
  ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
  ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -172,7 +172,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling export.calling.catching
+ ;; CHECK:      [fuzz-exec] export export.calling.catching
  ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
  ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -197,7 +197,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling ref.calling
+ ;; CHECK:      [fuzz-exec] export ref.calling
  ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
  ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -219,7 +219,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling ref.calling.rethrow
+ ;; CHECK:      [fuzz-exec] export ref.calling.rethrow
  ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
  ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -241,7 +241,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling ref.calling.catching
+ ;; CHECK:      [fuzz-exec] export ref.calling.catching
  ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
  ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -278,7 +278,7 @@
   (i32.const 34)
  )
 
- ;; CHECK:      [fuzz-exec] calling ref.calling.legal
+ ;; CHECK:      [fuzz-exec] export ref.calling.legal
  ;; CHECK-NEXT: [LoggingExternalInterface logging 12]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
  (func $ref.calling.legal (export "ref.calling.legal")
@@ -299,7 +299,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling ref.calling.illegal
+ ;; CHECK:      [fuzz-exec] export ref.calling.illegal
  ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
  (func $ref.calling.illegal (export "ref.calling.illegal")
   ;; The i64 param causes an error here, so we will only log 1 because we catch an exception.
@@ -317,7 +317,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling ref.calling.illegal-v128
+ ;; CHECK:      [fuzz-exec] export ref.calling.illegal-v128
  ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
  (func $ref.calling.illegal-v128 (export "ref.calling.illegal-v128")
   ;; As above, we throw on the v128 param, and log 1.
@@ -335,7 +335,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling ref.calling.illegal-exnref
+ ;; CHECK:      [fuzz-exec] export ref.calling.illegal-exnref
  ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
  (func $ref.calling.illegal-exnref (export "ref.calling.illegal-exnref")
   ;; As above, we throw on the exnref param, and log 1.
@@ -354,7 +354,7 @@
   (v128.const i32x4 1 2 3 4)
  )
 
- ;; CHECK:      [fuzz-exec] calling ref.calling.illegal-v128-result
+ ;; CHECK:      [fuzz-exec] export ref.calling.illegal-v128-result
  ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
  (func $ref.calling.illegal-v128-result (export "ref.calling.illegal-v128-result")
   ;; The v128 result causes an error here, so we will log 1 as an exception. The JS
@@ -380,7 +380,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling ref.calling.illegal-exnref-result
+ ;; CHECK:      [fuzz-exec] export ref.calling.illegal-exnref-result
  ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
  (func $ref.calling.illegal-exnref-result (export "ref.calling.illegal-exnref-result")
   ;; As above with the v128, the exnref cannot be converted to a JS value.
@@ -399,7 +399,7 @@
   (ref.null noexn)
  )
 
- ;; CHECK:      [fuzz-exec] calling ref.calling.illegal-nullexnref-result
+ ;; CHECK:      [fuzz-exec] export ref.calling.illegal-nullexnref-result
  ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
  (func $ref.calling.illegal-nullexnref-result (export "ref.calling.illegal-nullexnref-result")
   ;; As above, the nullexnref cannot be converted to a JS value.
@@ -418,7 +418,7 @@
   (i64.const 90)
  )
 
- ;; CHECK:      [fuzz-exec] calling ref.calling.legal-result
+ ;; CHECK:      [fuzz-exec] export ref.calling.legal-result
  ;; CHECK-NEXT: [LoggingExternalInterface logging 910]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
  (func $ref.calling.legal-result (export "ref.calling.legal-result")
@@ -435,7 +435,7 @@
   (unreachable)
  )
 
- ;; CHECK:      [fuzz-exec] calling ref.calling.trap
+ ;; CHECK:      [fuzz-exec] export ref.calling.trap
  ;; CHECK-NEXT: [trap unreachable]
  (func $ref.calling.trap (export "ref.calling.trap")
   ;; We try to catch an exception here, but the target function traps, which is
@@ -447,7 +447,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling catch-js-tag
+ ;; CHECK:      [fuzz-exec] export catch-js-tag
  ;; CHECK-NEXT: [fuzz-exec] note result: catch-js-tag => 100
  (func $catch-js-tag (export "catch-js-tag") (result i32)
   ;; The table.set out of bounds will throw a JS exception, so it will be caught
@@ -469,7 +469,7 @@
  )
 
 
- ;; CHECK:      [fuzz-exec] calling do-sleep
+ ;; CHECK:      [fuzz-exec] export do-sleep
  ;; CHECK-NEXT: [fuzz-exec] note result: do-sleep => 42
  (func $do-sleep (export "do-sleep") (result i32)
   (call $sleep
@@ -480,7 +480,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling return-externref-exception
+ ;; CHECK:      [fuzz-exec] export return-externref-exception
  ;; CHECK-NEXT: [fuzz-exec] note result: return-externref-exception => object
  ;; CHECK-NEXT: warning: no passes specified, not doing any work
  (func $return-externref-exception (export "return-externref-exception") (result externref)
@@ -498,7 +498,7 @@
   )
  )
 )
-;; CHECK:      [fuzz-exec] calling logging
+;; CHECK:      [fuzz-exec] export logging
 ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
 ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -506,21 +506,21 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging function]
 ;; CHECK-NEXT: [LoggingExternalInterface logging null]
 
-;; CHECK:      [fuzz-exec] calling throwing
+;; CHECK:      [fuzz-exec] export throwing
 ;; CHECK-NEXT: [exception thrown: imported-js-tag externref(0)]
 
-;; CHECK:      [fuzz-exec] calling throwing-tag
+;; CHECK:      [fuzz-exec] export throwing-tag
 ;; CHECK-NEXT: [exception thrown: imported-wasm-tag 42]
 
-;; CHECK:      [fuzz-exec] calling table.setting
+;; CHECK:      [fuzz-exec] export table.setting
 ;; CHECK-NEXT: [exception thrown: imported-js-tag externref(0)]
 
-;; CHECK:      [fuzz-exec] calling table.getting
+;; CHECK:      [fuzz-exec] export table.getting
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
 ;; CHECK-NEXT: [exception thrown: imported-js-tag externref(0)]
 
-;; CHECK:      [fuzz-exec] calling export.calling
+;; CHECK:      [fuzz-exec] export export.calling
 ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
 ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -529,7 +529,7 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging null]
 ;; CHECK-NEXT: [exception thrown: imported-js-tag externref(0)]
 
-;; CHECK:      [fuzz-exec] calling export.calling.rethrow
+;; CHECK:      [fuzz-exec] export export.calling.rethrow
 ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
 ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -538,7 +538,7 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging null]
 ;; CHECK-NEXT: [exception thrown: imported-js-tag externref(0)]
 
-;; CHECK:      [fuzz-exec] calling export.calling.catching
+;; CHECK:      [fuzz-exec] export export.calling.catching
 ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
 ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -548,7 +548,7 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
 
-;; CHECK:      [fuzz-exec] calling ref.calling
+;; CHECK:      [fuzz-exec] export ref.calling
 ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
 ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -557,7 +557,7 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging null]
 ;; CHECK-NEXT: [exception thrown: imported-js-tag externref(0)]
 
-;; CHECK:      [fuzz-exec] calling ref.calling.rethrow
+;; CHECK:      [fuzz-exec] export ref.calling.rethrow
 ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
 ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -566,7 +566,7 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging null]
 ;; CHECK-NEXT: [exception thrown: imported-js-tag externref(0)]
 
-;; CHECK:      [fuzz-exec] calling ref.calling.catching
+;; CHECK:      [fuzz-exec] export ref.calling.catching
 ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 3.14159]
 ;; CHECK-NEXT: [LoggingExternalInterface logging null]
@@ -576,42 +576,42 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
 
-;; CHECK:      [fuzz-exec] calling ref.calling.legal
+;; CHECK:      [fuzz-exec] export ref.calling.legal
 ;; CHECK-NEXT: [LoggingExternalInterface logging 12]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 
-;; CHECK:      [fuzz-exec] calling ref.calling.illegal
+;; CHECK:      [fuzz-exec] export ref.calling.illegal
 ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
 
-;; CHECK:      [fuzz-exec] calling ref.calling.illegal-v128
+;; CHECK:      [fuzz-exec] export ref.calling.illegal-v128
 ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
 
-;; CHECK:      [fuzz-exec] calling ref.calling.illegal-exnref
+;; CHECK:      [fuzz-exec] export ref.calling.illegal-exnref
 ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
 
-;; CHECK:      [fuzz-exec] calling ref.calling.illegal-v128-result
+;; CHECK:      [fuzz-exec] export ref.calling.illegal-v128-result
 ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
 
-;; CHECK:      [fuzz-exec] calling ref.calling.illegal-exnref-result
+;; CHECK:      [fuzz-exec] export ref.calling.illegal-exnref-result
 ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
 
-;; CHECK:      [fuzz-exec] calling ref.calling.illegal-nullexnref-result
+;; CHECK:      [fuzz-exec] export ref.calling.illegal-nullexnref-result
 ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
 
-;; CHECK:      [fuzz-exec] calling ref.calling.legal-result
+;; CHECK:      [fuzz-exec] export ref.calling.legal-result
 ;; CHECK-NEXT: [LoggingExternalInterface logging 910]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 
-;; CHECK:      [fuzz-exec] calling ref.calling.trap
+;; CHECK:      [fuzz-exec] export ref.calling.trap
 ;; CHECK-NEXT: [trap unreachable]
 
-;; CHECK:      [fuzz-exec] calling catch-js-tag
+;; CHECK:      [fuzz-exec] export catch-js-tag
 ;; CHECK-NEXT: [fuzz-exec] note result: catch-js-tag => 100
 
-;; CHECK:      [fuzz-exec] calling do-sleep
+;; CHECK:      [fuzz-exec] export do-sleep
 ;; CHECK-NEXT: [fuzz-exec] note result: do-sleep => 42
 
-;; CHECK:      [fuzz-exec] calling return-externref-exception
+;; CHECK:      [fuzz-exec] export return-externref-exception
 ;; CHECK-NEXT: [fuzz-exec] note result: return-externref-exception => object
 ;; CHECK-NEXT: [fuzz-exec] comparing catch-js-tag
 ;; CHECK-NEXT: [fuzz-exec] comparing do-sleep
diff --git a/test/lit/exec/gc-cycle-leak.wast b/test/lit/exec/gc-cycle-leak.wast
index f4f62b53367..f477f24010a 100644
--- a/test/lit/exec/gc-cycle-leak.wast
+++ b/test/lit/exec/gc-cycle-leak.wast
@@ -5,7 +5,7 @@
 (module
  (type $A (struct (field (mut (ref null $A)))))
 
- ;; CHECK:      [fuzz-exec] calling test
+ ;; CHECK:      [fuzz-exec] export test
  (func $test (export "test")
   (local $a (ref $A))
   ;; This function makes a self-cycle where the local $a's ref field points to
@@ -24,5 +24,5 @@
   )
  )
 )
-;; CHECK:      [fuzz-exec] calling test
+;; CHECK:      [fuzz-exec] export test
 ;; CHECK-NEXT: [fuzz-exec] comparing test
diff --git a/test/lit/exec/host-limit.wast b/test/lit/exec/host-limit.wast
index ba5087f6942..2f6298ca675 100644
--- a/test/lit/exec/host-limit.wast
+++ b/test/lit/exec/host-limit.wast
@@ -15,7 +15,7 @@
   (i32.const -1)
  ))
 
- ;; CHECK:      [fuzz-exec] calling export
+ ;; CHECK:      [fuzz-exec] export export
  ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
  ;; CHECK-NEXT: ignoring comparison of ExecutionResults!
  (func $export (export "export")
diff --git a/test/lit/exec/i31.wast b/test/lit/exec/i31.wast
index 807641d2440..78a45c73b39 100644
--- a/test/lit/exec/i31.wast
+++ b/test/lit/exec/i31.wast
@@ -3,7 +3,7 @@
 ;; RUN: wasm-opt %s -all --fuzz-exec -q -o /dev/null 2>&1 | filecheck %s
 
 (module
-  ;; CHECK:      [fuzz-exec] calling null-local
+  ;; CHECK:      [fuzz-exec] export null-local
   ;; CHECK-NEXT: [fuzz-exec] note result: null-local => 1
   (func $null-local (export "null-local") (result i32)
     (local $ref (ref null i31))
@@ -12,7 +12,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling null-immediate
+  ;; CHECK:      [fuzz-exec] export null-immediate
   ;; CHECK-NEXT: [fuzz-exec] note result: null-immediate => 1
   (func $null-immediate (export "null-immediate") (result i32)
     (ref.is_null
@@ -20,7 +20,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling non-null
+  ;; CHECK:      [fuzz-exec] export non-null
   ;; CHECK-NEXT: [fuzz-exec] note result: non-null => 0
   (func $non-null (export "non-null") (result i32)
     (ref.is_null
@@ -30,7 +30,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling nn-u
+  ;; CHECK:      [fuzz-exec] export nn-u
   ;; CHECK-NEXT: [fuzz-exec] note result: nn-u => 2147483647
   (func $nn-u (export "nn-u") (result i32)
     (i31.get_u
@@ -40,7 +40,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling nn-s
+  ;; CHECK:      [fuzz-exec] export nn-s
   ;; CHECK-NEXT: [fuzz-exec] note result: nn-s => -1
   (func $nn-s (export "nn-s") (result i32)
     (i31.get_s
@@ -50,7 +50,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling zero-is-not-null
+  ;; CHECK:      [fuzz-exec] export zero-is-not-null
   ;; CHECK-NEXT: [fuzz-exec] note result: zero-is-not-null => 0
   (func $zero-is-not-null (export "zero-is-not-null") (result i32)
     (local $ref (ref null i31))
@@ -69,7 +69,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling trap
+  ;; CHECK:      [fuzz-exec] export trap
   ;; CHECK-NEXT: [trap null ref]
   (func $trap (export "trap") (result i32)
     (i31.get_u
@@ -77,7 +77,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling return-i31
+  ;; CHECK:      [fuzz-exec] export return-i31
   ;; CHECK-NEXT: [fuzz-exec] note result: return-i31 => i31ref(42)
   (func $return-i31 (export "return-i31") (result i31ref)
     ;; An i31 should be logged out using its integer value, unlike a struct or
@@ -87,7 +87,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling return-exted-i31
+  ;; CHECK:      [fuzz-exec] export return-exted-i31
   ;; CHECK-NEXT: [fuzz-exec] note result: return-exted-i31 => i31ref(42)
   (func $return-exted-i31 (export "return-exted-i31") (result externref)
     ;; Even an externalized i31 is logged out using its integer value.
@@ -98,31 +98,31 @@
     )
   )
 )
-;; CHECK:      [fuzz-exec] calling null-local
+;; CHECK:      [fuzz-exec] export null-local
 ;; CHECK-NEXT: [fuzz-exec] note result: null-local => 1
 
-;; CHECK:      [fuzz-exec] calling null-immediate
+;; CHECK:      [fuzz-exec] export null-immediate
 ;; CHECK-NEXT: [fuzz-exec] note result: null-immediate => 1
 
-;; CHECK:      [fuzz-exec] calling non-null
+;; CHECK:      [fuzz-exec] export non-null
 ;; CHECK-NEXT: [fuzz-exec] note result: non-null => 0
 
-;; CHECK:      [fuzz-exec] calling nn-u
+;; CHECK:      [fuzz-exec] export nn-u
 ;; CHECK-NEXT: [fuzz-exec] note result: nn-u => 2147483647
 
-;; CHECK:      [fuzz-exec] calling nn-s
+;; CHECK:      [fuzz-exec] export nn-s
 ;; CHECK-NEXT: [fuzz-exec] note result: nn-s => -1
 
-;; CHECK:      [fuzz-exec] calling zero-is-not-null
+;; CHECK:      [fuzz-exec] export zero-is-not-null
 ;; CHECK-NEXT: [fuzz-exec] note result: zero-is-not-null => 0
 
-;; CHECK:      [fuzz-exec] calling trap
+;; CHECK:      [fuzz-exec] export trap
 ;; CHECK-NEXT: [trap null ref]
 
-;; CHECK:      [fuzz-exec] calling return-i31
+;; CHECK:      [fuzz-exec] export return-i31
 ;; CHECK-NEXT: [fuzz-exec] note result: return-i31 => i31ref(42)
 
-;; CHECK:      [fuzz-exec] calling return-exted-i31
+;; CHECK:      [fuzz-exec] export return-exted-i31
 ;; CHECK-NEXT: [fuzz-exec] note result: return-exted-i31 => i31ref(42)
 ;; CHECK-NEXT: [fuzz-exec] comparing nn-s
 ;; CHECK-NEXT: [fuzz-exec] comparing nn-u
diff --git a/test/lit/exec/imported-func.wast b/test/lit/exec/imported-func.wast
index fb837616d52..8a0c18f2951 100644
--- a/test/lit/exec/imported-func.wast
+++ b/test/lit/exec/imported-func.wast
@@ -15,15 +15,15 @@
  )
 )
 
-;; CHECK:      [fuzz-exec] calling func
+;; CHECK:      [fuzz-exec] export func
 ;; CHECK-NEXT: [fuzz-exec] running second module
-;; CHECK-NEXT: [fuzz-exec] calling cast-A
-;; CHECK-NEXT: [fuzz-exec] calling cast-B
-;; CHECK-NEXT: [fuzz-exec] calling cast-C
-;; CHECK-NEXT: [fuzz-exec] calling cast-A-exact
+;; CHECK-NEXT: [fuzz-exec] export cast-A
+;; CHECK-NEXT: [fuzz-exec] export cast-B
+;; CHECK-NEXT: [fuzz-exec] export cast-C
+;; CHECK-NEXT: [fuzz-exec] export cast-A-exact
 ;; CHECK-NEXT: [trap cast error]
-;; CHECK-NEXT: [fuzz-exec] calling cast-B-exact
+;; CHECK-NEXT: [fuzz-exec] export cast-B-exact
 ;; CHECK-NEXT: [trap cast error]
-;; CHECK-NEXT: [fuzz-exec] calling cast-C-exact
-;; CHECK-NEXT: [fuzz-exec] calling last
+;; CHECK-NEXT: [fuzz-exec] export cast-C-exact
+;; CHECK-NEXT: [fuzz-exec] export last
 
diff --git a/test/lit/exec/intrinsics.wast b/test/lit/exec/intrinsics.wast
index c8ae2864338..2da2ad2c7e0 100644
--- a/test/lit/exec/intrinsics.wast
+++ b/test/lit/exec/intrinsics.wast
@@ -5,7 +5,7 @@
 (module
   (import "binaryen-intrinsics" "call.without.effects" (func $cwe (param i32 funcref) (result i32)))
 
-  ;; CHECK:      [fuzz-exec] calling get-ref
+  ;; CHECK:      [fuzz-exec] export get-ref
   ;; CHECK-NEXT: [fuzz-exec] note result: get-ref => 42
   (func $get-ref (export "get-ref") (result i32)
     (call $cwe
diff --git a/test/lit/exec/memory-copy.wat b/test/lit/exec/memory-copy.wat
index 3583b048e55..926c57e27f3 100644
--- a/test/lit/exec/memory-copy.wat
+++ b/test/lit/exec/memory-copy.wat
@@ -27,7 +27,7 @@
   )
 
   ;; non-overlapping copy
-  ;; CHECK:      [fuzz-exec] calling test1
+  ;; CHECK:      [fuzz-exec] export test1
   ;; CHECK-NEXT: [LoggingExternalInterface logging 9]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 10]
@@ -72,7 +72,7 @@
     (call $assert_load (i32.const 14) (i32.const 0))
   )
   ;; Overlap, src > dst
-  ;; CHECK:      [fuzz-exec] calling test2
+  ;; CHECK:      [fuzz-exec] export test2
   ;; CHECK-NEXT: [LoggingExternalInterface logging 9]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 187]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 10]
@@ -100,7 +100,7 @@
     (call $assert_load (i32.const 13) (i32.const 0xdd))
   )
   ;; Overlap, src < dst
-  ;; CHECK:      [fuzz-exec] calling test3
+  ;; CHECK:      [fuzz-exec] export test3
   ;; CHECK-NEXT: [LoggingExternalInterface logging 9]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 187]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 10]
@@ -129,13 +129,13 @@
     (call $assert_load (i32.const 16) (i32.const 0))
   )
   ;; Overlap src < dst but size is OOB (but the address does not overflow)
-  ;; CHECK:      [fuzz-exec] calling test4a
+  ;; CHECK:      [fuzz-exec] export test4a
   ;; CHECK-NEXT: [trap out of bounds segment access in memory.copy]
   (func $test4a (export "test4a")
     (memory.copy (i32.const 13) (i32.const 11) (i32.const 0x10000))
     (call $print_memory) ;; not reached.
   )
-  ;; CHECK:      [fuzz-exec] calling test4b
+  ;; CHECK:      [fuzz-exec] export test4b
   (func $test4b (export "test4b")
     (call $assert_load (i32.const 10) (i32.const 0x0))
     (call $assert_load (i32.const 11) (i32.const 0xaa))
@@ -146,24 +146,24 @@
     (call $assert_load (i32.const 16) (i32.const 0))
   )
   ;; Copy ending at memory limit is ok
-  ;; CHECK:      [fuzz-exec] calling test5
+  ;; CHECK:      [fuzz-exec] export test5
   (func $test5 (export "test5")
     (memory.copy (i32.const 0xff00) (i32.const 0) (i32.const 0x100))
     (memory.copy (i32.const 0xfe00) (i32.const 0xff00) (i32.const 0x100))
   )
   ;; Succeed when copying 0 bytes at the end of the region
-  ;; CHECK:      [fuzz-exec] calling test6
+  ;; CHECK:      [fuzz-exec] export test6
   (func $test6 (export "test6")
     (memory.copy (i32.const 0x10000) (i32.const 0) (i32.const 0))
     (memory.copy (i32.const 0x0) (i32.const 0x10000) (i32.const 0))
   )
   ;; copying 0 bytes outside of the limit is not allowed.
-  ;; CHECK:      [fuzz-exec] calling test7
+  ;; CHECK:      [fuzz-exec] export test7
   ;; CHECK-NEXT: [trap out of bounds segment access in memory.copy]
   (func $test7 (export "test7")
     (memory.copy (i32.const 0x10001) (i32.const 0) (i32.const 0x0))
   )
-  ;; CHECK:      [fuzz-exec] calling test8
+  ;; CHECK:      [fuzz-exec] export test8
   ;; CHECK-NEXT: [trap out of bounds segment access in memory.copy]
   (func $test8 (export "test8")
     (memory.copy (i32.const 0x0) (i32.const 0x10001) (i32.const 0))
@@ -172,7 +172,7 @@
 
 
 
-;; CHECK:      [fuzz-exec] calling test1
+;; CHECK:      [fuzz-exec] export test1
 ;; CHECK-NEXT: [LoggingExternalInterface logging 9]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 10]
@@ -206,7 +206,7 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging 16]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 
-;; CHECK:      [fuzz-exec] calling test2
+;; CHECK:      [fuzz-exec] export test2
 ;; CHECK-NEXT: [LoggingExternalInterface logging 9]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 187]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 10]
@@ -224,7 +224,7 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging 16]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 
-;; CHECK:      [fuzz-exec] calling test3
+;; CHECK:      [fuzz-exec] export test3
 ;; CHECK-NEXT: [LoggingExternalInterface logging 9]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 187]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 10]
@@ -242,19 +242,19 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging 16]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 
-;; CHECK:      [fuzz-exec] calling test4a
+;; CHECK:      [fuzz-exec] export test4a
 ;; CHECK-NEXT: [trap unreachable]
 
-;; CHECK:      [fuzz-exec] calling test4b
+;; CHECK:      [fuzz-exec] export test4b
 
-;; CHECK:      [fuzz-exec] calling test5
+;; CHECK:      [fuzz-exec] export test5
 
-;; CHECK:      [fuzz-exec] calling test6
+;; CHECK:      [fuzz-exec] export test6
 
-;; CHECK:      [fuzz-exec] calling test7
+;; CHECK:      [fuzz-exec] export test7
 ;; CHECK-NEXT: [trap unreachable]
 
-;; CHECK:      [fuzz-exec] calling test8
+;; CHECK:      [fuzz-exec] export test8
 ;; CHECK-NEXT: [trap unreachable]
 ;; CHECK-NEXT: [fuzz-exec] comparing test1
 ;; CHECK-NEXT: [fuzz-exec] comparing test2
diff --git a/test/lit/exec/memory-fill.wat b/test/lit/exec/memory-fill.wat
index c63dcef0c92..07446bcfbb3 100644
--- a/test/lit/exec/memory-fill.wat
+++ b/test/lit/exec/memory-fill.wat
@@ -24,7 +24,7 @@
     )
   )
   ;; basic fill test
-  ;; CHECK:      [fuzz-exec] calling test1
+  ;; CHECK:      [fuzz-exec] export test1
   ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
@@ -56,7 +56,7 @@
     (call $assert_load (i32.const 4) (i32.const 0x0))
   )
   ;; Fill value is stored as a byte
-  ;; CHECK:      [fuzz-exec] calling test2
+  ;; CHECK:      [fuzz-exec] export test2
   ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 170]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
@@ -68,7 +68,7 @@
     (call $assert_load (i32.const 1) (i32.const 0xaa))
   )
   ;; Fill all of memory
-  ;; CHECK:      [fuzz-exec] calling test3
+  ;; CHECK:      [fuzz-exec] export test3
   ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
@@ -87,7 +87,7 @@
     (call $print_memory (i32.const 0) (i32.const 6))
   )
   ;; Succeed when writing 0 bytes at the end of the region
-  ;; CHECK:      [fuzz-exec] calling test4
+  ;; CHECK:      [fuzz-exec] export test4
   ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
@@ -108,7 +108,7 @@
     (call $print_memory (i32.const 0) (i32.const 7))
   )
   ;; Writing 0 bytes outside of memory is not allowed
-  ;; CHECK:      [fuzz-exec] calling test5
+  ;; CHECK:      [fuzz-exec] export test5
   ;; CHECK-NEXT: [trap out of bounds memory access in memory.fill]
   (func $test5 (export "test5")
     (memory.fill (i32.const 0x10001) (i32.const 0) (i32.const 0))
@@ -117,7 +117,7 @@
   )
   ;; again we do not test negative/overflowing addresses as the spec test does.
 )
-;; CHECK:      [fuzz-exec] calling test1
+;; CHECK:      [fuzz-exec] export test1
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
@@ -139,13 +139,13 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging 4]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 
-;; CHECK:      [fuzz-exec] calling test2
+;; CHECK:      [fuzz-exec] export test2
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 170]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 170]
 
-;; CHECK:      [fuzz-exec] calling test3
+;; CHECK:      [fuzz-exec] export test3
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
@@ -159,7 +159,7 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging 5]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 
-;; CHECK:      [fuzz-exec] calling test4
+;; CHECK:      [fuzz-exec] export test4
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 1]
@@ -175,7 +175,7 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging 6]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 
-;; CHECK:      [fuzz-exec] calling test5
+;; CHECK:      [fuzz-exec] export test5
 ;; CHECK-NEXT: [trap unreachable]
 ;; CHECK-NEXT: [fuzz-exec] comparing test1
 ;; CHECK-NEXT: [fuzz-exec] comparing test2
diff --git a/test/lit/exec/memory.grow.wast b/test/lit/exec/memory.grow.wast
index 426f4b4c021..9d9f1ef45f1 100644
--- a/test/lit/exec/memory.grow.wast
+++ b/test/lit/exec/memory.grow.wast
@@ -5,7 +5,7 @@
 (module
   (memory $0 1)
 
-  ;; CHECK:      [fuzz-exec] calling grow_twice
+  ;; CHECK:      [fuzz-exec] export grow_twice
   ;; CHECK-NEXT: [fuzz-exec] note result: grow_twice => 3
   (func $grow_twice (export "grow_twice") (result i32)
     ;; The nested grow will increase the size from 1 to 3, and return the old
@@ -17,7 +17,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling measure
+  ;; CHECK:      [fuzz-exec] export measure
   ;; CHECK-NEXT: [fuzz-exec] note result: measure => 4
   (func $measure (export "measure") (result i32)
     ;; This should return the final size, 4.
diff --git a/test/lit/exec/memory64.wast b/test/lit/exec/memory64.wast
index 0d28e719fc4..78ce0fd814a 100644
--- a/test/lit/exec/memory64.wast
+++ b/test/lit/exec/memory64.wast
@@ -7,7 +7,7 @@
 
  (data $0 "\00\00\00\00\00")
 
- ;; CHECK:      [fuzz-exec] calling memory.init.trap
+ ;; CHECK:      [fuzz-exec] export memory.init.trap
  ;; CHECK-NEXT: [trap out of bounds segment access in memory.init]
  (func $memory.init.trap (export "memory.init.trap")
   ;; Trap on OOB on the segment offset.
@@ -18,7 +18,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling memory.init.trap2
+ ;; CHECK:      [fuzz-exec] export memory.init.trap2
  ;; CHECK-NEXT: [trap out of bounds segment access in memory.init]
  (func $memory.init.trap2 (export "memory.init.trap2")
   ;; Trap on OOB on the size.
@@ -29,7 +29,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling memory.grow.fail
+ ;; CHECK:      [fuzz-exec] export memory.grow.fail
  ;; CHECK-NEXT: [fuzz-exec] note result: memory.grow.fail => -1
  (func $memory.grow.fail (export "memory.grow.fail") (result i64)
   (memory.grow
@@ -38,13 +38,13 @@
  )
 )
 
-;; CHECK:      [fuzz-exec] calling memory.init.trap
+;; CHECK:      [fuzz-exec] export memory.init.trap
 ;; CHECK-NEXT: [trap out of bounds segment access in memory.init]
 
-;; CHECK:      [fuzz-exec] calling memory.init.trap2
+;; CHECK:      [fuzz-exec] export memory.init.trap2
 ;; CHECK-NEXT: [trap out of bounds segment access in memory.init]
 
-;; CHECK:      [fuzz-exec] calling memory.grow.fail
+;; CHECK:      [fuzz-exec] export memory.grow.fail
 ;; CHECK-NEXT: [fuzz-exec] note result: memory.grow.fail => -1
 ;; CHECK-NEXT: [fuzz-exec] comparing memory.grow.fail
 ;; CHECK-NEXT: [fuzz-exec] comparing memory.init.trap
diff --git a/test/lit/exec/negative-zero.wast b/test/lit/exec/negative-zero.wast
index 2c45dbdfb9c..f2f71ee9b5d 100644
--- a/test/lit/exec/negative-zero.wast
+++ b/test/lit/exec/negative-zero.wast
@@ -3,7 +3,7 @@
 ;; RUN: wasm-opt %s -all --fuzz-exec -o /dev/null 2>&1 | filecheck %s
 
 (module
- ;; CHECK:      [fuzz-exec] calling min1
+ ;; CHECK:      [fuzz-exec] export min1
  ;; CHECK-NEXT: [fuzz-exec] note result: min1 => -0
  (func $min1 (export "min1") (result f64)
   ;; This should return -0.
@@ -13,7 +13,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling min2
+ ;; CHECK:      [fuzz-exec] export min2
  ;; CHECK-NEXT: [fuzz-exec] note result: min2 => -0
  (func $min2 (export "min2") (result f64)
   ;; Flipped arms; still -0.
@@ -23,7 +23,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling min1-f32
+ ;; CHECK:      [fuzz-exec] export min1-f32
  ;; CHECK-NEXT: [fuzz-exec] note result: min1-f32 => -0
  (func $min1-f32 (export "min1-f32") (result f32)
   ;; As above, but f32 and not f64
@@ -33,7 +33,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling min2-f32
+ ;; CHECK:      [fuzz-exec] export min2-f32
  ;; CHECK-NEXT: [fuzz-exec] note result: min2-f32 => -0
  (func $min2-f32 (export "min2-f32") (result f32)
   ;; Flipped arms; still -0.
@@ -43,7 +43,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling max1
+ ;; CHECK:      [fuzz-exec] export max1
  ;; CHECK-NEXT: [fuzz-exec] note result: max1 => 0
  (func $max1 (export "max1") (result f64)
   ;; This should return 0.
@@ -53,7 +53,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling max2
+ ;; CHECK:      [fuzz-exec] export max2
  ;; CHECK-NEXT: [fuzz-exec] note result: max2 => 0
  (func $max2 (export "max2") (result f64)
   ;; Flipped arms; still 0.
@@ -63,7 +63,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling max1-f32
+ ;; CHECK:      [fuzz-exec] export max1-f32
  ;; CHECK-NEXT: [fuzz-exec] note result: max1-f32 => 0
  (func $max1-f32 (export "max1-f32") (result f32)
   ;; As above, but f32 and not f64
@@ -73,7 +73,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling max2-f32
+ ;; CHECK:      [fuzz-exec] export max2-f32
  ;; CHECK-NEXT: [fuzz-exec] note result: max2-f32 => 0
  ;; CHECK-NEXT: warning: no passes specified, not doing any work
  (func $max2-f32 (export "max2-f32") (result f32)
@@ -84,28 +84,28 @@
   )
  )
 )
-;; CHECK:      [fuzz-exec] calling min1
+;; CHECK:      [fuzz-exec] export min1
 ;; CHECK-NEXT: [fuzz-exec] note result: min1 => -0
 
-;; CHECK:      [fuzz-exec] calling min2
+;; CHECK:      [fuzz-exec] export min2
 ;; CHECK-NEXT: [fuzz-exec] note result: min2 => -0
 
-;; CHECK:      [fuzz-exec] calling min1-f32
+;; CHECK:      [fuzz-exec] export min1-f32
 ;; CHECK-NEXT: [fuzz-exec] note result: min1-f32 => -0
 
-;; CHECK:      [fuzz-exec] calling min2-f32
+;; CHECK:      [fuzz-exec] export min2-f32
 ;; CHECK-NEXT: [fuzz-exec] note result: min2-f32 => -0
 
-;; CHECK:      [fuzz-exec] calling max1
+;; CHECK:      [fuzz-exec] export max1
 ;; CHECK-NEXT: [fuzz-exec] note result: max1 => 0
 
-;; CHECK:      [fuzz-exec] calling max2
+;; CHECK:      [fuzz-exec] export max2
 ;; CHECK-NEXT: [fuzz-exec] note result: max2 => 0
 
-;; CHECK:      [fuzz-exec] calling max1-f32
+;; CHECK:      [fuzz-exec] export max1-f32
 ;; CHECK-NEXT: [fuzz-exec] note result: max1-f32 => 0
 
-;; CHECK:      [fuzz-exec] calling max2-f32
+;; CHECK:      [fuzz-exec] export max2-f32
 ;; CHECK-NEXT: [fuzz-exec] note result: max2-f32 => 0
 ;; CHECK-NEXT: [fuzz-exec] comparing max1
 ;; CHECK-NEXT: [fuzz-exec] comparing max1-f32
diff --git a/test/lit/exec/no-compare-refs.wast b/test/lit/exec/no-compare-refs.wast
index 646ec1550b9..66ca476b435 100644
--- a/test/lit/exec/no-compare-refs.wast
+++ b/test/lit/exec/no-compare-refs.wast
@@ -11,12 +11,12 @@
 
   ;; The type of the reference this function returns will change as a result of
   ;; signature pruning. The fuzzer should not complain about this.
-  ;; CHECK:      [fuzz-exec] calling return-ref
+  ;; CHECK:      [fuzz-exec] export return-ref
   ;; CHECK-NEXT: [fuzz-exec] note result: return-ref => function
   (func $return-ref (export "return-ref") (result funcref)
     (ref.func $no-use-param)
   )
 )
-;; CHECK:      [fuzz-exec] calling return-ref
+;; CHECK:      [fuzz-exec] export return-ref
 ;; CHECK-NEXT: [fuzz-exec] note result: return-ref => function
 ;; CHECK-NEXT: [fuzz-exec] comparing return-ref
diff --git a/test/lit/exec/non-nullable.wast b/test/lit/exec/non-nullable.wast
index da71d53ebeb..9cd55df543f 100644
--- a/test/lit/exec/non-nullable.wast
+++ b/test/lit/exec/non-nullable.wast
@@ -3,12 +3,12 @@
 ;; RUN: wasm-opt %s -all --fuzz-exec -q -o /dev/null 2>&1 | filecheck %s
 
 (module
-  ;; CHECK:      [fuzz-exec] calling get-ref
+  ;; CHECK:      [fuzz-exec] export get-ref
   ;; CHECK-NEXT: [trap fuzzer can only send defaultable parameters to exports]
   (func $get-ref (export "get-ref") (param $0 (ref any))
     (nop)
   )
 )
-;; CHECK:      [fuzz-exec] calling get-ref
+;; CHECK:      [fuzz-exec] export get-ref
 ;; CHECK-NEXT: [trap fuzzer can only send defaultable parameters to exports]
 ;; CHECK-NEXT: [fuzz-exec] comparing get-ref
diff --git a/test/lit/exec/nontrapping-fptoint-lowering.wat b/test/lit/exec/nontrapping-fptoint-lowering.wat
index 72a86bf9cdc..b61f6616fc2 100644
--- a/test/lit/exec/nontrapping-fptoint-lowering.wat
+++ b/test/lit/exec/nontrapping-fptoint-lowering.wat
@@ -22,7 +22,7 @@
   (func $i64.trunc_sat_f64_s (param $x f64) (result i64) (i64.trunc_sat_f64_s (local.get $x)))
   (func $i64.trunc_sat_f64_u (param $x f64) (result i64) (i64.trunc_sat_f64_u (local.get $x)))
 
-  ;; CHECK:      [fuzz-exec] calling f32_i32
+  ;; CHECK:      [fuzz-exec] export f32_i32
   (func $f32_i32 (export "f32_i32")
     (call $assert_i32 (call $i32.trunc_sat_f32_s (f32.const 0.0)) (i32.const 0))
     (call $assert_i32 (call $i32.trunc_sat_f32_s (f32.const -0.0)) (i32.const 0))
@@ -49,7 +49,7 @@
     (drop (call $i32.trunc_sat_f32_s (f32.const -nan:0x200000)))
   )
 
-  ;; CHECK:      [fuzz-exec] calling f32_i32_u
+  ;; CHECK:      [fuzz-exec] export f32_i32_u
   (func $f32_i32_u (export "f32_i32_u")
     (call $assert_i32 (call $i32.trunc_sat_f32_u (f32.const 0.0)) (i32.const 0))
     (call $assert_i32 (call $i32.trunc_sat_f32_u (f32.const -0.0)) (i32.const 0))
@@ -74,7 +74,7 @@
     (drop (call $i32.trunc_sat_f32_u (f32.const -nan:0x200000)))
   )
 
-  ;; CHECK:      [fuzz-exec] calling f64_i32
+  ;; CHECK:      [fuzz-exec] export f64_i32
   (func $f64_i32 (export "f64_i32")
     (call $assert_i32 (call $i32.trunc_sat_f64_s (f64.const 0.0)) (i32.const 0))
     (call $assert_i32 (call $i32.trunc_sat_f64_s (f64.const -0.0)) (i32.const 0))
@@ -100,7 +100,7 @@
     (drop (call $i32.trunc_sat_f64_s (f64.const -nan:0x4000000000000)))
   )
 
-  ;; CHECK:      [fuzz-exec] calling f64_i32_s
+  ;; CHECK:      [fuzz-exec] export f64_i32_s
   (func $f64_i32_s (export "f64_i32_s")
     (call $assert_i32 (call $i32.trunc_sat_f64_u (f64.const 0.0)) (i32.const 0))
     (call $assert_i32 (call $i32.trunc_sat_f64_u (f64.const -0.0)) (i32.const 0))
@@ -130,7 +130,7 @@
     (drop (call $i32.trunc_sat_f64_u (f64.const -nan:0x4000000000000)))
   )
 
-  ;; CHECK:      [fuzz-exec] calling f32_i64
+  ;; CHECK:      [fuzz-exec] export f32_i64
   (func $f32_i64 (export "f32_i64")
     (call $assert_i64 (call $i64.trunc_sat_f32_s (f32.const 0.0)) (i64.const 0))
     (call $assert_i64 (call $i64.trunc_sat_f32_s (f32.const -0.0)) (i64.const 0))
@@ -158,7 +158,7 @@
     (drop (call $i64.trunc_sat_f32_s (f32.const -nan:0x200000)))
   )
 
-  ;; CHECK:      [fuzz-exec] calling f32_i64_u
+  ;; CHECK:      [fuzz-exec] export f32_i64_u
   (func $f32_i64_u (export "f32_i64_u")
     (call $assert_i64 (call $i64.trunc_sat_f32_u (f32.const 0.0)) (i64.const 0))
     (call $assert_i64 (call $i64.trunc_sat_f32_u (f32.const -0.0)) (i64.const 0))
@@ -181,7 +181,7 @@
     (drop (call $i64.trunc_sat_f32_u (f32.const -nan:0x200000)))
   )
 
-  ;; CHECK:      [fuzz-exec] calling f64_i64
+  ;; CHECK:      [fuzz-exec] export f64_i64
   (func $f64_i64 (export "f64_i64")
     (call $assert_i64 (call $i64.trunc_sat_f64_s (f64.const 0.0)) (i64.const 0))
     (call $assert_i64 (call $i64.trunc_sat_f64_s (f64.const -0.0)) (i64.const 0))
@@ -209,7 +209,7 @@
     (drop (call $i64.trunc_sat_f64_s (f64.const -nan:0x4000000000000)))
   )
 
-  ;; CHECK:      [fuzz-exec] calling f64_i64_u
+  ;; CHECK:      [fuzz-exec] export f64_i64_u
   (func $f64_i64_u (export "f64_i64_u")
     (call $assert_i64 (call $i64.trunc_sat_f64_u (f64.const 0.0)) (i64.const 0))
     (call $assert_i64 (call $i64.trunc_sat_f64_u (f64.const -0.0)) (i64.const 0))
@@ -236,21 +236,21 @@
     (drop (call $i64.trunc_sat_f64_u (f64.const -nan:0x4000000000000)))
   )
 )
-;; CHECK:      [fuzz-exec] calling f32_i32
+;; CHECK:      [fuzz-exec] export f32_i32
 
-;; CHECK:      [fuzz-exec] calling f32_i32_u
+;; CHECK:      [fuzz-exec] export f32_i32_u
 
-;; CHECK:      [fuzz-exec] calling f64_i32
+;; CHECK:      [fuzz-exec] export f64_i32
 
-;; CHECK:      [fuzz-exec] calling f64_i32_s
+;; CHECK:      [fuzz-exec] export f64_i32_s
 
-;; CHECK:      [fuzz-exec] calling f32_i64
+;; CHECK:      [fuzz-exec] export f32_i64
 
-;; CHECK:      [fuzz-exec] calling f32_i64_u
+;; CHECK:      [fuzz-exec] export f32_i64_u
 
-;; CHECK:      [fuzz-exec] calling f64_i64
+;; CHECK:      [fuzz-exec] export f64_i64
 
-;; CHECK:      [fuzz-exec] calling f64_i64_u
+;; CHECK:      [fuzz-exec] export f64_i64_u
 ;; CHECK-NEXT: [fuzz-exec] comparing f32_i32
 ;; CHECK-NEXT: [fuzz-exec] comparing f32_i32_u
 ;; CHECK-NEXT: [fuzz-exec] comparing f32_i64
diff --git a/test/lit/exec/read-nn-null.wast b/test/lit/exec/read-nn-null.wast
index beb2c5c7ec9..06ba0151b21 100644
--- a/test/lit/exec/read-nn-null.wast
+++ b/test/lit/exec/read-nn-null.wast
@@ -30,10 +30,10 @@
 (module
   (import "fuzzing-support" "log-i32" (func $log (param i32)))
 
-  ;; NORMAL:      [fuzz-exec] calling foo
+  ;; NORMAL:      [fuzz-exec] export foo
   ;; NORMAL-NEXT: [LoggingExternalInterface logging 42]
   ;; NORMAL-NEXT: [trap unreachable]
-  ;; TNH:      [fuzz-exec] calling foo
+  ;; TNH:      [fuzz-exec] export foo
   ;; TNH-NEXT: [LoggingExternalInterface logging 42]
   ;; TNH-NEXT: [trap unreachable]
   (func $foo (export "foo") (param $i i32) (result funcref)
@@ -61,12 +61,12 @@
     )
   )
 )
-;; NORMAL:      [fuzz-exec] calling foo
+;; NORMAL:      [fuzz-exec] export foo
 ;; NORMAL-NEXT: [LoggingExternalInterface logging 42]
 ;; NORMAL-NEXT: [trap unreachable]
 ;; NORMAL-NEXT: [fuzz-exec] comparing foo
 
-;; TNH:      [fuzz-exec] calling foo
+;; TNH:      [fuzz-exec] export foo
 ;; TNH-NEXT: [LoggingExternalInterface logging 42]
 ;; TNH-NEXT: [trap unreachable]
 ;; TNH-NEXT: [fuzz-exec] comparing foo
diff --git a/test/lit/exec/relaxed.wast b/test/lit/exec/relaxed.wast
index bf88835b7d4..f78d11c125a 100644
--- a/test/lit/exec/relaxed.wast
+++ b/test/lit/exec/relaxed.wast
@@ -5,7 +5,7 @@
 (module
  (import "fuzzing-support" "log-i32" (func $log (param i32)))
 
- ;; CHECK:      [fuzz-exec] calling i32x4.dot_i8x16_i7x16_add_s
+ ;; CHECK:      [fuzz-exec] export i32x4.dot_i8x16_i7x16_add_s
  ;; CHECK-NEXT: [LoggingExternalInterface logging 8]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 14]
  ;; CHECK-NEXT: [LoggingExternalInterface logging 22]
diff --git a/test/lit/exec/second.wast b/test/lit/exec/second.wast
index f94b1d82d76..558a6320a64 100644
--- a/test/lit/exec/second.wast
+++ b/test/lit/exec/second.wast
@@ -10,8 +10,8 @@
 ;; Test that --fuzz-exec-second will run a second wasm file that is
 ;; provided, and call its exports as well as the first module's.
 
-;; CHECK:      [fuzz-exec] calling first
+;; CHECK:      [fuzz-exec] export first
 ;; CHECK-NEXT: [fuzz-exec] note result: first => 42
-;; CHECK:      [fuzz-exec] calling second
+;; CHECK:      [fuzz-exec] export second
 ;; CHECK-NEXT: [fuzz-exec] note result: second => 1337
 
diff --git a/test/lit/exec/second_retcall.wast b/test/lit/exec/second_retcall.wast
index 842d2e446b7..282de620f2f 100644
--- a/test/lit/exec/second_retcall.wast
+++ b/test/lit/exec/second_retcall.wast
@@ -18,6 +18,6 @@
 ;; Export a funcref through a global, and return_call it from the other module.
 ;; It must be called ok, print 42, and not error.
 
-;; CHECK:      [fuzz-exec] calling caller
+;; CHECK:      [fuzz-exec] export caller
 ;; CHECK-NEXT: [LoggingExternalInterface logging 42]
 
diff --git a/test/lit/exec/simd-load-lane-oob.wast b/test/lit/exec/simd-load-lane-oob.wast
index 6227de060f9..182b082ad21 100644
--- a/test/lit/exec/simd-load-lane-oob.wast
+++ b/test/lit/exec/simd-load-lane-oob.wast
@@ -9,7 +9,7 @@
   (memory $mem 1 1)
   (global $g (mut i32) (i32.const 0))
 
-  ;; CHECK:      [fuzz-exec] calling oob
+  ;; CHECK:      [fuzz-exec] export oob
   ;; CHECK-NEXT: [trap final > memory: 4294967295 > 65536]
   (func $oob (export "oob")
     (drop
@@ -26,17 +26,17 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling get
+  ;; CHECK:      [fuzz-exec] export get
   ;; CHECK-NEXT: [fuzz-exec] note result: get => 1
   (func $get (export "get") (result i32)
     ;; This should be 1
     (global.get $g)
   )
 )
-;; CHECK:      [fuzz-exec] calling oob
+;; CHECK:      [fuzz-exec] export oob
 ;; CHECK-NEXT: [trap final > memory: 4294967295 > 65536]
 
-;; CHECK:      [fuzz-exec] calling get
+;; CHECK:      [fuzz-exec] export get
 ;; CHECK-NEXT: [fuzz-exec] note result: get => 1
 ;; CHECK-NEXT: [fuzz-exec] comparing get
 ;; CHECK-NEXT: [fuzz-exec] comparing oob
diff --git a/test/lit/exec/simd.wast b/test/lit/exec/simd.wast
index 8dc453feacf..614e772c2a9 100644
--- a/test/lit/exec/simd.wast
+++ b/test/lit/exec/simd.wast
@@ -7,7 +7,7 @@
 
  (data $0 (i64.const 0) "abcdefg")
 
- ;; CHECK:      [fuzz-exec] calling load8x8_s
+ ;; CHECK:      [fuzz-exec] export load8x8_s
  ;; CHECK-NEXT: [fuzz-exec] note result: load8x8_s => i32x4 0x00620061 0x00640063 0x00660065 0x00000067
  (func $load8x8_s (export "load8x8_s") (result v128)
   (v128.load8x8_s align=2
@@ -15,7 +15,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling load32x2_u
+ ;; CHECK:      [fuzz-exec] export load32x2_u
  ;; CHECK-NEXT: [trap final > memory: 13835058055282163712 > 1048576]
  (func $load32x2_u (export "load32x2_u") (result v128)
   ;; This large 64-bit address is out of bounds, and this should trap.
@@ -24,7 +24,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling i8x16.avgr_u
+ ;; CHECK:      [fuzz-exec] export i8x16.avgr_u
  ;; CHECK-NEXT: [fuzz-exec] note result: i8x16.avgr_u => i32x4 0x80808080 0x80808080 0x80808080 0x80808080
  (func $i8x16.avgr_u (export "i8x16.avgr_u") (result v128)
   (i8x16.avgr_u
@@ -34,13 +34,13 @@
  )
 )
 
-;; CHECK:      [fuzz-exec] calling load8x8_s
+;; CHECK:      [fuzz-exec] export load8x8_s
 ;; CHECK-NEXT: [fuzz-exec] note result: load8x8_s => i32x4 0x00620061 0x00640063 0x00660065 0x00000067
 
-;; CHECK:      [fuzz-exec] calling load32x2_u
+;; CHECK:      [fuzz-exec] export load32x2_u
 ;; CHECK-NEXT: [trap final > memory: 13835058055282163712 > 1048576]
 
-;; CHECK:      [fuzz-exec] calling i8x16.avgr_u
+;; CHECK:      [fuzz-exec] export i8x16.avgr_u
 ;; CHECK-NEXT: [fuzz-exec] note result: i8x16.avgr_u => i32x4 0x80808080 0x80808080 0x80808080 0x80808080
 ;; CHECK-NEXT: [fuzz-exec] comparing i8x16.avgr_u
 ;; CHECK-NEXT: [fuzz-exec] comparing load32x2_u
diff --git a/test/lit/exec/strings.wast b/test/lit/exec/strings.wast
index e9dd9fd2d0b..4a149a587a3 100644
--- a/test/lit/exec/strings.wast
+++ b/test/lit/exec/strings.wast
@@ -9,7 +9,7 @@
 
   (memory 1 1)
 
-  ;; CHECK:      [fuzz-exec] calling new_wtf16_array
+  ;; CHECK:      [fuzz-exec] export new_wtf16_array
   ;; CHECK-NEXT: [fuzz-exec] note result: new_wtf16_array => string("ello")
   (func $new_wtf16_array (export "new_wtf16_array") (result stringref)
     (string.new_wtf16_array
@@ -25,13 +25,13 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling const
+  ;; CHECK:      [fuzz-exec] export const
   ;; CHECK-NEXT: [fuzz-exec] note result: const => string("world")
   (func $const (export "const") (result stringref)
     (string.const "world")
   )
 
-  ;; CHECK:      [fuzz-exec] calling eq.1
+  ;; CHECK:      [fuzz-exec] export eq.1
   ;; CHECK-NEXT: [fuzz-exec] note result: eq.1 => 0
   (func $eq.1 (export "eq.1") (result i32)
     (string.eq
@@ -40,7 +40,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling eq.2
+  ;; CHECK:      [fuzz-exec] export eq.2
   ;; CHECK-NEXT: [fuzz-exec] note result: eq.2 => 1
   (func $eq.2 (export "eq.2") (result i32)
     (string.eq
@@ -49,7 +49,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling eq.3
+  ;; CHECK:      [fuzz-exec] export eq.3
   ;; CHECK-NEXT: [fuzz-exec] note result: eq.3 => 0
   (func $eq.3 (export "eq.3") (result i32)
     (string.eq
@@ -58,7 +58,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling eq.4
+  ;; CHECK:      [fuzz-exec] export eq.4
   ;; CHECK-NEXT: [fuzz-exec] note result: eq.4 => 0
   (func $eq.4 (export "eq.4") (result i32)
     (string.eq
@@ -67,7 +67,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling eq.5
+  ;; CHECK:      [fuzz-exec] export eq.5
   ;; CHECK-NEXT: [fuzz-exec] note result: eq.5 => 1
   (func $eq.5 (export "eq.5") (result i32)
     (string.eq
@@ -76,7 +76,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling compare.1
+  ;; CHECK:      [fuzz-exec] export compare.1
   ;; CHECK-NEXT: [trap null ref]
   (func $compare.1 (export "compare.1") (result i32)
     (string.compare
@@ -85,7 +85,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling compare.2
+  ;; CHECK:      [fuzz-exec] export compare.2
   ;; CHECK-NEXT: [trap null ref]
   (func $compare.2 (export "compare.2") (result i32)
     (string.compare
@@ -94,7 +94,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling compare.3
+  ;; CHECK:      [fuzz-exec] export compare.3
   ;; CHECK-NEXT: [trap null ref]
   (func $compare.3 (export "compare.3") (result i32)
     (string.compare
@@ -103,7 +103,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling compare.4
+  ;; CHECK:      [fuzz-exec] export compare.4
   ;; CHECK-NEXT: [fuzz-exec] note result: compare.4 => 0
   (func $compare.4 (export "compare.4") (result i32)
     (string.compare
@@ -112,7 +112,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling compare.5
+  ;; CHECK:      [fuzz-exec] export compare.5
   ;; CHECK-NEXT: [fuzz-exec] note result: compare.5 => -1
   (func $compare.5 (export "compare.5") (result i32)
     (string.compare
@@ -121,7 +121,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling compare.6
+  ;; CHECK:      [fuzz-exec] export compare.6
   ;; CHECK-NEXT: [fuzz-exec] note result: compare.6 => 1
   (func $compare.6 (export "compare.6") (result i32)
     (string.compare
@@ -130,7 +130,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling compare.7
+  ;; CHECK:      [fuzz-exec] export compare.7
   ;; CHECK-NEXT: [fuzz-exec] note result: compare.7 => -1
   (func $compare.7 (export "compare.7") (result i32)
     (string.compare
@@ -139,7 +139,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling compare.8
+  ;; CHECK:      [fuzz-exec] export compare.8
   ;; CHECK-NEXT: [fuzz-exec] note result: compare.8 => 1
   (func $compare.8 (export "compare.8") (result i32)
     (string.compare
@@ -148,7 +148,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling compare.9
+  ;; CHECK:      [fuzz-exec] export compare.9
   ;; CHECK-NEXT: [fuzz-exec] note result: compare.9 => 1
   (func $compare.9 (export "compare.9") (result i32)
     (string.compare
@@ -157,7 +157,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling compare.10
+  ;; CHECK:      [fuzz-exec] export compare.10
   ;; CHECK-NEXT: [fuzz-exec] note result: compare.10 => -1
   (func $compare.10 (export "compare.10") (result i32)
     (string.compare
@@ -166,7 +166,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling get_codeunit
+  ;; CHECK:      [fuzz-exec] export get_codeunit
   ;; CHECK-NEXT: [fuzz-exec] note result: get_codeunit => 99
   (func $get_codeunit (export "get_codeunit") (result i32)
     ;; Reads 'c' which is code 99.
@@ -176,7 +176,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling encode
+  ;; CHECK:      [fuzz-exec] export encode
   ;; CHECK-NEXT: [LoggingExternalInterface logging 3]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
   ;; CHECK-NEXT: [LoggingExternalInterface logging 97]
@@ -232,7 +232,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling encode-unsigned
+  ;; CHECK:      [fuzz-exec] export encode-unsigned
   ;; CHECK-NEXT: [trap oob]
   (func $encode-unsigned (export "encode-unsigned")
     (drop
@@ -247,7 +247,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling encode-overflow
+  ;; CHECK:      [fuzz-exec] export encode-overflow
   ;; CHECK-NEXT: [trap oob]
   (func $encode-overflow (export "encode-overflow")
     ;; The string's size + the offset lead to an overflow here in the array.
@@ -262,7 +262,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling slice
+  ;; CHECK:      [fuzz-exec] export slice
   ;; CHECK-NEXT: [fuzz-exec] note result: slice => string("def")
   (func $slice (export "slice") (result (ref string))
     ;; Slicing [3:6] here should definitely output "def".
@@ -273,7 +273,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling slice-big
+  ;; CHECK:      [fuzz-exec] export slice-big
   ;; CHECK-NEXT: [fuzz-exec] note result: slice-big => string("defgh")
   (func $slice-big (export "slice-big") (result (ref string))
     ;; Slicing [3:huge unsigned value] leads to slicing til the end: "defgh".
@@ -284,7 +284,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling slice-ordering
+  ;; CHECK:      [fuzz-exec] export slice-ordering
   ;; CHECK-NEXT: [fuzz-exec] note result: slice-ordering => string("h")
   (func $slice-ordering (export "slice-ordering") (result (ref string))
     (local $0 i32)
@@ -299,7 +299,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling new_empty
+  ;; CHECK:      [fuzz-exec] export new_empty
   ;; CHECK-NEXT: [fuzz-exec] note result: new_empty => string("")
   (func $new_empty (export "new_empty") (result stringref)
     ;; Make an empty string from an empty array.
@@ -312,7 +312,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling new_empty_oob
+  ;; CHECK:      [fuzz-exec] export new_empty_oob
   ;; CHECK-NEXT: [trap array oob]
   (func $new_empty_oob (export "new_empty_oob") (result stringref)
     ;; Try to make a string from an empty array that we slice at [1:0], which is
@@ -326,7 +326,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling new_empty_oob_2
+  ;; CHECK:      [fuzz-exec] export new_empty_oob_2
   ;; CHECK-NEXT: [trap array oob]
   (func $new_empty_oob_2 (export "new_empty_oob_2") (result stringref)
     ;; Try to make a string from an empty array that we slice at [:1], which is
@@ -340,7 +340,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling new_oob
+  ;; CHECK:      [fuzz-exec] export new_oob
   ;; CHECK-NEXT: [trap array oob]
   (func $new_oob (export "new_oob") (result stringref)
     ;; Try to make a string from an array of size 1 that we slice at [1:0],
@@ -355,7 +355,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling new_2
+  ;; CHECK:      [fuzz-exec] export new_2
   ;; CHECK-NEXT: [fuzz-exec] note result: new_2 => string("")
   (func $new_2 (export "new_2") (result stringref)
     (string.new_wtf16_array
@@ -368,7 +368,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling new_oob_3
+  ;; CHECK:      [fuzz-exec] export new_oob_3
   ;; CHECK-NEXT: [trap array oob]
   (func $new_oob_3 (export "new_oob_3") (result stringref)
     (string.new_wtf16_array
@@ -380,7 +380,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling new_4
+  ;; CHECK:      [fuzz-exec] export new_4
   ;; CHECK-NEXT: [fuzz-exec] note result: new_4 => string("\u0000")
   (func $new_4 (export "new_4") (result stringref)
     (string.new_wtf16_array
@@ -393,7 +393,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling slice-unicode
+  ;; CHECK:      [fuzz-exec] export slice-unicode
   ;; CHECK-NEXT: [fuzz-exec] note result: slice-unicode => string("d\u00a3f")
   (func $slice-unicode (export "slice-unicode") (result (ref string))
     (stringview_wtf16.slice
@@ -404,14 +404,14 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling concat-surrogates
+  ;; CHECK:      [fuzz-exec] export concat-surrogates
   ;; CHECK-NEXT: [fuzz-exec] note result: concat-surrogates => string("\ud800\udf48")
   (func $concat-surrogates (export "concat-surrogates") (result (ref string))
     ;; Concatenating these surrogates creates '𐍈'.
     (string.concat (string.const "\ED\A0\80") (string.const "\ED\BD\88"))
   )
 
-  ;; CHECK:      [fuzz-exec] calling string.from_code_point
+  ;; CHECK:      [fuzz-exec] export string.from_code_point
   ;; CHECK-NEXT: [fuzz-exec] note result: string.from_code_point => string("A")
   (func $string.from_code_point (export "string.from_code_point") (result stringref)
     (string.from_code_point
@@ -419,7 +419,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling unsigned_code_point
+  ;; CHECK:      [fuzz-exec] export unsigned_code_point
   ;; CHECK-NEXT: [fuzz-exec] note result: unsigned_code_point => string("\u0093")
   (func $unsigned_code_point (export "unsigned_code_point") (result stringref)
     (string.from_code_point
@@ -429,7 +429,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling weird_code_point
+  ;; CHECK:      [fuzz-exec] export weird_code_point
   ;; CHECK-NEXT: [fuzz-exec] note result: weird_code_point => string("\u03e8")
   (func $weird_code_point (export "weird_code_point") (result stringref)
     (string.from_code_point
@@ -437,7 +437,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling isolated_high_code_point
+  ;; CHECK:      [fuzz-exec] export isolated_high_code_point
   ;; CHECK-NEXT: [fuzz-exec] note result: isolated_high_code_point => string("\ud800")
   (func $isolated_high_code_point (export "isolated_high_code_point") (result stringref)
     (string.from_code_point
@@ -445,7 +445,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling isolated_low_code_point
+  ;; CHECK:      [fuzz-exec] export isolated_low_code_point
   ;; CHECK-NEXT: [fuzz-exec] note result: isolated_low_code_point => string("\udc00")
   (func $isolated_low_code_point (export "isolated_low_code_point") (result stringref)
     (string.from_code_point
@@ -453,7 +453,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling surrogate_pair_code_point
+  ;; CHECK:      [fuzz-exec] export surrogate_pair_code_point
   ;; CHECK-NEXT: [fuzz-exec] note result: surrogate_pair_code_point => string("\u286c")
   (func $surrogate_pair_code_point (export "surrogate_pair_code_point") (result stringref)
     (string.from_code_point
@@ -461,7 +461,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling invalid_code_point
+  ;; CHECK:      [fuzz-exec] export invalid_code_point
   ;; CHECK-NEXT: [trap invalid code point]
   (func $invalid_code_point (export "invalid_code_point") (result stringref)
     (string.from_code_point
@@ -469,7 +469,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling string.measure
+  ;; CHECK:      [fuzz-exec] export string.measure
   ;; CHECK-NEXT: [fuzz-exec] note result: string.measure => 5
   (func $string.measure (export "string.measure") (result i32)
     (string.measure_wtf16
@@ -477,7 +477,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling string.to.any
+  ;; CHECK:      [fuzz-exec] export string.to.any
   ;; CHECK-NEXT: [fuzz-exec] note result: string.to.any => string("six")
   (func $string.to.any (export "string.to.any") (result anyref)
     (any.convert_extern
@@ -485,7 +485,7 @@
     )
   )
 
-  ;; CHECK:      [fuzz-exec] calling string.to.any.and.back
+  ;; CHECK:      [fuzz-exec] export string.to.any.and.back
   ;; CHECK-NEXT: [fuzz-exec] note result: string.to.any.and.back => string("seven")
   (func $string.to.any.and.back (export "string.to.any.and.back") (result externref)
     (extern.convert_any
@@ -495,61 +495,61 @@
     )
   )
 )
-;; CHECK:      [fuzz-exec] calling new_wtf16_array
+;; CHECK:      [fuzz-exec] export new_wtf16_array
 ;; CHECK-NEXT: [fuzz-exec] note result: new_wtf16_array => string("ello")
 
-;; CHECK:      [fuzz-exec] calling const
+;; CHECK:      [fuzz-exec] export const
 ;; CHECK-NEXT: [fuzz-exec] note result: const => string("world")
 
-;; CHECK:      [fuzz-exec] calling eq.1
+;; CHECK:      [fuzz-exec] export eq.1
 ;; CHECK-NEXT: [fuzz-exec] note result: eq.1 => 0
 
-;; CHECK:      [fuzz-exec] calling eq.2
+;; CHECK:      [fuzz-exec] export eq.2
 ;; CHECK-NEXT: [fuzz-exec] note result: eq.2 => 1
 
-;; CHECK:      [fuzz-exec] calling eq.3
+;; CHECK:      [fuzz-exec] export eq.3
 ;; CHECK-NEXT: [fuzz-exec] note result: eq.3 => 0
 
-;; CHECK:      [fuzz-exec] calling eq.4
+;; CHECK:      [fuzz-exec] export eq.4
 ;; CHECK-NEXT: [fuzz-exec] note result: eq.4 => 0
 
-;; CHECK:      [fuzz-exec] calling eq.5
+;; CHECK:      [fuzz-exec] export eq.5
 ;; CHECK-NEXT: [fuzz-exec] note result: eq.5 => 1
 
-;; CHECK:      [fuzz-exec] calling compare.1
+;; CHECK:      [fuzz-exec] export compare.1
 ;; CHECK-NEXT: [trap null ref]
 
-;; CHECK:      [fuzz-exec] calling compare.2
+;; CHECK:      [fuzz-exec] export compare.2
 ;; CHECK-NEXT: [trap null ref]
 
-;; CHECK:      [fuzz-exec] calling compare.3
+;; CHECK:      [fuzz-exec] export compare.3
 ;; CHECK-NEXT: [trap null ref]
 
-;; CHECK:      [fuzz-exec] calling compare.4
+;; CHECK:      [fuzz-exec] export compare.4
 ;; CHECK-NEXT: [fuzz-exec] note result: compare.4 => 0
 
-;; CHECK:      [fuzz-exec] calling compare.5
+;; CHECK:      [fuzz-exec] export compare.5
 ;; CHECK-NEXT: [fuzz-exec] note result: compare.5 => -1
 
-;; CHECK:      [fuzz-exec] calling compare.6
+;; CHECK:      [fuzz-exec] export compare.6
 ;; CHECK-NEXT: [fuzz-exec] note result: compare.6 => 1
 
-;; CHECK:      [fuzz-exec] calling compare.7
+;; CHECK:      [fuzz-exec] export compare.7
 ;; CHECK-NEXT: [fuzz-exec] note result: compare.7 => -1
 
-;; CHECK:      [fuzz-exec] calling compare.8
+;; CHECK:      [fuzz-exec] export compare.8
 ;; CHECK-NEXT: [fuzz-exec] note result: compare.8 => 1
 
-;; CHECK:      [fuzz-exec] calling compare.9
+;; CHECK:      [fuzz-exec] export compare.9
 ;; CHECK-NEXT: [fuzz-exec] note result: compare.9 => 1
 
-;; CHECK:      [fuzz-exec] calling compare.10
+;; CHECK:      [fuzz-exec] export compare.10
 ;; CHECK-NEXT: [fuzz-exec] note result: compare.10 => -1
 
-;; CHECK:      [fuzz-exec] calling get_codeunit
+;; CHECK:      [fuzz-exec] export get_codeunit
 ;; CHECK-NEXT: [fuzz-exec] note result: get_codeunit => 99
 
-;; CHECK:      [fuzz-exec] calling encode
+;; CHECK:      [fuzz-exec] export encode
 ;; CHECK-NEXT: [LoggingExternalInterface logging 3]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 97]
@@ -557,76 +557,76 @@
 ;; CHECK-NEXT: [LoggingExternalInterface logging 99]
 ;; CHECK-NEXT: [LoggingExternalInterface logging 0]
 
-;; CHECK:      [fuzz-exec] calling encode-unsigned
+;; CHECK:      [fuzz-exec] export encode-unsigned
 ;; CHECK-NEXT: [trap oob]
 
-;; CHECK:      [fuzz-exec] calling encode-overflow
+;; CHECK:      [fuzz-exec] export encode-overflow
 ;; CHECK-NEXT: [trap oob]
 
-;; CHECK:      [fuzz-exec] calling slice
+;; CHECK:      [fuzz-exec] export slice
 ;; CHECK-NEXT: [fuzz-exec] note result: slice => string("def")
 
-;; CHECK:      [fuzz-exec] calling slice-big
+;; CHECK:      [fuzz-exec] export slice-big
 ;; CHECK-NEXT: [fuzz-exec] note result: slice-big => string("defgh")
 
-;; CHECK:      [fuzz-exec] calling slice-ordering
+;; CHECK:      [fuzz-exec] export slice-ordering
 ;; CHECK-NEXT: [fuzz-exec] note result: slice-ordering => string("h")
 
-;; CHECK:      [fuzz-exec] calling new_empty
+;; CHECK:      [fuzz-exec] export new_empty
 ;; CHECK-NEXT: [fuzz-exec] note result: new_empty => string("")
 
-;; CHECK:      [fuzz-exec] calling new_empty_oob
+;; CHECK:      [fuzz-exec] export new_empty_oob
 ;; CHECK-NEXT: [trap array oob]
 
-;; CHECK:      [fuzz-exec] calling new_empty_oob_2
+;; CHECK:      [fuzz-exec] export new_empty_oob_2
 ;; CHECK-NEXT: [trap array oob]
 
-;; CHECK:      [fuzz-exec] calling new_oob
+;; CHECK:      [fuzz-exec] export new_oob
 ;; CHECK-NEXT: [trap array oob]
 
-;; CHECK:      [fuzz-exec] calling new_2
+;; CHECK:      [fuzz-exec] export new_2
 ;; CHECK-NEXT: [fuzz-exec] note result: new_2 => string("")
 
-;; CHECK:      [fuzz-exec] calling new_oob_3
+;; CHECK:      [fuzz-exec] export new_oob_3
 ;; CHECK-NEXT: [trap array oob]
 
-;; CHECK:      [fuzz-exec] calling new_4
+;; CHECK:      [fuzz-exec] export new_4
 ;; CHECK-NEXT: [fuzz-exec] note result: new_4 => string("\u0000")
 
-;; CHECK:      [fuzz-exec] calling slice-unicode
+;; CHECK:      [fuzz-exec] export slice-unicode
 ;; CHECK-NEXT: [fuzz-exec] note result: slice-unicode => string("d\u00a3f")
 
-;; CHECK:      [fuzz-exec] calling concat-surrogates
+;; CHECK:      [fuzz-exec] export concat-surrogates
 ;; CHECK-NEXT: [fuzz-exec] note result: concat-surrogates => string("\ud800\udf48")
 
-;; CHECK:      [fuzz-exec] calling string.from_code_point
+;; CHECK:      [fuzz-exec] export string.from_code_point
 ;; CHECK-NEXT: [fuzz-exec] note result: string.from_code_point => string("A")
 
-;; CHECK:      [fuzz-exec] calling unsigned_code_point
+;; CHECK:      [fuzz-exec] export unsigned_code_point
 ;; CHECK-NEXT: [fuzz-exec] note result: unsigned_code_point => string("\u0093")
 
-;; CHECK:      [fuzz-exec] calling weird_code_point
+;; CHECK:      [fuzz-exec] export weird_code_point
 ;; CHECK-NEXT: [fuzz-exec] note result: weird_code_point => string("\u03e8")
 
-;; CHECK:      [fuzz-exec] calling isolated_high_code_point
+;; CHECK:      [fuzz-exec] export isolated_high_code_point
 ;; CHECK-NEXT: [fuzz-exec] note result: isolated_high_code_point => string("\ud800")
 
-;; CHECK:      [fuzz-exec] calling isolated_low_code_point
+;; CHECK:      [fuzz-exec] export isolated_low_code_point
 ;; CHECK-NEXT: [fuzz-exec] note result: isolated_low_code_point => string("\udc00")
 
-;; CHECK:      [fuzz-exec] calling surrogate_pair_code_point
+;; CHECK:      [fuzz-exec] export surrogate_pair_code_point
 ;; CHECK-NEXT: [fuzz-exec] note result: surrogate_pair_code_point => string("\u286c")
 
-;; CHECK:      [fuzz-exec] calling invalid_code_point
+;; CHECK:      [fuzz-exec] export invalid_code_point
 ;; CHECK-NEXT: [trap invalid code point]
 
-;; CHECK:      [fuzz-exec] calling string.measure
+;; CHECK:      [fuzz-exec] export string.measure
 ;; CHECK-NEXT: [fuzz-exec] note result: string.measure => 5
 
-;; CHECK:      [fuzz-exec] calling string.to.any
+;; CHECK:      [fuzz-exec] export string.to.any
 ;; CHECK-NEXT: [fuzz-exec] note result: string.to.any => string("six")
 
-;; CHECK:      [fuzz-exec] calling string.to.any.and.back
+;; CHECK:      [fuzz-exec] export string.to.any.and.back
 ;; CHECK-NEXT: [fuzz-exec] note result: string.to.any.and.back => string("seven")
 ;; CHECK-NEXT: [fuzz-exec] comparing compare.1
 ;; CHECK-NEXT: [fuzz-exec] comparing compare.10
diff --git a/test/lit/exec/table.fill.wast b/test/lit/exec/table.fill.wast
index 74b6f937692..06ff58666c7 100644
--- a/test/lit/exec/table.fill.wast
+++ b/test/lit/exec/table.fill.wast
@@ -11,7 +11,7 @@
   (i32.const 0)
  )
 
- ;; CHECK:      [fuzz-exec] calling fill
+ ;; CHECK:      [fuzz-exec] export fill
  ;; CHECK-NEXT: [trap out of bounds table access]
  (func $fill (export "fill")
   ;; This fill is out of bounds as the -1 is unsigned. Nothing will be written.
@@ -21,7 +21,7 @@
    (i32.const -1)
   )
  )
- ;; CHECK:      [fuzz-exec] calling call
+ ;; CHECK:      [fuzz-exec] export call
  ;; CHECK-NEXT: [trap null target in call_indirect]
  (func $call (export "call") (result i32)
   ;; Nothing was written, so this traps.
diff --git a/test/lit/exec/table.grow.wast b/test/lit/exec/table.grow.wast
index 83a12456603..a5798c3c9f3 100644
--- a/test/lit/exec/table.grow.wast
+++ b/test/lit/exec/table.grow.wast
@@ -5,7 +5,7 @@
 (module
  (table $0 0 funcref)
 
- ;; CHECK:      [fuzz-exec] calling just-right
+ ;; CHECK:      [fuzz-exec] export just-right
  ;; CHECK-NEXT: [fuzz-exec] note result: just-right => 0
  (func $just-right (export "just-right") (result i32)
   ;; Growing up to the limit of 10*1000*1000 will succeed.
@@ -15,7 +15,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling too-much
+ ;; CHECK:      [fuzz-exec] export too-much
  ;; CHECK-NEXT: [fuzz-exec] note result: too-much => -1
  (func $too-much (export "too-much") (result i32)
   ;; Growing beyond the limit will error and return -1.
diff --git a/test/lit/exec/table64.wast b/test/lit/exec/table64.wast
index 6f89d787ee9..fa4ededffb8 100644
--- a/test/lit/exec/table64.wast
+++ b/test/lit/exec/table64.wast
@@ -16,7 +16,7 @@
   (i32.const 1337)
  )
 
- ;; CHECK:      [fuzz-exec] calling call-a
+ ;; CHECK:      [fuzz-exec] export call-a
  ;; CHECK-NEXT: [fuzz-exec] note result: call-a => 42
  (func $call-a (export "call-a") (result i32)
   ;; This call succeeds, and calls $i32-a which returns 42.
@@ -25,7 +25,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling call-b
+ ;; CHECK:      [fuzz-exec] export call-b
  ;; CHECK-NEXT: [fuzz-exec] note result: call-b => 1337
  (func $call-b (export "call-b") (result i32)
   ;; This call succeeds, and calls $i32-b which returns 1337.
@@ -34,7 +34,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling oob
+ ;; CHECK:      [fuzz-exec] export oob
  ;; CHECK-NEXT: [trap out of bounds table access]
  (func $oob (export "oob") (result i32)
   ;; This call traps on oob.
@@ -43,7 +43,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling oob-huge
+ ;; CHECK:      [fuzz-exec] export oob-huge
  ;; CHECK-NEXT: [trap out of bounds table access]
  (func $oob-huge (export "oob-huge") (result i32)
   ;; This call traps on oob with a value over 32 bits, 2**32 + 1, which if we
@@ -57,7 +57,7 @@
   )
  )
 
- ;; CHECK:      [fuzz-exec] calling null
+ ;; CHECK:      [fuzz-exec] export null
  ;; CHECK-NEXT: [trap null target in call_indirect]
  (func $null (export "null") (result i32)
   ;; This call traps on null
@@ -67,19 +67,19 @@
  )
 )
 
-;; CHECK:      [fuzz-exec] calling call-a
+;; CHECK:      [fuzz-exec] export call-a
 ;; CHECK-NEXT: [fuzz-exec] note result: call-a => 42
 
-;; CHECK:      [fuzz-exec] calling call-b
+;; CHECK:      [fuzz-exec] export call-b
 ;; CHECK-NEXT: [fuzz-exec] note result: call-b => 1337
 
-;; CHECK:      [fuzz-exec] calling oob
+;; CHECK:      [fuzz-exec] export oob
 ;; CHECK-NEXT: [trap out of bounds table access]
 
-;; CHECK:      [fuzz-exec] calling oob-huge
+;; CHECK:      [fuzz-exec] export oob-huge
 ;; CHECK-NEXT: [trap out of bounds table access]
 
-;; CHECK:      [fuzz-exec] calling null
+;; CHECK:      [fuzz-exec] export null
 ;; CHECK-NEXT: [trap null target in call_indirect]
 ;; CHECK-NEXT: [fuzz-exec] comparing call-a
 ;; CHECK-NEXT: [fuzz-exec] comparing call-b
diff --git a/test/lit/exec/tag-cross-module.wast b/test/lit/exec/tag-cross-module.wast
index 0bb17c97fee..37a390144ea 100644
--- a/test/lit/exec/tag-cross-module.wast
+++ b/test/lit/exec/tag-cross-module.wast
@@ -16,12 +16,12 @@
  )
 )
 
-;; CHECK: [fuzz-exec] calling func
+;; CHECK: [fuzz-exec] export func
 ;; CHECK-NEXT: [exception thrown: tag nullref]
 ;; CHECK-NEXT: [fuzz-exec] running second module
-;; CHECK-NEXT: [fuzz-exec] calling func2-internal
+;; CHECK-NEXT: [fuzz-exec] export func2-internal
 ;; CHECK-NEXT: [exception thrown: tag nullref]
-;; CHECK-NEXT: [fuzz-exec] calling func2-imported
+;; CHECK-NEXT: [fuzz-exec] export func2-imported
 ;; CHECK-NEXT: func2-imported => null
 
 
diff --git a/test/lit/node/fuzz_shell.wast b/test/lit/node/fuzz_shell.wast
index deb157ec873..bada2837e10 100644
--- a/test/lit/node/fuzz_shell.wast
+++ b/test/lit/node/fuzz_shell.wast
@@ -14,7 +14,7 @@
 ;;
 ;; RUN: node %S/../../../scripts/fuzz_shell.js %t.wasm | filecheck %s
 ;;
-;; CHECK: [fuzz-exec] calling test
+;; CHECK: [fuzz-exec] export test
 ;; CHECK: [fuzz-exec] note result: test => 42
 
 
diff --git a/test/lit/node/fuzz_shell_append.wast b/test/lit/node/fuzz_shell_append.wast
index 4aa61d5361f..366ec12e3d6 100644
--- a/test/lit/node/fuzz_shell_append.wast
+++ b/test/lit/node/fuzz_shell_append.wast
@@ -65,17 +65,17 @@
 ;; RUN: node %S/../../../scripts/fuzz_shell.js %t.wasm | filecheck %s
 ;;
 ;; "errors" reports we've seen no errors.
-;; CHECK: [fuzz-exec] calling errors
+;; CHECK: [fuzz-exec] export errors
 ;; CHECK: [LoggingExternalInterface logging 0]
 
 ;; "call0" calls "errors", which logs 0 twice.
-;; CHECK: [fuzz-exec] calling call0
+;; CHECK: [fuzz-exec] export call0
 ;; CHECK: [LoggingExternalInterface logging 0]
 ;; CHECK: [LoggingExternalInterface logging 0]
 
 ;; "call3" calls an invalid index, and logs -1 as an error, and 1 as the total
 ;; errors so far.
-;; CHECK: [fuzz-exec] calling call3
+;; CHECK: [fuzz-exec] export call3
 ;; CHECK: [LoggingExternalInterface logging -1]
 ;; CHECK: [LoggingExternalInterface logging 1]
 
@@ -87,23 +87,23 @@
 ;; RUN: node %t.js %t.wasm | filecheck %s --check-prefix=APPENDED
 ;;
 ;; The first part is unchanged from before.
-;; APPENDED: [fuzz-exec] calling errors
+;; APPENDED: [fuzz-exec] export errors
 ;; APPENDED: [LoggingExternalInterface logging 0]
-;; APPENDED: [fuzz-exec] calling call0
+;; APPENDED: [fuzz-exec] export call0
 ;; APPENDED: [LoggingExternalInterface logging 0]
 ;; APPENDED: [LoggingExternalInterface logging 0]
-;; APPENDED: [fuzz-exec] calling call3
+;; APPENDED: [fuzz-exec] export call3
 ;; APPENDED: [LoggingExternalInterface logging -1]
 ;; APPENDED: [LoggingExternalInterface logging 1]
 
 ;; Next, we build the module again, append its exports, and call them all.
 
 ;; "errors" from the first module recalls that we errored before.
-;; APPENDED: [fuzz-exec] calling errors
+;; APPENDED: [fuzz-exec] export errors
 ;; APPENDED: [LoggingExternalInterface logging 1]
 
 ;; "call0" calls "errors", and they both log 1.
-;; APPENDED: [fuzz-exec] calling call0
+;; APPENDED: [fuzz-exec] export call0
 ;; APPENDED: [LoggingExternalInterface logging 1]
 ;; APPENDED: [LoggingExternalInterface logging 1]
 
@@ -111,23 +111,23 @@
 ;; at index 3: the second module's "errors". That reports that the second module
 ;; has seen no errors, and then call3 from the first module reports that that
 ;; module has seen 1 error.
-;; APPENDED: [fuzz-exec] calling call3
+;; APPENDED: [fuzz-exec] export call3
 ;; APPENDED: [LoggingExternalInterface logging 0]
 ;; APPENDED: [LoggingExternalInterface logging 1]
 
 ;; "errors" from the second module reports no errors.
-;; APPENDED: [fuzz-exec] calling errors
+;; APPENDED: [fuzz-exec] export errors
 ;; APPENDED: [LoggingExternalInterface logging 0]
 
 ;; "call0" from the second module to the first makes the first module's "errors"
 ;; report 1, and then we report 0 from the second module.
-;; APPENDED: [fuzz-exec] calling call0
+;; APPENDED: [fuzz-exec] export call0
 ;; APPENDED: [LoggingExternalInterface logging 1]
 ;; APPENDED: [LoggingExternalInterface logging 0]
 
 ;; "call3" from the second module calls "errors" in the second module, and they
 ;; both report 0 errors.
-;; APPENDED: [fuzz-exec] calling call3
+;; APPENDED: [fuzz-exec] export call3
 ;; APPENDED: [LoggingExternalInterface logging 0]
 ;; APPENDED: [LoggingExternalInterface logging 0]
 
diff --git a/test/lit/node/fuzz_shell_bigint.wast b/test/lit/node/fuzz_shell_bigint.wast
index 5612f005c61..8df31c588e8 100644
--- a/test/lit/node/fuzz_shell_bigint.wast
+++ b/test/lit/node/fuzz_shell_bigint.wast
@@ -15,8 +15,8 @@
 ;; RUN: wasm-opt %s -o %t.wasm -q
 ;; RUN: node %S/../../../scripts/fuzz_shell.js %t.wasm | filecheck %s
 
-;; CHECK:      [fuzz-exec] calling big
+;; CHECK:      [fuzz-exec] export big
 ;; CHECK-NEXT: [fuzz-exec] note result: big => -1 -1
-;; CHECK-NEXT: [fuzz-exec] calling medium
+;; CHECK-NEXT: [fuzz-exec] export medium
 ;; CHECK-NEXT: [fuzz-exec] note result: medium => 1 268435456
 
diff --git a/test/lit/node/fuzz_shell_numeric_export.wast b/test/lit/node/fuzz_shell_numeric_export.wast
index 4072bef3468..c3913c5ddeb 100644
--- a/test/lit/node/fuzz_shell_numeric_export.wast
+++ b/test/lit/node/fuzz_shell_numeric_export.wast
@@ -20,10 +20,10 @@
 ;; RUN: wasm-opt %s -o %t.wasm -q --fuzz-exec-before | filecheck %s
 ;; RUN: node %S/../../../scripts/fuzz_shell.js %t.wasm | filecheck %s
 ;;
-;; CHECK: [fuzz-exec] calling a
+;; CHECK: [fuzz-exec] export a
 ;; CHECK: [fuzz-exec] note result: a => 10
-;; CHECK: [fuzz-exec] calling 0
+;; CHECK: [fuzz-exec] export 0
 ;; CHECK: [fuzz-exec] note result: 0 => 20
-;; CHECK: [fuzz-exec] calling c
+;; CHECK: [fuzz-exec] export c
 ;; CHECK: [fuzz-exec] note result: c => 30
 
diff --git a/test/lit/node/fuzz_shell_orders.wast b/test/lit/node/fuzz_shell_orders.wast
index 76fd40f4548..29cb9d57dac 100644
--- a/test/lit/node/fuzz_shell_orders.wast
+++ b/test/lit/node/fuzz_shell_orders.wast
@@ -22,11 +22,11 @@
 ;; RUN: wasm-opt %s -o %t.wasm -q
 ;; RUN: node %S/../../../scripts/fuzz_shell.js %t.wasm | filecheck %s
 ;;
-;; CHECK: [fuzz-exec] calling a
+;; CHECK: [fuzz-exec] export a
 ;; CHECK: [fuzz-exec] note result: a => 10
-;; CHECK: [fuzz-exec] calling b
+;; CHECK: [fuzz-exec] export b
 ;; CHECK: [fuzz-exec] note result: b => 20
-;; CHECK: [fuzz-exec] calling c
+;; CHECK: [fuzz-exec] export c
 ;; CHECK: [fuzz-exec] note result: c => 30
 
 ;; Append another run with a seed that leads to a different order
@@ -36,18 +36,18 @@
 ;; RUN: node %t.js %t.wasm | filecheck %s --check-prefix=APPENDED
 ;;
 ;; The original order: a,b,c
-;; APPENDED: [fuzz-exec] calling a
+;; APPENDED: [fuzz-exec] export a
 ;; APPENDED: [fuzz-exec] note result: a => 10
-;; APPENDED: [fuzz-exec] calling b
+;; APPENDED: [fuzz-exec] export b
 ;; APPENDED: [fuzz-exec] note result: b => 20
-;; APPENDED: [fuzz-exec] calling c
+;; APPENDED: [fuzz-exec] export c
 ;; APPENDED: [fuzz-exec] note result: c => 30
 
 ;; A new order: b,c,a
-;; APPENDED: [fuzz-exec] calling b
+;; APPENDED: [fuzz-exec] export b
 ;; APPENDED: [fuzz-exec] note result: b => 20
-;; APPENDED: [fuzz-exec] calling c
+;; APPENDED: [fuzz-exec] export c
 ;; APPENDED: [fuzz-exec] note result: c => 30
-;; APPENDED: [fuzz-exec] calling a
+;; APPENDED: [fuzz-exec] export a
 ;; APPENDED: [fuzz-exec] note result: a => 10
 
diff --git a/test/lit/node/fuzz_shell_second.wast b/test/lit/node/fuzz_shell_second.wast
index c61a0f65e3b..707ee440093 100644
--- a/test/lit/node/fuzz_shell_second.wast
+++ b/test/lit/node/fuzz_shell_second.wast
@@ -20,22 +20,22 @@
 ;;
 ;; RUN: node %S/../../../scripts/fuzz_shell.js %t.wasm %t.second.wasm | filecheck %s
 ;;
-;; CHECK: [fuzz-exec] calling first
+;; CHECK: [fuzz-exec] export first
 ;; CHECK: [fuzz-exec] note result: first => 42
-;; CHECK: [fuzz-exec] calling __fuzz_split_func
+;; CHECK: [fuzz-exec] export __fuzz_split_func
 ;; CHECK: [fuzz-exec] note result: __fuzz_split_func => 999
-;; CHECK: [fuzz-exec] calling second
+;; CHECK: [fuzz-exec] export second
 ;; CHECK: [fuzz-exec] note result: second => 1337
 
 ;; Run in reverse order, flipping the order in the output.
 ;;
 ;; RUN: node %S/../../../scripts/fuzz_shell.js %t.second.wasm %t.wasm | filecheck %s --check-prefix=REVERSE
 ;;
-;; REVERSE: [fuzz-exec] calling second
+;; REVERSE: [fuzz-exec] export second
 ;; REVERSE: [fuzz-exec] note result: second => 1337
-;; REVERSE: [fuzz-exec] calling first
+;; REVERSE: [fuzz-exec] export first
 ;; REVERSE: [fuzz-exec] note result: first => 42
-;; REVERSE: [fuzz-exec] calling __fuzz_split_func
+;; REVERSE: [fuzz-exec] export __fuzz_split_func
 ;; REVERSE: [fuzz-exec] note result: __fuzz_split_func => 999
 
 ;; Run with --fuzz-split, which does not run exports from the second one,
@@ -43,8 +43,8 @@
 ;;
 ;; RUN: node %S/../../../scripts/fuzz_shell.js %t.wasm %t.second.wasm --fuzz-split | filecheck %s --check-prefix=WASM_SPLIT
 ;;
-;; WASM_SPLIT: [fuzz-exec] calling first
+;; WASM_SPLIT: [fuzz-exec] export first
 ;; WASM_SPLIT: [fuzz-exec] note result: first => 42
-;; WASM_SPLIT-NOT: [fuzz-exec] calling second
-;; WASM_SPLIT-NOT: [fuzz-exec] calling __fuzz_split_func
+;; WASM_SPLIT-NOT: [fuzz-exec] export second
+;; WASM_SPLIT-NOT: [fuzz-exec] export __fuzz_split_func
 
diff --git a/test/passes/Oz_fuzz-exec_all-features.txt b/test/passes/Oz_fuzz-exec_all-features.txt
index 845a45d166c..495525d825c 100644
--- a/test/passes/Oz_fuzz-exec_all-features.txt
+++ b/test/passes/Oz_fuzz-exec_all-features.txt
@@ -1,59 +1,59 @@
-[fuzz-exec] calling structs
+[fuzz-exec] export structs
 [LoggingExternalInterface logging 0]
 [LoggingExternalInterface logging 42]
 [LoggingExternalInterface logging 100]
 [LoggingExternalInterface logging 100]
-[fuzz-exec] calling arrays
+[fuzz-exec] export arrays
 [LoggingExternalInterface logging 50]
 [LoggingExternalInterface logging 42]
 [LoggingExternalInterface logging 128]
 [LoggingExternalInterface logging -128]
 [LoggingExternalInterface logging 42]
-[fuzz-exec] calling br_on_cast
+[fuzz-exec] export br_on_cast
 [LoggingExternalInterface logging 3]
-[fuzz-exec] calling br_on_failed_cast-1
+[fuzz-exec] export br_on_failed_cast-1
 [LoggingExternalInterface logging 1]
-[fuzz-exec] calling br_on_failed_cast-2
+[fuzz-exec] export br_on_failed_cast-2
 [LoggingExternalInterface logging 1]
 [LoggingExternalInterface logging 999]
-[fuzz-exec] calling cast-null-anyref-to-gc
+[fuzz-exec] export cast-null-anyref-to-gc
 [LoggingExternalInterface logging 0]
-[fuzz-exec] calling br-on_non_null
-[fuzz-exec] calling br-on_non_null-2
+[fuzz-exec] export br-on_non_null
+[fuzz-exec] export br-on_non_null-2
 [LoggingExternalInterface logging 1]
 [trap unreachable]
-[fuzz-exec] calling ref-as-func-of-func
-[fuzz-exec] calling cast-on-func
+[fuzz-exec] export ref-as-func-of-func
+[fuzz-exec] export cast-on-func
 [LoggingExternalInterface logging 0]
 [LoggingExternalInterface logging 1337]
 [LoggingExternalInterface logging 1]
 [trap cast error]
-[fuzz-exec] calling array-alloc-failure
+[fuzz-exec] export array-alloc-failure
 [host limit allocation failure]
-[fuzz-exec] calling init-array-packed
+[fuzz-exec] export init-array-packed
 [fuzz-exec] note result: init-array-packed => 213
-[fuzz-exec] calling array-copy
+[fuzz-exec] export array-copy
 [LoggingExternalInterface logging 10]
 [LoggingExternalInterface logging 10]
 [LoggingExternalInterface logging 99]
 [LoggingExternalInterface logging 0]
 [LoggingExternalInterface logging 10]
-[fuzz-exec] calling array.new_fixed
+[fuzz-exec] export array.new_fixed
 [LoggingExternalInterface logging 2]
 [LoggingExternalInterface logging 42]
 [LoggingExternalInterface logging 50]
-[fuzz-exec] calling array.new_fixed-packed
+[fuzz-exec] export array.new_fixed-packed
 [LoggingExternalInterface logging 8]
-[fuzz-exec] calling static-casts
+[fuzz-exec] export static-casts
 [LoggingExternalInterface logging 1]
 [LoggingExternalInterface logging 0]
 [LoggingExternalInterface logging 0]
 [LoggingExternalInterface logging 1]
 [LoggingExternalInterface logging 0]
 [LoggingExternalInterface logging 1]
-[fuzz-exec] calling static-br_on_cast
+[fuzz-exec] export static-br_on_cast
 [LoggingExternalInterface logging 3]
-[fuzz-exec] calling static-br_on_cast_fail
+[fuzz-exec] export static-br_on_cast_fail
 [LoggingExternalInterface logging -2]
 (module
  (type $bytes (array (mut i8)))
@@ -303,64 +303,64 @@
   )
  )
 )
-[fuzz-exec] calling structs
+[fuzz-exec] export structs
 [LoggingExternalInterface logging 0]
 [LoggingExternalInterface logging 42]
 [LoggingExternalInterface logging 100]
 [LoggingExternalInterface logging 100]
-[fuzz-exec] calling arrays
+[fuzz-exec] export arrays
 [LoggingExternalInterface logging 50]
 [LoggingExternalInterface logging 42]
 [LoggingExternalInterface logging 128]
 [LoggingExternalInterface logging -128]
 [LoggingExternalInterface logging 42]
-[fuzz-exec] calling br_on_cast
+[fuzz-exec] export br_on_cast
 [LoggingExternalInterface logging 3]
-[fuzz-exec] calling br_on_failed_cast-1
+[fuzz-exec] export br_on_failed_cast-1
 [LoggingExternalInterface logging 1]
-[fuzz-exec] calling br_on_failed_cast-2
+[fuzz-exec] export br_on_failed_cast-2
 [LoggingExternalInterface logging 1]
 [LoggingExternalInterface logging 999]
-[fuzz-exec] calling cast-null-anyref-to-gc
+[fuzz-exec] export cast-null-anyref-to-gc
 [LoggingExternalInterface logging 0]
-[fuzz-exec] calling br-on_non_null
-[fuzz-exec] calling br-on_non_null-2
+[fuzz-exec] export br-on_non_null
+[fuzz-exec] export br-on_non_null-2
 [LoggingExternalInterface logging 1]
 [trap unreachable]
-[fuzz-exec] calling ref-as-func-of-func
-[fuzz-exec] calling cast-on-func
+[fuzz-exec] export ref-as-func-of-func
+[fuzz-exec] export cast-on-func
 [LoggingExternalInterface logging 0]
 [LoggingExternalInterface logging 1337]
 [LoggingExternalInterface logging 1]
 [trap unreachable]
-[fuzz-exec] calling array-alloc-failure
-[fuzz-exec] calling init-array-packed
+[fuzz-exec] export array-alloc-failure
+[fuzz-exec] export init-array-packed
 [fuzz-exec] note result: init-array-packed => 213
-[fuzz-exec] calling array-copy
+[fuzz-exec] export array-copy
 [LoggingExternalInterface logging 10]
 [LoggingExternalInterface logging 10]
 [LoggingExternalInterface logging 99]
 [LoggingExternalInterface logging 0]
 [LoggingExternalInterface logging 10]
-[fuzz-exec] calling array.new_fixed
+[fuzz-exec] export array.new_fixed
 [LoggingExternalInterface logging 2]
 [LoggingExternalInterface logging 42]
 [LoggingExternalInterface logging 50]
-[fuzz-exec] calling array.new_fixed-packed
+[fuzz-exec] export array.new_fixed-packed
 [LoggingExternalInterface logging 8]
-[fuzz-exec] calling static-casts
+[fuzz-exec] export static-casts
 [LoggingExternalInterface logging 1]
 [LoggingExternalInterface logging 0]
 [LoggingExternalInterface logging 0]
 [LoggingExternalInterface logging 1]
 [LoggingExternalInterface logging 0]
 [LoggingExternalInterface logging 1]
-[fuzz-exec] calling static-br_on_cast
+[fuzz-exec] export static-br_on_cast
 [LoggingExternalInterface logging 3]
-[fuzz-exec] calling static-br_on_cast_fail
+[fuzz-exec] export static-br_on_cast_fail
 [LoggingExternalInterface logging -2]
 ignoring comparison of ExecutionResults!
-[fuzz-exec] calling foo
+[fuzz-exec] export foo
 [host limit allocation failure]
 (module
  (type $0 (func (result i32)))
@@ -369,6 +369,6 @@ ignoring comparison of ExecutionResults!
   (i32.const 0)
  )
 )
-[fuzz-exec] calling foo
+[fuzz-exec] export foo
 [fuzz-exec] note result: foo => 0
 ignoring comparison of ExecutionResults!
diff --git a/test/passes/fuzz-exec_O.txt b/test/passes/fuzz-exec_O.txt
index d9e1cf79115..f6848aebb5f 100644
--- a/test/passes/fuzz-exec_O.txt
+++ b/test/passes/fuzz-exec_O.txt
@@ -1,6 +1,6 @@
-[fuzz-exec] calling func_0
+[fuzz-exec] export func_0
 [trap final > memory: 4294967295 > 65514]
-[fuzz-exec] calling func_1
+[fuzz-exec] export func_1
 [trap final > memory: 4294967295 > 65514]
 (module
  (type $0 (func (result i64)))
@@ -24,29 +24,29 @@
   )
  )
 )
-[fuzz-exec] calling func_0
+[fuzz-exec] export func_0
 [trap final > memory: 4294967295 > 65514]
-[fuzz-exec] calling func_1
+[fuzz-exec] export func_1
 [trap final > memory: 4294967295 > 65514]
 [fuzz-exec] comparing func_0
 [fuzz-exec] comparing func_1
-[fuzz-exec] calling div
+[fuzz-exec] export div
 [fuzz-exec] note result: div => nan:0x400000
-[fuzz-exec] calling mul1
+[fuzz-exec] export mul1
 [fuzz-exec] note result: mul1 => nan:0x400000
-[fuzz-exec] calling mul2
+[fuzz-exec] export mul2
 [fuzz-exec] note result: mul2 => nan:0x400000
-[fuzz-exec] calling add1
+[fuzz-exec] export add1
 [fuzz-exec] note result: add1 => nan:0x400000
-[fuzz-exec] calling add2
+[fuzz-exec] export add2
 [fuzz-exec] note result: add2 => nan:0x400000
-[fuzz-exec] calling add3
+[fuzz-exec] export add3
 [fuzz-exec] note result: add3 => nan:0x400000
-[fuzz-exec] calling add4
+[fuzz-exec] export add4
 [fuzz-exec] note result: add4 => nan:0x400000
-[fuzz-exec] calling sub1
+[fuzz-exec] export sub1
 [fuzz-exec] note result: sub1 => nan:0x400000
-[fuzz-exec] calling sub2
+[fuzz-exec] export sub2
 [fuzz-exec] note result: sub2 => nan:0x400000
 (module
  (type $0 (func (result f32)))
@@ -63,23 +63,23 @@
   (f32.const nan:0x400000)
  )
 )
-[fuzz-exec] calling div
+[fuzz-exec] export div
 [fuzz-exec] note result: div => nan:0x400000
-[fuzz-exec] calling mul1
+[fuzz-exec] export mul1
 [fuzz-exec] note result: mul1 => nan:0x400000
-[fuzz-exec] calling mul2
+[fuzz-exec] export mul2
 [fuzz-exec] note result: mul2 => nan:0x400000
-[fuzz-exec] calling add1
+[fuzz-exec] export add1
 [fuzz-exec] note result: add1 => nan:0x400000
-[fuzz-exec] calling add2
+[fuzz-exec] export add2
 [fuzz-exec] note result: add2 => nan:0x400000
-[fuzz-exec] calling add3
+[fuzz-exec] export add3
 [fuzz-exec] note result: add3 => nan:0x400000
-[fuzz-exec] calling add4
+[fuzz-exec] export add4
 [fuzz-exec] note result: add4 => nan:0x400000
-[fuzz-exec] calling sub1
+[fuzz-exec] export sub1
 [fuzz-exec] note result: sub1 => nan:0x400000
-[fuzz-exec] calling sub2
+[fuzz-exec] export sub2
 [fuzz-exec] note result: sub2 => nan:0x400000
 [fuzz-exec] comparing add1
 [fuzz-exec] comparing add2
diff --git a/test/passes/fuzz-exec_all-features.txt b/test/passes/fuzz-exec_all-features.txt
index 16588f7ada4..222c59bd65e 100644
--- a/test/passes/fuzz-exec_all-features.txt
+++ b/test/passes/fuzz-exec_all-features.txt
@@ -1,12 +1,12 @@
-[fuzz-exec] calling a
+[fuzz-exec] export a
 [fuzz-exec] note result: a => -69
-[fuzz-exec] calling b
+[fuzz-exec] export b
 [fuzz-exec] note result: b => -31768
-[fuzz-exec] calling c
+[fuzz-exec] export c
 [fuzz-exec] note result: c => -69
-[fuzz-exec] calling d
+[fuzz-exec] export d
 [fuzz-exec] note result: d => -31768
-[fuzz-exec] calling e
+[fuzz-exec] export e
 [fuzz-exec] note result: e => -2146649112
 (module
  (type $0 (func (result i64)))
@@ -42,32 +42,32 @@
   )
  )
 )
-[fuzz-exec] calling a
+[fuzz-exec] export a
 [fuzz-exec] note result: a => -69
-[fuzz-exec] calling b
+[fuzz-exec] export b
 [fuzz-exec] note result: b => -31768
-[fuzz-exec] calling c
+[fuzz-exec] export c
 [fuzz-exec] note result: c => -69
-[fuzz-exec] calling d
+[fuzz-exec] export d
 [fuzz-exec] note result: d => -31768
-[fuzz-exec] calling e
+[fuzz-exec] export e
 [fuzz-exec] note result: e => -2146649112
 [fuzz-exec] comparing a
 [fuzz-exec] comparing b
 [fuzz-exec] comparing c
 [fuzz-exec] comparing d
 [fuzz-exec] comparing e
-[fuzz-exec] calling unaligned_load
+[fuzz-exec] export unaligned_load
 [trap unaligned atomic operation]
-[fuzz-exec] calling unaligned_load_offset
+[fuzz-exec] export unaligned_load_offset
 [trap unaligned atomic operation]
-[fuzz-exec] calling aligned_for_size
+[fuzz-exec] export aligned_for_size
 [fuzz-exec] note result: aligned_for_size => 0
-[fuzz-exec] calling unaligned_notify
+[fuzz-exec] export unaligned_notify
 [trap unaligned atomic operation]
-[fuzz-exec] calling wrap_cmpxchg
+[fuzz-exec] export wrap_cmpxchg
 [LoggingExternalInterface logging 42]
-[fuzz-exec] calling oob_notify
+[fuzz-exec] export oob_notify
 [trap final > memory: 4294967192 > 65514]
 (module
  (type $0 (func (result i32)))
@@ -126,17 +126,17 @@
   )
  )
 )
-[fuzz-exec] calling unaligned_load
+[fuzz-exec] export unaligned_load
 [trap unaligned atomic operation]
-[fuzz-exec] calling unaligned_load_offset
+[fuzz-exec] export unaligned_load_offset
 [trap unaligned atomic operation]
-[fuzz-exec] calling aligned_for_size
+[fuzz-exec] export aligned_for_size
 [fuzz-exec] note result: aligned_for_size => 0
-[fuzz-exec] calling unaligned_notify
+[fuzz-exec] export unaligned_notify
 [trap unaligned atomic operation]
-[fuzz-exec] calling wrap_cmpxchg
+[fuzz-exec] export wrap_cmpxchg
 [LoggingExternalInterface logging 42]
-[fuzz-exec] calling oob_notify
+[fuzz-exec] export oob_notify
 [trap final > memory: 4294967192 > 65514]
 [fuzz-exec] comparing aligned_for_size
 [fuzz-exec] comparing oob_notify
@@ -144,7 +144,7 @@
 [fuzz-exec] comparing unaligned_load_offset
 [fuzz-exec] comparing unaligned_notify
 [fuzz-exec] comparing wrap_cmpxchg
-[fuzz-exec] calling unsigned_2_bytes
+[fuzz-exec] export unsigned_2_bytes
 [fuzz-exec] note result: unsigned_2_bytes => 65535
 (module
  (type $0 (func (result i32)))
@@ -158,10 +158,10 @@
   )
  )
 )
-[fuzz-exec] calling unsigned_2_bytes
+[fuzz-exec] export unsigned_2_bytes
 [fuzz-exec] note result: unsigned_2_bytes => 65535
 [fuzz-exec] comparing unsigned_2_bytes
-[fuzz-exec] calling rmw-reads-modifies-and-writes
+[fuzz-exec] export rmw-reads-modifies-and-writes
 [LoggingExternalInterface logging 0]
 (module
  (type $0 (func (param i32)))
@@ -183,10 +183,10 @@
   )
  )
 )
-[fuzz-exec] calling rmw-reads-modifies-and-writes
+[fuzz-exec] export rmw-reads-modifies-and-writes
 [LoggingExternalInterface logging 0]
 [fuzz-exec] comparing rmw-reads-modifies-and-writes
-[fuzz-exec] calling rmw-reads-modifies-and-writes-asymmetrical
+[fuzz-exec] export rmw-reads-modifies-and-writes-asymmetrical
 [LoggingExternalInterface logging 214]
 (module
  (type $0 (func (param i32)))
@@ -208,10 +208,10 @@
   )
  )
 )
-[fuzz-exec] calling rmw-reads-modifies-and-writes-asymmetrical
+[fuzz-exec] export rmw-reads-modifies-and-writes-asymmetrical
 [LoggingExternalInterface logging 214]
 [fuzz-exec] comparing rmw-reads-modifies-and-writes-asymmetrical
-[fuzz-exec] calling func
+[fuzz-exec] export func
 [fuzz-exec] note result: func => function
 (module
  (type $0 (func (result funcref)))
@@ -221,6 +221,6 @@
   (ref.func $func)
  )
 )
-[fuzz-exec] calling func
+[fuzz-exec] export func
 [fuzz-exec] note result: func => function
 [fuzz-exec] comparing func
diff --git a/test/passes/optimize-instructions_fuzz-exec.txt b/test/passes/optimize-instructions_fuzz-exec.txt
index 4b552c0606d..141b9a94390 100644
--- a/test/passes/optimize-instructions_fuzz-exec.txt
+++ b/test/passes/optimize-instructions_fuzz-exec.txt
@@ -1,4 +1,4 @@
-[fuzz-exec] calling test32
+[fuzz-exec] export test32
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
@@ -6,7 +6,7 @@
 [LoggingExternalInterface logging nan:0x7fff82]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
-[fuzz-exec] calling test64
+[fuzz-exec] export test64
 [LoggingExternalInterface logging nan:0x8000000000000]
 [LoggingExternalInterface logging nan:0x8000000000000]
 [LoggingExternalInterface logging nan:0x8000000000000]
@@ -14,14 +14,14 @@
 [LoggingExternalInterface logging nan:0xfffffffffff82]
 [LoggingExternalInterface logging nan:0x8000000000000]
 [LoggingExternalInterface logging nan:0x8000000000000]
-[fuzz-exec] calling just-one-nan
+[fuzz-exec] export just-one-nan
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
-[fuzz-exec] calling ignore
+[fuzz-exec] export ignore
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
@@ -158,7 +158,7 @@
   )
  )
 )
-[fuzz-exec] calling test32
+[fuzz-exec] export test32
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
@@ -166,7 +166,7 @@
 [LoggingExternalInterface logging nan:0x7fff82]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
-[fuzz-exec] calling test64
+[fuzz-exec] export test64
 [LoggingExternalInterface logging nan:0x8000000000000]
 [LoggingExternalInterface logging nan:0x8000000000000]
 [LoggingExternalInterface logging nan:0x8000000000000]
@@ -174,14 +174,14 @@
 [LoggingExternalInterface logging nan:0xfffffffffff82]
 [LoggingExternalInterface logging nan:0x8000000000000]
 [LoggingExternalInterface logging nan:0x8000000000000]
-[fuzz-exec] calling just-one-nan
+[fuzz-exec] export just-one-nan
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
-[fuzz-exec] calling ignore
+[fuzz-exec] export ignore
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
 [LoggingExternalInterface logging nan:0x400000]
@@ -190,15 +190,15 @@
 [fuzz-exec] comparing just-one-nan
 [fuzz-exec] comparing test32
 [fuzz-exec] comparing test64
-[fuzz-exec] calling foo
+[fuzz-exec] export foo
 [LoggingExternalInterface logging 1]
 [LoggingExternalInterface logging 1]
 [LoggingExternalInterface logging 0]
-[fuzz-exec] calling do-shift
+[fuzz-exec] export do-shift
 [LoggingExternalInterface logging -64]
-[fuzz-exec] calling call-compare-maybe-signed-eq
+[fuzz-exec] export call-compare-maybe-signed-eq
 [fuzz-exec] note result: call-compare-maybe-signed-eq => 0
-[fuzz-exec] calling call-compare-maybe-signed-ne
+[fuzz-exec] export call-compare-maybe-signed-ne
 [fuzz-exec] note result: call-compare-maybe-signed-ne => 1
 (module
  (type $0 (func (param i32)))
@@ -299,15 +299,15 @@
   )
  )
 )
-[fuzz-exec] calling foo
+[fuzz-exec] export foo
 [LoggingExternalInterface logging 1]
 [LoggingExternalInterface logging 1]
 [LoggingExternalInterface logging 0]
-[fuzz-exec] calling do-shift
+[fuzz-exec] export do-shift
 [LoggingExternalInterface logging -64]
-[fuzz-exec] calling call-compare-maybe-signed-eq
+[fuzz-exec] export call-compare-maybe-signed-eq
 [fuzz-exec] note result: call-compare-maybe-signed-eq => 0
-[fuzz-exec] calling call-compare-maybe-signed-ne
+[fuzz-exec] export call-compare-maybe-signed-ne
 [fuzz-exec] note result: call-compare-maybe-signed-ne => 1
 [fuzz-exec] comparing call-compare-maybe-signed-eq
 [fuzz-exec] comparing call-compare-maybe-signed-ne
diff --git a/test/passes/simplify-globals_all-features_fuzz-exec.txt b/test/passes/simplify-globals_all-features_fuzz-exec.txt
index cb097d58728..1b45778afb4 100644
--- a/test/passes/simplify-globals_all-features_fuzz-exec.txt
+++ b/test/passes/simplify-globals_all-features_fuzz-exec.txt
@@ -1,4 +1,4 @@
-[fuzz-exec] calling export
+[fuzz-exec] export export
 [fuzz-exec] note result: export => function
 (module
  (type $0 (func (param f32 i31ref i64 f64 funcref)))
@@ -16,6 +16,6 @@
   (ref.func $0)
  )
 )
-[fuzz-exec] calling export
+[fuzz-exec] export export
 [fuzz-exec] note result: export => function
 [fuzz-exec] comparing export
diff --git a/test/passes/ssa_fuzz-exec_enable-threads.txt b/test/passes/ssa_fuzz-exec_enable-threads.txt
index 04d6ef59a6e..ccc8b87ec0a 100644
--- a/test/passes/ssa_fuzz-exec_enable-threads.txt
+++ b/test/passes/ssa_fuzz-exec_enable-threads.txt
@@ -1,4 +1,4 @@
-[fuzz-exec] calling func_0
+[fuzz-exec] export func_0
 [fuzz-exec] note result: func_0 => 16384
 (module
  (type $0 (func (result i32)))
@@ -140,6 +140,6 @@
   )
  )
 )
-[fuzz-exec] calling func_0
+[fuzz-exec] export func_0
 [fuzz-exec] note result: func_0 => 16384
 [fuzz-exec] comparing func_0
diff --git a/test/unit/test_cluster_fuzz.py b/test/unit/test_cluster_fuzz.py
index d1ffc10253c..5dae09cc06f 100644
--- a/test/unit/test_cluster_fuzz.py
+++ b/test/unit/test_cluster_fuzz.py
@@ -450,7 +450,7 @@ def test_file_contents(self):
                 # managed to run some code before exiting (modules with no
                 # exports will be considered "invalid" here, but that is very
                 # rare, and in a sense they are actually unuseful).
-                if proc.returncode == 0 and b'[fuzz-exec] calling ' in proc.stdout:
+                if proc.returncode == 0 and b'[fuzz-exec] export ' in proc.stdout:
                     valid_executions += 1
                 else:
                     print('====')