Metric names fixed