Fix hp class name change