Rename and format