Update to metric names for consistency