Added DisplayName type and updated tests