diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index abf8e6809..53953600e 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -548,7 +548,7 @@ struct BuildContext {
 	bool   ignore_microsoft_magic;
 	bool   linker_map_file;
 
-	bool   para_poly_diagnostics;
+	bool   build_diagnostics;
 
 	bool   use_single_module;
 	bool   use_separate_modules;
diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp
index bbfd91d30..ab0811085 100644
--- a/src/llvm_backend.cpp
+++ b/src/llvm_backend.cpp
@@ -3571,8 +3571,8 @@ gb_internal bool lb_generate_code(lbGenerator *gen) {
 	TIME_SECTION("LLVM Correct Entity Linkage");
 	lb_correct_entity_linkage(gen);
 
-	if (build_context.para_poly_diagnostics) {
-		lb_do_code_gen_diagnostics(gen);
+	if (build_context.build_diagnostics) {
+		lb_do_build_diagnostics(gen);
 	}
 
 	llvm_error = nullptr;
diff --git a/src/llvm_backend_utility.cpp b/src/llvm_backend_utility.cpp
index 244ad6d73..fa8f85d0f 100644
--- a/src/llvm_backend_utility.cpp
+++ b/src/llvm_backend_utility.cpp
@@ -3054,7 +3054,7 @@ gb_internal void lb_do_module_diagnostics(lbGenerator *gen) {
 
 }
 
-gb_internal void lb_do_code_gen_diagnostics(lbGenerator *gen) {
+gb_internal void lb_do_build_diagnostics(lbGenerator *gen) {
 	lb_do_para_poly_diagnostics(gen);
 	gb_printf("------------------------------------------------------------------------------------------\n");
 	gb_printf("------------------------------------------------------------------------------------------\n\n");
diff --git a/src/main.cpp b/src/main.cpp
index 707b85232..6ad20cf26 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -394,7 +394,7 @@ enum BuildFlagKind {
 
 	BuildFlag_IntegerDivisionByZero,
 
-	BuildFlag_ParaPolyDiagnostics,
+	BuildFlag_BuildDiagnostics,
 
 	// internal use only
 	BuildFlag_InternalFastISel,
@@ -621,7 +621,7 @@ gb_internal bool parse_build_flags(Array<String> args) {
 
 	add_flag(&build_flags, BuildFlag_IntegerDivisionByZero,   str_lit("integer-division-by-zero"),  BuildFlagParam_String, Command__does_check);
 
-	add_flag(&build_flags, BuildFlag_ParaPolyDiagnostics,     str_lit("para-poly-diagnostics"),     BuildFlagParam_None,    Command__does_build);
+	add_flag(&build_flags, BuildFlag_BuildDiagnostics,        str_lit("build-diagnostics"),         BuildFlagParam_None,    Command__does_build);
 
 	add_flag(&build_flags, BuildFlag_InternalFastISel,        str_lit("internal-fast-isel"),        BuildFlagParam_None,    Command_all);
 	add_flag(&build_flags, BuildFlag_InternalIgnoreLazy,      str_lit("internal-ignore-lazy"),      BuildFlagParam_None,    Command_all);
@@ -1565,8 +1565,8 @@ gb_internal bool parse_build_flags(Array<String> args) {
 							}
 							break;
 
-						case BuildFlag_ParaPolyDiagnostics:
-							build_context.para_poly_diagnostics = true;
+						case BuildFlag_BuildDiagnostics:
+							build_context.build_diagnostics = true;
 							break;
 
 						case BuildFlag_InternalFastISel: