Update variable names to reduce confusion.

I considered renaming the dimens as well, but
  that requires refactors across more repos,
  and seems excessive in this otherwise
  functional refactor.

Test: manual
Change-Id: I2fb6e5b20159644803facca3f79da9b0cd097ad0