reformat and rename