WIP adjust metrics names and docstrings