Spring cleaning and renaming