Adjust metric names to be more readable in the monitoring system.
Merge pull request #227 from tbak/2.x

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