Fixed metric naming (for real this time)