Fixes terminology.
Merge.