Use parallel terminology more consistently