Fix metric names inconsistencies 1