Fixed some metric names