Fix up some namespace issues for module-like import