diff --git a/test/lit/basic/exception-handling-old.wast b/test/lit/basic/exception-handling-legacy.wast
similarity index 100%
rename from test/lit/basic/exception-handling-old.wast
rename to test/lit/basic/exception-handling-legacy.wast
diff --git a/test/lit/binary/stacky-eh-old.test b/test/lit/binary/stacky-eh-legacy.test
similarity index 100%
rename from test/lit/binary/stacky-eh-old.test
rename to test/lit/binary/stacky-eh-legacy.test
diff --git a/test/lit/binary/stacky-eh-old.test.wasm b/test/lit/binary/stacky-eh-legacy.test.wasm
similarity index 100%
rename from test/lit/binary/stacky-eh-old.test.wasm
rename to test/lit/binary/stacky-eh-legacy.test.wasm
diff --git a/test/lit/exec/eh-old-gc.wast b/test/lit/exec/eh-legacy-gc.wast
similarity index 100%
rename from test/lit/exec/eh-old-gc.wast
rename to test/lit/exec/eh-legacy-gc.wast
diff --git a/test/lit/exec/eh-old-print.wast b/test/lit/exec/eh-legacy-print.wast
similarity index 100%
rename from test/lit/exec/eh-old-print.wast
rename to test/lit/exec/eh-legacy-print.wast
diff --git a/test/lit/exec/eh-old.wast b/test/lit/exec/eh-legacy.wast
similarity index 100%
rename from test/lit/exec/eh-old.wast
rename to test/lit/exec/eh-legacy.wast
diff --git a/test/lit/gc-eh-old.wast b/test/lit/gc-eh-legacy.wast
similarity index 100%
rename from test/lit/gc-eh-old.wast
rename to test/lit/gc-eh-legacy.wast
diff --git a/test/lit/passes/coalesce-locals-eh-old.wast b/test/lit/passes/coalesce-locals-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/coalesce-locals-eh-old.wast
rename to test/lit/passes/coalesce-locals-eh-legacy.wast
diff --git a/test/lit/passes/code-folding-eh-old.wast b/test/lit/passes/code-folding-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/code-folding-eh-old.wast
rename to test/lit/passes/code-folding-eh-legacy.wast
diff --git a/test/lit/passes/code-pushing-eh-old.wast b/test/lit/passes/code-pushing-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/code-pushing-eh-old.wast
rename to test/lit/passes/code-pushing-eh-legacy.wast
diff --git a/test/lit/passes/dce-eh-old.wast b/test/lit/passes/dce-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/dce-eh-old.wast
rename to test/lit/passes/dce-eh-legacy.wast
diff --git a/test/lit/passes/flatten-eh-old.wast b/test/lit/passes/flatten-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/flatten-eh-old.wast
rename to test/lit/passes/flatten-eh-legacy.wast
diff --git a/test/lit/passes/inlining-eh-old.wast b/test/lit/passes/inlining-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/inlining-eh-old.wast
rename to test/lit/passes/inlining-eh-legacy.wast
diff --git a/test/lit/passes/instrument-locals-eh-old.wast b/test/lit/passes/instrument-locals-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/instrument-locals-eh-old.wast
rename to test/lit/passes/instrument-locals-eh-legacy.wast
diff --git a/test/lit/passes/optimize-instructions-eh-old.wast b/test/lit/passes/optimize-instructions-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/optimize-instructions-eh-old.wast
rename to test/lit/passes/optimize-instructions-eh-legacy.wast
diff --git a/test/lit/passes/optimize-instructions-iit-eh-old.wast b/test/lit/passes/optimize-instructions-iit-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/optimize-instructions-iit-eh-old.wast
rename to test/lit/passes/optimize-instructions-iit-eh-legacy.wast
diff --git a/test/lit/passes/remove-unused-module-elements-eh-old.wast b/test/lit/passes/remove-unused-module-elements-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/remove-unused-module-elements-eh-old.wast
rename to test/lit/passes/remove-unused-module-elements-eh-legacy.wast
diff --git a/test/lit/passes/remove-unused-names-eh-old.wast b/test/lit/passes/remove-unused-names-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/remove-unused-names-eh-old.wast
rename to test/lit/passes/remove-unused-names-eh-legacy.wast
diff --git a/test/lit/passes/rse-eh-old.wast b/test/lit/passes/rse-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/rse-eh-old.wast
rename to test/lit/passes/rse-eh-legacy.wast
diff --git a/test/lit/passes/simplify-locals-eh-old.wast b/test/lit/passes/simplify-locals-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/simplify-locals-eh-old.wast
rename to test/lit/passes/simplify-locals-eh-legacy.wast
diff --git a/test/lit/passes/stack-ir-eh-old.wast b/test/lit/passes/stack-ir-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/stack-ir-eh-old.wast
rename to test/lit/passes/stack-ir-eh-legacy.wast
diff --git a/test/lit/passes/stack-ir-roundtrip-eh-old.wast b/test/lit/passes/stack-ir-roundtrip-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/stack-ir-roundtrip-eh-old.wast
rename to test/lit/passes/stack-ir-roundtrip-eh-legacy.wast
diff --git a/test/lit/passes/strip-eh-old.wast b/test/lit/passes/strip-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/strip-eh-old.wast
rename to test/lit/passes/strip-eh-legacy.wast
diff --git a/test/lit/passes/vacuum-eh-old.wast b/test/lit/passes/vacuum-eh-legacy.wast
similarity index 100%
rename from test/lit/passes/vacuum-eh-old.wast
rename to test/lit/passes/vacuum-eh-legacy.wast
diff --git a/test/spec/exception-handling-old.wast b/test/spec/exception-handling-legacy.wast
similarity index 100%
rename from test/spec/exception-handling-old.wast
rename to test/spec/exception-handling-legacy.wast