Rename metrics to be closer to the proposed schema