Changed group names and class names