Converted all enums to NS_ENUM macro