Actually we should consider changing the metric names to camelCase too in another OR.