Improve naming and clarify use of options