Repair rename issue