Global renaming and cleaning