* fixed references to deprecated class names