diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s
index c9207e39..4968e411 100644
--- a/asm/code_8098BDC.s
+++ b/asm/code_8098BDC.s
@@ -5573,7 +5573,7 @@ _0809BC26:
 	lsrs r4, 31
 	bl sub_809B294
 	adds r0, r4, 0
-	bl KangaskhanStorage_New
+	bl CreateKangaskhanStorage
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809BC5C
@@ -5658,7 +5658,7 @@ _0809BCE8:
 	beq _0809BCF0
 	movs r0, 0x3
 _0809BCF0:
-	bl KecleonBros_New
+	bl CreateKecleonBros
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809BD10
diff --git a/data/data_8115F5C.s b/data/data_8115F5C.s
index baa767e3..fb4786ec 100644
--- a/data/data_8115F5C.s
+++ b/data/data_8115F5C.s
@@ -133,8 +133,8 @@ gUnknown_81161B8: @ 81161B8
 gUnknown_81161C8: @ 81161C8
         .byte 0x01, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
-        .4byte KangaskhanStorage_Delete
-        .4byte KangaskhanStorage_Callback
+        .4byte DeleteKangaskhanStorage
+        .4byte KangaskhanStorageCallback
 
 	.global gUnknown_81161D8
 gUnknown_81161D8: @ 81161D8
@@ -154,8 +154,8 @@ gUnknown_81161E8: @ 81161E8
 gUnknown_81161F8: @ 81161F8
         .byte 0x01, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
-        .4byte KecleonBros_Delete
-        .4byte KecleonBros_Callback
+        .4byte DeleteKecleonBros
+        .4byte KecleonBrosCallback
 
 	.global gUnknown_8116208
 gUnknown_8116208: @ 8116208
diff --git a/include/kangaskhan_storage.h b/include/kangaskhan_storage.h
index 21a65b12..d075879e 100644
--- a/include/kangaskhan_storage.h
+++ b/include/kangaskhan_storage.h
@@ -81,7 +81,8 @@ enum KangaskhanStorageStates
     KANGASKHAN_STORAGE_IS_MONEY_USED_TM = 9,
 };
 
-u32 KangaskhanStorage_Callback(void);
-u32 KangaskhanStorage_New(bool32 isAsleep);
+u32 CreateKangaskhanStorage(bool32 isAsleep);
+void DeleteKangaskhanStorage(void);
+u32 KangaskhanStorageCallback(void);
 
 #endif
diff --git a/include/kecleon_bros.h b/include/kecleon_bros.h
index 4e029df1..bb27ebcb 100644
--- a/include/kecleon_bros.h
+++ b/include/kecleon_bros.h
@@ -82,10 +82,10 @@ enum KecleonStoreStates
     KECLEON_STORE_CANT_SELL_ITEM = 13,
 };
 
-u32 KecleonBros_Callback(void);
-void KecleonBros_Delete(void);
 // mode corresponds to the enum: KecleonBrosMode
-u32 KecleonBros_New(u32 mode);
+u32 CreateKecleonBros(u32 mode);
+void DeleteKecleonBros(void);
+u32 KecleonBrosCallback(void);
 
 bool32 sub_801A5D8(u32, s32, struct UnkTextStruct2_sub *, u32);
 u32 sub_801A6E8(bool8);
diff --git a/src/kangaskhan_storage.c b/src/kangaskhan_storage.c
index f8d56e3e..92cf66fb 100644
--- a/src/kangaskhan_storage.c
+++ b/src/kangaskhan_storage.c
@@ -105,7 +105,7 @@ void sub_8018AE4(void);
 void AdvanceToKangaskhanStorageFallbackState(void);
 void UpdateKangaskhanStorageState(u32);
 
-u32 KangaskhanStorage_New(bool32 isAsleep)
+u32 CreateKangaskhanStorage(bool32 isAsleep)
 {
     char *monName;
     struct OpenedFile *faceFile;
@@ -139,7 +139,7 @@ u32 KangaskhanStorage_New(bool32 isAsleep)
     return 1;
 }
 
-u32 KangaskhanStorage_Callback(void)
+u32 KangaskhanStorageCallback(void)
 {
     switch (gKangaskhanStorageWork->currState) {
         case KANGASKHAN_STORAGE_INIT:
@@ -190,7 +190,7 @@ u32 KangaskhanStorage_Callback(void)
     return 0;
 }
 
-void KangaskhanStorage_Delete(void)
+void DeleteKangaskhanStorage(void)
 {
     if (gKangaskhanStorageWork != NULL) {
         CloseFile(gKangaskhanStorageWork->faceFile);
diff --git a/src/kecleon_bros.c b/src/kecleon_bros.c
index 17397dac..2153f2a5 100644
--- a/src/kecleon_bros.c
+++ b/src/kecleon_bros.c
@@ -113,7 +113,7 @@ void Kecleon_SortItems(void);
 void KecleonBros_SetState(u32);
 void UpdateKecleonStoreDialogue(void);
 
-u32 KecleonBros_New(u32 mode)
+u32 CreateKecleonBros(u32 mode)
 {
     char *monName;
     struct OpenedFile *faceFile;
@@ -173,7 +173,7 @@ u32 KecleonBros_New(u32 mode)
     return 1;
 }
 
-u32 KecleonBros_Callback(void)
+u32 KecleonBrosCallback(void)
 {
     switch (gKecleonBrosWork->currState) {
         case KECLEON_STORE_INIT:
@@ -218,7 +218,7 @@ u32 KecleonBros_Callback(void)
     return 0;
 }
 
-void KecleonBros_Delete(void)
+void DeleteKecleonBros(void)
 {
     if (gKecleonBrosWork != NULL) {
         CloseFile(gKecleonBrosWork->faceFile);