Rename top level case classes for groups and brackets