Corrected various enum object names.