Changed variables names

Variables namaes changed because of gerrithub
testing.

FIX=issueNumberHere