Replaced all enum to NS_ENUM