Updated references to deprecated enums