Re-sort group names, and remove accidentally added prefix to class names.