Rename and formatting