OptionValues - Specify id+name+label for option callbacks that use it

OptionValues - Specify id+name+label for option callbacks that use it

Previously some API calls relied on a bug which conflated name with label,
that bug has been fixed, causing some test failures. The solution is to
update the option lists with a full multidimensional array with translated labels
and untranslated names.