Fix build break due to import shadowing

This was causing Cargo build failures for me
Let's do both.