Change some variable names to match up with framework
am: 779ff5fab7  -s ours

Change-Id: Idf484346099f4a508967b15dafb700e1f2c8370a