Massive cleaning and renaming