Updated measurement class names to be more consistent.