simplify function names

7 files changed, 156 insertions, 156 deletions

diff --git a/asm/rom4.s b/asm/rom4.s
index 9e9992273..74051f8a5 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -3664,7 +3664,7 @@ _080548C4:
 	ldr r0, _080548DC
 	bl SetUpWindowConfig
 	ldr r0, _080548E0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	b _08054928
 	.align 2, 0
 _080548DC: .4byte gWindowConfig_81E6C3C
@@ -3772,7 +3772,7 @@ _080549B4:
 	ldr r0, _080549CC
 	bl SetUpWindowConfig
 	ldr r0, _080549D0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	b _08054A38
 	.align 2, 0
 _080549CC: .4byte gWindowConfig_81E6C3C
@@ -3934,7 +3934,7 @@ _08054B0C:
 	ldr r0, _08054B24
 	bl SetUpWindowConfig
 	ldr r0, _08054B28
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	b _08054B70
 	.align 2, 0
 _08054B24: .4byte gWindowConfig_81E6C3C
@@ -4079,7 +4079,7 @@ sub_8054C2C: @ 8054C2C
 	ldr r0, _08054C4C
 	bl SetUpWindowConfig
 	ldr r0, _08054C50
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl mapdata_load_assets_to_gpu_and_full_redraw
 	pop {r0}
 	bx r0
diff --git a/asm/rom5.s b/asm/rom5.s
index 1ccf5a81e..a5ca33806 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -27840,7 +27840,7 @@ sub_8088380: @ 8088380
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	movs r0, 0x26
 	ldrsh r1, [r5, r0]
 	lsls r0, r1, 4
@@ -28196,7 +28196,7 @@ sub_808862C: @ 808862C
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	movs r0, 0x26
 	ldrsh r1, [r5, r0]
 	lsls r0, r1, 4
@@ -34384,12 +34384,12 @@ _0808B77C: .4byte 0x03001770
 _0808B780: .4byte 0x0000043c
 _0808B784:
 	ldr r0, _0808B78C
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	b _0808B95C
 	.align 2, 0
 _0808B78C: .4byte gWindowConfig_81E71B4
 _0808B790:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	bne _0808B79A
 	b _0808B9B2
@@ -35897,7 +35897,7 @@ _0808C344:
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldrb r0, [r5]
 	adds r0, 0x1
 	strb r0, [r5]
@@ -37952,7 +37952,7 @@ _0808D4D8:
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r0, _0808D4FC
 	ldr r1, _0808D500
 	bl LZ77UnCompVram
@@ -41870,7 +41870,7 @@ _0808F3F4:
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r1, _0808F410
 	ldr r3, _0808F414
 	adds r1, r3
@@ -42779,7 +42779,7 @@ _0808FB9C:
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl ResetPaletteFade
 	ldr r1, _0808FBBC
 	ldr r0, _0808FBC0
@@ -43446,7 +43446,7 @@ _08090174:
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	add r1, sp, 0x4
 	movs r0, 0xFF
 	strb r0, [r1]
@@ -44290,7 +44290,7 @@ _0809085C:
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r2, _08090890
 	add r1, sp, 0x4
 	movs r0, 0
@@ -47235,7 +47235,7 @@ _08091F50:
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r0, _08091FAC
 	bl LoadCompressedObjectPic
 	ldr r0, _08091FB0
@@ -49554,7 +49554,7 @@ _080931DC:
 	adds r0, 0x1
 	strb r0, [r1]
 _080931EC:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	beq _08093232
 	b _0809320A
@@ -50322,7 +50322,7 @@ sub_80937BC: @ 80937BC
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -50598,7 +50598,7 @@ sub_80939A4: @ 80939A4
 	movs r1, 0
 	bl CreateTask
 	ldr r0, _080939BC
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -51616,7 +51616,7 @@ _0809413C: .4byte 0x06004800
 sub_8094140: @ 8094140
 	push {r4,r5,lr}
 	ldr r0, _0809417C
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r4, _08094180
 	ldr r5, _08094184
 	adds r0, r4, 0
@@ -51646,7 +51646,7 @@ _08094184: .4byte 0x02000094
 sub_8094188: @ 8094188
 	push {lr}
 	ldr r0, _080941D0
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	bl sub_80942F8
 	bl sub_8094334
 	bl sub_80943C4
@@ -51655,7 +51655,7 @@ sub_8094188: @ 8094188
 	bl sub_80944E8
 	bl sub_8094538
 	ldr r0, _080941D4
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	bl sub_8094354
 	bl sub_80943E4
 	bl sub_8094448
@@ -56712,7 +56712,7 @@ _080968E8:
 _080968F0: .4byte gWindowConfig_81E6D00
 _080968F4:
 	ldr r0, _08096900
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl MenuZeroFillScreen
 	b _0809697A
 	.align 2, 0
@@ -56851,7 +56851,7 @@ _08096A34:
 _08096A3C: .4byte gWindowConfig_81E6D00
 _08096A40:
 	ldr r0, _08096A4C
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl MenuZeroFillScreen
 	b _08096AD8
 	.align 2, 0
@@ -71212,7 +71212,7 @@ _0809DB94:
 _0809DB9C: .4byte gWindowConfig_81E6E6C
 _0809DBA0:
 	ldr r0, _0809DBB0
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	ldr r1, _0809DBB4
 	ldr r2, _0809DBB8
 	adds r1, r2
@@ -71222,7 +71222,7 @@ _0809DBB0: .4byte gWindowConfig_81E6E6C
 _0809DBB4: .4byte 0x03001770
 _0809DBB8: .4byte 0x0000043c
 _0809DBBC:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	bne _0809DBC6
 	b _0809DE38
@@ -82247,7 +82247,7 @@ _080A3270:
 _080A3278: .4byte gWindowConfig_81E6DFC
 _080A327C:
 	ldr r0, _080A328C
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	ldr r1, _080A3290
 	ldr r0, _080A3294
 	adds r1, r0
@@ -82257,7 +82257,7 @@ _080A328C: .4byte gWindowConfig_81E6DFC
 _080A3290: .4byte 0x03001770
 _080A3294: .4byte 0x0000043c
 _080A3298:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	bne _080A32A2
 	b _080A34A8
@@ -114959,7 +114959,7 @@ BuyMenuDrawGraphics: @ 80B3108
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl BuyMenuDrawMapGraphics
 	ldr r0, _080B322C
 	strb r6, [r0, 0x9]
@@ -120657,7 +120657,7 @@ sub_80B5DC8: @ 80B5DC8
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -123847,7 +123847,7 @@ sub_80B74FC: @ 80B74FC
 	adds r0, r4, 0
 	bl StringExpandPlaceholders
 	ldr r0, _080B7538
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	bl MenuDisplayMessageBox
 	adds r0, r4, 0
 	bl sub_8072044
@@ -124208,7 +124208,7 @@ sub_80B7794: @ 80B7794
 	adds r0, r1
 	adds r0, r6
 	ldr r0, [r0]
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r5, _080B77F4
 	ldrb r0, [r4, 0xE]
 	lsls r0, 3
@@ -124223,7 +124223,7 @@ sub_80B7794: @ 80B7794
 	adds r6, 0x8
 	adds r1, r6
 	ldr r0, [r1]
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldrb r0, [r4, 0xE]
 	lsls r0, 3
 	adds r5, 0x4
@@ -124254,7 +124254,7 @@ sub_80B77F8: @ 80B77F8
 	adds r2, 0x8
 	adds r1, r2
 	ldr r0, [r1]
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r1, _080B7834
 	ldrb r0, [r4, 0xE]
 	lsls r0, 3
@@ -124344,7 +124344,7 @@ _080B78A4: .4byte gUnknown_083CE3A8
 sub_80B78A8: @ 80B78A8
 	push {r4,lr}
 	ldr r0, _080B78E4
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r1, _080B78E8
 	ldr r4, _080B78EC
 	ldrb r0, [r4, 0x1]
@@ -124457,7 +124457,7 @@ sub_80B7960: @ 80B7960
 	adds r1, r4, 0
 	bl StringCopy
 	ldr r0, _080B79A4
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _080B799C
 	subs r4, 0x11
 	ldrb r1, [r4, 0x2]
@@ -129741,7 +129741,7 @@ unref_sub_80BA0EC: @ 80BA0EC
 	ldr r0, _080BA220
 	bl SetUpWindowConfig
 	ldr r0, _080BA224
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	movs r0, 0x1
 	negs r0, r0
 	str r4, [sp]
@@ -131814,7 +131814,7 @@ sub_80BB25C: @ 80BB25C
 	ldr r0, _080BB374
 	bl SetUpWindowConfig
 	ldr r0, _080BB378
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r1, _080BB37C
 	movs r0, 0x1
 	strh r0, [r1]
@@ -220554,9 +220554,9 @@ _080E6380:
 _080E6388: .4byte gWindowConfig_81E6DA8
 _080E638C:
 	ldr r0, _080E63A0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r0, _080E63A4
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl MenuZeroFillScreen
 	b _080E6402
 	.align 2, 0
@@ -226572,7 +226572,7 @@ sub_80E91D4: @ 80E91D4
 	lsrs r0, 24
 	adds r4, r0, 0
 	ldr r0, _080E91FC
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	cmp r4, 0xA
 	bne _080E9200
 	movs r0, 0x3
@@ -226825,7 +226825,7 @@ _080E93F8:
 	movs r4, 0
 _080E93FA:
 	ldr r0, _080E943C
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _080E9440
 	ldr r2, [r0]
 	ldr r0, _080E9444
@@ -226879,7 +226879,7 @@ _080E9450:
 	bl MenuPrint
 _080E9476:
 	ldr r0, _080E9488
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -227028,7 +227028,7 @@ _080E95A0: .4byte gUnknown_08E94AD0
 sub_80E95A4: @ 80E95A4
 	push {lr}
 	ldr r0, _080E95C0
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _080E95C4
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x9]
@@ -227080,7 +227080,7 @@ _080E960A:
 	bl sub_80E9620
 _080E9612:
 	ldr r0, _080E961C
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -227237,7 +227237,7 @@ _080E9740: .4byte gUnknown_083DBEA8
 sub_80E9744: @ 80E9744
 	push {lr}
 	ldr r0, _080E9760
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _080E9764
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x9]
@@ -227289,7 +227289,7 @@ _080E97AA:
 	bl sub_80E97C0
 _080E97B2:
 	ldr r0, _080E97BC
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -227434,7 +227434,7 @@ _080E98C0: .4byte 0x0000ffff
 sub_80E98C4: @ 80E98C4
 	push {lr}
 	ldr r0, _080E98E0
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _080E98E4
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x9]
@@ -227486,7 +227486,7 @@ _080E991E:
 	movs r2, 0x1B
 	bl MenuFillWindowRectWithBlankTile
 	ldr r0, _080E993C
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 _080E9936:
 	pop {r0}
 	bx r0
@@ -227525,7 +227525,7 @@ sub_80E9940: @ 80E9940
 sub_80E9974: @ 80E9974
 	push {r4-r6,lr}
 	ldr r0, _080E99C4
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _080E99C8
 	ldr r2, [r0]
 	adds r0, r2, 0
@@ -227710,7 +227710,7 @@ _080E9AD0: .4byte gUnknown_083DB694
 sub_80E9AD4: @ 80E9AD4
 	push {r4,lr}
 	ldr r0, _080E9AF4
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	movs r4, 0
 _080E9ADE:
 	adds r0, r4, 0
@@ -227791,7 +227791,7 @@ _080E9B58:
 	cmp r0, 0x7
 	bne _080E9B94
 	ldr r0, _080E9B90
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	b _080E9B9A
 	.align 2, 0
 _080E9B7C: .4byte gUnknown_083DB694
@@ -227802,7 +227802,7 @@ _080E9B8C: .4byte 0x00009a2a
 _080E9B90: .4byte gWindowConfig_81E6D70
 _080E9B94:
 	ldr r0, _080E9BE0
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 _080E9B9A:
 	ldr r2, _080E9BE4
 	ldr r4, [r2]
@@ -227844,7 +227844,7 @@ _080E9BEC: .4byte 0x00009e14
 _080E9BF0: .4byte 0x000099a6
 _080E9BF4:
 	ldr r0, _080E9C64
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	movs r6, 0
 	ldr r1, _080E9C68
 	adds r0, r5, r1
@@ -228050,7 +228050,7 @@ _080E9D78: .4byte 0x0000ffff
 sub_80E9D7C: @ 80E9D7C
 	push {r4-r7,lr}
 	ldr r0, _080E9DAC
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _080E9DB0
 	ldr r2, [r0]
 	movs r0, 0xE0
@@ -238752,12 +238752,12 @@ _080EF2EA:
 _080EF2F4: .4byte gWindowConfig_81E7224
 _080EF2F8:
 	ldr r0, _080EF300
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	b _080EF40C
 	.align 2, 0
 _080EF300: .4byte gWindowConfig_81E7224
 _080EF304:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	beq _080EF30E
 	b _080EF40C
@@ -239506,12 +239506,12 @@ _080EF8D2:
 _080EF8DC: .4byte gWindowConfig_81E7224
 _080EF8E0:
 	ldr r0, _080EF8E8
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	b _080EF9DC
 	.align 2, 0
 _080EF8E8: .4byte gWindowConfig_81E7224
 _080EF8EC:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	bne _080EF9DC
 	b _080EF9EA
@@ -240396,12 +240396,12 @@ _080EFFE8:
 _080EFFF0: .4byte gWindowConfig_81E7080
 _080EFFF4:
 	ldr r0, _080EFFFC
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	b _080F0154
 	.align 2, 0
 _080EFFFC: .4byte gWindowConfig_81E7080
 _080F0000:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	beq _080F000A
 	b _080F0154
@@ -240797,12 +240797,12 @@ _080F0344:
 _080F034C: .4byte gWindowConfig_81E70D4
 _080F0350:
 	ldr r0, _080F0358
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	b _080F0618
 	.align 2, 0
 _080F0358: .4byte gWindowConfig_81E70D4
 _080F035C:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	beq _080F0366
 	b _080F0618
@@ -241354,7 +241354,7 @@ _080F07E0:
 	bl sub_80F445C
 _080F07F4:
 	ldr r0, _080F0814
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _080F0818
 	ldr r0, [r0]
 	ldr r1, _080F0810
@@ -241377,7 +241377,7 @@ sub_80F081C: @ 80F081C
 	lsls r0, 24
 	lsrs r5, r0, 24
 	ldr r0, _080F0838
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	cmp r5, 0x4
 	bhi _080F08C6
 	lsls r0, r5, 2
@@ -241467,7 +241467,7 @@ _080F08E0: .4byte 0x0001869f
 sub_80F08E4: @ 80F08E4
 	push {lr}
 	ldr r0, _080F08FC
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	movs r0, 0
 	movs r1, 0x9
 	movs r2, 0xB
@@ -241652,7 +241652,7 @@ _080F0A40:
 	adds r1, r3, 0
 	bl sub_80F4428
 	ldr r0, _080F0A70
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	lsls r2, r5, 24
 	lsrs r2, 24
 	adds r0, r4, 0
@@ -241686,7 +241686,7 @@ sub_80F0A74: @ 80F0A74
 	movs r0, 0x1F
 	ands r7, r0
 	ldr r0, _080F0AE4
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	lsls r2, r7, 3
 	adds r0, r4, 0
 	movs r1, 0x61
@@ -241813,7 +241813,7 @@ _080F0B60:
 	cmp r2, r0
 	beq _080F0BAA
 	ldr r0, _080F0BC8
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	adds r1, r4, 0
 	adds r3, r1, 0x1
 	movs r0, 0xC
@@ -241836,7 +241836,7 @@ _080F0BC4: .4byte 0x0000876c
 _080F0BC8: .4byte gWindowConfig_81E70D4
 _080F0BCC:
 	ldr r0, _080F0C10
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r1, _080F0C14
 	adds r0, r5, r1
 	ldrh r0, [r0]
@@ -241929,7 +241929,7 @@ _080F0C64:
 	movs r0, 0
 	strh r0, [r1]
 	ldr r0, _080F0CC4
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _080F0CC8
 	adds r1, r4, r0
 	ldrh r0, [r5]
@@ -242067,7 +242067,7 @@ _080F0D8C:
 	movs r0, 0
 	strh r0, [r1]
 	ldr r0, _080F0DBC
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _080F0DC0
 	adds r1, r4, r0
 	ldrh r3, [r5]
@@ -242266,7 +242266,7 @@ _080F0F10:
 	movs r0, 0x1F
 	ands r4, r0
 	ldr r0, _080F0F60
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	adds r3, r4, 0x1
 	movs r0, 0xC
 	adds r1, r4, 0
@@ -242385,7 +242385,7 @@ sub_80F0FFC: @ 80F0FFC
 	movs r2, 0
 	bl sub_80FBFB4
 	ldr r0, _080F1054
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	adds r0, r5, 0
 	bl sub_80F19DC
 	ldr r0, _080F1058
@@ -242488,12 +242488,12 @@ _080F1104:
 _080F110C: .4byte gWindowConfig_81E70B8
 _080F1110:
 	ldr r0, _080F1118
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	b _080F1218
 	.align 2, 0
 _080F1118: .4byte gWindowConfig_81E70B8
 _080F111C:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	beq _080F1126
 	b _080F1218
@@ -258266,12 +258266,12 @@ _080F8B10:
 _080F8B18: .4byte gWindowConfig_81E6DFC
 _080F8B1C:
 	ldr r0, _080F8B24
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	b _080F8D30
 	.align 2, 0
 _080F8B24: .4byte gWindowConfig_81E6DFC
 _080F8B28:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	beq _080F8B32
 	b _080F8D30
@@ -265343,7 +265343,7 @@ _080FC104:
 _080FC10C: .4byte gWindowConfig_81E7224
 _080FC110:
 	ldr r0, _080FC11C
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl MenuZeroFillScreen
 	b _080FC1E6
 	.align 2, 0
@@ -277217,7 +277217,7 @@ sub_8101C84: @ 8101C84
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -283620,7 +283620,7 @@ sub_8104B80: @ 8104B80
 	bl sub_8104DA4
 	bl sub_81065DC
 	ldr r0, _08104BC0
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _08104BC4
 	movs r1, 0xA
 	movs r2, 0x20
@@ -283682,7 +283682,7 @@ sub_8104BFC: @ 8104BFC
 	adds r4, r0, 0
 	bl MenuZeroFillScreen
 	ldr r0, _08104C3C
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	bl sub_81064B8
 	ldrb r0, [r4, 0xA]
 	bl sub_8104CAC
@@ -287528,7 +287528,7 @@ sub_81068FC: @ 81068FC
 	push {r4,lr}
 	ldr r4, _08106914
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	pop {r4}
@@ -294734,7 +294734,7 @@ sub_8109E80: @ 8109E80
 	ldr r0, _0810A0CC
 	bl SetUpWindowConfig
 	ldr r0, _0810A0D0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	movs r0, 0x1
 	negs r0, r0
 	mov r1, r9
@@ -295811,7 +295811,7 @@ _0810A816:
 	ldr r0, _0810A85C
 	bl SetUpWindowConfig
 	ldr r0, _0810A860
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	add sp, 0x8
 	pop {r3}
 	mov r8, r3
@@ -297811,12 +297811,12 @@ _0810B7D4: .4byte 0x03001770
 _0810B7D8: .4byte 0x0000043c
 _0810B7DC:
 	ldr r0, _0810B7E4
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	b _0810B91C
 	.align 2, 0
 _0810B7E4: .4byte gWindowConfig_81E6E34
 _0810B7E8:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	bne _0810B7F2
 	b _0810B960
@@ -297830,12 +297830,12 @@ _0810B7FC: .4byte 0x03001770
 _0810B800: .4byte 0x0000043c
 _0810B804:
 	ldr r0, _0810B80C
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	b _0810B91C
 	.align 2, 0
 _0810B80C: .4byte gWindowConfig_81E6E50
 _0810B810:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	bne _0810B81A
 	b _0810B960
@@ -298206,7 +298206,7 @@ _0810BB08: .4byte sub_810B96C
 sub_810BB0C: @ 810BB0C
 	push {lr}
 	ldr r0, _0810BB28
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _0810BB2C
 	bl itemid_get_item
 	movs r1, 0x2
@@ -298224,7 +298224,7 @@ _0810BB2C: .4byte 0x00000111
 sub_810BB30: @ 810BB30
 	push {lr}
 	ldr r0, _0810BB70
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _0810BB74
 	movs r1, 0x2
 	movs r2, 0xD
@@ -298267,7 +298267,7 @@ sub_810BB88: @ 810BB88
 	lsrs r0, 24
 	mov r8, r0
 	ldr r0, _0810BBF4
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	mov r6, r8
 	adds r0, r6, 0
 	adds r0, 0x8
@@ -298683,7 +298683,7 @@ _0810BECC:
 	cmp r6, 0x4
 	bls _0810BE30
 	ldr r0, _0810BF10
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _0810BF14
 	ldrb r2, [r0]
 	ldrb r1, [r0, 0x1]
@@ -299276,7 +299276,7 @@ _0810C37C:
 	movs r0, 0x1
 	bl sub_80F98A4
 	ldr r0, _0810C3EC
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	adds r1, r4, 0x4
 	movs r0, 0x7
 	movs r2, 0xD
@@ -299484,7 +299484,7 @@ sub_810C540: @ 810C540
 	lsls r5, 24
 	lsrs r5, 24
 	ldr r0, _0810C5A0
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	bl sub_8072DEC
 	movs r0, 0x7
 	movs r1, 0x4
@@ -299639,7 +299639,7 @@ sub_810C668: @ 810C668
 	bl sub_80F979C
 _0810C698:
 	ldr r0, _0810C6D0
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	movs r0, 0x7
 	movs r1, 0x6
 	movs r2, 0xD
@@ -299699,7 +299699,7 @@ sub_810C704: @ 810C704
 	lsls r4, 24
 	lsrs r4, 24
 	ldr r0, _0810C738
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	ldr r0, _0810C73C
 	ldrb r0, [r0, 0x1]
 	bl sub_810BC84
@@ -317414,7 +317414,7 @@ _08115460:
 	ldr r0, _08115480
 	bl SetUpWindowConfig
 	ldr r0, _08115484
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r0, _08115488
 	movs r2, 0xE0
 	lsls r2, 1
@@ -377577,13 +377577,13 @@ sub_81326D8: @ 81326D8
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl MenuZeroFillScreen
 	ldr r4, _08132790
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl MenuZeroFillScreen
 	ldr r0, _08132794
 	strh r5, [r0]
@@ -377646,13 +377646,13 @@ sub_81327A4: @ 81327A4
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl MenuZeroFillScreen
 	ldr r4, _0813285C
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl MenuZeroFillScreen
 	movs r1, 0x80
 	lsls r1, 19
@@ -378589,7 +378589,7 @@ _08132FE8: .4byte 0x030007b0
 sub_8132FEC: @ 8132FEC
 	push {r4-r6,lr}
 	ldr r0, _08133024
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	movs r5, 0
 	ldr r4, _08133028
 	adds r6, r4, 0
@@ -378609,7 +378609,7 @@ _08132FFA:
 	cmp r5, 0x3
 	bls _08132FFA
 	ldr r0, _0813302C
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -385214,12 +385214,12 @@ _08136366:
 _08136370: .4byte gWindowConfig_81E7080
 _08136374:
 	ldr r0, _0813637C
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	b _08136524
 	.align 2, 0
 _0813637C: .4byte gWindowConfig_81E7080
 _08136380:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	bne _0813638A
 	b _0813657A
@@ -386244,7 +386244,7 @@ sub_8136BB8: @ 8136BB8
 	ldr r1, _08136C38
 	bl StringAppend
 	ldr r0, _08136C3C
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	movs r0, 0
 	movs r1, 0x10
 	movs r2, 0x1D
@@ -386287,7 +386287,7 @@ sub_8136C40: @ 8136C40
 	bhi _08136C60
 	bl MenuZeroFillScreen
 	ldr r0, _08136C68
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 _08136C60:
 	adds r0, r4, 0
 	pop {r4}
@@ -386301,7 +386301,7 @@ _08136C68: .4byte gWindowConfig_81E7080
 sub_8136C6C: @ 8136C6C
 	push {lr}
 	ldr r0, _08136C8C
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	movs r0, 0
 	movs r1, 0x10
 	movs r2, 0x1D
@@ -386429,7 +386429,7 @@ _08136D5A:
 sub_8136D60: @ 8136D60
 	push {lr}
 	ldr r0, _08136D84
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	movs r0, 0
 	movs r1, 0x10
 	movs r2, 0x1D
@@ -386451,7 +386451,7 @@ sub_8136D8C: @ 8136D8C
 	push {lr}
 	bl MenuZeroFillScreen
 	ldr r0, _08136D9C
-	bl BasicInitMenuWindowConfig
+	bl BasicInitMenuWindow
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -402751,7 +402751,7 @@ sub_813EEE4: @ 813EEE4
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl MenuZeroFillScreen
 	ldr r1, _0813EFA0
 	movs r2, 0xF8
@@ -409284,7 +409284,7 @@ sub_81422E8: @ 81422E8
 	adds r0, r5, 0
 	bl SetUpWindowConfig
 	adds r0, r5, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r1, _08142318
 	lsls r0, r4, 2
 	adds r0, r4
@@ -409839,7 +409839,7 @@ sub_8142738: @ 8142738
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r0, _08142788
 	ldrb r0, [r0, 0x8]
 	movs r1, 0x78
@@ -410267,7 +410267,7 @@ _08142AB8:
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r1, _08142AF0
 	adds r0, r6, r5
 	lsls r0, 3
@@ -411604,7 +411604,7 @@ sub_8143570: @ 8143570
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -412192,7 +412192,7 @@ _08143A0E:
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r0, _08143AFC
 	movs r1, 0x80
 	movs r2, 0x40
@@ -416724,7 +416724,7 @@ sub_8145D88: @ 8145D88
 	ldr r0, _08145ED4
 	bl SetUpWindowConfig
 	ldr r0, _08145ED8
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl pokedex_diploma_something
 	movs r0, 0x1
 	negs r0, r0
@@ -417043,12 +417043,12 @@ _08146108: .4byte 0x03001770
 _0814610C: .4byte 0x0000043c
 _08146110:
 	ldr r0, _08146118
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	b _0814620C
 	.align 2, 0
 _08146118: .4byte gWindowConfig_81E6E18
 _0814611C:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	bne _08146126
 	b _08146250
@@ -418081,7 +418081,7 @@ CB2_InitMysteryEventMenu: @ 8146930
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	bl MenuZeroFillScreen
 	movs r1, 0x80
 	lsls r1, 19
@@ -418749,7 +418749,7 @@ _08146E6C:
 	ldr r0, _08146FF4
 	bl SetUpWindowConfig
 	ldr r0, _08146FF8
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	movs r0, 0xD
 	movs r1, 0x8
 	movs r2, 0x10
@@ -419991,12 +419991,12 @@ _08147978: .4byte 0x03001770
 _0814797C: .4byte 0x0000043c
 _08147980:
 	ldr r0, _08147988
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	b _08147A44
 	.align 2, 0
 _08147988: .4byte gWindowConfig_81E6E50
 _0814798C:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	bne _08147996
 	b _08147AD0
@@ -422004,7 +422004,7 @@ _08148A2C:
 	ldr r0, _08148AE0
 	bl SetUpWindowConfig
 	ldr r0, _08148AE4
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	movs r0, 0x1
 	negs r0, r0
 	ldr r1, _08148AE8
diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s
index dbd6f24ec..3e4d74726 100644
--- a/asm/rom_8040EB4.s
+++ b/asm/rom_8040EB4.s
@@ -14455,7 +14455,7 @@ _08047F48:
 	ldr r0, _08048024
 	bl SetVBlankCallback
 	ldr r0, _08048028
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r4, _0804802C
 	adds r0, r4, 0
 	bl SetUpWindowConfig
@@ -15150,7 +15150,7 @@ _0804857C:
 	ldr r0, _0804863C
 	bl SetVBlankCallback
 	ldr r0, _08048640
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r4, _08048644
 	adds r0, r4, 0
 	bl SetUpWindowConfig
@@ -26668,7 +26668,7 @@ _0804E5AC:
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r3, _0804E610
 	ldr r2, [r3]
 	ldrb r0, [r2]
@@ -27327,7 +27327,7 @@ _0804EBBC:
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r1, _0804EC68
 	ldr r2, _0804EC6C
 	adds r0, r2, 0
@@ -27976,7 +27976,7 @@ sub_804F0F4: @ 804F0F4
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r1, _0804F160
 	ldr r2, _0804F164
 	adds r0, r2, 0
@@ -34568,7 +34568,7 @@ unref_sub_80524BC: @ 80524BC
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r0, _08052524
 	ldrh r0, [r0, 0x20]
 	bl SeedRng
diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s
index 46dc9d146..f3809002f 100644
--- a/asm/rom_8065394.s
+++ b/asm/rom_8065394.s
@@ -11759,7 +11759,7 @@ _0806AB16:
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	movs r1, 0x80
 	lsls r1, 19
 	movs r2, 0x88
@@ -12756,12 +12756,12 @@ _0806B3B8: .4byte 0x03001770
 _0806B3BC: .4byte 0x0000043c
 _0806B3C0:
 	ldr r0, _0806B3C8
-	bl MultistepInitMenuWindowConfigBegin
+	bl MultistepInitMenuWindowBegin
 	b _0806B426
 	.align 2, 0
 _0806B3C8: .4byte gWindowConfig_81E6CC8
 _0806B3CC:
-	bl MultistepInitMenuWindowConfigContinue
+	bl MultistepInitMenuWindowContinue
 	cmp r0, 0
 	beq _0806B450
 	ldr r1, _0806B3DC
@@ -24725,7 +24725,7 @@ sub_8071284: @ 8071284
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, _080712AC
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	ldr r4, _080712B0
 	adds r0, r4, 0
 	movs r1, 0x50
@@ -25829,7 +25829,7 @@ _08071AB6:
 	adds r0, r4, 0
 	bl SetUpWindowConfig
 	adds r0, r4, 0
-	bl InitMenuWindowConfig
+	bl InitMenuWindow
 	movs r1, 0x80
 	lsls r1, 19
 	movs r2, 0x80
diff --git a/src/link.c b/src/link.c
index 0fa1f4673..13fcf8c05 100644
--- a/src/link.c
+++ b/src/link.c
@@ -27,7 +27,7 @@ struct LinkTestBGInfo
     u32 dummy_C;
 };
 
-extern void InitMenuWindowConfig(const struct WindowConfig *);
+extern void InitMenuWindow(const struct WindowConfig *);
 extern void sub_80516C4(u8, u16);
 
 extern u8 unk_2000000[];
@@ -237,7 +237,7 @@ static void LinkTestScreen(void)
     ResetTasks();
     SetVBlankCallback(VBlankCB_LinkTest);
     SetUpWindowConfig(&gWindowConfig_81E6CE4);
-    InitMenuWindowConfig(&gWindowConfig_81E6CE4);
+    InitMenuWindow(&gWindowConfig_81E6CE4);
     ResetBlockSend();
     gLinkType = 0x1111;
     OpenLink();
@@ -1224,7 +1224,7 @@ void CB2_LinkError(void)
     ResetTasks();
     SetVBlankCallback(VBlankCB_LinkTest);
     SetUpWindowConfig(&gWindowConfig_81E7198);
-    InitMenuWindowConfig(&gWindowConfig_81E7198);
+    InitMenuWindow(&gWindowConfig_81E7198);
     MenuZeroFillScreen();
     REG_BLDALPHA = 0;
     REG_BG0VOFS = 0;
diff --git a/src/main_menu.c b/src/main_menu.c
index 246cf72a3..721c7090e 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -35,7 +35,7 @@ void DisplayYesNoMenu(u8 r0, u8 r1, u32 r2);
 s8 ProcessMenuInputNoWrap_(void);
 void c2_load_new_map_2(void);
 void LZ77UnCompVram(const void *src, void *dest);
-void InitMenuWindowConfig(const struct WindowConfig *);
+void InitMenuWindow(const struct WindowConfig *);
 void CB2_MainMenu(void);
 void VBlankCB_MainMenu(void);
 void DecompressPicFromTable_2(const struct SpriteSheet *, u8, u8, void *, void *, u32);
@@ -139,7 +139,7 @@ u32 InitMainMenu(u8 a1)
     ResetSpriteData();
     FreeAllSpritePalettes();
     SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitMenuWindowConfig(&gWindowConfig_81E6CE4);
+    InitMenuWindow(&gWindowConfig_81E6CE4);
 
     if (a1)
         BeginNormalPaletteFade(-1, 0, 0x10, 0, 0x0000); // fade to black
@@ -721,7 +721,7 @@ void set_default_player_name(u8 a);
 void Task_Birch1(u8 taskId)
 {
     SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitMenuWindowConfig(&gWindowConfig_81E6CE4);
+    InitMenuWindow(&gWindowConfig_81E6CE4);
     REG_WIN0H = 0;
     REG_WIN0V = 0;
     REG_WININ = 0;
@@ -1363,7 +1363,7 @@ void new_game_prof_birch_speech_part2_start()
     AddBirchSpeechObjects(taskId);
 
     SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitMenuWindowConfig(&gWindowConfig_81E6CE4);
+    InitMenuWindow(&gWindowConfig_81E6CE4);
 
     if (gSaveBlock2.playerGender != MALE)
     {
diff --git a/src/menu.c b/src/menu.c
index 6533b59cf..1ced7d517 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -17,15 +17,15 @@ struct Menu
     u8 columnXCoords[8];
 };
 
-void InitMenuWindowConfig(struct WindowConfig *);
-void MultistepInitMenuWindowConfigBegin(struct WindowConfig *);
-void MultistepInitMenuWindowConfigInternal(struct WindowConfig *, u16);
-bool32 MultistepInitMenuWindowConfigContinue(void);
-void InitMenuWindowConfigInternal(struct WindowConfig *, u16);
+void InitMenuWindow(struct WindowConfig *);
+void MultistepInitMenuWindowBegin(struct WindowConfig *);
+void MultistepInitMenuWindowInternal(struct WindowConfig *, u16);
+bool32 MultistepInitMenuWindowContinue(void);
+void InitMenuWindowInternal(struct WindowConfig *, u16);
 void unref_sub_8071DA4(struct WindowConfig *, u16);
 void MenuLoadTextWindowGraphics_OverrideFrameType(u8);
 void MenuLoadTextWindowGraphics(void);
-void BasicInitMenuWindowConfig(struct WindowConfig *);
+void BasicInitMenuWindow(struct WindowConfig *);
 void MenuPrint(u8 *, u8, u8);
 void MenuZeroFillWindowRect(u8, u8, u8, u8);
 void MenuFillWindowRectWithBlankTile(u8, u8, u8, u8);
@@ -102,17 +102,17 @@ extern u16 gMenuMessageBoxContentTileOffset;
 
 extern const u8 *gUnknown_08376D74[][2];
 
-void InitMenuWindowConfig(struct WindowConfig *winConfig)
+void InitMenuWindow(struct WindowConfig *winConfig)
 {
-    InitMenuWindowConfigInternal(winConfig, 1);
+    InitMenuWindowInternal(winConfig, 1);
 }
 
-void MultistepInitMenuWindowConfigBegin(struct WindowConfig *winConfig)
+void MultistepInitMenuWindowBegin(struct WindowConfig *winConfig)
 {
-    MultistepInitMenuWindowConfigInternal(winConfig, 1);
+    MultistepInitMenuWindowInternal(winConfig, 1);
 }
 
-void MultistepInitMenuWindowConfigInternal(struct WindowConfig *winConfig, u16 tileOffset)
+void MultistepInitMenuWindowInternal(struct WindowConfig *winConfig, u16 tileOffset)
 {
     gMenuMultistepInitState = 0;
     gMenuTextTileOffset = tileOffset;
@@ -120,7 +120,7 @@ void MultistepInitMenuWindowConfigInternal(struct WindowConfig *winConfig, u16 t
     InitWindowFromConfig(&gMenuWindow, winConfig);
 }
 
-bool32 MultistepInitMenuWindowConfigContinue(void)
+bool32 MultistepInitMenuWindowContinue(void)
 {
     switch (gMenuMultistepInitState)
     {
@@ -149,7 +149,7 @@ bool32 MultistepInitMenuWindowConfigContinue(void)
     }
 }
 
-void InitMenuWindowConfigInternal(struct WindowConfig *winConfig, u16 tileOffset)
+void InitMenuWindowInternal(struct WindowConfig *winConfig, u16 tileOffset)
 {
     gMenuWindowPtr = &gMenuWindow;
     InitWindowFromConfig(&gMenuWindow, winConfig);
@@ -181,7 +181,7 @@ void MenuLoadTextWindowGraphics(void)
     LoadTextWindowGraphics(gMenuWindowPtr);
 }
 
-void BasicInitMenuWindowConfig(struct WindowConfig *winConfig)
+void BasicInitMenuWindow(struct WindowConfig *winConfig)
 {
     InitWindowFromConfig(gMenuWindowPtr, winConfig);
     gMenuWindowPtr->tileDataStartOffset = gMenuTextTileOffset;