Make review terminology more consistent

Bug: 47824
Change-Id: Idfe49bde5e6b7dfd5dbd68279f046ec23402cc5a
Merge "Make review terminology more consistent"