rename and resort