Tidy up the metric names