Prefix all options with a namespace for consistency

We had a couple of outliers where we had to suffix them with `Option`.
For consistency sake,
we switch the scheme to prefixing them with the type of option they are.

Author: joneshf