fixed old class names