fix references to deprecated classes