Renaming and merging