Update metric names and descriptions

Fixes #2