Rename variables to be more relevant

Also bump version

Change-Id: I0ba470401aafdc79d2f0c2bdc098820ed290d338
Merge "Rename variables to be more relevant"