Refactor: ProductGroups -> ProductContainers