Rename and remove duplicate