Merge "Update metric names for API consistency."