Made terminology more consistent.