Fixed naming unification bugs