More consistent terminology use for review

I overlooked these in the previous patch set.

Change-Id: I7623622ced279f3e1263213234b6eab0d98462da
Merge "More consistent terminology use for review"