diff --git a/tests/compile-fail/overwriting_part_of_relocation_makes_the_rest_undefined.rs b/tests/compile-fail/overwriting_part_of_relocation_makes_the_rest_uninit.rs
similarity index 100%
rename from tests/compile-fail/overwriting_part_of_relocation_makes_the_rest_undefined.rs
rename to tests/compile-fail/overwriting_part_of_relocation_makes_the_rest_uninit.rs
diff --git a/tests/compile-fail/transmute-pair-undef.rs b/tests/compile-fail/transmute-pair-uninit.rs
similarity index 100%
rename from tests/compile-fail/transmute-pair-undef.rs
rename to tests/compile-fail/transmute-pair-uninit.rs
diff --git a/tests/compile-fail/undefined_buffer.rs b/tests/compile-fail/uninit_buffer.rs
similarity index 100%
rename from tests/compile-fail/undefined_buffer.rs
rename to tests/compile-fail/uninit_buffer.rs
diff --git a/tests/compile-fail/undefined_byte_read.rs b/tests/compile-fail/uninit_byte_read.rs
similarity index 100%
rename from tests/compile-fail/undefined_byte_read.rs
rename to tests/compile-fail/uninit_byte_read.rs
diff --git a/tests/run-pass/move-undef-primval.rs b/tests/run-pass/move-uninit-primval.rs
similarity index 100%
rename from tests/run-pass/move-undef-primval.rs
rename to tests/run-pass/move-uninit-primval.rs