HV-690 Adapting to changed enum names