diff --git a/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def b/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def
index 1042f6c8630d0..05e9e950bc7d8 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def
+++ b/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def
@@ -322,10 +322,10 @@ __OMP_FUNCTION_TYPE(TaskRoutineEntry, false, Int32, Int32,
 #define __ICV_DATA_ENV(Name, EnvVarName, Init)                                 \
   ICV_DATA_ENV(ICV_##Name, #Name, #EnvVarName, Init)
 
-__ICV_DATA_ENV(nthreads, OMP_NUM_THREADS, IMPLEMENTATION_DEFINED)
-__ICV_DATA_ENV(active_levels, NONE, ZERO)
-__ICV_DATA_ENV(cancel, OMP_CANCELLATION, FALSE)
-__ICV_DATA_ENV(__last, last, LAST)
+__ICV_DATA_ENV(nthreads, OMP_NUM_THREADS, ICV_IMPLEMENTATION_DEFINED)
+__ICV_DATA_ENV(active_levels, NONE, ICV_ZERO)
+__ICV_DATA_ENV(cancel, OMP_CANCELLATION, ICV_FALSE)
+__ICV_DATA_ENV(__last, last, ICV_LAST)
 
 #undef __ICV_DATA_ENV
 #undef ICV_DATA_ENV
diff --git a/llvm/lib/Transforms/IPO/OpenMPOpt.cpp b/llvm/lib/Transforms/IPO/OpenMPOpt.cpp
index 68ac5044c9829..03835bcae5f52 100644
--- a/llvm/lib/Transforms/IPO/OpenMPOpt.cpp
+++ b/llvm/lib/Transforms/IPO/OpenMPOpt.cpp
@@ -222,17 +222,17 @@ struct OMPInformationCache : public InformationCache {
     ICV.InitKind = Init;                                                       \
     ICV.EnvVarName = _EnvVarName;                                              \
     switch (ICV.InitKind) {                                                    \
-    case IMPLEMENTATION_DEFINED:                                               \
+    case ICV_IMPLEMENTATION_DEFINED:                                           \
       ICV.InitValue = nullptr;                                                 \
       break;                                                                   \
-    case ZERO:                                                                 \
+    case ICV_ZERO:                                                             \
       ICV.InitValue =                                                          \
           ConstantInt::get(Type::getInt32Ty(Int32->getContext()), 0);          \
       break;                                                                   \
-    case FALSE:                                                                \
+    case ICV_FALSE:                                                            \
       ICV.InitValue = ConstantInt::getFalse(Int1->getContext());               \
       break;                                                                   \
-    case LAST:                                                                 \
+    case ICV_LAST:                                                             \
       break;                                                                   \
     }                                                                          \
   }