Fixed metric naming (substitutions)