Fixed conversion between underscore and camelcase style of options