Replaced full name with separate given and family name fields