cleaning and renaming