diff --git a/docs/general/GER.ics b/docs/general/GER.ics
index cf1df1dfa..3553f814c 100644
--- a/docs/general/GER.ics
+++ b/docs/general/GER.ics
@@ -1022,12 +1022,12 @@ SUMMARY:🏓 Tiago APOLONIA 🇵🇹 - 🇩🇪 Dang QIU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-JPN-GER
+UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-GER-JPN
 DTSTAMP:20240728T222400Z
 DTSTART:20240728T222400Z
 DTEND:20240728T230400Z
 DESCRIPTION:Surfing - Men's Round 2 - Heat 2
-SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
+SUMMARY:🏄 Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index 20e13ebc1..17a72f50d 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -1087,12 +1087,12 @@ SUMMARY:🏄 IGARASHI Kanoa 🇯🇵 - 🇮🇹 Leonardo FIORAVANTI
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-JPN-GER
+UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-GER-JPN
 DTSTAMP:20240728T222400Z
 DTSTART:20240728T222400Z
 DTEND:20240728T230400Z
 DESCRIPTION:Surfing - Men's Round 2 - Heat 2
-SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
+SUMMARY:🏄 Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/general.ics b/docs/general/general.ics
index 80fee2215..b1dac84ca 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -7700,12 +7700,12 @@ SUMMARY:🏄 IGARASHI Kanoa 🇯🇵 - 🇮🇹 Leonardo FIORAVANTI
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-JPN-GER
+UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-GER-JPN
 DTSTAMP:20240728T222400Z
 DTSTART:20240728T222400Z
 DTEND:20240728T230400Z
 DESCRIPTION:Surfing - Men's Round 2 - Heat 2
-SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
+SUMMARY:🏄 Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/GER.ics b/docs/surfing/GER.ics
index 139747ec7..1ad644eaf 100644
--- a/docs/surfing/GER.ics
+++ b/docs/surfing/GER.ics
@@ -33,12 +33,12 @@ SUMMARY:🏄 Sarah BAUM 🇿🇦 - 🇩🇪 Camilla KEMP
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-JPN-GER
+UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-GER-JPN
 DTSTAMP:20240728T222400Z
 DTSTART:20240728T222400Z
 DTEND:20240728T230400Z
 DESCRIPTION:Surfing - Men's Round 2 - Heat 2
-SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
+SUMMARY:🏄 Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/JPN.ics b/docs/surfing/JPN.ics
index ef52e910c..b6c7ee813 100644
--- a/docs/surfing/JPN.ics
+++ b/docs/surfing/JPN.ics
@@ -62,12 +62,12 @@ SUMMARY:🏄 IGARASHI Kanoa 🇯🇵 - 🇮🇹 Leonardo FIORAVANTI
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-JPN-GER
+UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-GER-JPN
 DTSTAMP:20240728T222400Z
 DTSTART:20240728T222400Z
 DTEND:20240728T230400Z
 DESCRIPTION:Surfing - Men's Round 2 - Heat 2
-SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
+SUMMARY:🏄 Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/general.ics b/docs/surfing/general.ics
index 31c7d07ae..40f03d2dd 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -245,12 +245,12 @@ SUMMARY:🏄 IGARASHI Kanoa 🇯🇵 - 🇮🇹 Leonardo FIORAVANTI
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-JPN-GER
+UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-GER-JPN
 DTSTAMP:20240728T222400Z
 DTSTART:20240728T222400Z
 DTEND:20240728T230400Z
 DESCRIPTION:Surfing - Men's Round 2 - Heat 2
-SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
+SUMMARY:🏄 Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 344a5864e..2f3f854ae 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -10768,7 +10768,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T222400Z" data-end="20240728T230400Z" data-noc="JPN,GER">
+<div class="event py-4" data-start="20240728T222400Z" data-end="20240728T230400Z" data-noc="GER,JPN">
  <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">
@@ -10776,7 +10776,7 @@
    SURFING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
+   <div class="">Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
    </div>
  </div>
 </div>