Bring enums into align with system.