diff --git a/app/pods/protected/strains/measurements-table-row/component.js b/app/pods/protected/strains/measurements-table-row/component.js
index 8c265bc..62bf56f 100644
--- a/app/pods/protected/strains/measurements-table-row/component.js
+++ b/app/pods/protected/strains/measurements-table-row/component.js
@@ -1,21 +1,22 @@
 import Ember from 'ember';
 import ajaxError from '../../../../utils/ajax-error';
 
-const { Component } = Ember;
+const { Component, computed } = Ember;
 
 export default Component.extend({
   tagName: 'tr',
   isEditing: false,
   allCharacteristics: null,
+  measurement: null,
 
   oldCharacteristicId: function() {
-    let json = this.get('row').toJSON();
+    let json = this.get('measurement').toJSON();
     return json.characteristic;
   }.property(),
 
-  rowChanged: Ember.computed('row.notes', 'row.value', 'row.characteristic.id', function() {
-    return this.get('row.hasDirtyAttributes') ||
-      this.get('oldCharacteristicId') !== this.get('row.characteristic.id');
+  rowChanged: computed('measurement.notes', 'measurement.value', 'measurement.characteristic.id', function() {
+    return this.get('measurement.hasDirtyAttributes') ||
+      this.get('oldCharacteristicId') !== this.get('measurement.characteristic.id');
   }),
 
   actions: {
@@ -25,11 +26,11 @@ export default Component.extend({
 
     save: function() {
       if (this.get('rowChanged')) {
-        this.get('row').save().then(() => {
+        this.get('measurement').save().then(() => {
           this.get('flashMessages').clearMessages();
           this.toggleProperty('isEditing');
         }, () => {
-          ajaxError(this.get('row.errors'), this.get('flashMessages'));
+          ajaxError(this.get('measurement.errors'), this.get('flashMessages'));
         });
       } else {
         this.toggleProperty('isEditing');
@@ -37,11 +38,11 @@ export default Component.extend({
     },
 
     delete: function() {
-      let char = this.get('row.characteristic');
+      let char = this.get('measurement.characteristic');
       if (char.get('isNew')) {
         char.destroyRecord();
       }
-      this.get('row').destroyRecord();
+      this.get('measurement').destroyRecord();
     }
 
   },
diff --git a/app/pods/protected/strains/measurements-table-row/template.hbs b/app/pods/protected/strains/measurements-table-row/template.hbs
index 61a7140..cab5554 100644
--- a/app/pods/protected/strains/measurements-table-row/template.hbs
+++ b/app/pods/protected/strains/measurements-table-row/template.hbs
@@ -5,15 +5,15 @@
       select-2
       multiple=false
       content=allCharacteristics
-      value=row.characteristic
+      value=measurement.characteristic
       optionLabelPath="characteristicName"
     }}
   </td>
   <td>
-    {{input value=row.value}}
+    {{input value=measurement.value}}
   </td>
   <td>
-    {{input value=row.notes}}
+    {{input value=measurement.notes}}
   </td>
   {{#if canEdit}}
     <td>
@@ -30,18 +30,18 @@
   {{/if}}
 {{else}}
   <td>
-    {{{row.characteristic.characteristicTypeName}}}
+    {{{measurement.characteristic.characteristicTypeName}}}
   </td>
   <td>
-    {{#link-to 'protected.characteristics.show' row.characteristic.id}}
-      {{{row.characteristic.characteristicName}}}
+    {{#link-to 'protected.characteristics.show' measurement.characteristic.id}}
+      {{{measurement.characteristic.characteristicName}}}
     {{/link-to}}
   </td>
   <td>
-    {{row.value}}
+    {{measurement.value}}
   </td>
   <td>
-    {{row.notes}}
+    {{measurement.notes}}
   </td>
   {{#if canEdit}}
     <td>
diff --git a/app/pods/protected/strains/measurements-table/template.hbs b/app/pods/protected/strains/measurements-table/template.hbs
index 288421e..146d44e 100644
--- a/app/pods/protected/strains/measurements-table/template.hbs
+++ b/app/pods/protected/strains/measurements-table/template.hbs
@@ -42,7 +42,7 @@
     {{#each sortedMeasurements as |measurement|}}
       {{
         protected/strains/measurements-table-row
-        row=measurement
+        measurement=measurement
         allCharacteristics=allCharacteristics
         canEdit=canEdit
       }}