diff --git a/docs/general/AUS.ics b/docs/general/AUS.ics
index 518376668..da5a8dd47 100644
--- a/docs/general/AUS.ics
+++ b/docs/general/AUS.ics
@@ -1295,12 +1295,12 @@ SUMMARY:🏄 Jack ROBINSON 🇦🇺 - 🇺🇸 John John FLORENCE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T211200Z-surfing-MENS-ROUND-3-HEAT-8-AUS-JPN
+UID:20240729T211200Z-surfing-MENS-ROUND-3-HEAT-8-JPN-AUS
 DTSTAMP:20240729T211200Z
 DTSTART:20240729T211200Z
 DTEND:20240729T214200Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 8
-SUMMARY:🏄 Ethan EWING 🇦🇺 - 🇯🇵 O'LEARY Connor
+SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇦🇺 Ethan EWING
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index f9d677ef1..cfa80438d 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -1615,12 +1615,12 @@ SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇯🇵 IGARASHI Kanoa
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T211200Z-surfing-MENS-ROUND-3-HEAT-8-AUS-JPN
+UID:20240729T211200Z-surfing-MENS-ROUND-3-HEAT-8-JPN-AUS
 DTSTAMP:20240729T211200Z
 DTSTART:20240729T211200Z
 DTEND:20240729T214200Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 8
-SUMMARY:🏄 Ethan EWING 🇦🇺 - 🇯🇵 O'LEARY Connor
+SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇦🇺 Ethan EWING
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/general.ics b/docs/general/general.ics
index 480441149..0a28112b7 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -11049,12 +11049,12 @@ SUMMARY:🏄 Jack ROBINSON 🇦🇺 - 🇺🇸 John John FLORENCE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T211200Z-surfing-MENS-ROUND-3-HEAT-8-AUS-JPN
+UID:20240729T211200Z-surfing-MENS-ROUND-3-HEAT-8-JPN-AUS
 DTSTAMP:20240729T211200Z
 DTSTART:20240729T211200Z
 DTEND:20240729T214200Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 8
-SUMMARY:🏄 Ethan EWING 🇦🇺 - 🇯🇵 O'LEARY Connor
+SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇦🇺 Ethan EWING
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/AUS.ics b/docs/surfing/AUS.ics
index fbaf7e7d3..96f95bde1 100644
--- a/docs/surfing/AUS.ics
+++ b/docs/surfing/AUS.ics
@@ -71,12 +71,12 @@ SUMMARY:🏄 Jack ROBINSON 🇦🇺 - 🇺🇸 John John FLORENCE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T211200Z-surfing-MENS-ROUND-3-HEAT-8-AUS-JPN
+UID:20240729T211200Z-surfing-MENS-ROUND-3-HEAT-8-JPN-AUS
 DTSTAMP:20240729T211200Z
 DTSTART:20240729T211200Z
 DTEND:20240729T214200Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 8
-SUMMARY:🏄 Ethan EWING 🇦🇺 - 🇯🇵 O'LEARY Connor
+SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇦🇺 Ethan EWING
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/JPN.ics b/docs/surfing/JPN.ics
index 8194ee370..6cd05d3d4 100644
--- a/docs/surfing/JPN.ics
+++ b/docs/surfing/JPN.ics
@@ -89,12 +89,12 @@ SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇯🇵 IGARASHI Kanoa
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T211200Z-surfing-MENS-ROUND-3-HEAT-8-AUS-JPN
+UID:20240729T211200Z-surfing-MENS-ROUND-3-HEAT-8-JPN-AUS
 DTSTAMP:20240729T211200Z
 DTSTART:20240729T211200Z
 DTEND:20240729T214200Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 8
-SUMMARY:🏄 Ethan EWING 🇦🇺 - 🇯🇵 O'LEARY Connor
+SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇦🇺 Ethan EWING
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/general.ics b/docs/surfing/general.ics
index 9f1e03f4c..fe00dfa9e 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -371,12 +371,12 @@ SUMMARY:🏄 Jack ROBINSON 🇦🇺 - 🇺🇸 John John FLORENCE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T211200Z-surfing-MENS-ROUND-3-HEAT-8-AUS-JPN
+UID:20240729T211200Z-surfing-MENS-ROUND-3-HEAT-8-JPN-AUS
 DTSTAMP:20240729T211200Z
 DTSTART:20240729T211200Z
 DTEND:20240729T214200Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 8
-SUMMARY:🏄 Ethan EWING 🇦🇺 - 🇯🇵 O'LEARY Connor
+SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇦🇺 Ethan EWING
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 680465780..d5ddcf0c3 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -16505,7 +16505,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T211200Z" data-end="20240729T214200Z" data-noc="AUS,JPN">
+<div class="event py-4" data-start="20240729T211200Z" data-end="20240729T214200Z" data-noc="JPN,AUS">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -16514,7 +16514,7 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's Round 3 - Heat 8
-   <div class="">Ethan EWING 🇦🇺 - 🇯🇵 O'LEARY Connor</div>
+   <div class="">O'LEARY Connor 🇯🇵 - 🇦🇺 Ethan EWING</div>
    </div>
  </div>
 </div>