Changed metric names to match docs and fix skew calculations