diff --git a/include/pokenav.h b/include/pokenav.h
index 6dc88cab7..59f670089 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -370,7 +370,7 @@ bool32 WaitForPokenavShutdownFade(void);
 void SetActiveMenuLoopTasks(void *func1, void *func2);
 void ShutdownPokenav(void);
 
-// pokenav_menu_handler_1.c
+// pokenav_menu_handler.c
 bool32 PokenavCallback_Init_MainMenuCursorOnMap(void);
 bool32 PokenavCallback_Init_MainMenuCursorOnMatchCall(void);
 bool32 PokenavCallback_Init_MainMenuCursorOnRibbons(void);
@@ -383,7 +383,7 @@ int GetPokenavCursorPos(void);
 int GetCurrentMenuItemId(void);
 u16 GetHelpBarTextId(void);
 
-// pokenav_menu_handler_2.c
+// pokenav_menu_handler_gfx.c
 bool32 OpenPokenavMenuInitial(void);
 bool32 OpenPokenavMenuNotInitial(void);
 void CreateMenuHandlerLoopedTask(s32 ltIdx);
diff --git a/ld_script.txt b/ld_script.txt
index c4283265d..257fb3c6e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -311,8 +311,8 @@ SECTIONS {
         src/pokenav.o(.text);
         src/pokenav_main_menu.o(.text);
         src/pokenav_match_call_ui.o(.text);
-        src/pokenav_menu_handler_1.o(.text);
-        src/pokenav_menu_handler_2.o(.text);
+        src/pokenav_menu_handler.o(.text);
+        src/pokenav_menu_handler_gfx.o(.text);
         src/pokenav_match_call_1.o(.text);
         src/pokenav_match_call_2.o(.text);
         src/pokenav_region_map.o(.text);
@@ -666,8 +666,8 @@ SECTIONS {
         src/pokenav.o(.rodata);
         src/pokenav_main_menu.o(.rodata);
         src/pokenav_match_call_ui.o(.rodata);
-        src/pokenav_menu_handler_1.o(.rodata);
-        src/pokenav_menu_handler_2.o(.rodata);
+        src/pokenav_menu_handler.o(.rodata);
+        src/pokenav_menu_handler_gfx.o(.rodata);
         src/pokenav_match_call_1.o(.rodata);
         src/pokenav_match_call_2.o(.rodata);
         src/pokenav_region_map.o(.rodata);
diff --git a/src/pokenav_menu_handler_1.c b/src/pokenav_menu_handler.c
similarity index 100%
rename from src/pokenav_menu_handler_1.c
rename to src/pokenav_menu_handler.c
diff --git a/src/pokenav_menu_handler_2.c b/src/pokenav_menu_handler_gfx.c
similarity index 100%
rename from src/pokenav_menu_handler_2.c
rename to src/pokenav_menu_handler_gfx.c