Adapt to new metrics schema names