diff --git a/aleksis/apps/chronos/templates/chronos/quicklaunch.html b/aleksis/apps/chronos/templates/chronos/all.html
similarity index 100%
rename from aleksis/apps/chronos/templates/chronos/quicklaunch.html
rename to aleksis/apps/chronos/templates/chronos/all.html
diff --git a/aleksis/apps/chronos/templates/chronos/hintform.html b/aleksis/apps/chronos/templates/chronos/hint_form.html
similarity index 100%
rename from aleksis/apps/chronos/templates/chronos/hintform.html
rename to aleksis/apps/chronos/templates/chronos/hint_form.html
diff --git a/aleksis/apps/chronos/templates/chronos/myplan.html b/aleksis/apps/chronos/templates/chronos/my_timetable.html
similarity index 100%
rename from aleksis/apps/chronos/templates/chronos/myplan.html
rename to aleksis/apps/chronos/templates/chronos/my_timetable.html
diff --git a/aleksis/apps/chronos/templates/chronos/partials/hints/hintsinsub.html b/aleksis/apps/chronos/templates/chronos/partials/hints/substitutions.html
similarity index 100%
rename from aleksis/apps/chronos/templates/chronos/partials/hints/hintsinsub.html
rename to aleksis/apps/chronos/templates/chronos/partials/hints/substitutions.html
diff --git a/aleksis/apps/chronos/templates/chronos/partials/hints/hintsinsubprint.html b/aleksis/apps/chronos/templates/chronos/partials/hints/substitutions_print.html
similarity index 100%
rename from aleksis/apps/chronos/templates/chronos/partials/hints/hintsinsubprint.html
rename to aleksis/apps/chronos/templates/chronos/partials/hints/substitutions_print.html
diff --git a/aleksis/apps/chronos/templates/chronos/partials/hints/hintsinplan.html b/aleksis/apps/chronos/templates/chronos/partials/hints/timetable.html
similarity index 100%
rename from aleksis/apps/chronos/templates/chronos/partials/hints/hintsinplan.html
rename to aleksis/apps/chronos/templates/chronos/partials/hints/timetable.html
diff --git a/aleksis/apps/chronos/templates/chronos/substitution.html b/aleksis/apps/chronos/templates/chronos/substitutions.html
similarity index 100%
rename from aleksis/apps/chronos/templates/chronos/substitution.html
rename to aleksis/apps/chronos/templates/chronos/substitutions.html
diff --git a/aleksis/apps/chronos/templates/chronos/substitutionprint.html b/aleksis/apps/chronos/templates/chronos/substitutions_print.html
similarity index 100%
rename from aleksis/apps/chronos/templates/chronos/substitutionprint.html
rename to aleksis/apps/chronos/templates/chronos/substitutions_print.html
diff --git a/aleksis/apps/chronos/templates/chronos/plan.html b/aleksis/apps/chronos/templates/chronos/timetable.html
similarity index 100%
rename from aleksis/apps/chronos/templates/chronos/plan.html
rename to aleksis/apps/chronos/templates/chronos/timetable.html
diff --git a/aleksis/apps/chronos/views.py b/aleksis/apps/chronos/views.py
index bdb68d006899ba22210153dda8312ebd29d9c75a..da2181ae3e5f92fd1f60fc0c5481e00b2fa36f39 100644
--- a/aleksis/apps/chronos/views.py
+++ b/aleksis/apps/chronos/views.py
@@ -74,7 +74,7 @@ def all(request: HttpRequest) -> HttpResponse:
     context['classes'] = classes
     context['rooms'] = rooms
 
-    return render(request, 'chronos/quicklaunch.html', context)
+    return render(request, 'chronos/all.html', context)
 
 
 @login_required
@@ -89,7 +89,7 @@ def my_timetable(
     else:
         wanted_day = get_next_relevant_day(timezone.now().date(), datetime.now().time())
 
-    return render(request, "chronos/myplan.html", context)
+    return render(request, "chronos/my_timetable.html", context)
 
 
 @login_required
@@ -179,7 +179,7 @@ def timetable(
     context["url_prev"] = reverse("timetable_by_week", args=[type_, pk, week_prev.year, week_prev.week])
     context["url_next"] = reverse("timetable_by_week", args=[type_, pk, week_next.year, week_next.week])
 
-    return render(request, "chronos/plan.html", context)
+    return render(request, "chronos/timetable.html", context)
 
 
 @login_required
@@ -294,4 +294,4 @@ def substitutions(
         reverse("substitutions_by_day", args=[day_next.year, day_next.month, day_next.day])
     )
 
-    return render(request, "chronos/substitution.html", context)
+    return render(request, "chronos/substitutions.html", context)