Issue #2376691 by slashrsm: Change terminology.