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

https://issues.jboss.org/browse/ISPN-2934

Applies both to master and 5.2.x