minor naming unification