Revert "Changed Group Names To Concrete"

This reverts commit a3261a07914ca7c57eacd4356fea751baea13892.