rename group.id -> gid