Renamed DataTypes to more descriptive MeasurementTypes