Change terminology to be consistent.