relocated mark_successor logic to rename