change variable name

Change-Id: I2802ca2d31f98c4a6b02d8d8e51890d2eeaa95c4
Merge "change variable name" into 0.3.x