RFR: (Refactor) Rename Metric.Type to Metric.DataType and rename StatType to RollupType

Just renaming stuff as per IRC conversation.