Renamed MeasurementSet to MeasurementList
Renamed measurement_set -> measurement_list