Normalize optionset and options methods

Fixes issues with POST /optionsets/{id}/options and normalizes several related method names.