Right now we're using the terms 'measure' and 'modality' to refer to the same thing -- should we standardize that?