Renamed OptionValue to OptionType.