adjust some metric names
one more tweak to metric names...