Switch from DisplayName to Name for I18n friendliness