--- a/templates/ajovuoro.html	Tue Jun 20 09:39:42 2017 +0300
+++ b/templates/ajovuoro.html	Tue Jun 20 10:27:52 2017 +0300
@@ -34,14 +34,14 @@
 		window.scrollTo(0, 0);
 	} 
 	</script>
-	<title>{{linja}} {{selite}}</title>
+	<title>{{route}} {{description}}</title>
 </head>
 <body>
 	<h1>
-	{% if yö %}
+	{% if night %}
 	&#127769;
 	{% endif %}
-	{{linja}} {{selite}}</h1>
+	{{route}} {{description}}</h1>
 	<nav>
 	<div class="tab-bar">
 	<span></span>
@@ -57,10 +57,10 @@
 				<th class='sarake-aika'>Aika</th>
 				<th class='sarake-alue'>Alue</th>
 			</tr>
-			{% for rivi in suppea_reitti %}
+			{% for entry in concise_schedule %}
 			<tr>
-				<td class='sarake-aika'>{{rivi['aika']}}</td>
-				<td class='sarake-alue'>{{rivi['alue']}}</td>
+				<td class='sarake-aika'>{{entry['time']}}</td>
+				<td class='sarake-alue'>{{entry['region']}}</td>
 			</tr>
 			{% endfor %}
 		</table>
@@ -72,14 +72,14 @@
 				<th class='sarake-pysäkkiviite'>Pysäkki</th>
 				<th class='sarake-pysäkki'>Nimi</th>
 			</tr>
-			{% for rivi in reitti %}
+			{% for halt in schedule %}
 			<tr>
-				<td class='sarake-aika'>{{rivi['aika']}}</td>
+				<td class='sarake-aika'>{{halt['time']}}</td>
 				<td class='sarake-pysäkkiviite'>
-					<a href="/pysäkki/{{rivi['tunniste']}}"><img src='/static/pysäkki.png' height='24' /> {{rivi['tunniste']}}</a>
+					<a href="/pysäkki/{{halt['reference']}}"><img src='/static/pysäkki.png' height='24' /> {{halt['reference']}}</a>
 				</td>
 				<td class='sarake-pysäkki'>
-					<a href="/pysäkki/{{rivi['tunniste']}}">{{rivi['nimi']}}</a>
+					<a href="/pysäkki/{{halt['reference']}}">{{halt['name']}}</a>
 				</td>
 			</tr>
 			{% endfor %}