rename & reformat