Format more names properly.