Clean-up and renaming.