Fix out of date class names