Fix of class names