Rename variables in surface#execute for clarity

Change-Id: Ice2c354f8b673c78c790a44cc2b4a3143bc0c0de
Merge "Rename variables in surface#execute for clarity"