change name to id
Merge pull request #471 from dimagi/id-name

change name to id
group cleanup
Merge pull request #473 from dimagi/cz-dev

group cleanup
mergeeee