Revert "Revert "Changed Group Names To Concrete""

This reverts commit b6350ba482e8851b554b4d1143d6a1db79858cd1.