final naming fixes for latest version of Rust