tightened up rename in apply_to