diff --git a/docs/general/CHN.ics b/docs/general/CHN.ics
index ff10bca4a..fbe1f7430 100644
--- a/docs/general/CHN.ics
+++ b/docs/general/CHN.ics
@@ -1114,12 +1114,12 @@ SUMMARY:🏉 NZL 🇳🇿 - 🇨🇳 CHN
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-PER-CHN
+UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-CHN-PER
 DTSTAMP:20240728T170000Z
 DTSTART:20240728T170000Z
 DTEND:20240728T173000Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 1
-SUMMARY:🏄 Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
+SUMMARY:🏄 YANG Siqi 🇨🇳 - 🇵🇪 Sol AGUIRRE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/PER.ics b/docs/general/PER.ics
index df9c0b65b..048f02669 100644
--- a/docs/general/PER.ics
+++ b/docs/general/PER.ics
@@ -129,12 +129,12 @@ SUMMARY:⛵ Women's Windsurfing - Race 4
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-PER-CHN
+UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-CHN-PER
 DTSTAMP:20240728T170000Z
 DTSTART:20240728T170000Z
 DTEND:20240728T173000Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 1
-SUMMARY:🏄 Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
+SUMMARY:🏄 YANG Siqi 🇨🇳 - 🇵🇪 Sol AGUIRRE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/general.ics b/docs/general/general.ics
index 061011a7d..76dd45d20 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -7185,12 +7185,12 @@ SUMMARY:🏉 IRL 🇮🇪 - 🇿🇦 RSA
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-PER-CHN
+UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-CHN-PER
 DTSTAMP:20240728T170000Z
 DTSTART:20240728T170000Z
 DTEND:20240728T173000Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 1
-SUMMARY:🏄 Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
+SUMMARY:🏄 YANG Siqi 🇨🇳 - 🇵🇪 Sol AGUIRRE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/CHN.ics b/docs/surfing/CHN.ics
index a83be65d1..544e34d2b 100644
--- a/docs/surfing/CHN.ics
+++ b/docs/surfing/CHN.ics
@@ -14,12 +14,12 @@ SUMMARY:🏄 Women's Round 1 - Heat 7
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-PER-CHN
+UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-CHN-PER
 DTSTAMP:20240728T170000Z
 DTSTART:20240728T170000Z
 DTEND:20240728T173000Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 1
-SUMMARY:🏄 Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
+SUMMARY:🏄 YANG Siqi 🇨🇳 - 🇵🇪 Sol AGUIRRE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/PER.ics b/docs/surfing/PER.ics
index 86cb5783a..7413b806c 100644
--- a/docs/surfing/PER.ics
+++ b/docs/surfing/PER.ics
@@ -34,12 +34,12 @@ SUMMARY:🏄 Women's Round 1 - Heat 2
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-PER-CHN
+UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-CHN-PER
 DTSTAMP:20240728T170000Z
 DTSTART:20240728T170000Z
 DTEND:20240728T173000Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 1
-SUMMARY:🏄 Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
+SUMMARY:🏄 YANG Siqi 🇨🇳 - 🇵🇪 Sol AGUIRRE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/general.ics b/docs/surfing/general.ics
index 28a6d9e91..4b05ece36 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -164,12 +164,12 @@ SUMMARY:🏄 Women's Round 1 - Heat 8
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-PER-CHN
+UID:20240728T170000Z-surfing-WOMENS-ROUND-2-HEAT-1-CHN-PER
 DTSTAMP:20240728T170000Z
 DTSTART:20240728T170000Z
 DTEND:20240728T173000Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 1
-SUMMARY:🏄 Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
+SUMMARY:🏄 YANG Siqi 🇨🇳 - 🇵🇪 Sol AGUIRRE
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index c3cd8f786..112a10cb1 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -10185,7 +10185,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T170000Z" data-end="20240728T173000Z" data-noc="PER,CHN">
+<div class="event py-4" data-start="20240728T170000Z" data-end="20240728T173000Z" data-noc="CHN,PER">
  <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">
@@ -10193,7 +10193,7 @@
    SURFING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Sol AGUIRRE 🇵🇪 - 🇨🇳 YANG Siqi
+   <div class="">YANG Siqi 🇨🇳 - 🇵🇪 Sol AGUIRRE
    </div>
  </div>
 </div>