Better handle contributor's given and family names.