Updating metric names to match new format

Change-Id: I395c56864373dc43c89c86e455102ea54c50a64c