Some class names were changed.