diff --git a/src/aotcompile.cpp b/src/aotcompile.cpp
index 3753b4e24ac94a..a9315a7a10c0a6 100644
--- a/src/aotcompile.cpp
+++ b/src/aotcompile.cpp
@@ -1631,7 +1631,7 @@ void jl_dump_native_impl(void *native_code,
             jl_ExecutionEngine->getTargetOptions(),
             RelocModel,
             CMModel,
-            CodeGenOpt::Aggressive // -O3 TODO: respect command -O0 flag?
+            CodeGenOptLevel::Aggressive // -O3 TODO: respect command -O0 flag?
             ));
     fixupTM(*SourceTM);
     auto DL = jl_create_datalayout(*SourceTM);
diff --git a/src/jitlayers.cpp b/src/jitlayers.cpp
index b134768525fa6f..836a374f4eaac3 100644
--- a/src/jitlayers.cpp
+++ b/src/jitlayers.cpp
@@ -603,15 +603,15 @@ jl_value_t *jl_dump_method_asm_impl(jl_method_instance_t *mi, size_t world,
     return jl_dump_function_asm(&llvmf_dump, emit_mc, asm_variant, debuginfo, binary, false);
 }
 
-CodeGenOpt::Level CodeGenOptLevelFor(int optlevel)
+CodeGenOptLevel CodeGenOptLevelFor(int optlevel)
 {
 #ifdef DISABLE_OPT
-    return CodeGenOpt::None;
+    return CodeGenOptLevel::None;
 #else
-    return optlevel == 0 ? CodeGenOpt::None :
-        optlevel == 1 ? CodeGenOpt::Less :
-        optlevel == 2 ? CodeGenOpt::Default :
-        CodeGenOpt::Aggressive;
+    return optlevel == 0 ? CodeGenOptLevel::None :
+        optlevel == 1 ? CodeGenOptLevel::Less :
+        optlevel == 2 ? CodeGenOptLevel::Default :
+        CodeGenOptLevel::Aggressive;
 #endif
 }
 
diff --git a/src/jitlayers.h b/src/jitlayers.h
index a849148653f07c..cee70e87f8c702 100644
--- a/src/jitlayers.h
+++ b/src/jitlayers.h
@@ -642,4 +642,4 @@ void optimizeDLSyms(Module &M);
 // NewPM
 #include "passes.h"
 
-CodeGenOpt::Level CodeGenOptLevelFor(int optlevel) JL_NOTSAFEPOINT;
+CodeGenOptLevel CodeGenOptLevelFor(int optlevel) JL_NOTSAFEPOINT;