Fix naming to prevent warnings in modern Rust