More issues on renaming imports.