Even more metrics name cleanup, after looking at some example uses.