diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index e1feaaed9..3b9220095 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -22,7 +22,7 @@ NUM_MEM_BUFFERS EQU const_value
 	const HAVE_AMOUNT ; 1
 	const HAVE_LESS   ; 2
 
-; checkpokeitem return values
+; checkpokemail return values
 	const_def
 	const POKEMAIL_WRONG_MAIL ; 0
 	const POKEMAIL_CORRECT    ; 1
diff --git a/docs/event_commands.md b/docs/event_commands.md
index 5eaf1d778..21c49dfee 100644
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@@ -99,9 +99,9 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
 
 ## `$2E`: <code>giveegg <i>mon_id</i>, <i>level</i></code>
 
-## `$2F`: <code>givepokeitem <i>pointer</i></code>
+## `$2F`: <code>givepokemail <i>pointer</i></code>
 
-## `$30`: <code>checkpokeitem <i>pointer</i></code>
+## `$30`: <code>checkpokemail <i>pointer</i></code>
 
 ## `$31`: <code>checkevent <i>event_flag</i></code>
 
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 9aaf98f39..a18be2e6c 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -112,8 +112,8 @@ ScriptCommandTable:
 	dw Script_checkpoke                  ; 2c
 	dw Script_givepoke                   ; 2d
 	dw Script_giveegg                    ; 2e
-	dw Script_givepokeitem               ; 2f
-	dw Script_checkpokeitem              ; 30
+	dw Script_givepokemail               ; 2f
+	dw Script_checkpokemail              ; 30
 	dw Script_checkevent                 ; 31
 	dw Script_clearevent                 ; 32
 	dw Script_setevent                   ; 33
@@ -2019,7 +2019,7 @@ Script_stringtotext:
 	ld de, wStringBuffer2
 	jp ConvertMemToText
 
-Script_givepokeitem:
+Script_givepokemail:
 ; script command 0x2f
 ; parameters: pointer
 
@@ -2037,10 +2037,10 @@ Script_givepokeitem:
 	ld a, [wScriptBank]
 	call FarCopyBytes
 	pop bc
-	farcall GivePokeItem
+	farcall GivePokeMail
 	ret
 
-Script_checkpokeitem:
+Script_checkpokemail:
 ; script command 0x30
 ; parameters: pointer
 
@@ -2050,7 +2050,7 @@ Script_checkpokeitem:
 	ld d, a
 	ld a, [wScriptBank]
 	ld b, a
-	farcall CheckPokeItem
+	farcall CheckPokeMail
 	ret
 
 Script_giveitem:
diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm
index b8685c0df..33bce604d 100644
--- a/engine/pokemon/mail.asm
+++ b/engine/pokemon/mail.asm
@@ -124,7 +124,7 @@ GetMailboxCount: ; 44648
 	jp CloseSRAM
 ; 44654
 
-CheckPokeItem:: ; 44654
+CheckPokeMail:: ; 44654
 	push bc
 	push de
 	farcall SelectMonFromParty
@@ -194,7 +194,7 @@ CheckPokeItem:: ; 44654
 ; 446cc
 
 
-GivePokeItem:: ; 446cc
+GivePokeMail:: ; 446cc
 	ld a, [wPartyCount]
 	dec a
 	push af
diff --git a/macros/legacy.asm b/macros/legacy.asm
index a139e02b4..9e452da28 100644
--- a/macros/legacy.asm
+++ b/macros/legacy.asm
@@ -51,6 +51,8 @@ reloadmapmusic    EQUS "dontrestartmapmusic"
 resetfuncs        EQUS "endall"
 storetext         EQUS "battletowertext"
 displaylocation   EQUS "landmarktotext"
+givepokeitem      EQUS "givepokemail"
+checkpokeitem     EQUS "checkpokemail"
 
 
 ; macros/scripts/maps.asm