Fix references to first and last name fields.