diff --git a/core/models.py b/core/models.py
index 82e020d3..f58247e8 100644
--- a/core/models.py
+++ b/core/models.py
@@ -154,11 +154,11 @@ class DiaperChange(models.Model):
     def attributes(self):
         attributes = []
         if self.wet:
-            attributes.append(DiaperChange._meta.get_field('wet').name)
+            attributes.append(self._meta.get_field('wet').verbose_name)
         if self.solid:
-            attributes.append(DiaperChange._meta.get_field('solid').name)
+            attributes.append(self._meta.get_field('solid').verbose_name)
         if self.color:
-            attributes.append(self.color)
+            attributes.append(self.get_color_display())
         return attributes
 
     def clean(self):
diff --git a/core/templates/core/diaperchange_list.html b/core/templates/core/diaperchange_list.html
index 1412219b..bac7690e 100644
--- a/core/templates/core/diaperchange_list.html
+++ b/core/templates/core/diaperchange_list.html
@@ -28,7 +28,7 @@
                         <th scope="row"><a href="{% url 'core:child' change.child.slug %}">{{ change.child }}</a></th>
                         <td class="text-center">{{ change.wet|bool_icon }}</td>
                         <td class="text-center">{{ change.solid|bool_icon }}</td>
-                        <td>{{ change.color }}</td>
+                        <td>{{ change.get_color_display }}</td>
                         <td>{{ change.time|date:'n/j/y G:i' }}</td>
                         <td class="text-center">
                             <div class="btn-group btn-group-sm" role="group" aria-label="{% trans "Actions" %}">
diff --git a/core/templates/core/feeding_list.html b/core/templates/core/feeding_list.html
index af48aad2..11b18e8f 100644
--- a/core/templates/core/feeding_list.html
+++ b/core/templates/core/feeding_list.html
@@ -28,8 +28,8 @@
                 {% for feeding in object_list %}
                     <tr>
                         <th scope="row"><a href="{% url 'core:child' feeding.child.slug %}">{{ feeding.child }}</a></th>
-                        <td>{{ feeding.method }}</td>
-                        <td>{{ feeding.type }}</td>
+                        <td>{{ feeding.get_method_display }}</td>
+                        <td>{{ feeding.get_type_display }}</td>
                         <td>
                             {% if feeding.amount %}
                                 {{ feeding.amount }}
diff --git a/dashboard/templates/cards/feeding_last.html b/dashboard/templates/cards/feeding_last.html
index 168b96f0..3aaccfdf 100644
--- a/dashboard/templates/cards/feeding_last.html
+++ b/dashboard/templates/cards/feeding_last.html
@@ -13,7 +13,7 @@
 
 {% block content %}
     {% if feeding %}
-        {{ feeding.type }}, {{ feeding.method }}
+        {{ feeding.get_type_display }}, {{ feeding.get_method_display }}
         {% if feeding.amount %}
             ({{ feeding.amount }})
         {% endif %}
diff --git a/dashboard/templates/cards/feeding_last_method.html b/dashboard/templates/cards/feeding_last_method.html
index 1f62bf36..404a1e2d 100644
--- a/dashboard/templates/cards/feeding_last_method.html
+++ b/dashboard/templates/cards/feeding_last_method.html
@@ -5,7 +5,7 @@
 
 {% block title %}
     {% if feeding %}
-        <div class="display-4 text-center">{{ feeding.method }}</div>
+        <div class="display-4 text-center">{{ feeding.get_method_display }}</div>
     {% else %}
         {% trans "None" %}
     {% endif %}