diff --git a/charmap.txt b/charmap.txt
index faa0e9475..ebcd1f6b6 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -257,21 +257,21 @@ PKMN      = 53 54
 POKEBLOCK = 55 56 57 58 59
 
 @ string placeholders
-@ unknown           (FD 00)
-PLAYER             = FD 01
-STR_VAR_1          = FD 02
-STR_VAR_2          = FD 03
-STR_VAR_3          = FD 04
-@ unknown           (FD 05)
-RIVAL              = FD 06
+@ unknown       (FD 00)
+PLAYER         = FD 01
+STR_VAR_1      = FD 02
+STR_VAR_2      = FD 03
+STR_VAR_3      = FD 04
+@ unknown       (FD 05)
+RIVAL          = FD 06
 @ version-dependent strings
-VERSION            = FD 07 @ "RUBY"    / "SAPPHIRE"
-EVIL_TEAM          = FD 08 @ "MAGMA"   / "AQUA"
-GOOD_TEAM          = FD 09 @ "AQUA"    / "MAGMA"
-EVIL_TEAM_LEADER   = FD 0A @ "MAXIE"   / "ARCHIE"
-GOOD_TEAM_LEADER   = FD 0B @ "ARCHIE"  / "MAXIE"
-CUR_VERSION_MASCOT = FD 0C @ "GROUDON" / "KYOGRE"
-OPP_VERSION_MASCOT = FD 0D @ "KYOGRE"  / "GROUDON"
+VERSION        = FD 07 @ "RUBY"    / "SAPPHIRE"
+EVIL_TEAM      = FD 08 @ "MAGMA"   / "AQUA"
+GOOD_TEAM      = FD 09 @ "AQUA"    / "MAGMA"
+EVIL_LEADER    = FD 0A @ "MAXIE"   / "ARCHIE"
+GOOD_LEADER    = FD 0B @ "ARCHIE"  / "MAXIE"
+EVIL_LEGENDARY = FD 0C @ "GROUDON" / "KYOGRE"
+GOOD_LEGENDARY = FD 0D @ "KYOGRE"  / "GROUDON"
 
 @ indicates the end of a town/city name (before " TOWN" or " CITY")
 NAME_END = FC 00
diff --git a/data/string_util.s b/data/string_util.s
index 63890ddd9..9e3a5d568 100644
--- a/data/string_util.s
+++ b/data/string_util.s
@@ -37,7 +37,7 @@ gExpandPlaceholderFuncTable: @ 81E72F8
 	.4byte ExpandPlaceholder_Version
 	.4byte ExpandPlaceholder_EvilTeam
 	.4byte ExpandPlaceholder_GoodTeam
-	.4byte ExpandPlaceholder_EvilTeamLeader
-	.4byte ExpandPlaceholder_GoodTeamLeader
-	.4byte ExpandPlaceholder_CurVersionMascot
-	.4byte ExpandPlaceholder_OppVersionMascot
+	.4byte ExpandPlaceholder_EvilLeader
+	.4byte ExpandPlaceholder_GoodLeader
+	.4byte ExpandPlaceholder_EvilLegendary
+	.4byte ExpandPlaceholder_GoodLegendary
diff --git a/src/string_util.c b/src/string_util.c
index 05c415478..1ac5be114 100644
--- a/src/string_util.c
+++ b/src/string_util.c
@@ -469,13 +469,13 @@ u8 *ExpandPlaceholder_RivalName()
 }
 
 #define VERSION_DEPENDENT_PLACEHOLDER_LIST \
-    X(Version,          Ruby,    Sapphire) \
-    X(EvilTeam,         Magma,   Aqua)     \
-    X(GoodTeam,         Aqua,    Magma)    \
-    X(EvilTeamLeader,   Maxie,   Archie)   \
-    X(GoodTeamLeader,   Archie,  Maxie)    \
-    X(CurVersionMascot, Groudon, Kyogre)   \
-    X(OppVersionMascot, Kyogre,  Groudon)
+    X(Version,       Ruby,    Sapphire)    \
+    X(EvilTeam,      Magma,   Aqua)        \
+    X(GoodTeam,      Aqua,    Magma)       \
+    X(EvilLeader,    Maxie,   Archie)      \
+    X(GoodLeader,    Archie,  Maxie)       \
+    X(EvilLegendary, Groudon, Kyogre)      \
+    X(GoodLegendary, Kyogre,  Groudon)
 
 #ifdef SAPPHIRE
 #define X(ph, r, s) \