Long term I would also support a change. I too admittedly have not been able to find words because it’s somewhat of a weird grouping.
I think the solution would probably involve a different design, such as a dropdown, that could hold more menu items.