Oops! I also forget to change the flag names in the docs and the commit
message. Fixing those here.

- John