Adapted to the latest class name changes.