Updated metric names for consistency.

Review: https://reviews.apache.org/r/21720