Fix class name changes