Renaming and cleaning project