diff --git a/anatomy/templates/anatomy/exams.html b/anatomy/templates/anatomy/exams.html
index ebf76f9a..28d46ee3 100644
--- a/anatomy/templates/anatomy/exams.html
+++ b/anatomy/templates/anatomy/exams.html
@@ -3,7 +3,7 @@
 {% block navigation %}
     {{block.super}}
     <br/>
-    Exams: {{exam.name}}->
+    Exams: {{exam}}->
     <a href="{% url 'anatomy:exam_overview' pk=exam.pk %}">Overview</a> /
     {% if exam.exam_mode %}
         <a href="{% url 'anatomy:mark_overview' pk=exam.pk %}">Mark</a> /
diff --git a/anatomy/templates/anatomy/mark_overview.html b/anatomy/templates/anatomy/mark_overview.html
index 54cadabb..6141898b 100644
--- a/anatomy/templates/anatomy/mark_overview.html
+++ b/anatomy/templates/anatomy/mark_overview.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 <div class="anatomy">
-    <h2>Marking exam: {{ exam.name }}</h2>
+    <h2>Marking exam: {{ exam }}</h2>
     You can start marking from a particular question by clicking on it below.
 
     <div>
diff --git a/anatomy/templates/anatomy/question_detail.html b/anatomy/templates/anatomy/question_detail.html
index 8a024da3..a2f3e72a 100644
--- a/anatomy/templates/anatomy/question_detail.html
+++ b/anatomy/templates/anatomy/question_detail.html
@@ -45,7 +45,7 @@
         </div>
         <div>
             Exams: {% for exam in question.exams.all %}
-                <a href="{% url 'anatomy:exam_overview' pk=exam.pk %}">{{ exam.name }}</a>
+                <a href="{% url 'anatomy:exam_overview' pk=exam.pk %}">{{ exam }}</a>
             {% endfor %}
         </div>
         <div>
diff --git a/anatomy/templates/anatomy/question_link_header.html b/anatomy/templates/anatomy/question_link_header.html
index 3acacc48..aeb03c6e 100644
--- a/anatomy/templates/anatomy/question_link_header.html
+++ b/anatomy/templates/anatomy/question_link_header.html
@@ -19,7 +19,7 @@
                 {% if previous > -1 %}
                     <a href="{% url 'anatomy:exam_question_detail' exam.id previous %}">Previous question</a>
                 {% endif %}
-                Viewing question as part of exam: <a href="{% url 'anatomy:exam_overview' exam.id %}">{{exam.name}}</a> [{{pos}}/{{exam_length}}]
+                Viewing question as part of exam: <a href="{% url 'anatomy:exam_overview' exam.id %}">{{exam}}</a> [{{pos}}/{{exam_length}}]
                 {% if next %}
                     <a href="{% url 'anatomy:exam_question_detail' exam.id next %}">Next question</a>
                 {% endif %}
diff --git a/anatomy/tests/test_anatomy_exams.py b/anatomy/tests/test_anatomy_exams.py
index d1cb6c31..44ecf67a 100644
--- a/anatomy/tests/test_anatomy_exams.py
+++ b/anatomy/tests/test_anatomy_exams.py
@@ -303,7 +303,7 @@ def test_exams(db, client):
             .find("li", attrs={"data-exam-id": exam.pk})
         )
         assert search_exam
-        assert exam.name in str(search_exam)
+        assert str(exam) in str(search_exam)
         assert len(search_exam.find("button", {"class": "start-button"})) > 0
         # assert "Active" in assigned_exams # check it is active
 
@@ -319,8 +319,8 @@ def test_exams(db, client):
             .find_all("li", attrs={"data-exam-id": exam.pk})
         )
         assert results_exam
-        assert exam.name in str(results_exam)
-        assert exam.name + " test" not in str(results_exam)
+        assert str(exam) in str(results_exam)
+        assert str(exam) + " test" not in str(results_exam)
         assert "Results Published" not in str(
             results_exam
         )  # It should not be published yet
diff --git a/atlas/models.py b/atlas/models.py
index 6cdde5fb..b9c76a07 100644
--- a/atlas/models.py
+++ b/atlas/models.py
@@ -47,6 +47,7 @@ from generic.models import (
     CidUserExam,
     CidUserGroup,
     ExamOrCollectionGenericBase,
+    ExamUserStatus,
     Examination,
     # Condition,
     ExamBase,
@@ -775,6 +776,8 @@ class CaseCollection(ExamOrCollectionGenericBase):
         help_text="If true allows users self complete and review cases in a self directed way.",
     )
 
+    exam_user_status = GenericRelation(ExamUserStatus)
+
     feedback_once_collection_complete = models.BooleanField(default=True, help_text="If true feedback is only given once the collection is complete. If false feedback is given after each case.")
 
     class COLLECTION_TYPE_CHOICES(models.TextChoices):
@@ -996,6 +999,8 @@ class CaseDetail(models.Model):
 
     question_schema = models.JSONField(null=True, blank=True)
     question_answers = models.JSONField(null=True, blank=True)
+    # TODO add feedback for questions
+    #question_feedback = models.JSONField(null=True, blank=True)
 
     sort_order = models.IntegerField(default=1000)
 
diff --git a/atlas/templates/atlas/collection_case_view_take.html b/atlas/templates/atlas/collection_case_view_take.html
index 22b240d6..2414487d 100644
--- a/atlas/templates/atlas/collection_case_view_take.html
+++ b/atlas/templates/atlas/collection_case_view_take.html
@@ -177,7 +177,7 @@
                     {% endif %}
                 </div>
 
-                <details><summary>View questions</summary>
+                <details><summary class="opacity-50">View questions</summary>
                     {{form.json.errors}}
                     <div class="form-contents">
                         <fieldset {% if question_completed %}disabled="disabled"{% endif %}>
diff --git a/atlas/templates/atlas/collection_review_start.html b/atlas/templates/atlas/collection_review_start.html
index fe037945..8e7d69ff 100644
--- a/atlas/templates/atlas/collection_review_start.html
+++ b/atlas/templates/atlas/collection_review_start.html
@@ -1,7 +1,7 @@
 {% extends 'atlas/base.html' %}
 
 {% block content %}
-    <h2>Collection: {{exam.name}}</h2>
+    <h2>Collection: {{exam}}</h2>
 
 {% comment %}     <ul>
         {% for case in collection.cases.all %}
diff --git a/atlas/templates/atlas/index.html b/atlas/templates/atlas/index.html
index a66602e8..0ed34a86 100644
--- a/atlas/templates/atlas/index.html
+++ b/atlas/templates/atlas/index.html
@@ -9,6 +9,6 @@
 <h3>My cases / collections</h3>
 View my <a href='{% url "atlas:case_view" %}?author={{request.user.id}}'>cases</a>.<br/>
 
-<a href="{% url 'atlas:user_uploads' %}"><button><i class="bi bi-cloud-arrow-up"></i> Uploads awaiting import</button></a>
+<a href="{% url 'atlas:user_uploads' %}"><i class="bi bi-cloud-arrow-up"></i> Uploads awaiting import</a>
 
 {% endblock %}
\ No newline at end of file
diff --git a/atlas/views.py b/atlas/views.py
index 8d038462..df2a5bb6 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -1914,6 +1914,16 @@ def collection_take_overview(
             cid_user_exam.completed = True
             cid_user_exam.save()
 
+            if cid is not None:
+                c = CidUser.objects.get(cid=cid)
+                collection.exam_user_status.create(
+                    cid_user=c, user_user=None, status="submitted", extra="manual submission"
+                )
+            else:
+                collection.exam_user_status.create(
+                    cid_user=None, user_user=request.user, status="submitted", extra="manual submission"
+                )
+
             return HttpResponse("True")
         else:
             raise Http404()
diff --git a/generic/models.py b/generic/models.py
index b6e9f66e..c6a685cf 100644
--- a/generic/models.py
+++ b/generic/models.py
@@ -869,6 +869,14 @@ class ExamBase(ExamOrCollectionGenericBase):
     class Meta:
         abstract = True
 
+    def __str__(self):
+        print("TESTING")
+        if self.start_date and self.start_date is not None:
+            print(f"Start date: {self.start_date:%d %B %Y}")
+            return f"{self.name} ({self.start_date:%d %B %Y})"
+        else:
+            return self.name
+
     def save(self, *args, recreate_json=True, **kwargs):
         self.recreate_json = recreate_json
 
@@ -903,9 +911,6 @@ class ExamBase(ExamOrCollectionGenericBase):
 """
         return text
 
-    def __str__(self):
-        return self.name
-
     def get_absolute_url(self):
         return reverse("{}:exam_overview".format(self.app_name), kwargs={"pk": self.pk})
 
diff --git a/generic/templates/generic/exam_index.html b/generic/templates/generic/exam_index.html
index 7d2f6f05..3f1a4789 100644
--- a/generic/templates/generic/exam_index.html
+++ b/generic/templates/generic/exam_index.html
@@ -20,7 +20,7 @@
                 {% else %}
                     Packet:
                 {% endif %}
-                {{ exam.name }} </a></h1>
+                {{ exam }} </a></h1>
             <span class="authors">Authors: {{exam.get_authors}}</span>
             {% if exam.exam_mode %}
                 {% if app_name in "rapids longs anatomy" %}
diff --git a/generic/templates/generic/exam_overview_headers.html b/generic/templates/generic/exam_overview_headers.html
index 2ef494ec..602de13c 100644
--- a/generic/templates/generic/exam_overview_headers.html
+++ b/generic/templates/generic/exam_overview_headers.html
@@ -1,5 +1,5 @@
 {% include "generic/exam_link_headers.html" %}
-<h1>Exam: {{ exam.name }}</h1>
+<h1>Exam: {{ exam }}</h1>
 
 {% include 'exam_notes.html' %}
 
diff --git a/generic/templates/generic/exam_scores_base.html b/generic/templates/generic/exam_scores_base.html
index 753c003f..a7a25559 100644
--- a/generic/templates/generic/exam_scores_base.html
+++ b/generic/templates/generic/exam_scores_base.html
@@ -2,7 +2,7 @@
 
 {% block content %}
     <div class="">
-        <h2>{{ exam.name }}</h2>
+        <h2>{{ exam }}</h2>
         {% if cached_scores %}
             User answer scores are cached, if you update or change an answer you will need to <a href="{% url exam.app_name|add:':exam_scores_refresh' exam.pk %}">refresh the scores</a>.
         {% endif %}
diff --git a/generic/views.py b/generic/views.py
index b1ebb901..87165676 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -556,7 +556,7 @@ class ExamViews(View, LoginRequiredMixin):
             data = {
                 "status": "success",
                 "archive": exam.archive,
-                "name": exam.name,
+                "name": exam,
                 "id": exam.id,
             }
             return JsonResponse(data, status=200)
@@ -580,7 +580,7 @@ class ExamViews(View, LoginRequiredMixin):
             data = {
                 "status": "success",
                 "publish_results": exam.publish_results,
-                "name": exam.name,
+                "name": exam,
                 "id": exam.id,
             }
             return JsonResponse(data, status=200)
@@ -602,7 +602,7 @@ class ExamViews(View, LoginRequiredMixin):
             data = {
                 "status": "success",
                 "active": exam.active,
-                "name": exam.name,
+                "name": exam,
                 "id": exam.id,
             }
             return JsonResponse(data, status=200)
@@ -1483,13 +1483,9 @@ class ExamViews(View, LoginRequiredMixin):
         exam: ExamBase
         for exam in exams:
             if exam.active or self.check_user_access(request.user, exam.pk):
-                print(
-                    f"{exam.app_name=}, {exam.name=}, {cid=}, {passcode=}, {request.user=}"
-                )
                 if exam.exam_mode and not exam.check_cid_user(
                     cid, passcode, user=request.user, user_id=request.user.pk
                 ):
-                    print(exam.name, "fail")
                     continue
 
                 if exam.json_creation_time:
diff --git a/longs/templates/longs/exam_scores.html b/longs/templates/longs/exam_scores.html
index 233c5033..b389e1d7 100644
--- a/longs/templates/longs/exam_scores.html
+++ b/longs/templates/longs/exam_scores.html
@@ -19,77 +19,3 @@
 {% endblock table_answers %}
 
 
-
-
-{% comment %} {% extends 'longs/exams.html' %}
-
-{% block content %}
-<div class="longs">
-    <h2>{{ exam.name }}</h2>
-
-    {% if unmarked %}
-    <div class="alert alert-warning" role="alert">
-        The following questions need marking
-        {% for exam_index in unmarked %}
-        <a href="{% url 'longs:mark' exam.pk exam_index %}">{{ exam_index|add:1 }}</a>
-        {% endfor %}
-    </div>
-
-    {% endif %}
-
-</div>
-<div id="stats-block">
-    <h3>Stats</h3>
-    Candidates: {{cids|length}}<br />
-    Available marks: {{max_score}}<br />
-    Mean: {{mean}}, Median {{median}}, Mode {{mode}}
-
-    <div id="stats-plot">{{plot|safe}}</div>
-</div>
-<div class="col-sm-4">
-    <table class="table table-dark table-striped table-hover table-sm">
-        <tr>
-            <th>Candidate ID</th>
-            <th>Score</th>
-            <th>Normalised score</th>
-        </tr>
-        {% for user, value in user_answers_marks.items %}
-        <tr>
-            <td><a href="{% url 'cid_scores_admin' user %}">{{user}}</a></td>
-            <td>{{user_scores|get_item:user}}</td>
-            <td>{{user_scores_normalised|get_item:user}}</td>
-        </tr>
-        {% endfor %}
-    </table>
-</div>
-<div class="col">
-    <h3>Results as a table</h3>
-    <table class="longs table table-dark table-striped table-hover table-sm">
-        <thead class="thead-dark">
-            <tr>
-                <th>Candidate</th>
-                {% for cid in cids %}
-                <th><a href="{% url 'longs:exam_scores_cid_user' exam.pk cid 'None' %}">{{cid}}</a></th>
-                {% endfor %}
-
-            </tr>
-        </thead>
-        {% for question in questions %}
-        <tr>
-            <td><a href="{% url 'longs:mark' exam_id=exam.pk sk=forloop.counter0 %}">Question
-                    {{forloop.counter}}</a></td>
-            {% for ans, score in by_question|get_item:question %}
-            <td class="user-answer-score-{{score}}" title="answer score: {{score}}">{{score}}</td>
-            {% endfor %}
-        </tr>
-        {% endfor %}
-        <tr>
-            <td>Score:</td>
-            {% for score in user_scores_list %}
-            <td>{{score}}</td>
-            {% endfor %}
-        <tr>
-    </table>
-
-</div>
-{% endblock %} {% endcomment %}
\ No newline at end of file
diff --git a/longs/templates/longs/exams.html b/longs/templates/longs/exams.html
index c892d469..2c8d208d 100644
--- a/longs/templates/longs/exams.html
+++ b/longs/templates/longs/exams.html
@@ -3,7 +3,7 @@
 {% block navigation %}
     {{block.super}}
     <br/>
-    Exams: {{exam.name}}-> 
+    Exams: {{exam}}-> 
     <a href="{% url 'longs:exam_overview' pk=exam.pk %}">Overview</a> / 
     <a href="{% url 'longs:mark_overview' pk=exam.pk %}">Mark</a> / 
     <a href="{% url 'longs:exam_scores_all' pk=exam.pk %}">Scores</a> /
diff --git a/longs/templates/longs/long_display_block.html b/longs/templates/longs/long_display_block.html
index df211522..7d62af16 100755
--- a/longs/templates/longs/long_display_block.html
+++ b/longs/templates/longs/long_display_block.html
@@ -70,7 +70,7 @@
     </p>
     <div>
         Exam(s): {% for exam in question.exams.all %}
-        <a href="{% url 'longs:exam_overview' pk=exam.pk %}">{{ exam.name }}</a>,
+        <a href="{% url 'longs:exam_overview' pk=exam.pk %}">{{ exam }}</a>,
         {% endfor %}
     </div>
     <div>
diff --git a/longs/templates/longs/mark_overview.html b/longs/templates/longs/mark_overview.html
index d366981c..05c0d706 100644
--- a/longs/templates/longs/mark_overview.html
+++ b/longs/templates/longs/mark_overview.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 <div class="longs">
-    <h2>Marking exam: {{ exam.name }}</h2>
+    <h2>Marking exam: {{ exam }}</h2>
     You can start marking from a particular question by clicking on it below.
 
     <div>
diff --git a/longs/templates/longs/question_detail.html b/longs/templates/longs/question_detail.html
index 9b069af9..d57a8990 100755
--- a/longs/templates/longs/question_detail.html
+++ b/longs/templates/longs/question_detail.html
@@ -18,7 +18,7 @@
 {% if previous > -1 %}
 <a href="{% url 'longs:exam_question_detail' exam.id previous %}">Previous question</a>
 {% endif %}
- Viewing question as part of exam: <a href="{% url 'longs:exam_overview' exam.id %}">{{exam.name}}</a> [{{pos}}/{{exam_length}}]
+ Viewing question as part of exam: <a href="{% url 'longs:exam_overview' exam.id %}">{{exam}}</a> [{{pos}}/{{exam_length}}]
 {% if next %}
 <a href="{% url 'longs:exam_question_detail' exam.id next %}">Next question</a>
 {% endif %}
diff --git a/longs/tests/test_longs_exams.py b/longs/tests/test_longs_exams.py
index fa9ccd24..1d719675 100644
--- a/longs/tests/test_longs_exams.py
+++ b/longs/tests/test_longs_exams.py
@@ -445,7 +445,7 @@ def test_exams(db, client):
             .find("li", attrs={"data-exam-id": exam.pk})
         )
         assert search_exam
-        assert exam.name in str(search_exam)
+        assert str(exam) in str(search_exam)
         assert len(search_exam.find("button", {"class": "start-button"})) > 0
         # assert "Active" in assigned_exams # check it is active
 
@@ -461,8 +461,8 @@ def test_exams(db, client):
             .find_all("li", attrs={"data-exam-id": exam.pk})
         )
         assert results_exam
-        assert exam.name in str(results_exam)
-        assert exam.name + " test" not in str(results_exam)
+        assert str(exam) in str(results_exam)
+        assert str(exam) + " test" not in str(results_exam)
         assert "Results Published" not in str(
             results_exam
         )  # It should not be published yet
diff --git a/physics/templates/physics/available_exam_list.html b/physics/templates/physics/available_exam_list.html
index 23b2405c..43e7f380 100644
--- a/physics/templates/physics/available_exam_list.html
+++ b/physics/templates/physics/available_exam_list.html
@@ -8,7 +8,7 @@
 {% for exam in exams %}
  {% if exam.active %}
  <li>
-    <a href="{% url 'physics:exam_start' pk=exam.pk %}">{{exam.name}}</a>
+    <a href="{% url 'physics:exam_start' pk=exam.pk %}">{{exam}}</a>
  </li>
     {% endif %}
 {% endfor %}
diff --git a/physics/templates/physics/exam_start.html b/physics/templates/physics/exam_start.html
index c21171b1..ed5d6df2 100755
--- a/physics/templates/physics/exam_start.html
+++ b/physics/templates/physics/exam_start.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 
-    <h2>Start exam: {{exam.name}}</h2>
+    <h2>Start exam: {{exam}}</h2>
 
     {% if exam.time_limit %}
        This exam has a time limit of {{ exam.get_time_limit }}. The time will start when you click the Start Exam button below.<br/>
diff --git a/physics/templates/physics/exam_take.html b/physics/templates/physics/exam_take.html
index c466db2a..e9e9454b 100755
--- a/physics/templates/physics/exam_take.html
+++ b/physics/templates/physics/exam_take.html
@@ -10,7 +10,7 @@
     </span>
     {% include "exam_clock.html" %}
     <div class="no-select">
-        <h2>{{exam.name}}: Question [<span id="question-number">{{pos|add:1}}</span>/<span id="exam-length">{{exam_length}}</span>]</h2>
+        <h2>{{exam}}: Question [<span id="question-number">{{pos|add:1}}</span>/<span id="exam-length">{{exam_length}}</span>]</h2>
         {% if exam.publish_results %}
             <div class="alert alert-primary review-mode-alert" role="alert">
                 Exam is in review mode. Add question feedback <a href="#" onclick="return window.create_popup_window('{% url 'feedback_create' question_type='physics' pk=question.pk %}')">here</a>.
diff --git a/physics/templates/physics/exam_take_old.html b/physics/templates/physics/exam_take_old.html
index 863811a9..069b7a0d 100644
--- a/physics/templates/physics/exam_take_old.html
+++ b/physics/templates/physics/exam_take_old.html
@@ -3,7 +3,7 @@
 {% block content %}
 
     <div class="physics">
-        <h1>Exam: {{ exam.name }}</h1>
+        <h1>Exam: {{ exam }}</h1>
 
         <div class="alert alert-info" role="alert">
             <details>
diff --git a/physics/templates/physics/exam_take_overview.html b/physics/templates/physics/exam_take_overview.html
index ea83d55f..a5c6a6ba 100644
--- a/physics/templates/physics/exam_take_overview.html
+++ b/physics/templates/physics/exam_take_overview.html
@@ -10,7 +10,7 @@
     </span>
     {% include "exam_clock.html" %}
 
-    <h2>Exam: {{exam.name}}</h2>
+    <h2>Exam: {{exam}}</h2>
 
     {% if exam.publish_results %}
         <div class="alert alert-primary review-mode-alert" role="alert">
diff --git a/physics/templates/physics/exams.html b/physics/templates/physics/exams.html
index 6f2f8b70..91d7471a 100644
--- a/physics/templates/physics/exams.html
+++ b/physics/templates/physics/exams.html
@@ -3,7 +3,7 @@
 {% block navigation %}
 {{block.super}}
 <br/>
-Exams: {{exam.name}}-> <a href="{% url 'physics:exam_overview' pk=exam.pk %}">Overview</a> / 
+Exams: {{exam}}-> <a href="{% url 'physics:exam_overview' pk=exam.pk %}">Overview</a> / 
 <a href="{% url 'physics:exam_scores_all' pk=exam.pk %}">Scores</a> /
 <a href="{% url 'physics:exam_cids' exam_id=exam.pk %}">Candidates</a> /
     <a href="{% url 'physics:exam_stats' exam_id=exam.pk %}">Stats</a> /
diff --git a/physics/templates/physics/question_detail.html b/physics/templates/physics/question_detail.html
index ffe2f46f..7244ecfd 100644
--- a/physics/templates/physics/question_detail.html
+++ b/physics/templates/physics/question_detail.html
@@ -21,7 +21,7 @@
     {% endautoescape %}
     <div>
         Examinations: {% for exam in question.exams.all %}
-        <a href="{% url 'physics:exam_overview' pk=exam.pk %}">{{ exam.name }}</a>
+        <a href="{% url 'physics:exam_overview' pk=exam.pk %}">{{ exam }}</a>
         {% endfor %}
     </div>
     <div>
diff --git a/rad/tests/test_helpers.py b/rad/tests/test_helpers.py
index bc9467ca..46919778 100644
--- a/rad/tests/test_helpers.py
+++ b/rad/tests/test_helpers.py
@@ -342,7 +342,7 @@ class ExamTester:
                 .find("li", attrs={"data-exam-id": self.exam.pk})
             )
             assert search_exam
-            assert self.exam.name in str(search_exam)
+            assert str(self.exam) in str(search_exam)
             assert len(search_exam.find("button", {"class": "start-button"})) > 0
             # assert "Active" in assigned_exams # check it is active
 
@@ -358,8 +358,8 @@ class ExamTester:
                 .find_all("li", attrs={"data-exam-id": self.exam.pk})
             )
             assert results_exam
-            assert self.exam.name in str(results_exam)
-            assert self.exam.name + " test" not in str(results_exam)
+            assert str(self.exam) in str(results_exam)
+            assert str(self.exam) + " test" not in str(results_exam)
             assert "Results Published" not in str(
                 results_exam
             )  # It should not be published yet
diff --git a/rapids/templates/rapids/exams.html b/rapids/templates/rapids/exams.html
index 12425d1d..4be5bd67 100644
--- a/rapids/templates/rapids/exams.html
+++ b/rapids/templates/rapids/exams.html
@@ -3,7 +3,7 @@
 {% block navigation %}
     {{block.super}}
     <br/>
-    Exams: {{exam.name}}->
+    Exams: {{exam}}->
     <a href="{% url 'rapids:exam_overview' pk=exam.pk %}">Overview</a> /
     {% if exam.exam_mode %}
         <a href="{% url 'rapids:mark_overview' pk=exam.pk %}">Mark</a> /
diff --git a/rapids/templates/rapids/mark_overview.html b/rapids/templates/rapids/mark_overview.html
index f363318b..61c787d2 100644
--- a/rapids/templates/rapids/mark_overview.html
+++ b/rapids/templates/rapids/mark_overview.html
@@ -1,20 +1,20 @@
-{% extends 'rapids/exams.html' %}
-
-{% block content %}
-<div class="rapids">
-    <h2>Marking exam: {{ exam.name }}</h2>
-    You can start marking from a particular question by clicking on it below.
-
-    <div>
-    <button class="show-all-button">Show all</button><button class="show-unmarked-button">Show unmarked</button>
-    </div>
-    <div id="stark-marking-button"><a href="{% url 'rapids:mark' exam_pk=exam.pk sk=0 %}"><button>Click here to start marking</button></a></div>
-
-    <ul id="question-mark-list">
-        {% for question, unmarked_count, unmarked_count2 in question_unmarked_map %}
-        <li data-markcount={{unmarked_count}} {% if unmarked_count %}class="unmarked" {% endif %}><a href="{% url 'rapids:mark' exam_pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
-                {{ question }}</a><br />Unmarked answers: {{unmarked_count}}</li>
-        {% endfor %}
-    </ul>
-</div>
+{% extends 'rapids/exams.html' %}
+
+{% block content %}
+    <div class="rapids">
+        <h2>Marking exam: {{ exam }}</h2>
+        You can start marking from a particular question by clicking on it below.
+
+        <div>
+            <button class="show-all-button">Show all</button><button class="show-unmarked-button">Show unmarked</button>
+        </div>
+        <div id="stark-marking-button"><a href="{% url 'rapids:mark' exam_pk=exam.pk sk=0 %}"><button>Click here to start marking</button></a></div>
+
+        <ul id="question-mark-list">
+            {% for question, unmarked_count, unmarked_count2 in question_unmarked_map %}
+                <li data-markcount={{unmarked_count}} {% if unmarked_count %}class="unmarked" {% endif %}><a href="{% url 'rapids:mark' exam_pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
+                    {{ question }}</a><br />Unmarked answers: {{unmarked_count}}</li>
+            {% endfor %}
+        </ul>
+    </div>
 {% endblock %}
\ No newline at end of file
diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html
index fd31f8c1..1ed9fded 100755
--- a/rapids/templates/rapids/question_display_block.html
+++ b/rapids/templates/rapids/question_display_block.html
@@ -30,7 +30,7 @@
     </div>
     <div>
         Exam(s): {% for exam in question.exams.all %}
-            <a href="{% url 'rapids:exam_overview' pk=exam.pk %}">{{ exam.name }}</a>,
+            <a href="{% url 'rapids:exam_overview' pk=exam.pk %}">{{ exam }}</a>,
         {% endfor %}
 
 {% comment %}         <button id="add-to-exam" data-exam_json_edit_url="{% url 'generic:generic_exam_json_edit' %}"
diff --git a/rapids/templates/rapids/question_link_header.html b/rapids/templates/rapids/question_link_header.html
index 56eb1241..6187804a 100644
--- a/rapids/templates/rapids/question_link_header.html
+++ b/rapids/templates/rapids/question_link_header.html
@@ -1,25 +1,25 @@
 
-    <div class="floating-header">
+<div class="floating-header">
 
-        <a href="{% url 'rapids:rapid_update' pk=question.pk %}" title="Edit the Rapid">Edit</a>
-        <a href="{% url 'rapids:rapid_clone' pk=question.pk %}" title="Clone the Rapid (duplicate everything but the images)">Clone</a>
-        <a href="{% url 'rapids:question_delete' pk=question.pk %}" title="Delete the Rapid">Delete</a>
-        <a href="{% url 'rapids:question_answer_update' pk=question.pk %}" title="Update the question answers">Edit Answers</a>
-        <a href="#" onclick="return window.create_popup_window('{% url 'feedback_create' question_type='rapid' pk=question.pk %}')"> Add Note</a>
-        {% if request.user.is_superuser %}
-            <a href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Rapid using the admin interface">Admin Edit</a>
-            <a href="{% url 'rapids:question_user_answers' question.id %}" title="View user answers associated with this question">User answers</a>
-        {% endif %}
-        {% if exam %}
-            <div>
+    <a href="{% url 'rapids:rapid_update' pk=question.pk %}" title="Edit the Rapid">Edit</a>
+    <a href="{% url 'rapids:rapid_clone' pk=question.pk %}" title="Clone the Rapid (duplicate everything but the images)">Clone</a>
+    <a href="{% url 'rapids:question_delete' pk=question.pk %}" title="Delete the Rapid">Delete</a>
+    <a href="{% url 'rapids:question_answer_update' pk=question.pk %}" title="Update the question answers">Edit Answers</a>
+    <a href="#" onclick="return window.create_popup_window('{% url 'feedback_create' question_type='rapid' pk=question.pk %}')"> Add Note</a>
+    {% if request.user.is_superuser %}
+        <a href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Rapid using the admin interface">Admin Edit</a>
+        <a href="{% url 'rapids:question_user_answers' question.id %}" title="View user answers associated with this question">User answers</a>
+    {% endif %}
+    {% if exam %}
+        <div>
 
-                {% if previous > -1 %}
-                    <a href="{% url 'rapids:exam_question_detail' exam.id previous %}">Previous question</a>
-                {% endif %}
-                Viewing question as part of exam: <a href="{% url 'rapids:exam_overview' exam.id %}">{{exam.name}}</a> [{{pos}}/{{exam_length}}]
-                {% if next %}
-                    <a href="{% url 'rapids:exam_question_detail' exam.id next %}">Next question</a>
-                {% endif %}
-            </div>
-        {% endif %}
-    </div>
\ No newline at end of file
+            {% if previous > -1 %}
+                <a href="{% url 'rapids:exam_question_detail' exam.id previous %}">Previous question</a>
+            {% endif %}
+            Viewing question as part of exam: <a href="{% url 'rapids:exam_overview' exam.id %}">{{exam}}</a> [{{pos}}/{{exam_length}}]
+            {% if next %}
+                <a href="{% url 'rapids:exam_question_detail' exam.id next %}">Next question</a>
+            {% endif %}
+        </div>
+    {% endif %}
+</div>
\ No newline at end of file
diff --git a/rapids/tests/test_rapids_exams.py b/rapids/tests/test_rapids_exams.py
index 493aee5b..b49a5e49 100644
--- a/rapids/tests/test_rapids_exams.py
+++ b/rapids/tests/test_rapids_exams.py
@@ -340,7 +340,7 @@ def test_exams(db, client):
             .find("li", attrs={"data-exam-id": exam.pk})
         )
         assert search_exam
-        assert exam.name in str(search_exam)
+        assert str(exam) in str(search_exam)
         assert len(search_exam.find("button", {"class": "start-button"})) > 0
         # assert "Active" in assigned_exams # check it is active
 
@@ -356,8 +356,8 @@ def test_exams(db, client):
             .find_all("li", attrs={"data-exam-id": exam.pk})
         )
         assert results_exam
-        assert exam.name in str(results_exam)
-        assert exam.name + " test" not in str(results_exam)
+        assert str(exam) in str(results_exam)
+        assert str(exam) + " test" not in str(results_exam)
         assert "Results Published" not in str(
             results_exam
         )  # It should not be published yet
diff --git a/sbas/templates/sbas/available_exam_list.html b/sbas/templates/sbas/available_exam_list.html
index 78665863..86cb4226 100644
--- a/sbas/templates/sbas/available_exam_list.html
+++ b/sbas/templates/sbas/available_exam_list.html
@@ -1,19 +1,19 @@
 {% extends 'sbas/base.html' %}
 
 {% block content %}
-<h1>Examinations</h1>
-<div class="sbas">
- Active exams:<br/>
- <ul>
-{% for exam in exams %}
- {% if exam.active %}
- <li>
-    <a href="{% url 'sbas:exam_start' pk=exam.pk %}">{{exam.name}}</a>
- </li>
-    {% endif %}
-{% endfor %}
- </ul>
+    <h1>Examinations</h1>
+    <div class="sbas">
+        Active exams:<br/>
+        <ul>
+            {% for exam in exams %}
+                {% if exam.active %}
+                    <li>
+                        <a href="{% url 'sbas:exam_start' pk=exam.pk %}">{{exam}}</a>
+                    </li>
+                {% endif %}
+            {% endfor %}
+        </ul>
 
 
-</div>
+    </div>
 {% endblock %}
\ No newline at end of file
diff --git a/sbas/templates/sbas/exam_start.html b/sbas/templates/sbas/exam_start.html
index 80b78ede..9578a948 100755
--- a/sbas/templates/sbas/exam_start.html
+++ b/sbas/templates/sbas/exam_start.html
@@ -2,54 +2,54 @@
 
 {% block content %}
 
-    <h2>Start exam: {{exam.name}}</h2>
-    
+    <h2>Start exam: {{exam}}</h2>
+
     {% if exam.time_limit %}
-       This exam has a time limit of {{ exam.get_time_limit }}. The time will start when you click the Start Exam button below.<br/>
+        This exam has a time limit of {{ exam.get_time_limit }}. The time will start when you click the Start Exam button below.<br/>
     {% endif %}
 
     {% if request.user.is_authenticated and valid_user %}
-    <a href="{% url 'sbas:exam_take_user' pk=exam.pk sk=0 %}">Start Exam</a>
+        <a href="{% url 'sbas:exam_take_user' pk=exam.pk sk=0 %}">Start Exam</a>
     {% else %}
-    Enter your CID and passcode in the below boxes.<br />
-    <p><input id="cid-box" type="text" value="Candidate ID"></p>
-    <p><input id="passcode-box" type="text" value="Passcode"></p>
+        Enter your CID and passcode in the below boxes.<br />
+        <p><input id="cid-box" type="text" value="Candidate ID"></p>
+        <p><input id="passcode-box" type="text" value="Passcode"></p>
 
-    <button>Start exam</button>
+        <button>Start exam</button>
 
-    <script type="text/javascript">
-        $(document).ready(function () {
-            window.location.search.substr(1).split("&").forEach((item) =>
-                {
-                    s = item.split("=");
-                    if (s[0] == "cid") {
-                        $("#cid-box").val(s[1]);
+        <script type="text/javascript">
+            $(document).ready(function () {
+                window.location.search.substr(1).split("&").forEach((item) =>
+                    {
+                        s = item.split("=");
+                        if (s[0] == "cid") {
+                            $("#cid-box").val(s[1]);
 
-                    }
-                    if (s[0] == "passcode") {
-                        $("#passcode-box").val(s[1]);
+                        }
+                        if (s[0] == "passcode") {
+                            $("#passcode-box").val(s[1]);
+                        }
+                    });
+
+                $("#cid-box, #passcode-box").keypress(function(e) {
+                // Enter pressed?
+                    console.log(e)
+                    if(e.which == 10 || e.which == 13) {
+                        $("button").click();
                     }
                 });
 
-            $("#cid-box, #passcode-box").keypress(function(e) {
-                // Enter pressed?
-                console.log(e)
-                if(e.which == 10 || e.which == 13) {
-                    $("button").click();
-                }
-            });
+                $("button").click(() => {
+                    let cid = $("#cid-box").val();
+                    let passcode = $("#passcode-box").val();
 
-            $("button").click(() => {
-                let cid = $("#cid-box").val();
-                let passcode = $("#passcode-box").val();
-
-                if (Number.isInteger(parseInt(cid))) {
-                    window.location.replace("{% url 'sbas:exam_take' pk=exam.pk sk=0 cid='0000000' passcode='ZZZZZZ' %}".replace("0000000", cid).replace("ZZZZZZ", passcode));
-                } else {
-                    alert("Please enter a valid Candidate ID (CID).")
-                }
+                    if (Number.isInteger(parseInt(cid))) {
+                        window.location.replace("{% url 'sbas:exam_take' pk=exam.pk sk=0 cid='0000000' passcode='ZZZZZZ' %}".replace("0000000", cid).replace("ZZZZZZ", passcode));
+                    } else {
+                        alert("Please enter a valid Candidate ID (CID).")
+                    }
+                });
             });
-        });
-    </script>
+        </script>
     {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/sbas/templates/sbas/exam_take.html b/sbas/templates/sbas/exam_take.html
index 36b593cd..9b262014 100755
--- a/sbas/templates/sbas/exam_take.html
+++ b/sbas/templates/sbas/exam_take.html
@@ -10,7 +10,7 @@
     </span>
     {% include "exam_clock.html" %}
     <div class="no-select">
-        <h2>{{exam.name}}: Question [<span id="question-number">{{pos|add:1}}</span>/<span id="exam-length">{{exam_length}}</span>]</h2>
+        <h2>{{exam}}: Question [<span id="question-number">{{pos|add:1}}</span>/<span id="exam-length">{{exam_length}}</span>]</h2>
         {% if exam.publish_results %}
             <div class="alert alert-primary review-mode-alert" role="alert">
                 Exam is in review mode. Add question feedback <a href="#" onclick="return window.create_popup_window('{% url 'feedback_create' question_type='sbas' pk=question.pk %}')">here</a>.
@@ -64,16 +64,16 @@
     </div>
     <details><summary>Help</summary>
         <p>Each question contains a list of 5 different statements. One of these is the single BEST answer.</p>
-<p>Click on the correct statement to select it. Once selected it will be highlighted. </p>
-<p>Your answers are saved when navigating between questions (or if the save button is clicked on the final question). An overview of all the questions can be seen by clicking on the overview button (or by clicking <a target="_blank" href="
-    {% if cid %}
-    {% url 'sbas:exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}
-    {% else %}
-    {% url 'sbas:exam_scores_user' pk=exam.pk %}
-    {% endif %}
-    "
-    
-    >here</a>).</p>
+        <p>Click on the correct statement to select it. Once selected it will be highlighted. </p>
+        <p>Your answers are saved when navigating between questions (or if the save button is clicked on the final question). An overview of all the questions can be seen by clicking on the overview button (or by clicking <a target="_blank" href="
+                                                                                                                                                                                                                                                       {% if cid %}
+                                                                                                                                                                                                                                                       {% url 'sbas:exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}
+                                                                                                                                                                                                                                                   {% else %}
+                                                                                                                                                                                                                                                       {% url 'sbas:exam_scores_user' pk=exam.pk %}
+                                                                                                                                                                                                                                                   {% endif %}
+                                                                                                                                                                                                                                                      "
+
+            >here</a>).</p>
     </details>
 {% endblock %}
 
diff --git a/sbas/templates/sbas/exam_take_overview.html b/sbas/templates/sbas/exam_take_overview.html
index 227e8d87..3833f93c 100644
--- a/sbas/templates/sbas/exam_take_overview.html
+++ b/sbas/templates/sbas/exam_take_overview.html
@@ -2,19 +2,19 @@
 
 {% block content %}
     <span id="user-id">
-    {% if request.user.is_authenticated %}
-        User: {{request.user}}
-    {% else %}
-        CID: {{cid}}
-    {% endif %}
+        {% if request.user.is_authenticated %}
+            User: {{request.user}}
+        {% else %}
+            CID: {{cid}}
+        {% endif %}
     </span>
 
     {% include "exam_clock.html" %}
-    <h2>Exam: {{exam.name}}</h2>
+    <h2>Exam: {{exam}}</h2>
 
     {% if exam.publish_results %}
         <div class="alert alert-primary review-mode-alert" role="alert">
-            Exam is in review mode. Score are available 
+            Exam is in review mode. Score are available
             {% if request.user.is_authenticated %}
                 <a href="{% url 'sbas:exam_scores_user' pk=exam.id %}">here</a>
 
@@ -29,7 +29,7 @@
             You have unanswered questions.
         </div>
     {% endif %}
-        
+
 
     <div class="overview-text">{{answer_count}} out of {{exam_length}} questions answered. Unanswered questions are shown in red. <p>Click to go to a question.</p></div>
     <div class="sba-finish-list">
@@ -43,8 +43,8 @@
         {% endfor %}
     </div>
     <div id="time-details">
-    Start time: {{cid_user_exam.start_time}}<br/>
-    Last change time: {{cid_user_exam.end_time}}
+        Start time: {{cid_user_exam.start_time}}<br/>
+        Last change time: {{cid_user_exam.end_time}}
     </div>
 
 {% endblock %}
diff --git a/sbas/templates/sbas/exams.html b/sbas/templates/sbas/exams.html
index 737c770b..8583f3ac 100644
--- a/sbas/templates/sbas/exams.html
+++ b/sbas/templates/sbas/exams.html
@@ -3,7 +3,7 @@
 {% block navigation %}
     {{block.super}}
     <br/>
-    Exams: {{exam.name}}->
+    Exams: {{exam}}->
     <a href="{% url 'sbas:exam_overview' pk=exam.pk %}">Overview</a> /
     <a href="{% url 'sbas:exam_scores_all' pk=exam.pk %}">Scores</a> /
     <a href="{% url 'sbas:exam_cids' exam_id=exam.pk %}">Candidates</a> /
diff --git a/sbas/templates/sbas/question_detail.html b/sbas/templates/sbas/question_detail.html
index f22fc347..a687d5da 100644
--- a/sbas/templates/sbas/question_detail.html
+++ b/sbas/templates/sbas/question_detail.html
@@ -1,44 +1,44 @@
 {% extends 'sbas/base.html' %}
 
 {% block content %}
-<div class="question">
-    <a href="{% url 'sbas:question_update' question.id %}" title="Edit the Question">Edit</a>
-    <a href="{% url 'sbas:question_clone' question.id %}" title="Clone the Question">Clone</a>
-    <a href="{% url 'sbas:question_delete' pk=question.pk %}" title="Delete the Question">Delete</a>
-    <a href="{% url 'admin:sbas_question_change' question.id %}"
-        title="Edit the Question using the admin interface">Admin Edit</a>
-    <a href="#" onclick="return window.create_popup_window('{% url 'feedback_create' question_type='sbas' pk=question.pk %}')"> Add Note</a>
-    <div class="date">
-        Created: {{ question.created_date|date:"d/m/Y"}}
-    </div>
-    {% autoescape off %}
-    <span>{{question.stem}}</span>
-    <div>
-        <ol class="abcde">
-            <li>{{ question.a_answer }}</li>
-            <li>{{ question.b_answer }}</li>
-            <li>{{ question.c_answer }}</li>
-            <li>{{ question.d_answer }}</li>
-            <li>{{ question.e_answer }}</li>
-        </ol>
-        Best answer: {{ question.best_answer }} ({{question.get_correct_answer_stripped}})
-    </div>
-    {% endautoescape %}
-    <div>
-        Examinations: {% for exam in question.exams.all %}
-        <a href="{% url 'sbas:exam_overview' pk=exam.pk %}">{{ exam.name }}</a>
-        {% endfor %}
-    </div>
-    <div>
-        Category: {{ question.category }}
-    </div>
+    <div class="question">
+        <a href="{% url 'sbas:question_update' question.id %}" title="Edit the Question">Edit</a>
+        <a href="{% url 'sbas:question_clone' question.id %}" title="Clone the Question">Clone</a>
+        <a href="{% url 'sbas:question_delete' pk=question.pk %}" title="Delete the Question">Delete</a>
+        <a href="{% url 'admin:sbas_question_change' question.id %}"
+           title="Edit the Question using the admin interface">Admin Edit</a>
+        <a href="#" onclick="return window.create_popup_window('{% url 'feedback_create' question_type='sbas' pk=question.pk %}')"> Add Note</a>
+        <div class="date">
+            Created: {{ question.created_date|date:"d/m/Y"}}
+        </div>
+        {% autoescape off %}
+            <span>{{question.stem}}</span>
+            <div>
+                <ol class="abcde">
+                    <li>{{ question.a_answer }}</li>
+                    <li>{{ question.b_answer }}</li>
+                    <li>{{ question.c_answer }}</li>
+                    <li>{{ question.d_answer }}</li>
+                    <li>{{ question.e_answer }}</li>
+                </ol>
+                Best answer: {{ question.best_answer }} ({{question.get_correct_answer_stripped}})
+            </div>
+        {% endautoescape %}
+        <div>
+            Examinations: {% for exam in question.exams.all %}
+                <a href="{% url 'sbas:exam_overview' pk=exam.pk %}">{{ exam }}</a>
+            {% endfor %}
+        </div>
+        <div>
+            Category: {{ question.category }}
+        </div>
 
-    <div>
-        Author: {% for user in question.author.all %}
-        {{ author }},
-        {% endfor %}
-    </div>
+        <div>
+            Author: {% for user in question.author.all %}
+                {{ author }},
+            {% endfor %}
+        </div>
 
-    {% include 'question_notes.html' %}
-</div>
+        {% include 'question_notes.html' %}
+    </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/cid_scores.html b/templates/cid_scores.html
index d7f89e1f..e44e951e 100644
--- a/templates/cid_scores.html
+++ b/templates/cid_scores.html
@@ -20,7 +20,7 @@
                     <h4>{{exam_type|title}}</h4>
                     <ul class='{{exam_type|lower}}'>
                         {% for exam in exams  %}
-                            <li class="exam" data-exam-id="{{exam.pk}}">{{exam.name}}
+                            <li class="exam" data-exam-id="{{exam.pk}}">{{exam}}
                                 {% if exam.active %}
                                     <a href="{{exam.get_take_url}}?cid={{cid}}&passcode={{passcode}}" target="_blank" title="Click to take exam">
                                         <button class="small-url-button start-button">Start</button>
@@ -47,7 +47,7 @@
                         <h4>{{exam_type|title}}</h4>
                         <ul class='{{exam_type|lower}}'>
                             {% for exam in exams %}
-                                <li class="exam" data-exam-id="{{exam.pk}}"><a href="{% url exam_type|add:':exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}">{{exam.name}}</a> {% if exam.active %}[Active]{% endif %} {% if exam.publish_results %}[Results Published]{% endif %}</li>
+                                <li class="exam" data-exam-id="{{exam.pk}}"><a href="{% url exam_type|add:':exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}">{{exam}}</a> {% if exam.active %}[Active]{% endif %} {% if exam.publish_results %}[Results Published]{% endif %}</li>
                             {% endfor %}
                         </ul>
                     {% endif %}
diff --git a/templates/exam_cids.html b/templates/exam_cids.html
index 1e643cf5..a979f11e 100644
--- a/templates/exam_cids.html
+++ b/templates/exam_cids.html
@@ -4,9 +4,9 @@
 
     {% load thumbnail %}
     <div class="{{app_name}}">
-        <h1>Exam: {{ exam.name }}</h1>
+        <h1>Exam: {{ exam }}</h1>
 
-{% include "generic/exam_cids.html" %}
+        {% include "generic/exam_cids.html" %}
 
     </div>
 {% endblock %}
diff --git a/templates/exam_cids_edit.html b/templates/exam_cids_edit.html
index 77d27f8d..0b30760e 100644
--- a/templates/exam_cids_edit.html
+++ b/templates/exam_cids_edit.html
@@ -3,9 +3,9 @@
 {% block content %}
 
     <div class="{{app_name}}">
-        <h1>Exam: {{ exam.name }}</h1>
+        <h1>Exam: {{ exam }}</h1>
 
-{% include "generic/exam_cids_edit.html" %}
+        {% include "generic/exam_cids_edit.html" %}
 
     </div>
 {% endblock %}
diff --git a/templates/exam_inactive.html b/templates/exam_inactive.html
index 29c1c23e..3dc16dab 100644
--- a/templates/exam_inactive.html
+++ b/templates/exam_inactive.html
@@ -1,8 +1,8 @@
 {% extends 'base.html' %}
 
 {% block content %}
-<div class="">
-<h2>{{exam.name}}</h2>
-Exam is currently inactive.
-</div>
+    <div class="">
+        <h2>{{exam}}</h2>
+        Exam is currently inactive.
+    </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/exam_list.html b/templates/exam_list.html
index 1ba54648..79e8557e 100644
--- a/templates/exam_list.html
+++ b/templates/exam_list.html
@@ -8,7 +8,7 @@
             {% for exam in exams %}
                 {% if exam.active %}
                     <li class="exam-item">
-                        <a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col-2 exam-name">{{exam.name}}</a>
+                        <a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col-2 exam-name">{{exam}}</a>
                         {% if marking %}<a href="{% url app_name|add:':mark_overview' pk=exam.pk %}" class="flex-col-half">Mark</a>{% endif %}
                         <span class="flex-col">
                             <a href="{% url app_name|add:':exam_cids' exam_id=exam.pk %}">Candidates</a> <span class="candidate-counts">[<span title="Number of active CID users">
@@ -35,7 +35,7 @@
             {% for exam in exams %}
                 {% if not exam.active %}
                     <li class="exam-item">
-                        <a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col-2 exam-name">{{exam.name}}</a>
+                        <a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col-2 exam-name">{{exam}}</a>
                         {% if marking %}<a href="{% url app_name|add:':mark_overview' pk=exam.pk %}" class="flex-col-half">Mark</a>{% endif %}
                         <span class="flex-col">
                             <a href="{% url app_name|add:':exam_cids' exam_id=exam.pk %}">Candidates</a>
diff --git a/templates/exam_stats.html b/templates/exam_stats.html
index 39919122..c09f4931 100644
--- a/templates/exam_stats.html
+++ b/templates/exam_stats.html
@@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 
 {% block content %}
-    <h2>{{exam.name}}: Stats</h2>
+    <h2>{{exam}}: Stats</h2>
     {% if exam.stats_candidates < 4 %}
         Not enough data points...
     {% else %}
diff --git a/templates/exam_users_edit.html b/templates/exam_users_edit.html
index f1a5d1ef..163f7fde 100644
--- a/templates/exam_users_edit.html
+++ b/templates/exam_users_edit.html
@@ -3,9 +3,9 @@
 {% block content %}
 
     <div class="{{app_name}}">
-        <h1>Exam: {{ exam.name }}</h1>
+        <h1>Exam: {{ exam }}</h1>
 
-{% include "generic/exam_users_edit.html" %}
+        {% include "generic/exam_users_edit.html" %}
 
     </div>
 {% endblock %}
diff --git a/templates/user_score_header.html b/templates/user_score_header.html
index d0e84b97..2aab81dc 100644
--- a/templates/user_score_header.html
+++ b/templates/user_score_header.html
@@ -1,18 +1,18 @@
 
 {% if view_all_results %}
     <div class="alert alert-info" role="alert">
-        Exam state: 
-        
+        Exam state:
+
         {% if exam.active %}
             This exam is available to take.
-            {% else %}
+        {% else %}
             This exam is NOT available to take.
         {% endif %}
-            
-        
+
+
         {% if exam.publish_results %}
             Results are published.
-            {% else %}
+        {% else %}
             Results are NOT published.
         {% endif %}
 
@@ -24,6 +24,6 @@
         <div class="alert alert-info" role="alert">Results are not currently published. You can see your own answers below.</a></div>
     {% endif %}
 {% endif %}
-<h2>Exam: {{ exam.name }}</h2>
+<h2>Exam: {{ exam }}</h2>
 <h3>Candidate: {{ cid|default_if_none:request.user.username }}</h3>
 Answers:
\ No newline at end of file
diff --git a/templates/user_scores.html b/templates/user_scores.html
index 9b1a135e..58b4e570 100644
--- a/templates/user_scores.html
+++ b/templates/user_scores.html
@@ -20,7 +20,7 @@
                     <h4>{{exam_type|title}}</h4>
                     <ul class='{{exam_type|lower}}'>
                         {% for exam in exams  %}
-                            <li class="exam" data-exam-id="{{exam.pk}}">{{exam.name}}
+                            <li class="exam" data-exam-id="{{exam.pk}}">{{exam}}
                                 {% if exam.active %}
                                     <a href="{{exam.get_take_url}}" target="_blank" title="Click to take exam">
                                         <button class="small-url-button start-button">Start</button>
@@ -55,7 +55,7 @@
                                         <a href= "{% url exam_type|add:':exam_scores_user' pk=exam.pk %}" title="Click to view results">
                                     {% endif %}
 
-                                    {{exam.name}}</a> {% if exam.active %}[Active]{% endif %} {% if exam.publish_results %}[Results Published]{% endif %}</li>
+                                    {{exam}}</a> {% if exam.active %}[Active]{% endif %} {% if exam.publish_results %}[Results Published]{% endif %}</li>
                             {% endfor %}
                         </ul>
                     {% endif %}