diff --git a/rowers/templates/menu_analytics.html b/rowers/templates/menu_analytics.html
index f1475a76..ac847155 100644
--- a/rowers/templates/menu_analytics.html
+++ b/rowers/templates/menu_analytics.html
@@ -71,21 +71,21 @@
 {% if user.is_authenticated and user|is_manager %}
 <p>&nbsp;</p>
 
-{% if user|team_members %}
+{% if user|coach_rowers %}
 <ul class="cd-accordion-menu animated">
   <li class="has-children" id="athletes">
     <input type="checkbox" name="athlete-selector" id="athlete-selector">
     <label for="athlete-selector"><i class="fas fa-users fa-fw"></i>&nbsp;Athletes</label>
     <ul>
-      {% for member in user|team_members %}
+      {% for member in user|coach_rowers %}
       <a href={{ request.path|userurl:member }}>
         <i class="fas fa-user fa-fw"></i>
-        {% if member == rower.user %}
+        {% if member.user == rower.user %}
         &bull;
         {% else %}
         &nbsp;
         {% endif %}
-        {{ member.first_name }} {{ member.last_name }}
+        {{ member.user.first_name }} {{ member.user.last_name }}
       </a>
       {% endfor %}
     </ul>
diff --git a/rowers/templates/menu_plan.html b/rowers/templates/menu_plan.html
index c46e0c0f..fc82f23a 100644
--- a/rowers/templates/menu_plan.html
+++ b/rowers/templates/menu_plan.html
@@ -87,21 +87,21 @@
 {% if user.is_authenticated and user|is_manager %}
 <p>&nbsp;</p>
 
-{% if user|team_members %}
+{% if user|coach_rowers %}
 <ul class="cd-accordion-menu animated">
   <li class="has-children" id="athletes">
     <input type="checkbox" name="athlete-selector" id="athlete-selector">
     <label for="athlete-selector"><i class="fas fa-users fa-fw"></i>&nbsp;Athletes</label>
     <ul>
-      {% for member in user|team_members %}
+      {% for member in user|coach_rowers %}
       <a href={{ request.path|userurl:member }}?when={{ timeperiod }}>
         <i class="fas fa-user fa-fw"></i>
-        {% if member == rower.user %}
+        {% if member.user == rower.user %}
         &bull;
         {% else %}
         &nbsp; 
         {% endif %}
-        {{ member.first_name }} {{ member.last_name }}
+        {{ member.user.first_name }} {{ member.user.last_name }}
       </a>
       {% endfor %}
     </ul>
diff --git a/rowers/templates/menu_profile.html b/rowers/templates/menu_profile.html
index 5da7d5fe..19d370b8 100644
--- a/rowers/templates/menu_profile.html
+++ b/rowers/templates/menu_profile.html
@@ -39,21 +39,21 @@
 
 {% if user.is_authenticated and user|is_manager %}
 <p>&nbsp;</p>
-{% if user|team_members %}
+{% if user|coach_rowers %}
 <ul class="cd-accordion-menu animated">
   <li class="has-children" id="athletes">
     <input type="checkbox" name="athlete-selector" id="athlete-selector">
     <label for="athlete-selector"><i class="fas fa-users fa-fw"></i>&nbsp;Athletes</label>
     <ul>
-      {% for member in user|team_members %}
+      {% for member in user|coach_rowers %}
       <a href={{ request.path|userurl:member }}>
         <i class="fas fa-user fa-fw"></i>
-        {% if member == rower.user %}
+        {% if member.user == rower.user %}
         &bull;
         {% else %}
         &nbsp;
         {% endif %}
-        {{ member.first_name }} {{ member.last_name }}
+        {{ member.user.first_name }} {{ member.user.last_name }}
       </a>
       {% endfor %}
     </ul>
diff --git a/rowers/templates/menu_workouts.html b/rowers/templates/menu_workouts.html
index f7e2cd66..20084c21 100644
--- a/rowers/templates/menu_workouts.html
+++ b/rowers/templates/menu_workouts.html
@@ -47,22 +47,22 @@
 
 {% if user.is_authenticated and user|is_manager %}
 <p>&nbsp;</p>
-{% if user|team_members %}
+{% if user|coach_rowers %}
 <ul class="cd-accordion-menu animated">
   <li class="has-children" id="athletes">
     <input type="checkbox" name="athlete-selector" id="athlete-selector">
     <label for="athlete-selector"><i class="fas fa-users fa-fw"></i>&nbsp;Athletes</label>
     <ul>
-      {% for member in user|team_members %}
+      {% for member in user|coach_rowers %}
       <li>
         <a href={{ request.path|userurl:member }}>
           <i class="fas fa-user fa-fw"></i>
-          {% if member == rower.user and not team %}
+          {% if member.user == rower.user and not team %}
           &bull;
           {% else %}
           &nbsp; 
           {% endif %}
-          {{ member.first_name }} {{ member.last_name }}
+          {{ member.user.first_name }} {{ member.user.last_name }}
         </a>
       </li>
       {% endfor %}
@@ -77,7 +77,7 @@
 <ul class="cd-accordion-menu animated">
   <li class="has-children" id="teams">
     <input type="checkbox" name="team-selector" id="team-selector">
-    <label for="team-selector"><i class="fas fa-bullhorn fa-fw"></i>&nbsp;Teams</label>
+    <label for="team-selector"><i class="fas fa-bullhorn fa-fw"></i>&nbsp;Groups</label>
     <ul>
       {% for tteam in teams %}
       <li>