Attempt to make terminology more consistent.