Unify variable names