Import cleanup and renaming.