rename and touch up.