Reformat and file rename