rename and re-order