Merge "Fix for uniformization of metric names"