Adjust terminology to be consistent