Rename variables for better comprehension

Change-Id: Ifa8da084a93e85201564bae3aa71b0c3c899894b
Merge "Rename variables for better comprehension"