rename and change order