Reported metrics name tweaks