diff --git a/rowers/templates/standard_view.html b/rowers/templates/standard_view.html
index 8a92f859..222282e5 100644
--- a/rowers/templates/standard_view.html
+++ b/rowers/templates/standard_view.html
@@ -59,7 +59,7 @@
       <td>{{ standard.name }}</td>
       <td>{{ standard.coursedistance }}</td>
       <td>{{ standard.coursetime }}</td>
-      <td>{{ standard.boatclass }}</td>
+      <td>{{ standard.boatclass|boatclass }}</td>
       <td>{{ standard.boattype }}</td>
       <td>{{ standard.sex|sex }}</td>
       <td>{{ standard.weightclass|weight }}</td>
diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py
index 9a2aab71..84b5c947 100644
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -22,7 +22,9 @@ from rowers import c2stuff, runkeeperstuff
 from rowers.c2stuff import c2_open
 from rowers.runkeeperstuff import runkeeper_open
 from rowers.rower_rules import is_coach_user, is_workout_user, isplanmember,ispromember
-from rowers.mytypes import otwtypes,adaptivetypes,sexcategories,weightcategories
+from rowers.mytypes import (
+    otwtypes,adaptivetypes,sexcategories,weightcategories,workouttypes,
+    )
 from rowers.utils import NoTokenError
 
 import rowers.payments as payments
@@ -49,6 +51,17 @@ def adaptive(s):
 
     return u
 
+@register.filter
+def boatclass(s):
+    u = s
+
+    for e,v in workouttypes:
+        if e.lower() == u.lower():
+            u = v
+            continue
+
+    return u
+
 @register.filter
 def sex(s):
     u = s