A few class name changes.