ISPN-2934 Revert the metric names to be compatible with JDG 6.0.x