DC2B-33: Add givenName and familyName to User