diff --git a/include/code_801C620.h b/include/iq_skill_info_menu.h
similarity index 82%
rename from include/code_801C620.h
rename to include/iq_skill_info_menu.h
index 35830ef5c..3f2fed3eb 100644
--- a/include/code_801C620.h
+++ b/include/iq_skill_info_menu.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_CODE_801C620_H
-#define GUARD_CODE_801C620_H
+#ifndef GUARD_IQ_SKILL_INFO_MENU_H
+#define GUARD_IQ_SKILL_INFO_MENU_H
 
 #include "structs/menu.h"
 #include "structs/subStruct_203B240.h"
@@ -24,4 +24,4 @@ bool8 CreateIQSkillInfoMenu(u8 iqSkill);
 u32 HandleIQSkillInfoMenuState(void);
 void CleanIQSkillInfoMenu(void);
 
-#endif // GUARD_CODE_801C620_H
+#endif // GUARD_IQ_SKILL_INFO_MENU_H
diff --git a/include/iq_skill_list_menu.h b/include/iq_skill_list_menu.h
index 4a0d71626..4f08e311e 100644
--- a/include/iq_skill_list_menu.h
+++ b/include/iq_skill_list_menu.h
@@ -22,7 +22,7 @@ bool8 HasNoAvailIQSkills(s16 species);
 bool8 CreateIQSkillListMenu(s16 species, u32 index, u32);
 u32 HandleIQSkillListMenuInput(bool8);
 s32 GetIQSkillSelection(void);
-void sub_801C3B0(bool8);
+void RedrawIQSkillListMenu(bool8);
 void CleanIQSkillListMenu(void);
 void BuildIQSkillList(void);
 
diff --git a/ld_script.txt b/ld_script.txt
index 6e15a1ec8..6a62971de 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -117,7 +117,7 @@ SECTIONS {
         src/code_801B60C.o(.text);
         src/iq_skill_menu.o(.text);
         src/iq_skill_list_menu.o(.text);
-        src/code_801C620.o(.text);
+        src/iq_skill_info_menu.o(.text);
         src/code_801C8C4.o(.text);
         src/code_801D014.o(.text);
         src/code_801D9E4.o(.text);
@@ -455,7 +455,7 @@ SECTIONS {
         src/code_801B60C.o(.rodata);
         src/iq_skill_menu.o(.rodata);
         src/iq_skill_list_menu.o(.rodata);
-        src/code_801C620.o(.rodata);
+        src/iq_skill_info_menu.o(.rodata);
         src/code_801C8C4.o(.rodata);
         src/code_801D014.o(.rodata);
         src/code_801D9E4.o(.rodata);
diff --git a/src/data/code_801C620.h b/src/data/iq_skill_info_menu.h
similarity index 100%
rename from src/data/code_801C620.h
rename to src/data/iq_skill_info_menu.h
diff --git a/src/data/code_801C244.h b/src/data/iq_skill_list_menu.h
similarity index 100%
rename from src/data/code_801C244.h
rename to src/data/iq_skill_list_menu.h
diff --git a/src/code_801C620.c b/src/iq_skill_info_menu.c
similarity index 98%
rename from src/code_801C620.c
rename to src/iq_skill_info_menu.c
index 496bfa1fe..277f610dc 100644
--- a/src/code_801C620.c
+++ b/src/iq_skill_info_menu.c
@@ -2,7 +2,7 @@
 #include "globaldata.h"
 #include "code_80118A4.h"
 #include "code_80130A8.h"
-#include "code_801C620.h"
+#include "iq_skill_info_menu.h"
 #include "code_8097DD0.h"
 #include "input.h"
 #include "memory.h"
@@ -17,7 +17,7 @@ extern u8 gAvailablePokemonNames[]; // 202DF98
 
 static EWRAM_DATA_2 struct unkStruct_203B240 *sUnknown_203B240 = {0};
 
-#include "data/code_801C620.h"
+#include "data/iq_skill_info_menu.h"
 
 static void SetIQSkillInfoMenuState(s32 newState);
 static void sub_801C6E4(void);
diff --git a/src/iq_skill_list_menu.c b/src/iq_skill_list_menu.c
index 4e0c0faf0..b7fcf6318 100644
--- a/src/iq_skill_list_menu.c
+++ b/src/iq_skill_list_menu.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "globaldata.h"
+#include "constants/input.h"
 #include "code_80118A4.h"
 #include "code_80130A8.h"
 #include "iq_skill_list_menu.h"
@@ -14,7 +15,7 @@ extern u8 gUnknown_202DEA8[];
 
 static EWRAM_DATA_2 struct unkStruct_203B23C *sUnknown_203B23C = {0};
 
-#include "data/code_801C244.h"
+#include "data/iq_skill_list_menu.h"
 
 static void sub_801C440(void);
 
@@ -59,13 +60,13 @@ u32 HandleIQSkillListMenuInput(bool8 a0)
     }
 
     switch (GetKeyPress(&sUnknown_203B23C->s24.s0.input)) {
-        case 2:
+        case INPUT_B_BUTTON:
             PlayMenuSoundEffect(1);
             return 2;
-        case 1:
+        case INPUT_A_BUTTON:
             PlayMenuSoundEffect(0);
             return 3;
-        case 4:
+        case INPUT_START_BUTTON:
             PlayMenuSoundEffect(4);
             return 4;
         default:
@@ -83,7 +84,7 @@ s32 GetIQSkillSelection(void)
     return (sUnknown_203B23C->s24.s0.input.unk1E * sUnknown_203B23C->s24.s0.input.unk1C) + sUnknown_203B23C->s24.s0.input.menuIndex;
 }
 
-void sub_801C3B0(bool8 r0)
+void RedrawIQSkillListMenu(bool8 addCursor)
 {
     ResetUnusedInputStruct();
     sub_800641C(sUnknown_203B23C->s24.s0.unk3C, FALSE, FALSE);
@@ -92,7 +93,7 @@ void sub_801C3B0(bool8 r0)
     sub_801C440();
     BuildIQSkillList();
 
-    if (r0)
+    if (addCursor)
        AddMenuCursorSprite(&sUnknown_203B23C->s24.s0.input);
 }
 
diff --git a/src/iq_skill_menu.c b/src/iq_skill_menu.c
index 1e3c93c4a..55bd8513f 100644
--- a/src/iq_skill_menu.c
+++ b/src/iq_skill_menu.c
@@ -3,7 +3,7 @@
 #include "code_80118A4.h"
 #include "iq_skill_menu.h"
 #include "iq_skill_list_menu.h"
-#include "code_801C620.h"
+#include "iq_skill_info_menu.h"
 #include "common_strings.h"
 #include "input.h"
 #include "memory.h"
@@ -20,8 +20,8 @@ static void SetIQSkillMenuState(s32 newState);
 static void sub_801BFCC(void);
 static void HandleIQSkillMenuState(void);
 static void BuildIQSkillMenuActions(void);
-static void sub_801C118(void);
-static void sub_801C1A0(void);
+static void HandleIQSkillMenuMain(void);
+static void HandleIQSkillMenuAction(void);
 static void HandleIQSkillMenuInfo(void);
 
 bool8 CreateIQSkillMenu(s16 species)
@@ -47,10 +47,10 @@ u32 sub_801BF48(void)
             return 3;
         case IQ_SKILL_MENU_STATE_INIT:
         case IQ_SKILL_MENU_STATE_MAIN:
-            sub_801C118();
+            HandleIQSkillMenuMain();
             break;
         case 2:
-            sub_801C1A0();
+            HandleIQSkillMenuAction();
             break;
         case IQ_SKILL_MENU_STATE_INFO:
             HandleIQSkillMenuInfo();
@@ -98,10 +98,10 @@ static void HandleIQSkillMenuState(void)
             CreateIQSkillListMenu(sUnknown_203B238->species, 0, 8);
             break;
         case IQ_SKILL_MENU_STATE_MAIN:
-            sub_801C3B0(TRUE);
+            RedrawIQSkillListMenu(TRUE);
             break;
         case 2:
-            BuildIQSkillList(); // Build list of IQ Skills
+            BuildIQSkillList();
             BuildIQSkillMenuActions();
             sub_8012D60(&sUnknown_203B238->unk74, sUnknown_203B238->unk34, NULL, NULL, sUnknown_203B238->menuAction, 2);
             break;
@@ -143,7 +143,7 @@ static void BuildIQSkillMenuActions(void)
     sUnknown_203B238->menuAction = IQ_SKILL_MENU_SWITCH;
 }
 
-static void sub_801C118(void)
+static void HandleIQSkillMenuMain(void)
 {
     switch (HandleIQSkillListMenuInput(TRUE)) {
         case 3:
@@ -166,7 +166,7 @@ static void sub_801C118(void)
     }
 }
 
-static void sub_801C1A0(void)
+static void HandleIQSkillMenuAction(void)
 {
     s32 menuAction;
 
diff --git a/sym_ewram2.txt b/sym_ewram2.txt
index fa457b3be..bf3164f30 100644
--- a/sym_ewram2.txt
+++ b/sym_ewram2.txt
@@ -132,7 +132,7 @@ gUnknown_203B1FC: /* 203B1FC (sub_80151C0 - sub_8015F84) */
 .include "src/code_801B60C.o"
 .include "src/iq_skill_menu.o"
 .include "src/iq_skill_list_menu.o"
-.include "src/code_801C620.o"
+.include "src/iq_skill_info_menu.o"
 .include "src/code_801C8C4.o"
 .include "src/code_801D014.o"
 .include "src/code_801D9E4.o"