diff --git a/ui/raidboss/data/03-hw/dungeon/baelsars_wall.ts b/ui/raidboss/data/03-hw/dungeon/baelsars_wall.ts
index 58822bda37..5f8fa5f2fa 100644
--- a/ui/raidboss/data/03-hw/dungeon/baelsars_wall.ts
+++ b/ui/raidboss/data/03-hw/dungeon/baelsars_wall.ts
@@ -88,7 +88,7 @@ const triggerSet: TriggerSet<Data> = {
       netRegex: { id: '1CC8', source: 'The Griffin' },
       condition: Conditions.targetIsNotYou(),
       alertText: (data, matches, output) =>
-        output.text!({ player: data.ShortName(matches.target) }),
+        output.text!({ player: data.party.member(matches.target) }),
       outputStrings: {
         text: {
           en: 'Break chain on ${player}',
diff --git a/ui/raidboss/data/03-hw/dungeon/baelsars_wall62.ts b/ui/raidboss/data/03-hw/dungeon/baelsars_wall62.ts
index b171358be3..3027055d75 100644
--- a/ui/raidboss/data/03-hw/dungeon/baelsars_wall62.ts
+++ b/ui/raidboss/data/03-hw/dungeon/baelsars_wall62.ts
@@ -88,7 +88,7 @@ const triggerSet: TriggerSet<Data> = {
       netRegex: { id: '1CC8', source: 'The Griffin' },
       condition: Conditions.targetIsNotYou(),
       alertText: (data, matches, output) =>
-        output.text!({ player: data.ShortName(matches.target) }),
+        output.text!({ player: data.party.member(matches.target) }),
       outputStrings: {
         text: {
           en: 'Break chain on ${player}',
diff --git a/ui/raidboss/data/03-hw/raid/a4s.ts b/ui/raidboss/data/03-hw/raid/a4s.ts
index 7920af6309..ef5ac63d67 100644
--- a/ui/raidboss/data/03-hw/raid/a4s.ts
+++ b/ui/raidboss/data/03-hw/raid/a4s.ts
@@ -30,7 +30,7 @@ const triggerSet: TriggerSet<Data> = {
       },
       infoText: (data, matches, output) => {
         if (data.me === matches.target)
-          return output.orbsOn!({ player: data.ShortName(matches.target) });
+          return output.orbsOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         orbsOn: {
diff --git a/ui/raidboss/data/03-hw/trial/sophia-ex.ts b/ui/raidboss/data/03-hw/trial/sophia-ex.ts
index b45618193f..9ba6ab3c68 100644
--- a/ui/raidboss/data/03-hw/trial/sophia-ex.ts
+++ b/ui/raidboss/data/03-hw/trial/sophia-ex.ts
@@ -211,7 +211,7 @@ const triggerSet: TriggerSet<Data> = {
         if (data.me === matches.target)
           return output.infusionOnYou!();
 
-        return output.infusionOn!({ player: data.ShortName(matches.target) });
+        return output.infusionOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         infusionOnYou: {
diff --git a/ui/raidboss/data/03-hw/trial/zurvan-ex.ts b/ui/raidboss/data/03-hw/trial/zurvan-ex.ts
index 1c53381216..be78cf28bb 100644
--- a/ui/raidboss/data/03-hw/trial/zurvan-ex.ts
+++ b/ui/raidboss/data/03-hw/trial/zurvan-ex.ts
@@ -46,7 +46,7 @@ const triggerSet: TriggerSet<Data> = {
       },
       alertText: (data, matches, output) => {
         if (!(data.me === matches.target))
-          return output.avoidWaveCannon!({ target: data.ShortName(matches.target) });
+          return output.avoidWaveCannon!({ target: data.party.member(matches.target) });
       },
       outputStrings: {
         waveCannonTarget: {
@@ -76,7 +76,7 @@ const triggerSet: TriggerSet<Data> = {
           return;
         if (data.waveTarget === undefined)
           return output.unknownStackTarget!();
-        return output.stackOn!({ player: data.ShortName(data.waveTarget) });
+        return output.stackOn!({ player: data.party.member(data.waveTarget) });
       },
       outputStrings: {
         unknownStackTarget: Outputs.stackMarker,
@@ -126,7 +126,7 @@ const triggerSet: TriggerSet<Data> = {
           return;
         if (matches.target === data.me)
           return output.stackYou!();
-        return output.stackOn!({ player: data.ShortName(matches.target) });
+        return output.stackOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         stackYou: Outputs.stackOnYou,
@@ -234,7 +234,7 @@ const triggerSet: TriggerSet<Data> = {
         data.tetherBuddy ??= buddy;
       },
       alertText: (data, _matches, output) => {
-        return output.tetherBuddy!({ buddy: data.ShortName(data.tetherBuddy) });
+        return output.tetherBuddy!({ buddy: data.party.member(data.tetherBuddy) });
       },
       outputStrings: {
         tetherBuddy: {
@@ -301,7 +301,7 @@ const triggerSet: TriggerSet<Data> = {
         if (data.infiniteElement === 'ice')
           element = output.ice!();
         const buddy = data.tetherBuddy;
-        return output.sealTowers!({ element: element, buddy: data.ShortName(buddy) });
+        return output.sealTowers!({ element: element, buddy: data.party.member(buddy) });
       },
       outputStrings: {
         sealTowers: {
diff --git a/ui/raidboss/data/04-sb/dungeon/fractal_continuum_hard.ts b/ui/raidboss/data/04-sb/dungeon/fractal_continuum_hard.ts
index 9d07792751..dc7990a81c 100644
--- a/ui/raidboss/data/04-sb/dungeon/fractal_continuum_hard.ts
+++ b/ui/raidboss/data/04-sb/dungeon/fractal_continuum_hard.ts
@@ -197,7 +197,7 @@ const triggerSet: TriggerSet<Data> = {
         const partner = data.dischord?.[partnerId];
         if (partner === undefined)
           return;
-        return output.text!({ player: data.ShortName(partner) });
+        return output.text!({ player: data.party.member(partner) });
       },
       outputStrings: {
         text: {
diff --git a/ui/raidboss/data/04-sb/dungeon/temple_of_the_fist.ts b/ui/raidboss/data/04-sb/dungeon/temple_of_the_fist.ts
index c0a446b1d3..12f7b53e66 100644
--- a/ui/raidboss/data/04-sb/dungeon/temple_of_the_fist.ts
+++ b/ui/raidboss/data/04-sb/dungeon/temple_of_the_fist.ts
@@ -116,7 +116,8 @@ const triggerSet: TriggerSet<Data> = {
       type: 'StartsUsing',
       netRegex: { id: '1FE6', source: 'Ivon Coeurlfist' },
       condition: (data) => data.role === 'healer' || data.job === 'BLU',
-      infoText: (data, matches, output) => output.text!({ player: data.ShortName(matches.target) }),
+      infoText: (data, matches, output) =>
+        output.text!({ player: data.party.member(matches.target) }),
       outputStrings: {
         text: {
           en: 'Heal ${player} soon',
diff --git a/ui/raidboss/data/04-sb/raid/o10s.ts b/ui/raidboss/data/04-sb/raid/o10s.ts
index 4612b50470..d84663e46d 100644
--- a/ui/raidboss/data/04-sb/raid/o10s.ts
+++ b/ui/raidboss/data/04-sb/raid/o10s.ts
@@ -37,7 +37,7 @@ const triggerSet: TriggerSet<Data> = {
       },
       infoText: (data, matches, output) => {
         if (data.me !== matches.target)
-          return output.fireOn!({ player: data.ShortName(matches.target) });
+          return output.fireOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         fireOnYou: {
diff --git a/ui/raidboss/data/04-sb/raid/o12n.ts b/ui/raidboss/data/04-sb/raid/o12n.ts
index f87e7792e5..6067a146f4 100644
--- a/ui/raidboss/data/04-sb/raid/o12n.ts
+++ b/ui/raidboss/data/04-sb/raid/o12n.ts
@@ -130,7 +130,7 @@ const triggerSet: TriggerSet<Data> = {
         // since it's stack, but also get away from Ground Zero purple marker.
         if (data.me === matches.target)
           return output.stackOnYou!();
-        return output.stackOnPlayer!({ player: data.ShortName(matches.target) });
+        return output.stackOnPlayer!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         stackOnYou: Outputs.stackOnYou,
diff --git a/ui/raidboss/data/04-sb/raid/o12s.ts b/ui/raidboss/data/04-sb/raid/o12s.ts
index 9ffdbd2695..37c292d4e4 100644
--- a/ui/raidboss/data/04-sb/raid/o12s.ts
+++ b/ui/raidboss/data/04-sb/raid/o12s.ts
@@ -544,7 +544,7 @@ const triggerSet: TriggerSet<Data> = {
           return;
         if (data.role !== 'tank' && data.job !== 'BLU')
           return;
-        return output.vulnOn!({ player: data.ShortName(matches.target) });
+        return output.vulnOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         vulnOn: {
@@ -685,7 +685,7 @@ const triggerSet: TriggerSet<Data> = {
           // might need an extra shield.  However, common blu strats have
           // folks diamondback this, so it's just noise.
           if (data.job !== 'BLU')
-            return output.shortStackOn!({ player: data.ShortName(matches.target) });
+            return output.shortStackOn!({ player: data.party.member(matches.target) });
         }
         return;
       },
@@ -800,7 +800,7 @@ const triggerSet: TriggerSet<Data> = {
         for (const player in data.archiveMarkers) {
           if (data.archiveMarkers[player] !== '003E')
             continue;
-          return output.text!({ player: data.ShortName(player) });
+          return output.text!({ player: data.party.member(player) });
         }
       },
       outputStrings: {
diff --git a/ui/raidboss/data/04-sb/raid/o2n.ts b/ui/raidboss/data/04-sb/raid/o2n.ts
index 15814e1afc..b68787c2ea 100644
--- a/ui/raidboss/data/04-sb/raid/o2n.ts
+++ b/ui/raidboss/data/04-sb/raid/o2n.ts
@@ -46,7 +46,7 @@ const triggerSet: TriggerSet<Data> = {
         if (data.me === matches.target)
           return output.stackMarkerOnYou!();
 
-        return output.stackOn!({ player: data.ShortName(matches.target) });
+        return output.stackOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         stackMarkerOnYou: {
diff --git a/ui/raidboss/data/04-sb/raid/o3s.ts b/ui/raidboss/data/04-sb/raid/o3s.ts
index 4a9c2b6e84..46f2827cc9 100644
--- a/ui/raidboss/data/04-sb/raid/o3s.ts
+++ b/ui/raidboss/data/04-sb/raid/o3s.ts
@@ -126,9 +126,9 @@ const triggerSet: TriggerSet<Data> = {
         } else {
           if (data.holyTargets.includes(data.me)) {
             ret.alertText = output.spread!();
-            ret.infoText = output.othersStackOnHoly!({ player: data.ShortName(stackTarget) });
+            ret.infoText = output.othersStackOnHoly!({ player: data.party.member(stackTarget) });
           } else {
-            ret.infoText = output.stackOnHoly!({ player: data.ShortName(stackTarget) });
+            ret.infoText = output.stackOnHoly!({ player: data.party.member(stackTarget) });
           }
         }
         return ret;
@@ -408,9 +408,9 @@ const triggerSet: TriggerSet<Data> = {
       netRegex: { id: '0012' },
       infoText: (data, matches, output) => {
         if (data.me === matches.target)
-          return output.breakTether!({ player: data.ShortName(matches.source) });
+          return output.breakTether!({ player: data.party.member(matches.source) });
         else if (data.me === matches.source)
-          return output.breakTether!({ player: data.ShortName(matches.target) });
+          return output.breakTether!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         breakTether: {
diff --git a/ui/raidboss/data/04-sb/raid/o7s.ts b/ui/raidboss/data/04-sb/raid/o7s.ts
index b211666c0e..37e3be7b7e 100644
--- a/ui/raidboss/data/04-sb/raid/o7s.ts
+++ b/ui/raidboss/data/04-sb/raid/o7s.ts
@@ -115,7 +115,7 @@ const triggerSet: TriggerSet<Data> = {
       infoText: (data, matches, output) => {
         if (data.me === matches.target)
           return;
-        return output.blueMarkerOn!({ player: data.ShortName(matches.target) });
+        return output.blueMarkerOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         blueMarkerOn: {
@@ -175,7 +175,7 @@ const triggerSet: TriggerSet<Data> = {
         if (data.me === matches.target)
           return output.rotOnYou!();
 
-        return output.rotOn!({ player: data.ShortName(matches.target) });
+        return output.rotOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         rotOnYou: {
diff --git a/ui/raidboss/data/04-sb/raid/o8s.ts b/ui/raidboss/data/04-sb/raid/o8s.ts
index f75049d0d1..efc7008f1c 100644
--- a/ui/raidboss/data/04-sb/raid/o8s.ts
+++ b/ui/raidboss/data/04-sb/raid/o8s.ts
@@ -276,7 +276,7 @@ const triggerSet: TriggerSet<Data> = {
         if (matches.target === data.me)
           return;
 
-        return output.embraceOn!({ player: data.ShortName(matches.target) });
+        return output.embraceOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         embraceOn: {
diff --git a/ui/raidboss/data/04-sb/trial/seiryu.ts b/ui/raidboss/data/04-sb/trial/seiryu.ts
index 124c6c786f..7c66976032 100644
--- a/ui/raidboss/data/04-sb/trial/seiryu.ts
+++ b/ui/raidboss/data/04-sb/trial/seiryu.ts
@@ -91,7 +91,7 @@ const triggerSet: TriggerSet<Data> = {
           return;
         if (matches.target === data.me)
           return output.stackOnYou!();
-        return output.stackOnPlayer!({ player: data.ShortName(matches.target) });
+        return output.stackOnPlayer!({ player: data.party.member(matches.target) });
       },
       run: (data) => delete data.redRush,
       outputStrings: {
diff --git a/ui/raidboss/data/04-sb/trial/shinryu-ex.ts b/ui/raidboss/data/04-sb/trial/shinryu-ex.ts
index ba14181bff..d271d1667d 100644
--- a/ui/raidboss/data/04-sb/trial/shinryu-ex.ts
+++ b/ui/raidboss/data/04-sb/trial/shinryu-ex.ts
@@ -57,7 +57,7 @@ const triggerSet: TriggerSet<Data> = {
         if (matches.target === data.me)
           return output.akhMornOnYou!();
         else if (data.role === 'tank')
-          return output.akhMornOn!({ player: data.ShortName(matches.target) });
+          return output.akhMornOn!({ player: data.party.member(matches.target) });
       },
       infoText: (data, matches, output) => {
         if (matches.target === data.me || data.role === 'tank')
@@ -386,11 +386,11 @@ const triggerSet: TriggerSet<Data> = {
         if (matches.target === data.me)
           return output.deathSentenceOnYou!();
         else if (data.role === 'healer')
-          return output.deathSentenceOn!({ player: data.ShortName(matches.target) });
+          return output.deathSentenceOn!({ player: data.party.member(matches.target) });
       },
       infoText: (data, matches, output) => {
         if (matches.target !== data.me && data.role !== 'healer')
-          return output.deathSentenceOn!({ player: data.ShortName(matches.target) });
+          return output.deathSentenceOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         deathSentenceOn: {
diff --git a/ui/raidboss/data/04-sb/trial/shinryu.ts b/ui/raidboss/data/04-sb/trial/shinryu.ts
index 349550e33e..0eef482715 100644
--- a/ui/raidboss/data/04-sb/trial/shinryu.ts
+++ b/ui/raidboss/data/04-sb/trial/shinryu.ts
@@ -22,7 +22,7 @@ const triggerSet: TriggerSet<Data> = {
         if (matches.target === data.me)
           return output.akhMornOnYou!();
         else if (data.role === 'tank')
-          return output.akhMornOn!({ player: data.ShortName(matches.target) });
+          return output.akhMornOn!({ player: data.party.member(matches.target) });
       },
       infoText: (data, matches, output) => {
         // Nobody with Akh Morn is a direct target for Akh Rai,
diff --git a/ui/raidboss/data/04-sb/trial/susano-ex.ts b/ui/raidboss/data/04-sb/trial/susano-ex.ts
index 05aed9eb4d..5265e0aabf 100644
--- a/ui/raidboss/data/04-sb/trial/susano-ex.ts
+++ b/ui/raidboss/data/04-sb/trial/susano-ex.ts
@@ -205,7 +205,7 @@ const triggerSet: TriggerSet<Data> = {
         // It's sometimes hard for tanks to see the line, so just give a
         // sound indicator for jumping rope back and forth.
         if (data.role === 'tank')
-          return output.text!({ player: data.ShortName(matches.target) });
+          return output.text!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         text: {
diff --git a/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.ts b/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.ts
index 8df979a82c..2b28231959 100644
--- a/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.ts
+++ b/ui/raidboss/data/04-sb/trial/tsukuyomi-ex.ts
@@ -45,7 +45,7 @@ const triggerSet: TriggerSet<Data> = {
           return output.tankBusterOnYou!();
 
         if (data.role === 'healer')
-          return output.busterOn!({ player: data.ShortName(matches.target) });
+          return output.busterOn!({ player: data.party.member(matches.target) });
       },
       infoText: (data, matches, output) => {
         if (matches.target === data.me || data.role === 'tank' || data.role === 'healer')
diff --git a/ui/raidboss/data/04-sb/trial/tsukuyomi.ts b/ui/raidboss/data/04-sb/trial/tsukuyomi.ts
index 3ad2fb7144..f49bbfa321 100644
--- a/ui/raidboss/data/04-sb/trial/tsukuyomi.ts
+++ b/ui/raidboss/data/04-sb/trial/tsukuyomi.ts
@@ -36,7 +36,7 @@ const triggerSet: TriggerSet<Data> = {
       alertText: (data, matches, output) => {
         if (data.me === matches.target)
           return output.lineStackOnYou!();
-        return output.lineStackOn!({ player: data.ShortName(matches.target) });
+        return output.lineStackOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         lineStackOnYou: {
diff --git a/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.ts b/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.ts
index 1029a0734f..d1b22cc2c3 100644
--- a/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.ts
+++ b/ui/raidboss/data/04-sb/ultimate/ultima_weapon_ultimate.ts
@@ -792,7 +792,7 @@ const triggerSet: TriggerSet<Data> = {
       condition: (data, matches) => matches.target === data.me || matches.source === data.me,
       infoText: (data, matches, output) => {
         const otherPlayer = matches.target === data.me ? matches.source : matches.target;
-        return output.fetters!({ player: data.ShortName(otherPlayer) });
+        return output.fetters!({ player: data.party.member(otherPlayer) });
       },
       outputStrings: {
         fetters: {
@@ -1158,9 +1158,9 @@ const triggerSet: TriggerSet<Data> = {
         if (data.titanGaols.length !== 3)
           return;
         return output.text!({
-          player1: data.ShortName(data.titanGaols[0]),
-          player2: data.ShortName(data.titanGaols[1]),
-          player3: data.ShortName(data.titanGaols[2]),
+          player1: data.party.member(data.titanGaols[0]),
+          player2: data.party.member(data.titanGaols[1]),
+          player3: data.party.member(data.titanGaols[2]),
         });
       },
       outputStrings: {
@@ -1188,7 +1188,7 @@ const triggerSet: TriggerSet<Data> = {
         if (idx === -1)
           return;
         const numStr = output[`num${idx + 1}`]!();
-        return output.text!({ num: numStr, player: data.ShortName(matches.target) });
+        return output.text!({ num: numStr, player: data.party.member(matches.target) });
       },
       outputStrings: {
         // In case people want to replace 1/2/3 with front/mid/back or something.
diff --git a/ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.ts b/ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.ts
index 1ea9721147..495e07daa8 100644
--- a/ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.ts
+++ b/ui/raidboss/data/04-sb/ultimate/unending_coil_ultimate.ts
@@ -399,7 +399,7 @@ const triggerSet: TriggerSet<Data> = {
       infoText: (data, _matches, output) => {
         if (!data.hatch)
           return;
-        const hatches = data.hatch.map((n) => data.ShortName(n)).join(', ');
+        const hatches = data.hatch.map((n) => data.party.member(n));
         delete data.hatch;
         return output.text!({ players: hatches });
       },
@@ -788,9 +788,7 @@ const triggerSet: TriggerSet<Data> = {
       },
       infoText: (data, _matches, output) => {
         if (!data.thunderOnYou) {
-          const thunderPlayers = data.thunderDebuffs.map((p) => data.ShortName(p));
-          const thunder1 = thunderPlayers[0] ?? '???';
-          const thunder2 = thunderPlayers[1] ?? '???';
+          const [thunder1, thunder2] = data.thunderDebuffs.map((p) => data.party.member(p));
           return output.thunderOnOthers!({ player1: thunder1, player2: thunder2 });
         }
       },
@@ -924,7 +922,7 @@ const triggerSet: TriggerSet<Data> = {
           name = data.dooms[data.doomCount];
         data.doomCount++;
         if (typeof name === 'string')
-          return output.text!({ num: data.doomCount, player: data.ShortName(name) });
+          return output.text!({ num: data.doomCount, player: data.party.member(name) });
       },
       outputStrings: {
         text: {
@@ -1015,7 +1013,7 @@ const triggerSet: TriggerSet<Data> = {
           return;
 
         if (tookTwo && tookTwo.length > 0) {
-          const players = tookTwo.map((name) => data.ShortName(name)).join(', ');
+          const players = tookTwo.map((name) => data.party.member(name));
           return output.fireInPlayersOut!({ players: players });
         }
         return output.fireIn!();
@@ -1203,7 +1201,7 @@ const triggerSet: TriggerSet<Data> = {
         if (matches.target === data.me)
           return;
         const num = data.naelDiveMarkerCount + 1;
-        return output.text!({ num: num, player: data.ShortName(matches.target) });
+        return output.text!({ num: num, player: data.party.member(matches.target) });
       },
       outputStrings: {
         text: {
@@ -1280,7 +1278,7 @@ const triggerSet: TriggerSet<Data> = {
       condition: (data) => data.trio === 'octet',
       infoText: (data, matches, output) => {
         const num = data.octetMarker.length;
-        return output.text!({ num: num, player: data.ShortName(matches.target) });
+        return output.text!({ num: num, player: data.party.member(matches.target) });
       },
       outputStrings: {
         text: {
@@ -1300,7 +1298,7 @@ const triggerSet: TriggerSet<Data> = {
       condition: (data) => data.trio === 'octet',
       infoText: (data, matches, output) => {
         const num = data.octetMarker.length;
-        return output.text!({ num: num, player: data.ShortName(matches.target) });
+        return output.text!({ num: num, player: data.party.member(matches.target) });
       },
       outputStrings: {
         text: {
@@ -1320,7 +1318,7 @@ const triggerSet: TriggerSet<Data> = {
       condition: (data) => data.trio === 'octet',
       infoText: (data, matches, output) => {
         const num = data.octetMarker.length;
-        return output.text!({ num: num, player: data.ShortName(matches.target) });
+        return output.text!({ num: num, player: data.party.member(matches.target) });
       },
       outputStrings: {
         text: {
@@ -1350,7 +1348,7 @@ const triggerSet: TriggerSet<Data> = {
         // If this person is not alive, then everybody should stack,
         // but tracking whether folks are alive or not is a mess.
         if (data.lastOctetMarker !== data.me)
-          return output.twinOnPlayer!({ player: data.ShortName(data.lastOctetMarker) });
+          return output.twinOnPlayer!({ player: data.party.member(data.lastOctetMarker) });
       },
       tts: (data, _matches, output) => {
         if (data.lastOctetMarker === undefined || data.lastOctetMarker === data.me)
@@ -1610,7 +1608,7 @@ const triggerSet: TriggerSet<Data> = {
         if (data.lastOctetMarker === undefined || data.lastOctetMarker === data.me)
           return;
 
-        const twin = data.ShortName(data.lastOctetMarker);
+        const twin = data.party.member(data.lastOctetMarker);
         if (data.megaStack.includes(data.lastOctetMarker))
           return output.twinHasMegaflare!({ player: twin });
         return output.twinHasTower!({ player: twin });
@@ -1861,7 +1859,7 @@ const triggerSet: TriggerSet<Data> = {
           return output.mornAfahYou!({ num: data.mornAfahCount });
         return output.mornAfahPlayer!({
           num: data.mornAfahCount,
-          player: data.ShortName(matches.target),
+          player: data.party.member(matches.target),
         });
       },
       outputStrings: {
diff --git a/ui/raidboss/data/06-ew/trial/sophia-un.ts b/ui/raidboss/data/06-ew/trial/sophia-un.ts
index 5d7b304bb5..7fb0deeca4 100644
--- a/ui/raidboss/data/06-ew/trial/sophia-un.ts
+++ b/ui/raidboss/data/06-ew/trial/sophia-un.ts
@@ -214,7 +214,7 @@ const triggerSet: TriggerSet<Data> = {
         if (data.me === matches.target)
           return output.infusionOnYou!();
 
-        return output.infusionOn!({ player: data.ShortName(matches.target) });
+        return output.infusionOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         infusionOnYou: {
diff --git a/ui/raidboss/data/06-ew/trial/zurvan-un.ts b/ui/raidboss/data/06-ew/trial/zurvan-un.ts
index d72074d449..c84c3e32de 100644
--- a/ui/raidboss/data/06-ew/trial/zurvan-un.ts
+++ b/ui/raidboss/data/06-ew/trial/zurvan-un.ts
@@ -49,7 +49,7 @@ const triggerSet: TriggerSet<Data> = {
       },
       alertText: (data, matches, output) => {
         if (!(data.me === matches.target))
-          return output.avoidWaveCannon!({ target: data.ShortName(matches.target) });
+          return output.avoidWaveCannon!({ target: data.party.member(matches.target) });
       },
       outputStrings: {
         waveCannonTarget: {
@@ -79,7 +79,7 @@ const triggerSet: TriggerSet<Data> = {
           return;
         if (data.waveTarget === undefined)
           return output.unknownStackTarget!();
-        return output.stackOn!({ player: data.ShortName(data.waveTarget) });
+        return output.stackOn!({ player: data.party.member(data.waveTarget) });
       },
       outputStrings: {
         unknownStackTarget: Outputs.stackMarker,
@@ -129,7 +129,7 @@ const triggerSet: TriggerSet<Data> = {
           return;
         if (matches.target === data.me)
           return output.stackYou!();
-        return output.stackOn!({ player: data.ShortName(matches.target) });
+        return output.stackOn!({ player: data.party.member(matches.target) });
       },
       outputStrings: {
         stackYou: Outputs.stackOnYou,
@@ -237,7 +237,7 @@ const triggerSet: TriggerSet<Data> = {
         data.tetherBuddy ??= buddy;
       },
       alertText: (data, _matches, output) => {
-        return output.tetherBuddy!({ buddy: data.ShortName(data.tetherBuddy) });
+        return output.tetherBuddy!({ buddy: data.party.member(data.tetherBuddy) });
       },
       outputStrings: {
         tetherBuddy: {
@@ -304,7 +304,7 @@ const triggerSet: TriggerSet<Data> = {
         if (data.infiniteElement === 'ice')
           element = output.ice!();
         const buddy = data.tetherBuddy;
-        return output.sealTowers!({ element: element, buddy: data.ShortName(buddy) });
+        return output.sealTowers!({ element: element, buddy: data.party.member(buddy) });
       },
       outputStrings: {
         sealTowers: {