make terminology more consistent