rename and reorder