2.x Adjust metric names to be more readable in the monitoring system.