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

https://issues.jboss.org/browse/ISPN-2934

Applies to 5.2.x

Haven't tested with master yet, but it should work