Fix various import shadowing issues