updated some more references to metric