Follow class name change