16 files changed, 13 insertions, 13 deletions
diff --git a/test/parse/module/bad-export-empty.txt b/test/parse/module/bad-export-func-empty.txt
index cfc1084c..8cadf9f1 100644
--- a/test/parse/module/bad-export-empty.txt
+++ b/test/parse/module/bad-export-func-empty.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
 (module (export))
 (;; STDERR ;;;
-parse/module/bad-export-empty.txt:2:16: syntax error, unexpected ), expecting TEXT
+parse/module/bad-export-func-empty.txt:2:16: syntax error, unexpected ), expecting TEXT
 (module (export))
                ^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-export-name-undefined.txt b/test/parse/module/bad-export-func-name-undefined.txt
index 40352dab..9456a920 100644
--- a/test/parse/module/bad-export-name-undefined.txt
+++ b/test/parse/module/bad-export-func-name-undefined.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
 (module (export "foo" (func $foo)))
 (;; STDERR ;;;
-parse/module/bad-export-name-undefined.txt:2:29: undefined function variable "$foo"
+parse/module/bad-export-func-name-undefined.txt:2:29: undefined function variable "$foo"
 (module (export "foo" (func $foo)))
                             ^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-export-name.txt b/test/parse/module/bad-export-func-name.txt
index 7695230d..554401e6 100644
--- a/test/parse/module/bad-export-name.txt
+++ b/test/parse/module/bad-export-func-name.txt
@@ -1,10 +1,10 @@
 ;;; ERROR: 1
 (module (export "foo" (func foo)))
 (;; STDERR ;;;
-parse/module/bad-export-name.txt:2:29: unexpected token "foo"
+parse/module/bad-export-func-name.txt:2:29: unexpected token "foo"
 (module (export "foo" (func foo)))
                             ^^^
-parse/module/bad-export-name.txt:2:32: syntax error, unexpected ), expecting NAT or VAR
+parse/module/bad-export-func-name.txt:2:32: syntax error, unexpected ), expecting NAT or VAR
 (module (export "foo" (func foo)))
                                ^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-export-no-string.txt b/test/parse/module/bad-export-func-no-string.txt
index ec573001..5f8f91aa 100644
--- a/test/parse/module/bad-export-no-string.txt
+++ b/test/parse/module/bad-export-func-no-string.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
 (module (func (nop)) (export nop nop))
 (;; STDERR ;;;
-parse/module/bad-export-no-string.txt:2:30: syntax error, unexpected NOP, expecting TEXT
+parse/module/bad-export-func-no-string.txt:2:30: syntax error, unexpected NOP, expecting TEXT
 (module (func (nop)) (export nop nop))
                              ^^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-export-too-many.txt b/test/parse/module/bad-export-func-too-many.txt
index b4938249..7a101ce0 100644
--- a/test/parse/module/bad-export-too-many.txt
+++ b/test/parse/module/bad-export-func-too-many.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
 (module (func (nop)) (export "nop" (func 0 foo)))
 (;; STDERR ;;;
-parse/module/bad-export-too-many.txt:2:44: unexpected token "foo"
+parse/module/bad-export-func-too-many.txt:2:44: unexpected token "foo"
 (module (func (nop)) (export "nop" (func 0 foo)))
                                            ^^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-export-undefined.txt b/test/parse/module/bad-export-func-undefined.txt
index c2066dc7..0f68d21f 100644
--- a/test/parse/module/bad-export-undefined.txt
+++ b/test/parse/module/bad-export-func-undefined.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
 (module (export "foo" (func 0)))
 (;; STDERR ;;;
-parse/module/bad-export-undefined.txt:2:29: function variable out of range (max 0)
+parse/module/bad-export-func-undefined.txt:2:29: function variable out of range (max 0)
 (module (export "foo" (func 0)))
                             ^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-import-not-param.txt b/test/parse/module/bad-import-func-not-param.txt
index 4738332e..551cd8a1 100644
--- a/test/parse/module/bad-import-not-param.txt
+++ b/test/parse/module/bad-import-func-not-param.txt
@@ -1,10 +1,10 @@
 ;;; ERROR: 1
 (module (import "foo" "bar" (func (parump i32))))
 (;; STDERR ;;;
-parse/module/bad-import-not-param.txt:2:36: unexpected token "parump"
+parse/module/bad-import-func-not-param.txt:2:36: unexpected token "parump"
 (module (import "foo" "bar" (func (parump i32))))
                                    ^^^^^^
-parse/module/bad-import-not-param.txt:2:43: syntax error, unexpected VALUE_TYPE, expecting TYPE or PARAM or RESULT
+parse/module/bad-import-func-not-param.txt:2:43: syntax error, unexpected VALUE_TYPE, expecting TYPE or PARAM or RESULT
 (module (import "foo" "bar" (func (parump i32))))
                                           ^^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-import-not-result.txt b/test/parse/module/bad-import-func-not-result.txt
index 61051d3d..6e6b9754 100644
--- a/test/parse/module/bad-import-not-result.txt
+++ b/test/parse/module/bad-import-func-not-result.txt
@@ -1,10 +1,10 @@
 ;;; ERROR: 1
 (module (import "foo" "bar" (func (param i32) (resalt i32))))
 (;; STDERR ;;;
-parse/module/bad-import-not-result.txt:2:48: unexpected token "resalt"
+parse/module/bad-import-func-not-result.txt:2:48: unexpected token "resalt"
 (module (import "foo" "bar" (func (param i32) (resalt i32))))
                                                ^^^^^^
-parse/module/bad-import-not-result.txt:2:55: syntax error, unexpected VALUE_TYPE, expecting RESULT
+parse/module/bad-import-func-not-result.txt:2:55: syntax error, unexpected VALUE_TYPE, expecting RESULT
 (module (import "foo" "bar" (func (param i32) (resalt i32))))
                                                       ^^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-import-one-string.txt b/test/parse/module/bad-import-func-one-string.txt
index 6334e7dc..a040a23a 100644
--- a/test/parse/module/bad-import-one-string.txt
+++ b/test/parse/module/bad-import-func-one-string.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
 (module (import "foo" (param i32)))
 (;; STDERR ;;;
-parse/module/bad-import-one-string.txt:2:23: syntax error, unexpected (, expecting TEXT
+parse/module/bad-import-func-one-string.txt:2:23: syntax error, unexpected (, expecting TEXT
 (module (import "foo" (param i32)))
                       ^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-import-redefinition.txt b/test/parse/module/bad-import-func-redefinition.txt
index 267478e2..62c038b3 100644
--- a/test/parse/module/bad-import-redefinition.txt
+++ b/test/parse/module/bad-import-func-redefinition.txt
@@ -3,7 +3,7 @@
   (import "bar" "baz" (func $foo (param i32)))
   (import "quux" "blorf" (func $foo (param f32))))
 (;; STDERR ;;;
-parse/module/bad-import-redefinition.txt:4:3: redefinition of function "$foo"
+parse/module/bad-import-func-redefinition.txt:4:3: redefinition of function "$foo"
   (import "quux" "blorf" (func $foo (param f32))))
   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/export-multi.txt b/test/parse/module/export-func-multi.txt
index 30d2231f..30d2231f 100644
--- a/test/parse/module/export-multi.txt
+++ b/test/parse/module/export-func-multi.txt
diff --git a/test/parse/module/export-named.txt b/test/parse/module/export-func-named.txt
index 8ebe5997..8ebe5997 100644
--- a/test/parse/module/export-named.txt
+++ b/test/parse/module/export-func-named.txt
diff --git a/test/parse/module/export.txt b/test/parse/module/export-func.txt
index 1892a220..1892a220 100644
--- a/test/parse/module/export.txt
+++ b/test/parse/module/export-func.txt
diff --git a/test/parse/module/import-no-param.txt b/test/parse/module/import-func-no-param.txt
index 9302e924..9302e924 100644
--- a/test/parse/module/import-no-param.txt
+++ b/test/parse/module/import-func-no-param.txt
diff --git a/test/parse/module/import-type.txt b/test/parse/module/import-func-type.txt
index 9f31b90b..9f31b90b 100644
--- a/test/parse/module/import-type.txt
+++ b/test/parse/module/import-func-type.txt
diff --git a/test/parse/module/import.txt b/test/parse/module/import-func.txt
index a999e017..a999e017 100644
--- a/test/parse/module/import.txt
+++ b/test/parse/module/import-func.txt