Merge "[Metrics] Fix naming issue." into rvc-dev