Rename option names to match existing convention

The convention is to use hyphens instead of underscores and I prefer
full words instead of abbreviations for clarity.