Use the same names for these flag bits as the callers do

No need for redundancy.

Change-Id: Ia68d2e57af33cdca90246de54cdff656ea6c3942