Rename two variables to make it clear what's stored inside them.

Change-Id: Idab69ebc94a5e8ff9ad9a971ddd0804ca89b4574