Change group names

https://praekelt.atlassian.net/browse/GST-5