diff --git a/templates/match_workspace.html b/templates/match_workspace.html
index f551bd3..3c7befe 100644
--- a/templates/match_workspace.html
+++ b/templates/match_workspace.html
@@ -355,7 +355,7 @@
     data-vmix-person-type="player"
     data-side="home"
     data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
-    data-role="{{ p.position or '' }}"
+    data-role="{{ p.pos or '' }}"
   >
     <div class="player-inline-text">
       <span class="last-name">{{ p.last_name or p.player_name }}</span>
@@ -462,7 +462,7 @@
     data-vmix-person-type="player"
     data-side="home"
     data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
-    data-role="{{ p.position or '' }}"
+    data-role="{{ p.pos or '' }}"
   >
     <div class="player-inline-text">
       <span class="last-name">{{ p.last_name or p.player_name }}</span>
@@ -579,7 +579,7 @@
     data-vmix-person-type="player"
     data-side="away"
     data-name="{{ ((p.last_name or p.player_name or '') ~ ' ' ~ (p.first_name or '')) | trim }}"
-    data-role="{{ p.position or '' }}"
+    data-role="{{ p.pos or '' }}"
   >
     <div class="player-inline-text">
       <span class="last-name">{{ p.last_name or p.player_name }}</span>
@@ -1255,19 +1255,13 @@
       return;
     }
 
-    function formatCoachName(rawName) {
+    function swapNameParts(rawName) {
       const parts = String(rawName || "").trim().split(/\s+/).filter(Boolean);
-      if (parts.length >= 2) {
-        return `${parts[1]} ${parts[0]}`;
-      }
-      return String(rawName || "").trim();
-    }
 
-    function formatPlayerName(rawName) {
-      const parts = String(rawName || "").trim().split(/\s+/).filter(Boolean);
       if (parts.length >= 2) {
         return `${parts[1]} ${parts[0]}`;
       }
+
       return String(rawName || "").trim();
     }
 
@@ -1316,22 +1310,20 @@
       const trigger = event.target.closest(".vmix-person-trigger");
       if (!trigger) return;
 
-      const personType = (trigger.dataset.vmixPersonType || "").trim();
-      const side = (trigger.dataset.side || "").trim();
-      const rawName = (trigger.dataset.name || "").trim();
-      const role = (trigger.dataset.role || "").trim();
+      const side = String(trigger.dataset.side || "").trim();
+      const rawName = String(trigger.dataset.name || "").trim();
+      const role = String(trigger.dataset.role || "").trim();
       const logoUrl = side === "away" ? teamLogos.away : teamLogos.home;
 
       if (!rawName) return;
 
-      const formattedName = personType === "coach"
-        ? formatCoachName(rawName)
-        : formatPlayerName(rawName);
+      const formattedName = swapNameParts(rawName);
 
       sendNeutralPersonTitle(formattedName, role, logoUrl);
     });
   })();
 </script>
+
     <script src="/static/script.js"></script>
     <div id="matrixLoader" class="matrix-loader" aria-hidden="true">
   <canvas id="matrixCanvas" class="matrix-canvas"></canvas>