Rename variables and methods for clarity.

Change-Id: I2a1b2f2d5605123e55f264d45b1e7292852f2a7f
2 files changed