diff --git a/tournaments/models/event.py b/tournaments/models/event.py
index 1dd8ad4..e2faf26 100644
--- a/tournaments/models/event.py
+++ b/tournaments/models/event.py
@@ -19,6 +19,18 @@ class Event(models.Model):
         return self.display_name()
 
     def display_name(self):
+        if self.club and self.club.name and self.name:
+            return self.club.acronym + " " + self.name
+        if self.name:
+            return self.name
+        elif self.club and self.club.name:
+            return self.club.name
+        else:
+            return self.creation_date.strftime("%Y-%m-%d %H:%M")
+
+    def display_long_name(self):
+        if self.club and self.club.name and self.name:
+            return self.club.name + " " + self.name
         if self.name:
             return self.name
         elif self.club and self.club.name:
diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py
index 9c99787..83e3625 100644
--- a/tournaments/models/tournament.py
+++ b/tournaments/models/tournament.py
@@ -60,9 +60,12 @@ class Tournament(models.Model):
 
     def display_name(self):
         if self.name:
-            return self.name
+            return self.base_name() + " " + self.name
         else:
-            return f"{self.level()} {self.category()}"
+            return self.base_name()
+
+    def base_name(self):
+        return f"{self.level()} {self.category()}"
 
     def level(self):
         return self.get_federal_level_category_display()
diff --git a/tournaments/templates/tournaments/tournament_row.html b/tournaments/templates/tournaments/tournament_row.html
index 7225a32..15a4472 100644
--- a/tournaments/templates/tournaments/tournament_row.html
+++ b/tournaments/templates/tournaments/tournament_row.html
@@ -6,8 +6,8 @@
                 </div>
                 <div class="table-cell table-cell-large horizontal-padding semibold">
                     {% if tournament.name %}
-                    <span>{{ tournament.event.club.name }}: </span>
-                    <span>{{ tournament.name }}</span>
+                    <div><span>{{ tournament.event.display_long_name }}</span></div>
+                    <div><span>{{ tournament.name }}</span></div>
                     {% else %}
                     <span>{{ tournament.event.club.name }}</span>
                     {% endif %}