reorder and rename