diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index 906e0ecc1..0a2291ceb 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -3625,12 +3625,12 @@ SUMMARY:🚴 Women, Last Chance Race
 LOCATION:BMX Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-MENS-QUARTERFINALS-HEAT-1-PER-JPN
+UID:20240801T214800Z-surfing-MENS-QUARTERFINALS-HEAT-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:Surfing - Men's Quarterfinals - Heat 1
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/PER.ics b/docs/general/PER.ics
index b799c4c83..225f61038 100644
--- a/docs/general/PER.ics
+++ b/docs/general/PER.ics
@@ -693,12 +693,12 @@ SUMMARY:⛵ Women's Windsurfing - Race 20
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-MENS-QUARTERFINALS-HEAT-1-PER-JPN
+UID:20240801T214800Z-surfing-MENS-QUARTERFINALS-HEAT-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:Surfing - Men's Quarterfinals - Heat 1
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/general.ics b/docs/general/general.ics
index 33338f114..9c156eb99 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -20962,12 +20962,12 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-MENS-QUARTERFINALS-HEAT-1-PER-JPN
+UID:20240801T214800Z-surfing-MENS-QUARTERFINALS-HEAT-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:Surfing - Men's Quarterfinals - Heat 1
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ja/JPN.ics b/docs/general/ja/JPN.ics
index 9e4146cd0..d99336463 100644
--- a/docs/general/ja/JPN.ics
+++ b/docs/general/ja/JPN.ics
@@ -3592,12 +3592,12 @@ SUMMARY:🚴 女子敗者復活戦
 LOCATION:BMXスタジアム
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing--1-PER-JPN
+UID:20240801T214800Z-surfing--1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:サーフィン - 男子準々決勝 - 第1ヒート
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ja/PER.ics b/docs/general/ja/PER.ics
index dc66abcfb..d101b4839 100644
--- a/docs/general/ja/PER.ics
+++ b/docs/general/ja/PER.ics
@@ -690,12 +690,12 @@ SUMMARY:⛵ 女子ウインドサーフィン - レース20
 LOCATION:マルセイユ・マリーナ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing--1-PER-JPN
+UID:20240801T214800Z-surfing--1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:サーフィン - 男子準々決勝 - 第1ヒート
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ja/general.ics b/docs/general/ja/general.ics
index 60ed9d947..606b38df0 100644
--- a/docs/general/ja/general.ics
+++ b/docs/general/ja/general.ics
@@ -20890,12 +20890,12 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing--1-PER-JPN
+UID:20240801T214800Z-surfing--1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:サーフィン - 男子準々決勝 - 第1ヒート
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ko/JPN.ics b/docs/general/ko/JPN.ics
index 3242b0c59..c5a60f04b 100644
--- a/docs/general/ko/JPN.ics
+++ b/docs/general/ko/JPN.ics
@@ -3588,12 +3588,12 @@ SUMMARY:🚴 여자 라스트찬스 레이스
 LOCATION:BMX 스타디움
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing--8-1-PER-JPN
+UID:20240801T214800Z-surfing--8-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:서핑 - 남자 8강 - 1조
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ko/PER.ics b/docs/general/ko/PER.ics
index 3a829a1ad..1b911a168 100644
--- a/docs/general/ko/PER.ics
+++ b/docs/general/ko/PER.ics
@@ -669,12 +669,12 @@ SUMMARY:⛵ 여자 윈드서핑 - 레이스 20
 LOCATION:마르세유 마리나
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing--8-1-PER-JPN
+UID:20240801T214800Z-surfing--8-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:서핑 - 남자 8강 - 1조
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ko/general.ics b/docs/general/ko/general.ics
index b60ae9694..ca6362dff 100644
--- a/docs/general/ko/general.ics
+++ b/docs/general/ko/general.ics
@@ -20863,12 +20863,12 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing--8-1-PER-JPN
+UID:20240801T214800Z-surfing--8-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:서핑 - 남자 8강 - 1조
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ru/JPN.ics b/docs/general/ru/JPN.ics
index 01df6fced..12cece805 100644
--- a/docs/general/ru/JPN.ics
+++ b/docs/general/ru/JPN.ics
@@ -3634,12 +3634,12 @@ SUMMARY:🚴 Гонка последнего шанса (ж)
 LOCATION:Стадион BMX
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-14-1--PER-JPN
+UID:20240801T214800Z-surfing-14-1--JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:Серфинг - 1/4 финала, заезд 1 (м)
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ru/PER.ics b/docs/general/ru/PER.ics
index d3afb6630..ae478ef5a 100644
--- a/docs/general/ru/PER.ics
+++ b/docs/general/ru/PER.ics
@@ -695,12 +695,12 @@ SUMMARY:⛵ Виндсерфинг, марафон (ж)
 LOCATION:Марсельская гавань
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-14-1--PER-JPN
+UID:20240801T214800Z-surfing-14-1--JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:Серфинг - 1/4 финала, заезд 1 (м)
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ru/general.ics b/docs/general/ru/general.ics
index 84b2917d7..13997f1f8 100644
--- a/docs/general/ru/general.ics
+++ b/docs/general/ru/general.ics
@@ -21015,12 +21015,12 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-14-1--PER-JPN
+UID:20240801T214800Z-surfing-14-1--JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:Серфинг - 1/4 финала, заезд 1 (м)
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/zh/JPN.ics b/docs/general/zh/JPN.ics
index 1c4bdd2b4..1d3ccd11d 100644
--- a/docs/general/zh/JPN.ics
+++ b/docs/general/zh/JPN.ics
@@ -3592,12 +3592,12 @@ SUMMARY:🚴 女子，最后机会赛
 LOCATION:圣康丁伊夫林小轮车体育馆
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-14-1-PER-JPN
+UID:20240801T214800Z-surfing-14-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:冲浪 - 男子1/4决赛 - 第1组
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/zh/PER.ics b/docs/general/zh/PER.ics
index c27056d44..aff54cb4d 100644
--- a/docs/general/zh/PER.ics
+++ b/docs/general/zh/PER.ics
@@ -669,12 +669,12 @@ SUMMARY:⛵ 女子水翼帆板iQFoil级 - 比赛20
 LOCATION:马赛港
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-14-1-PER-JPN
+UID:20240801T214800Z-surfing-14-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:冲浪 - 男子1/4决赛 - 第1组
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/zh/general.ics b/docs/general/zh/general.ics
index ff6ae687e..220a5083d 100644
--- a/docs/general/zh/general.ics
+++ b/docs/general/zh/general.ics
@@ -20864,12 +20864,12 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-14-1-PER-JPN
+UID:20240801T214800Z-surfing-14-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:冲浪 - 男子1/4决赛 - 第1组
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/ja/today.html b/docs/ja/today.html
index 58bbcf820..7fce7ebf4 100644
--- a/docs/ja/today.html
+++ b/docs/ja/today.html
@@ -41693,11 +41693,11 @@
    </div>
    <div>男子準々決勝 - 第1ヒート</div>
     <div class="competitors">
-      Alonso CORREA
-      🇵🇪
-      -
-      🇯🇵
       INABA Reo
+      🇯🇵
+      -
+      🇵🇪
+      Alonso CORREA
     </div>
  </div>
 </div>
diff --git a/docs/ko/today.html b/docs/ko/today.html
index a513543e2..0ddbfffd4 100644
--- a/docs/ko/today.html
+++ b/docs/ko/today.html
@@ -41693,11 +41693,11 @@
    </div>
    <div>남자 8강 - 1조</div>
     <div class="competitors">
-      Alonso CORREA
-      🇵🇪
-      -
-      🇯🇵
       INABA Reo
+      🇯🇵
+      -
+      🇵🇪
+      Alonso CORREA
     </div>
  </div>
 </div>
diff --git a/docs/ru/today.html b/docs/ru/today.html
index a725b49ee..179e3ca7d 100644
--- a/docs/ru/today.html
+++ b/docs/ru/today.html
@@ -41693,11 +41693,11 @@
    </div>
    <div>1/4 финала, заезд 1 (м)</div>
     <div class="competitors">
-      Alonso CORREA
-      🇵🇪
-      -
-      🇯🇵
       INABA Reo
+      🇯🇵
+      -
+      🇵🇪
+      Alonso CORREA
     </div>
  </div>
 </div>
diff --git a/docs/surfing/JPN.ics b/docs/surfing/JPN.ics
index 34afc4dcd..35534686f 100644
--- a/docs/surfing/JPN.ics
+++ b/docs/surfing/JPN.ics
@@ -107,12 +107,12 @@ SUMMARY:🏄 Nadia EROSTARBE 🇪🇸 - 🇯🇵 MATSUDA Shino
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-MENS-QUARTERFINALS-HEAT-1-PER-JPN
+UID:20240801T214800Z-surfing-MENS-QUARTERFINALS-HEAT-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:Surfing - Men's Quarterfinals - Heat 1
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 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 5ea6e32c2..2b1462dba 100644
--- a/docs/surfing/PER.ics
+++ b/docs/surfing/PER.ics
@@ -61,12 +61,12 @@ SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇿🇦 Jordy SMITH
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-MENS-QUARTERFINALS-HEAT-1-PER-JPN
+UID:20240801T214800Z-surfing-MENS-QUARTERFINALS-HEAT-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:Surfing - Men's Quarterfinals - Heat 1
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/general.ics b/docs/surfing/general.ics
index f8265509a..14bbd7491 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -452,12 +452,12 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-MENS-QUARTERFINALS-HEAT-1-PER-JPN
+UID:20240801T214800Z-surfing-MENS-QUARTERFINALS-HEAT-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:Surfing - Men's Quarterfinals - Heat 1
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/ja/JPN.ics b/docs/surfing/ja/JPN.ics
index c912d61ed..1877e1e43 100644
--- a/docs/surfing/ja/JPN.ics
+++ b/docs/surfing/ja/JPN.ics
@@ -107,12 +107,12 @@ SUMMARY:🏄 Nadia EROSTARBE 🇪🇸 - 🇯🇵 MATSUDA Shino
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing--1-PER-JPN
+UID:20240801T214800Z-surfing--1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:サーフィン - 男子準々決勝 - 第1ヒート
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:タウポ、タヒチ
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/ja/PER.ics b/docs/surfing/ja/PER.ics
index d0c49a53d..c6cb64357 100644
--- a/docs/surfing/ja/PER.ics
+++ b/docs/surfing/ja/PER.ics
@@ -61,12 +61,12 @@ SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇿🇦 Jordy SMITH
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing--1-PER-JPN
+UID:20240801T214800Z-surfing--1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:サーフィン - 男子準々決勝 - 第1ヒート
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:タウポ、タヒチ
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/ja/general.ics b/docs/surfing/ja/general.ics
index 945a51e95..22e346f7e 100644
--- a/docs/surfing/ja/general.ics
+++ b/docs/surfing/ja/general.ics
@@ -452,12 +452,12 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing--1-PER-JPN
+UID:20240801T214800Z-surfing--1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:サーフィン - 男子準々決勝 - 第1ヒート
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:タウポ、タヒチ
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/ko/JPN.ics b/docs/surfing/ko/JPN.ics
index f654397bc..e470819ed 100644
--- a/docs/surfing/ko/JPN.ics
+++ b/docs/surfing/ko/JPN.ics
@@ -107,12 +107,12 @@ SUMMARY:🏄 Nadia EROSTARBE 🇪🇸 - 🇯🇵 MATSUDA Shino
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing--8-1-PER-JPN
+UID:20240801T214800Z-surfing--8-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:서핑 - 남자 8강 - 1조
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:타히티, 테아후푸
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/ko/PER.ics b/docs/surfing/ko/PER.ics
index 1b6e564fe..8100e84f2 100644
--- a/docs/surfing/ko/PER.ics
+++ b/docs/surfing/ko/PER.ics
@@ -61,12 +61,12 @@ SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇿🇦 Jordy SMITH
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing--8-1-PER-JPN
+UID:20240801T214800Z-surfing--8-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:서핑 - 남자 8강 - 1조
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:타히티, 테아후푸
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/ko/general.ics b/docs/surfing/ko/general.ics
index dbb97afdc..7c9323a7b 100644
--- a/docs/surfing/ko/general.ics
+++ b/docs/surfing/ko/general.ics
@@ -452,12 +452,12 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing--8-1-PER-JPN
+UID:20240801T214800Z-surfing--8-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:서핑 - 남자 8강 - 1조
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:타히티, 테아후푸
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/ru/JPN.ics b/docs/surfing/ru/JPN.ics
index f91b4eaa5..588768d3d 100644
--- a/docs/surfing/ru/JPN.ics
+++ b/docs/surfing/ru/JPN.ics
@@ -107,12 +107,12 @@ SUMMARY:🏄 Nadia EROSTARBE 🇪🇸 - 🇯🇵 MATSUDA Shino
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-14-1--PER-JPN
+UID:20240801T214800Z-surfing-14-1--JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:Серфинг - 1/4 финала, заезд 1 (м)
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:Теахупоо, Таити
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/ru/PER.ics b/docs/surfing/ru/PER.ics
index f71c87741..e013c7cc4 100644
--- a/docs/surfing/ru/PER.ics
+++ b/docs/surfing/ru/PER.ics
@@ -61,12 +61,12 @@ SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇿🇦 Jordy SMITH
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-14-1--PER-JPN
+UID:20240801T214800Z-surfing-14-1--JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:Серфинг - 1/4 финала, заезд 1 (м)
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:Теахупоо, Таити
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/ru/general.ics b/docs/surfing/ru/general.ics
index c887f11c3..f929a011f 100644
--- a/docs/surfing/ru/general.ics
+++ b/docs/surfing/ru/general.ics
@@ -452,12 +452,12 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-14-1--PER-JPN
+UID:20240801T214800Z-surfing-14-1--JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:Серфинг - 1/4 финала, заезд 1 (м)
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:Теахупоо, Таити
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/zh/JPN.ics b/docs/surfing/zh/JPN.ics
index dce6b0253..3e5df5a4c 100644
--- a/docs/surfing/zh/JPN.ics
+++ b/docs/surfing/zh/JPN.ics
@@ -107,12 +107,12 @@ SUMMARY:🏄 Nadia EROSTARBE 🇪🇸 - 🇯🇵 MATSUDA Shino
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-14-1-PER-JPN
+UID:20240801T214800Z-surfing-14-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:冲浪 - 男子1/4决赛 - 第1组
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/zh/PER.ics b/docs/surfing/zh/PER.ics
index 49bf6f8ff..adfdd4417 100644
--- a/docs/surfing/zh/PER.ics
+++ b/docs/surfing/zh/PER.ics
@@ -61,12 +61,12 @@ SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇿🇦 Jordy SMITH
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-14-1-PER-JPN
+UID:20240801T214800Z-surfing-14-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:冲浪 - 男子1/4决赛 - 第1组
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/zh/general.ics b/docs/surfing/zh/general.ics
index ae52bd9f5..f5fcfaca2 100644
--- a/docs/surfing/zh/general.ics
+++ b/docs/surfing/zh/general.ics
@@ -452,12 +452,12 @@ SUMMARY:🏄 Brisa HENNESSY 🇨🇷 - 🇵🇹 Yolanda HOPKINS
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
-UID:20240801T214800Z-surfing-14-1-PER-JPN
+UID:20240801T214800Z-surfing-14-1-JPN-PER
 DTSTAMP:20240801T214800Z
 DTSTART:20240801T214800Z
 DTEND:20240801T221800Z
 DESCRIPTION:冲浪 - 男子1/4决赛 - 第1组
-SUMMARY:🏄 Alonso CORREA 🇵🇪 - 🇯🇵 INABA Reo
+SUMMARY:🏄 INABA Reo 🇯🇵 - 🇵🇪 Alonso CORREA
 LOCATION:特乎普欧，大溪地
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 13b386b1a..d2d8c940c 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -41693,11 +41693,11 @@
    </div>
    <div>Men's Quarterfinals - Heat 1</div>
     <div class="competitors">
-      Alonso CORREA
-      🇵🇪
-      -
-      🇯🇵
       INABA Reo
+      🇯🇵
+      -
+      🇵🇪
+      Alonso CORREA
     </div>
  </div>
 </div>
diff --git a/docs/zh/today.html b/docs/zh/today.html
index aab26bf44..5dcdabf24 100644
--- a/docs/zh/today.html
+++ b/docs/zh/today.html
@@ -41693,11 +41693,11 @@
    </div>
    <div>男子1/4决赛 - 第1组</div>
     <div class="competitors">
-      Alonso CORREA
-      🇵🇪
-      -
-      🇯🇵
       INABA Reo
+      🇯🇵
+      -
+      🇵🇪
+      Alonso CORREA
     </div>
  </div>
 </div>