The metric name was changed in Omnibus to reflect
that we now take the max, not avg.

Also rename helper to indicate that we don't always take
the average anymore.