Make terminology more consistent

[bschilder]

Different terms are used for the same concept which can be confusing: e.g. effect = outcome = annotation = metric = clinical characteristic