Moving to pure name-based grouping