adapt class name changed in the core