adaptations for changes in underlying metrics API

It looks like a couple of namespaces where missed out when moving to the new metrics API.  This pull request updates those namespaces and adds trivial tests to ensure that they compile.