give meaningful names of some vars

Change-Id: I16fa2bd4ade85f285bf47aefcc1a42f078365442