Fixed name conflicts for the latest Rust