diff --git a/templates/match_workspace.html b/templates/match_workspace.html
index 9059539..e7c3864 100644
--- a/templates/match_workspace.html
+++ b/templates/match_workspace.html
@@ -124,12 +124,12 @@
 
             <div class="team-box right">
               <div>
-                <div class="team-name">{{ session[17] }}</div>
+                <div class="team-name">{{ session[18] }}</div>
               </div>
-              {% if session[18] %}
+              {% if session[19] %}
               <img
-                src="{{ session[18] }}"
-                alt="{{ session[17] }}"
+                src="{{ session[19] }}"
+                alt="{{ session[18] }}"
                 class="team-logo"
               />
               {% endif %}
@@ -845,7 +845,7 @@ data-role="{{ p.position or '' }}"
           </div>
 
           <div class="panel">
-            <div class="team-panel-title">Расстановка — {{ session[17] }}</div>
+            <div class="team-panel-title">Расстановка — {{ session[18] }}</div>
 
             <div class="formation-toolbar">
               <select id="away-preset" class="formation-select" data-edit-lock onchange="saveSelectedPreset('away')">
@@ -1007,7 +1007,7 @@ data-role="{{ p.position or '' }}"
             <tbody>
               {% for s in standings %}
               <tr
-                class="{% if s.team_name == session[14] %}standings-row-home{% elif s.team_name == session[17] %}standings-row-away{% endif %}"
+                class="{% if s.team_name == session[14] %}standings-row-home{% elif s.team_name == session[18] %}standings-row-away{% endif %}"
               >
                 <td class="num-cell">{{ s.position }}</td>
                 <td class="st-logo-col">
@@ -1049,7 +1049,7 @@ data-role="{{ p.position or '' }}"
   window.MATCH_DATA = {
       teamNames: {
           home: {{ session[14] | tojson }},
-          away: {{ session[17] | tojson }}
+          away: {{ session[18] | tojson }}
       },
       teamLogos: {
           home: {{ session[15] | tojson }},
@@ -1185,7 +1185,7 @@ data-role="{{ p.position or '' }}"
             </div>
 
             <div class="squad-editor-team">
-              <div class="squad-editor-team-title">{{ session[17] }}</div>
+              <div class="squad-editor-team-title">{{ session[18] }}</div>
               <div id="squadEditorAway"></div>
             </div>
           </div>