diff --git a/tournaments/models/club.py b/tournaments/models/club.py
index df51b2b..f11e6ef 100644
--- a/tournaments/models/club.py
+++ b/tournaments/models/club.py
@@ -42,7 +42,7 @@ class Club(BaseModel):
                 return court.name
 
         if index is not None:
-            return f"Terrain {index + 1}"
+            return f"Piste {index + 1}"
 
         return ""
 
diff --git a/tournaments/models/court.py b/tournaments/models/court.py
index 1fcbe52..57f6908 100644
--- a/tournaments/models/court.py
+++ b/tournaments/models/court.py
@@ -17,4 +17,4 @@ class Court(BaseModel):
         if self.name:
             return self.name
         else:
-            return f"Terrain {self.index + 1}"
+            return f"Piste {self.index + 1}"
diff --git a/tournaments/models/match.py b/tournaments/models/match.py
index c45ac69..4dc43fe 100644
--- a/tournaments/models/match.py
+++ b/tournaments/models/match.py
@@ -67,7 +67,7 @@ class Match(SideStoreModel):
         if club:
             return club.court_name(index)
         elif index is not None:
-            return f"Terrain {index + 1}"
+            return f"Piste {index + 1}"
         return ""
 
     def backup_name(self):
diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_planning.html b/tournaments/templates/tournaments/broadcast/broadcasted_planning.html
index a8d60f2..fbd64cc 100644
--- a/tournaments/templates/tournaments/broadcast/broadcasted_planning.html
+++ b/tournaments/templates/tournaments/broadcast/broadcasted_planning.html
@@ -292,7 +292,7 @@
                                 <template x-for="courtNum in Array.from({length: courtCount || 1}, (_, i) => i + 1)" :key="courtNum">
                                     <div class="court-label" :style="{'width': calculateFractionWidth()}">
                                         <div class="bubble">
-                                            <div class="score ws bold">Terrain <span x-text="courtNum"></span></div>
+                                            <div class="score ws bold">Piste <span x-text="courtNum"></span></div>
                                         </div>
                                     </div>
                                 </template>
@@ -308,7 +308,7 @@
                                 <template x-for="courtNum in Array.from({length: courtCount || 1}, (_, i) => i + 1)" :key="courtNum">
                                     <div class="court-label" :style="{'width': calculateFractionWidth()}">
                                         <div class="bubble">
-                                            <div class="score ws bold">Terrain <span x-text="courtNum"></span></div>
+                                            <div class="score ws bold">Piste <span x-text="courtNum"></span></div>
                                         </div>
                                     </div>
                                 </template>
diff --git a/tournaments/templates/tournaments/match_cell.html b/tournaments/templates/tournaments/match_cell.html
index 8456e89..bc907bc 100644
--- a/tournaments/templates/tournaments/match_cell.html
+++ b/tournaments/templates/tournaments/match_cell.html
@@ -12,7 +12,7 @@
                     {% else %}
                     <label class="matchtitle">{{ match.title }}</label>
                     {% endif %}
-                    {% if not match.ended %}
+                    {% if match.court %}
                     <label class="right-label minor-info">{{ match.court }}</label>
                     {% endif %}
                 </div>
diff --git a/tournaments/templates/tournaments/tournament_info.html b/tournaments/templates/tournaments/tournament_info.html
index 48c85d3..3cf7716 100644
--- a/tournaments/templates/tournaments/tournament_info.html
+++ b/tournaments/templates/tournaments/tournament_info.html
@@ -158,7 +158,7 @@
             <div class="bubble">
                 <div class="semibold">{{ tournament.local_start_date_formatted }}</div>
                 <div>{{ tournament.day_duration_formatted }}</div>
-                <div>{{ tournament.court_count }} terrains</div>
+                <div>{{ tournament.court_count }} pistes</div>
                 <p>
                 </p>