Use DataPayloadOr in all of the display name types (#8347)