Rename Metric.Type to Metric.DataType and rename StatType to RollupType