rearrange and rename