Make some variable names less cryptic

No changes to function

Change-Id: I910abe7d8f42186bfd43706d3389fca2f0995cc6