Updating the other classes in the group module to match #7249