Measurement types now just expose values. Normalized naming conventions