Bug 24159: (QA follow-up) Make terminology consistent