Clean up some variable references

Change-Id: Id8b9f3acb742f8ebedb3818e283082432b83359c
Merge "Clean up some variable references"