Rename clientId to metricId.