diff --git a/src/test/compile-fail/bad-alt.rs b/src/test/compile-fail/bad-match.rs
similarity index 100%
rename from src/test/compile-fail/bad-alt.rs
rename to src/test/compile-fail/bad-match.rs
diff --git a/src/test/compile-fail/alt-arrows-block-then-binop.rs b/src/test/compile-fail/match-arrows-block-then-binop.rs
similarity index 100%
rename from src/test/compile-fail/alt-arrows-block-then-binop.rs
rename to src/test/compile-fail/match-arrows-block-then-binop.rs
diff --git a/src/test/compile-fail/alt-join.rs b/src/test/compile-fail/match-join.rs
similarity index 100%
rename from src/test/compile-fail/alt-join.rs
rename to src/test/compile-fail/match-join.rs
diff --git a/src/test/compile-fail/alt-pattern-field-mismatch-2.rs b/src/test/compile-fail/match-pattern-field-mismatch-2.rs
similarity index 100%
rename from src/test/compile-fail/alt-pattern-field-mismatch-2.rs
rename to src/test/compile-fail/match-pattern-field-mismatch-2.rs
diff --git a/src/test/compile-fail/alt-pattern-field-mismatch.rs b/src/test/compile-fail/match-pattern-field-mismatch.rs
similarity index 100%
rename from src/test/compile-fail/alt-pattern-field-mismatch.rs
rename to src/test/compile-fail/match-pattern-field-mismatch.rs
diff --git a/src/test/compile-fail/alt-range-fail-dominate.rs b/src/test/compile-fail/match-range-fail-dominate.rs
similarity index 100%
rename from src/test/compile-fail/alt-range-fail-dominate.rs
rename to src/test/compile-fail/match-range-fail-dominate.rs
diff --git a/src/test/compile-fail/alt-range-fail.rs b/src/test/compile-fail/match-range-fail.rs
similarity index 100%
rename from src/test/compile-fail/alt-range-fail.rs
rename to src/test/compile-fail/match-range-fail.rs
diff --git a/src/test/compile-fail/alt-tag-nullary.rs b/src/test/compile-fail/match-tag-nullary.rs
similarity index 100%
rename from src/test/compile-fail/alt-tag-nullary.rs
rename to src/test/compile-fail/match-tag-nullary.rs
diff --git a/src/test/compile-fail/alt-tag-unary.rs b/src/test/compile-fail/match-tag-unary.rs
similarity index 100%
rename from src/test/compile-fail/alt-tag-unary.rs
rename to src/test/compile-fail/match-tag-unary.rs
diff --git a/src/test/compile-fail/alt-vec-invalid.rs b/src/test/compile-fail/match-vec-invalid.rs
similarity index 100%
rename from src/test/compile-fail/alt-vec-invalid.rs
rename to src/test/compile-fail/match-vec-invalid.rs
diff --git a/src/test/compile-fail/alt-vec-mismatch-2.rs b/src/test/compile-fail/match-vec-mismatch-2.rs
similarity index 100%
rename from src/test/compile-fail/alt-vec-mismatch-2.rs
rename to src/test/compile-fail/match-vec-mismatch-2.rs
diff --git a/src/test/compile-fail/alt-vec-mismatch.rs b/src/test/compile-fail/match-vec-mismatch.rs
similarity index 100%
rename from src/test/compile-fail/alt-vec-mismatch.rs
rename to src/test/compile-fail/match-vec-mismatch.rs
diff --git a/src/test/compile-fail/alt-vec-unreachable.rs b/src/test/compile-fail/match-vec-unreachable.rs
similarity index 100%
rename from src/test/compile-fail/alt-vec-unreachable.rs
rename to src/test/compile-fail/match-vec-unreachable.rs
diff --git a/src/test/pretty/alt-naked-expr-long.rs b/src/test/pretty/match-naked-expr-long.rs
similarity index 100%
rename from src/test/pretty/alt-naked-expr-long.rs
rename to src/test/pretty/match-naked-expr-long.rs
diff --git a/src/test/pretty/alt-naked-expr-medium.rs b/src/test/pretty/match-naked-expr-medium.rs
similarity index 100%
rename from src/test/pretty/alt-naked-expr-medium.rs
rename to src/test/pretty/match-naked-expr-medium.rs
diff --git a/src/test/pretty/alt-naked-expr.rs b/src/test/pretty/match-naked-expr.rs
similarity index 100%
rename from src/test/pretty/alt-naked-expr.rs
rename to src/test/pretty/match-naked-expr.rs
diff --git a/src/test/run-fail/expr-alt-fail-fn.rs b/src/test/run-fail/expr-match-fail-fn.rs
similarity index 100%
rename from src/test/run-fail/expr-alt-fail-fn.rs
rename to src/test/run-fail/expr-match-fail-fn.rs
diff --git a/src/test/run-fail/expr-alt-fail.rs b/src/test/run-fail/expr-match-fail.rs
similarity index 100%
rename from src/test/run-fail/expr-alt-fail.rs
rename to src/test/run-fail/expr-match-fail.rs
diff --git a/src/test/run-fail/alt-bot-fail.rs b/src/test/run-fail/match-bot-fail.rs
similarity index 100%
rename from src/test/run-fail/alt-bot-fail.rs
rename to src/test/run-fail/match-bot-fail.rs
diff --git a/src/test/run-fail/alt-disc-bot.rs b/src/test/run-fail/match-disc-bot.rs
similarity index 100%
rename from src/test/run-fail/alt-disc-bot.rs
rename to src/test/run-fail/match-disc-bot.rs
diff --git a/src/test/run-fail/alt-wildcards.rs b/src/test/run-fail/match-wildcards.rs
similarity index 100%
rename from src/test/run-fail/alt-wildcards.rs
rename to src/test/run-fail/match-wildcards.rs
diff --git a/src/test/run-fail/unwind-alt.rs b/src/test/run-fail/unwind-match.rs
similarity index 100%
rename from src/test/run-fail/unwind-alt.rs
rename to src/test/run-fail/unwind-match.rs
diff --git a/src/test/run-pass/expr-alt-box.rs b/src/test/run-pass/expr-match-box.rs
similarity index 100%
rename from src/test/run-pass/expr-alt-box.rs
rename to src/test/run-pass/expr-match-box.rs
diff --git a/src/test/run-pass/expr-alt-fail-all.rs b/src/test/run-pass/expr-match-fail-all.rs
similarity index 100%
rename from src/test/run-pass/expr-alt-fail-all.rs
rename to src/test/run-pass/expr-match-fail-all.rs
diff --git a/src/test/run-pass/expr-alt-fail.rs b/src/test/run-pass/expr-match-fail.rs
similarity index 100%
rename from src/test/run-pass/expr-alt-fail.rs
rename to src/test/run-pass/expr-match-fail.rs
diff --git a/src/test/run-pass/expr-alt-generic-box1.rs b/src/test/run-pass/expr-match-generic-box1.rs
similarity index 100%
rename from src/test/run-pass/expr-alt-generic-box1.rs
rename to src/test/run-pass/expr-match-generic-box1.rs
diff --git a/src/test/run-pass/expr-alt-generic-box2.rs b/src/test/run-pass/expr-match-generic-box2.rs
similarity index 100%
rename from src/test/run-pass/expr-alt-generic-box2.rs
rename to src/test/run-pass/expr-match-generic-box2.rs
diff --git a/src/test/run-pass/expr-alt-generic-unique1.rs b/src/test/run-pass/expr-match-generic-unique1.rs
similarity index 100%
rename from src/test/run-pass/expr-alt-generic-unique1.rs
rename to src/test/run-pass/expr-match-generic-unique1.rs
diff --git a/src/test/run-pass/expr-alt-generic-unique2.rs b/src/test/run-pass/expr-match-generic-unique2.rs
similarity index 100%
rename from src/test/run-pass/expr-alt-generic-unique2.rs
rename to src/test/run-pass/expr-match-generic-unique2.rs
diff --git a/src/test/run-pass/expr-alt-generic.rs b/src/test/run-pass/expr-match-generic.rs
similarity index 100%
rename from src/test/run-pass/expr-alt-generic.rs
rename to src/test/run-pass/expr-match-generic.rs
diff --git a/src/test/run-pass/expr-alt-struct.rs b/src/test/run-pass/expr-match-struct.rs
similarity index 100%
rename from src/test/run-pass/expr-alt-struct.rs
rename to src/test/run-pass/expr-match-struct.rs
diff --git a/src/test/run-pass/expr-alt-unique.rs b/src/test/run-pass/expr-match-unique.rs
similarity index 100%
rename from src/test/run-pass/expr-alt-unique.rs
rename to src/test/run-pass/expr-match-unique.rs
diff --git a/src/test/run-pass/expr-alt.rs b/src/test/run-pass/expr-match.rs
similarity index 100%
rename from src/test/run-pass/expr-alt.rs
rename to src/test/run-pass/expr-match.rs
diff --git a/src/test/run-pass/fat-arrow-alt.rs b/src/test/run-pass/fat-arrow-match.rs
similarity index 100%
rename from src/test/run-pass/fat-arrow-alt.rs
rename to src/test/run-pass/fat-arrow-match.rs
diff --git a/src/test/run-pass/generic-tag-alt.rs b/src/test/run-pass/generic-tag-match.rs
similarity index 100%
rename from src/test/run-pass/generic-tag-alt.rs
rename to src/test/run-pass/generic-tag-match.rs
diff --git a/src/test/run-pass/alt-borrowed_str.rs b/src/test/run-pass/match-borrowed_str.rs
similarity index 100%
rename from src/test/run-pass/alt-borrowed_str.rs
rename to src/test/run-pass/match-borrowed_str.rs
diff --git a/src/test/run-pass/alt-bot-2.rs b/src/test/run-pass/match-bot-2.rs
similarity index 100%
rename from src/test/run-pass/alt-bot-2.rs
rename to src/test/run-pass/match-bot-2.rs
diff --git a/src/test/run-pass/alt-bot.rs b/src/test/run-pass/match-bot.rs
similarity index 100%
rename from src/test/run-pass/alt-bot.rs
rename to src/test/run-pass/match-bot.rs
diff --git a/src/test/run-pass/alt-implicit-copy-unique.rs b/src/test/run-pass/match-implicit-copy-unique.rs
similarity index 100%
rename from src/test/run-pass/alt-implicit-copy-unique.rs
rename to src/test/run-pass/match-implicit-copy-unique.rs
diff --git a/src/test/run-pass/alt-join.rs b/src/test/run-pass/match-join.rs
similarity index 100%
rename from src/test/run-pass/alt-join.rs
rename to src/test/run-pass/match-join.rs
diff --git a/src/test/run-pass/alt-naked-record-expr.rs b/src/test/run-pass/match-naked-record-expr.rs
similarity index 100%
rename from src/test/run-pass/alt-naked-record-expr.rs
rename to src/test/run-pass/match-naked-record-expr.rs
diff --git a/src/test/run-pass/alt-naked-record.rs b/src/test/run-pass/match-naked-record.rs
similarity index 100%
rename from src/test/run-pass/alt-naked-record.rs
rename to src/test/run-pass/match-naked-record.rs
diff --git a/src/test/run-pass/alt-path.rs b/src/test/run-pass/match-path.rs
similarity index 100%
rename from src/test/run-pass/alt-path.rs
rename to src/test/run-pass/match-path.rs
diff --git a/src/test/run-pass/alt-pattern-drop.rs b/src/test/run-pass/match-pattern-drop.rs
similarity index 100%
rename from src/test/run-pass/alt-pattern-drop.rs
rename to src/test/run-pass/match-pattern-drop.rs
diff --git a/src/test/run-pass/alt-pattern-lit.rs b/src/test/run-pass/match-pattern-lit.rs
similarity index 100%
rename from src/test/run-pass/alt-pattern-lit.rs
rename to src/test/run-pass/match-pattern-lit.rs
diff --git a/src/test/run-pass/alt-pattern-no-type-params.rs b/src/test/run-pass/match-pattern-no-type-params.rs
similarity index 100%
rename from src/test/run-pass/alt-pattern-no-type-params.rs
rename to src/test/run-pass/match-pattern-no-type-params.rs
diff --git a/src/test/run-pass/alt-pattern-simple.rs b/src/test/run-pass/match-pattern-simple.rs
similarity index 100%
rename from src/test/run-pass/alt-pattern-simple.rs
rename to src/test/run-pass/match-pattern-simple.rs
diff --git a/src/test/run-pass/alt-phi.rs b/src/test/run-pass/match-phi.rs
similarity index 100%
rename from src/test/run-pass/alt-phi.rs
rename to src/test/run-pass/match-phi.rs
diff --git a/src/test/run-pass/alt-range.rs b/src/test/run-pass/match-range.rs
similarity index 100%
rename from src/test/run-pass/alt-range.rs
rename to src/test/run-pass/match-range.rs
diff --git a/src/test/run-pass/alt-ref-binding-in-guard-3256.rs b/src/test/run-pass/match-ref-binding-in-guard-3256.rs
similarity index 100%
rename from src/test/run-pass/alt-ref-binding-in-guard-3256.rs
rename to src/test/run-pass/match-ref-binding-in-guard-3256.rs
diff --git a/src/test/run-pass/alt-ref-binding-mut-option.rs b/src/test/run-pass/match-ref-binding-mut-option.rs
similarity index 100%
rename from src/test/run-pass/alt-ref-binding-mut-option.rs
rename to src/test/run-pass/match-ref-binding-mut-option.rs
diff --git a/src/test/run-pass/alt-ref-binding-mut.rs b/src/test/run-pass/match-ref-binding-mut.rs
similarity index 100%
rename from src/test/run-pass/alt-ref-binding-mut.rs
rename to src/test/run-pass/match-ref-binding-mut.rs
diff --git a/src/test/run-pass/alt-ref-binding.rs b/src/test/run-pass/match-ref-binding.rs
similarity index 100%
rename from src/test/run-pass/alt-ref-binding.rs
rename to src/test/run-pass/match-ref-binding.rs
diff --git a/src/test/run-pass/alt-str.rs b/src/test/run-pass/match-str.rs
similarity index 100%
rename from src/test/run-pass/alt-str.rs
rename to src/test/run-pass/match-str.rs
diff --git a/src/test/run-pass/alt-tag.rs b/src/test/run-pass/match-tag.rs
similarity index 100%
rename from src/test/run-pass/alt-tag.rs
rename to src/test/run-pass/match-tag.rs
diff --git a/src/test/run-pass/alt-unique-bind.rs b/src/test/run-pass/match-unique-bind.rs
similarity index 100%
rename from src/test/run-pass/alt-unique-bind.rs
rename to src/test/run-pass/match-unique-bind.rs
diff --git a/src/test/run-pass/alt-value-binding-in-guard-3291.rs b/src/test/run-pass/match-value-binding-in-guard-3291.rs
similarity index 100%
rename from src/test/run-pass/alt-value-binding-in-guard-3291.rs
rename to src/test/run-pass/match-value-binding-in-guard-3291.rs
diff --git a/src/test/run-pass/alt-with-ret-arm.rs b/src/test/run-pass/match-with-ret-arm.rs
similarity index 100%
rename from src/test/run-pass/alt-with-ret-arm.rs
rename to src/test/run-pass/match-with-ret-arm.rs
diff --git a/src/test/run-pass/nested-exhaustive-alt.rs b/src/test/run-pass/nested-exhaustive-match.rs
similarity index 100%
rename from src/test/run-pass/nested-exhaustive-alt.rs
rename to src/test/run-pass/nested-exhaustive-match.rs
diff --git a/src/test/run-pass/nested-alts.rs b/src/test/run-pass/nested-matchs.rs
similarity index 100%
rename from src/test/run-pass/nested-alts.rs
rename to src/test/run-pass/nested-matchs.rs
diff --git a/src/test/run-pass/simple-generic-alt.rs b/src/test/run-pass/simple-generic-match.rs
similarity index 100%
rename from src/test/run-pass/simple-generic-alt.rs
rename to src/test/run-pass/simple-generic-match.rs
diff --git a/src/test/run-pass/simple-alt-generic-tag.rs b/src/test/run-pass/simple-match-generic-tag.rs
similarity index 100%
rename from src/test/run-pass/simple-alt-generic-tag.rs
rename to src/test/run-pass/simple-match-generic-tag.rs
diff --git a/src/test/run-pass/unique-alt-discrim.rs b/src/test/run-pass/unique-match-discrim.rs
similarity index 100%
rename from src/test/run-pass/unique-alt-discrim.rs
rename to src/test/run-pass/unique-match-discrim.rs
diff --git a/src/test/run-pass/use-uninit-alt.rs b/src/test/run-pass/use-uninit-match.rs
similarity index 100%
rename from src/test/run-pass/use-uninit-alt.rs
rename to src/test/run-pass/use-uninit-match.rs
diff --git a/src/test/run-pass/use-uninit-alt2.rs b/src/test/run-pass/use-uninit-match2.rs
similarity index 100%
rename from src/test/run-pass/use-uninit-alt2.rs
rename to src/test/run-pass/use-uninit-match2.rs