Fixing up of metric names