unify variable naming