- put underscore in member variables

Change-Id: Ice0b8441551738ea5d8c49d25a7c54b7b60a2f3f