Minor change: changing directly the given and family names, not looking
at the display name