Naming convention changed from classes to groups