Cleanup and renaming.