fixed handling of class names