Cleaning up and renaming for new packages.