rename and sort out