var naming unify

var naming unify