WHERY-1: Improve some terminology.