Rename and remove old