Rename and reevaluate