#23 Rename group id