Both these issues are resolved.

We have replaced requrejs and the names of the metrics have remained the same