diff --git a/templates/logbook2005style.html b/templates/logbook2005style.html
index 0104070..b0491b7 100644
--- a/templates/logbook2005style.html
+++ b/templates/logbook2005style.html
@@ -21,7 +21,7 @@ Exported on {% now 'Y-m-d H:m' %} using control panel webpage and exportlogbook(
 <hr />
 
 <div class="tripdate" id="{{logbook_entry.slug}}">{{logbook_entry.date|date:'Y-m-d'}}</div>
-<div class="trippeople">{% for persontrip in logbook_entry.persontrip_set.all %}{% if  persontrip.is_logbook_entry_author %}<u>{{persontrip.personexpedition.person|safe}}</u>{% else %}{{ persontrip.personexpedition.person|safe }}{% endif %}, {% endfor %}</div>
+<div class="trippeople">{% for personlogentry in logbook_entry.personlogentry_set.all %}{% if  personlogentry.is_logbook_entry_author %}<u>{{personlogentry.personexpedition.person|safe}}</u>{% else %}{{ personlogentry.personexpedition.person|safe }}{% endif %}, {% endfor %}</div>
 <div class="triptitle">{{logbook_entry.title|safe}}</div>
 
 {{logbook_entry.text|safe}}
diff --git a/templates/logbookentry.html b/templates/logbookentry.html
index d9b0de2..6fff583 100644
--- a/templates/logbookentry.html
+++ b/templates/logbookentry.html
@@ -29,7 +29,7 @@
 
 <table class="cavers">
 <tr><th>Caver</th><th>T/U</th><th>Prev</th><th>Next</th></tr>
-{% for personlogentry in logbookentry.persontrip_set.all %}
+{% for personlogentry in logbookentry.personlogentry_set.all %}
 <tr>
   {% if personlogentry.is_logbook_entry_author %}
     <td class="author">
@@ -64,7 +64,7 @@
 <div id="col1">
   <div class="logbookentry">
     <b>{{logbookentry.date|date:"D d M Y"}}</b>
-    {% for personlogentry in logbookentry.persontrip_set.all %}{% if personlogentry.is_logbook_entry_author %}<br />{{personlogentry.personexpedition.person}}{% endif %}{% endfor %}
+    {% for personlogentry in logbookentry.personlogentry_set.all %}{% if personlogentry.is_logbook_entry_author %}<br />{{personlogentry.personexpedition.person}}{% endif %}{% endfor %}
     <p>{{logbookentry.text|safe}}</p>
   </div>
 </div>
diff --git a/templates/person.html b/templates/person.html
index d88b91b..274448b 100644
--- a/templates/person.html
+++ b/templates/person.html
@@ -24,8 +24,8 @@
     <td> <a href="{{ personexpedition.get_absolute_url }}">{{personexpedition.expedition.year}}</a>
     </td>
     <td>
-    <span style="padding-left:{{personexpedition.persontrip_set.all|length}}0px; background-color:red"></span> &nbsp;
-      {{personexpedition.persontrip_set.all|length}}  
+    <span style="padding-left:{{personexpedition.personlogentry_set.all|length}}0px; background-color:red"></span> &nbsp;
+      {{personexpedition.personlogentry_set.all|length}}  
     </td>
 
     <td>