I think we can go without renaming the existing options.
At the moment we have -fprofile-arcs, we can add -fprofile-values
and -fprofile-gen (or -fprofile-generate as in GCC we usually don't do
shortcuts) to enable them both.
-fbranch-probabilities is somewhat missnamed, as it now does both branch
probabilities and profile based optimizations, but we can probably keep
it that way and add -fprofile-use that will imply it as well as other
profile based optimizations we are going to invent in the future.
That will make -fbranch-probabilities uninteresting to the majority of
users.