Remove bug in class name management.