Thanks: fix name grouping