diff --git a/home/header.asm b/home/header.asm
index 3531d2851..085787627 100644
--- a/home/header.asm
+++ b/home/header.asm
@@ -50,7 +50,7 @@ SECTION "serial", ROM0
 	jp Serial
 
 SECTION "joypad", ROM0
-	jp JoypadInt
+	jp Joypad
 
 
 ; Game Boy cartridge header
diff --git a/home/joypad.asm b/home/joypad.asm
index cfc94a4be..2ffd8343c 100644
--- a/home/joypad.asm
+++ b/home/joypad.asm
@@ -1,4 +1,4 @@
-JoypadInt::
+Joypad::
 ; Replaced by Joypad, called from VBlank instead of the useless
 ; joypad interrupt.
 
@@ -13,7 +13,7 @@ ClearJoypad::
 	ldh [hJoyDown], a
 	ret
 
-Joypad::
+UpdateJoypad::
 ; This is called automatically every frame in VBlank.
 ; Read the joypad register and translate it to something more
 ; workable for use in-game. There are 8 buttons, so we can use
diff --git a/home/vblank.asm b/home/vblank.asm
index e86ee00b7..4fea80c50 100644
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -131,7 +131,7 @@ VBlank0::
 	ld [wTextDelayFrames], a
 .ok2
 
-	call Joypad
+	call UpdateJoypad
 
 	ld a, BANK(_UpdateSound)
 	rst Bankswitch
@@ -325,7 +325,7 @@ VBlank4::
 
 	call hTransferVirtualOAM
 
-	call Joypad
+	call UpdateJoypad
 
 	xor a
 	ld [wVBlankOccurred], a
@@ -364,7 +364,7 @@ VBlank5::
 	xor a
 	ld [wVBlankOccurred], a
 
-	call Joypad
+	call UpdateJoypad
 
 	xor a
 	ldh [rIF], a