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: {