diff --git a/include/pokenav.h b/include/pokenav.h
index 847d4b7e76..9713546335 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -436,7 +436,7 @@ bool32 IsRegionMapLoopedTaskActive(void);
 void FreeRegionMapSubstruct1(void);
 void FreeRegionMapSubstruct2(void);
 
-// pokenav_conditions_1.c
+// pokenav_conditions.c
 u32 PokenavCallback_Init_ConditionGraph_Party(void);
 u32 PokenavCallback_Init_ConditionGraph_Search(void);
 u32 GetConditionGraphMenuCallback(void);
@@ -455,14 +455,14 @@ u16 GetConditionMonDataBuffer(void);
 void *GetConditionMonPicGfx(u8 id);
 void *GetConditionMonPal(u8 id);
 
-// pokenav_conditions_2.c
+// pokenav_conditions_gfx.c
 bool32 OpenConditionGraphMenu(void);
 void CreateConditionGraphMenuLoopedTask(s32);
 u32 IsConditionGraphMenuLoopedTaskActive(void);
 void FreeConditionGraphMenuSubstruct2(void);
 u8 GetMonMarkingsData(void);
 
-// pokenav_conditions_3.c
+// pokenav_conditions_search_results.c
 u32 PokenavCallback_Init_ConditionSearch(void);
 u32 PokenavCallback_Init_ReturnToMonSearchList(void);
 u32 GetConditionSearchResultsCallback(void);
diff --git a/ld_script.txt b/ld_script.txt
index ca0480e0fd..c4283265d8 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -316,9 +316,9 @@ SECTIONS {
         src/pokenav_match_call_1.o(.text);
         src/pokenav_match_call_2.o(.text);
         src/pokenav_region_map.o(.text);
-        src/pokenav_conditions_1.o(.text);
-        src/pokenav_conditions_2.o(.text);
-        src/pokenav_conditions_3.o(.text);
+        src/pokenav_conditions.o(.text);
+        src/pokenav_conditions_gfx.o(.text);
+        src/pokenav_conditions_search_results.o(.text);
         src/pokenav_ribbons_list.o(.text);
         src/pokenav_ribbons_summary.o(.text);
         src/pokenav_match_call_data.o(.text);
@@ -671,8 +671,8 @@ SECTIONS {
         src/pokenav_match_call_1.o(.rodata);
         src/pokenav_match_call_2.o(.rodata);
         src/pokenav_region_map.o(.rodata);
-        src/pokenav_conditions_2.o(.rodata);
-        src/pokenav_conditions_3.o(.rodata);
+        src/pokenav_conditions_gfx.o(.rodata);
+        src/pokenav_conditions_search_results.o(.rodata);
         src/pokenav_ribbons_list.o(.rodata);
         src/pokenav_ribbons_summary.o(.rodata);
         src/pokenav_match_call_data.o(.rodata);
diff --git a/src/pokenav_conditions_1.c b/src/pokenav_conditions.c
similarity index 100%
rename from src/pokenav_conditions_1.c
rename to src/pokenav_conditions.c
diff --git a/src/pokenav_conditions_2.c b/src/pokenav_conditions_gfx.c
similarity index 99%
rename from src/pokenav_conditions_2.c
rename to src/pokenav_conditions_gfx.c
index cecba800ca..a1593983d2 100644
--- a/src/pokenav_conditions_2.c
+++ b/src/pokenav_conditions_gfx.c
@@ -139,7 +139,7 @@ struct Pokenav_ConditionMenuGfx
     u8 filler2[0xFA3];
 };
 
-extern s8 GetConditionGraphMenuCurrentLoadIndex(void); // This function's declaration here is s8 vs. u8 in pokenav_conditions_1.c
+extern s8 GetConditionGraphMenuCurrentLoadIndex(void); // This function's declaration here is s8 vs. u8 in pokenav_conditions.c
 
 static u32 LoopedTask_OpenConditionGraphMenu(s32);
 static u32 GetConditionGraphMenuLoopedTaskActive(void);
diff --git a/src/pokenav_conditions_3.c b/src/pokenav_conditions_search_results.c
similarity index 100%
rename from src/pokenav_conditions_3.c
rename to src/pokenav_conditions_search_results.c
diff --git a/sym_bss.txt b/sym_bss.txt
index 8724f02d7f..75da960bf9 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -50,7 +50,7 @@
 	.include "src/multiboot.o"
 	.include "src/mirage_tower.o"
 	.include "src/berry_fix_program.o"
-	.include "src/pokenav_conditions_2.o"
+	.include "src/pokenav_conditions_gfx.o"
 	.include "src/pokenav_ribbons_summary.o"
 	.include "src/ereader_helpers.o"
 	.include "src/faraway_island.o"