better handling of name and displayName