rename and reformat