use consistent variable naming

Change-Id: I3a9d639606c54e156d09204f29c8fee7e369ee60