4 files changed, 7 insertions, 7 deletions
diff --git a/templates/expedition.html b/templates/expedition.html
index c0b4724..c3685e4 100644
--- a/templates/expedition.html
+++ b/templates/expedition.html
@@ -43,7 +43,7 @@ an "<b>S</b>" for a survey trip.  The colours of the "<b>T</b>" and "<b>S</b>" a
 </tr>
 {% for personexpoday in personexpodays %}
   <tr>
-  <td><a href="{{ personexpoday.personexpedition.get_absolute_url }}">{{personexpoday.personexpedition.person|safe}}</a></td>
+  <td><a href="{{ personexpoday.personexpedition.get_absolute_url }}">{{personexpoday.personexpedition.person.fullname|safe}}</a></td>
   {% for activities in personexpoday.personrow %}
 
   {% if activities.personentries or activities.survexblocks %}
diff --git a/templates/person.html b/templates/person.html
index 274448b..ed5c70c 100644
--- a/templates/person.html
+++ b/templates/person.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Person {{person}}{% endblock %}
 {% block contentheader %}
-<h2> {{person|safe}} </h2>
+<h2> {{person.fullname|safe}} </h2>
 {% endblock %}
 
 {% block content %}
@@ -15,7 +15,7 @@
 {% endif %}
 <br class="clearfloat" />
 
-<h3>{{person|safe}} has been on expo in the following years:</h3>
+<h3>{{person.fullname|safe}} has been on expo in the following years:</h3>
 
 <table>
 <th>Expo</th><th>Logbook mentions</th><th>Survex trips</th>
@@ -36,7 +36,7 @@
 {% endfor %}
 </table>
 <h3>Surveys done</h3>
-Wallets and surveys mentioning <a href="/wallets/person/{{person}}">{{person}}</a><br>
+Wallets and surveys mentioning <a href="/wallets/person/{{person}}">{{person.fullname}}</a><br>
 
 {% if person.blurb %}
 {{person.blurb|safe}}
diff --git a/templates/personexpedition.html b/templates/personexpedition.html
index 365c812..2b035eb 100644
--- a/templates/personexpedition.html
+++ b/templates/personexpedition.html
@@ -3,7 +3,7 @@
 
 {% block content %}
 <h1>
-  <a href="{{personexpedition.person.get_absolute_url}}">{{personexpedition.person|safe}}</a> : 
+  <a href="{{personexpedition.person.get_absolute_url}}">{{personexpedition.person.fullname|safe}}</a> : 
   <a href="{{personexpedition.expedition.get_absolute_url}}">{{personexpedition.expedition}}</a>
 </h1>
 
@@ -20,7 +20,7 @@
 {% endfor %}
 </p>
 <p>Status of all wallets for <b>
-<a href="/wallets/person/{{personexpedition.person.first_name|safe}}{{personexpedition.person.last_name|safe}}">{{personexpedition.person}}</a>
+<a href="/wallets/person/{{personexpedition.person.first_name|safe}}{{personexpedition.person.last_name|safe}}">{{personexpedition.person.fullname}}</a>
 </b>
 </p>
 <h3>Table of all trips and surveys aligned by date</h3>
diff --git a/templates/personwallets.html b/templates/personwallets.html
index 6554b3a..f74c231 100644
--- a/templates/personwallets.html
+++ b/templates/personwallets.html
@@ -3,7 +3,7 @@
 {% block title %}One Person Survey scans folders (wallets){% endblock %}
 
 {% block content %}
-<h3>Wallets for <a href="{{person.get_absolute_url}}">{{person}}</a> </h3>
+<h3>Wallets for <a href="{{person.get_absolute_url}}">{{person.fullname}}</a> </h3>
 <p>Each wallet contains the scanned original in-cave survey notes and sketches of 
 plans and elevations. It also contains scans of centre-line survex output on which
 hand-drawn passage sections are drawn. These hand-drawn passages will eventually be