Fix for uniformization of metric names

Change-Id: I2b1e542096a0e952d75465a16677a34038639864
5 files changed