Swap enums to names to fix carbon compatability