Reformat and rename