Rename metric definitions
Incorrect metric identifier