Changing the option names for clarity.
Updating the readme to reflect new options.