Change some variable names to match up with framework

Change-Id: I1ce28429d35f04f24895195e7d4b7c22f29a2199
1 file changed