Improve variable naming

Change-Id: I1f92bf8b5e013898a49c1ea4ff63c7ce9172e427
Merge "Improve variable naming"