diff --git a/docs/en/general/GER.ics b/docs/en/general/GER.ics
index dd21a0030..9235ab440 100644
--- a/docs/en/general/GER.ics
+++ b/docs/en/general/GER.ics
@@ -506,6 +506,15 @@ SUMMARY: Anita RAGUWARAN 🇩🇪 - 🇧🇷 Laissa Polyana TEIXEIRA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2-TUR-GER
+DTSTAMP:20240830T150000Z
+DTSTART:20240830T150000Z
+DTEND:20240830T160000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2
+SUMMARY: OZTURK/TURAN 🇹🇷 - 🇩🇪 BAUS/SCHMIDBERG
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240830T153000Z-wheelchair-rugby-OPEN-PRELIMINARY-ROUND-GROUP-A-GER-CA
 DTSTAMP:20240830T153000Z
 DTSTART:20240830T153000Z
diff --git a/docs/en/general/TUR.ics b/docs/en/general/TUR.ics
index e492b83d5..2808fdf80 100644
--- a/docs/en/general/TUR.ics
+++ b/docs/en/general/TUR.ics
@@ -424,13 +424,12 @@ SUMMARY: Emine SECKIN 🇹🇷 - 🇯🇵 YAMAZAKI Yuma
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2
+UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2-TUR-GER
 DTSTAMP:20240830T150000Z
 DTSTART:20240830T150000Z
 DTEND:20240830T160000Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2\n🇹🇷
-  OZTURK/TURAN
-SUMMARY:Men's Doubles - MD8 - Semifinal 2
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2
+SUMMARY: OZTURK/TURAN 🇹🇷 - 🇩🇪 BAUS/SCHMIDBERG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index 7c40e8b1d..d116d8e33 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -3310,15 +3310,6 @@ SUMMARY:Women's Discus Throw - F55 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T080000Z-para-table-tennis-MENS-WOMENS-DOUBLES-MIXED-QFSF
-DTSTAMP:20240830T080000Z
-DTSTART:20240830T080000Z
-DTEND:20240830T130000Z
-DESCRIPTION:Para Table Tennis - Men's & Women's Doubles Mixed QF/SF
-SUMMARY:Men's & Women's Doubles Mixed QF/SF
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240830T080100Z-para-taekwondo-WOMEN-K44-65KG-ROUND-OF-16-CHI-CHN
 DTSTAMP:20240830T080100Z
 DTSTART:20240830T080100Z
@@ -5385,13 +5376,12 @@ SUMMARY: Noor Askuzaimey MAT SALIM 🇲🇾 - 🇪🇬 Hanaa ELFAR
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2
+UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2-TUR-GER
 DTSTAMP:20240830T150000Z
 DTSTART:20240830T150000Z
 DTEND:20240830T160000Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2\n🇹🇷
-  OZTURK/TURAN
-SUMMARY:Men's Doubles - MD8 - Semifinal 2
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2
+SUMMARY: OZTURK/TURAN 🇹🇷 - 🇩🇪 BAUS/SCHMIDBERG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -5405,15 +5395,6 @@ SUMMARY:R1 - Men's 10m Air Rifle Standing SH1 Pre-Event Training
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T150000Z-para-table-tennis-MENS-WOMENS-DBLES-MIXED-QFSFFINALS
-DTSTAMP:20240830T150000Z
-DTSTART:20240830T150000Z
-DTEND:20240830T200000Z
-DESCRIPTION:Para Table Tennis - Men's & Women's Dbles Mixed QF/SF/Finals
-SUMMARY:Men's & Women's Dbles Mixed QF/SF/Finals
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240830T150900Z-para-taekwondo-WOMEN-K44-57KG-REPECHAGE
 DTSTAMP:20240830T150900Z
 DTSTART:20240830T150900Z
diff --git a/docs/en/medals/GER.ics b/docs/en/medals/GER.ics
index 4f1bebdb8..bbd9810cb 100644
--- a/docs/en/medals/GER.ics
+++ b/docs/en/medals/GER.ics
@@ -56,6 +56,15 @@ SUMMARY:Women's 100m - T35 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2-TUR-GER
+DTSTAMP:20240830T150000Z
+DTSTART:20240830T150000Z
+DTEND:20240830T160000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2
+SUMMARY: OZTURK/TURAN 🇹🇷 - 🇩🇪 BAUS/SCHMIDBERG
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240830T180000Z-para-table-tennis-WOMENS-DOUBLES-WD14-GOLD-MEDAL-MATCH
 DTSTAMP:20240830T180000Z
 DTSTART:20240830T180000Z
diff --git a/docs/en/medals/TUR.ics b/docs/en/medals/TUR.ics
index b920e2ca0..c38fd618c 100644
--- a/docs/en/medals/TUR.ics
+++ b/docs/en/medals/TUR.ics
@@ -22,13 +22,12 @@ SUMMARY: Asaf YASUR 🇮🇱 - 🇹🇷 Ali Can OZCAN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2
+UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2-TUR-GER
 DTSTAMP:20240830T150000Z
 DTSTART:20240830T150000Z
 DTEND:20240830T160000Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2\n🇹🇷
-  OZTURK/TURAN
-SUMMARY:Men's Doubles - MD8 - Semifinal 2
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2
+SUMMARY: OZTURK/TURAN 🇹🇷 - 🇩🇪 BAUS/SCHMIDBERG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/medals/general.ics b/docs/en/medals/general.ics
index 8c6a3c703..26b6d5544 100644
--- a/docs/en/medals/general.ics
+++ b/docs/en/medals/general.ics
@@ -565,13 +565,12 @@ SUMMARY: LOVAS/RIAPOS 🇸🇰 - 🇰🇷 CHA/PARK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2
+UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2-TUR-GER
 DTSTAMP:20240830T150000Z
 DTSTART:20240830T150000Z
 DTEND:20240830T160000Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2\n🇹🇷
-  OZTURK/TURAN
-SUMMARY:Men's Doubles - MD8 - Semifinal 2
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2
+SUMMARY: OZTURK/TURAN 🇹🇷 - 🇩🇪 BAUS/SCHMIDBERG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/GER.ics b/docs/en/para-table-tennis/GER.ics
index 236441e0c..bbbe73f1d 100644
--- a/docs/en/para-table-tennis/GER.ics
+++ b/docs/en/para-table-tennis/GER.ics
@@ -103,6 +103,15 @@ SUMMARY: GLINBANCHE/JAION 🇹🇭 - 🇩🇪 BRUECHLE/MIKOLASCHE
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2-TUR-GER
+DTSTAMP:20240830T150000Z
+DTSTART:20240830T150000Z
+DTEND:20240830T160000Z
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2
+SUMMARY: OZTURK/TURAN 🇹🇷 - 🇩🇪 BAUS/SCHMIDBERG
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240830T180000Z-para-table-tennis-WOMENS-DOUBLES-WD14-GOLD-MEDAL-MATCH
 DTSTAMP:20240830T180000Z
 DTSTART:20240830T180000Z
diff --git a/docs/en/para-table-tennis/TUR.ics b/docs/en/para-table-tennis/TUR.ics
index 479a1a695..0879473d2 100644
--- a/docs/en/para-table-tennis/TUR.ics
+++ b/docs/en/para-table-tennis/TUR.ics
@@ -49,13 +49,12 @@ SUMMARY: LIN/TIAN 🇹🇼 - 🇹🇷 DEMIR/KAVAS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2
+UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2-TUR-GER
 DTSTAMP:20240830T150000Z
 DTSTART:20240830T150000Z
 DTEND:20240830T160000Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2\n🇹🇷
-  OZTURK/TURAN
-SUMMARY:Men's Doubles - MD8 - Semifinal 2
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2
+SUMMARY: OZTURK/TURAN 🇹🇷 - 🇩🇪 BAUS/SCHMIDBERG
 LOCATION:South Paris Arena 4
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/general.ics b/docs/en/para-table-tennis/general.ics
index 8266722f9..778b3d30c 100644
--- a/docs/en/para-table-tennis/general.ics
+++ b/docs/en/para-table-tennis/general.ics
@@ -689,15 +689,6 @@ SUMMARY: ZOHIL/LUCIC 🇭🇷 - 🇨🇳 PENG/XIONG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T080000Z-para-table-tennis-MENS-WOMENS-DOUBLES-MIXED-QFSF
-DTSTAMP:20240830T080000Z
-DTSTART:20240830T080000Z
-DTEND:20240830T130000Z
-DESCRIPTION:Para Table Tennis - Men's & Women's Doubles Mixed QF/SF
-SUMMARY:Men's & Women's Doubles Mixed QF/SF
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240830T090000Z-para-table-tennis-MIXED-DOUBLES-XD17-QUARTERFINAL-4-UK
 DTSTAMP:20240830T090000Z
 DTSTART:20240830T090000Z
@@ -860,22 +851,12 @@ SUMMARY: MANARA/MASSAD 🇧🇷 - 🇫🇷 BOHEAS/BOUVAIS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2
+UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2-TUR-GER
 DTSTAMP:20240830T150000Z
 DTSTART:20240830T150000Z
 DTEND:20240830T160000Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2\n🇹🇷
-  OZTURK/TURAN
-SUMMARY:Men's Doubles - MD8 - Semifinal 2
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240830T150000Z-para-table-tennis-MENS-WOMENS-DBLES-MIXED-QFSFFINALS
-DTSTAMP:20240830T150000Z
-DTSTART:20240830T150000Z
-DTEND:20240830T200000Z
-DESCRIPTION:Para Table Tennis - Men's & Women's Dbles Mixed QF/SF/Finals
-SUMMARY:Men's & Women's Dbles Mixed QF/SF/Finals
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2
+SUMMARY: OZTURK/TURAN 🇹🇷 - 🇩🇪 BAUS/SCHMIDBERG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/medals.ics b/docs/en/para-table-tennis/medals.ics
index 63465ca7e..ef7f74054 100644
--- a/docs/en/para-table-tennis/medals.ics
+++ b/docs/en/para-table-tennis/medals.ics
@@ -49,13 +49,12 @@ SUMMARY: LOVAS/RIAPOS 🇸🇰 - 🇰🇷 CHA/PARK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2
+UID:20240830T150000Z-para-table-tennis-MENS-DOUBLES-MD8-SEMIFINAL-2-TUR-GER
 DTSTAMP:20240830T150000Z
 DTSTART:20240830T150000Z
 DTEND:20240830T160000Z
-DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2\n🇹🇷
-  OZTURK/TURAN
-SUMMARY:Men's Doubles - MD8 - Semifinal 2
+DESCRIPTION:Para Table Tennis - Men's Doubles - MD8 - Semifinal 2
+SUMMARY: OZTURK/TURAN 🇹🇷 - 🇩🇪 BAUS/SCHMIDBERG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index af11c849b..37331479b 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -7312,19 +7312,6 @@
     <div class="competitor IND">🇮🇳 Sakshi KASANA </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240830T080000Z" data-end="20240830T130000Z" data-noc="">
- <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">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   PARA TABLE TENNIS
-   </div>
-   <div>Men's & Women's Doubles Mixed QF/SF</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240830T080100Z" data-end="20240830T081200Z" data-noc="CHI,CHN">
  <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">
   <span class="time-start">__:__</span>
@@ -11710,7 +11697,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240830T150000Z" data-end="20240830T160000Z" data-noc="TUR">
+<div class="event py-4" data-start="20240830T150000Z" data-end="20240830T160000Z" data-noc="GER,TUR">
  <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">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -11722,7 +11709,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Doubles - MD8 - Semifinal 2</div>
-    <div class="competitor TUR">🇹🇷 OZTURK/TURAN </div>
+    <div class="competitors">
+      OZTURK/TURAN
+      🇹🇷
+      -
+      🇩🇪
+      BAUS/SCHMIDBERG
+    </div>
  </div>
 </div>
 <div class="event py-4" data-start="20240830T150000Z" data-end="20240830T160000Z" data-noc="">
@@ -11739,19 +11732,6 @@
    <div>R1 - Men's 10m Air Rifle Standing SH1 Pre-Event Training</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240830T150000Z" data-end="20240830T200000Z" data-noc="">
- <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">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   PARA TABLE TENNIS
-   </div>
-   <div>Men's & Women's Dbles Mixed QF/SF/Finals</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240830T150900Z" data-end="20240830T152000Z" data-noc="">
  <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">
   <span class="time-start">__:__</span>