Do not allow underscores in option names. Closes #2391