Changed naming conventions for NR custom metrics