renamed classes (collapse, merge)