Unify package name