unify class names