Fix namespace issues with imports.