STYLE: Rename shader variables to maintain consistency

Change-Id: I67c773b764b4b704eca9444104801fe9bd313cd5
Merge topic 'rename_shader_variables' into master

f6993a11 STYLE: Rename shader variables to maintain consistency