Unify group naming