Rename and re-order.