Mf/statement metrics - Fix metric naming