diff --git a/client-src/elements/chromedash-guide-stage-page.js b/client-src/elements/chromedash-guide-stage-page.js
index 721d638c..dd0e6a60 100644
--- a/client-src/elements/chromedash-guide-stage-page.js
+++ b/client-src/elements/chromedash-guide-stage-page.js
@@ -5,6 +5,7 @@ import './chromedash-form-table';
 import './chromedash-form-field';
 import {formatFeatureForEdit, STAGE_FORMS, IMPL_STATUS_FORMS} from './form-definition';
 import {IMPLEMENTATION_STATUS} from './form-field-enums';
+import {ALL_FIELDS} from './form-field-specs';
 import {SHARED_STYLES} from '../sass/shared-css.js';
 import {FORM_STYLES} from '../sass/forms-css.js';
 
@@ -200,16 +201,22 @@ export class ChromedashGuideStagePage extends LitElement {
     `;
   }
 
+  renderOneField(formattedFeature, field) {
+    const featureJSONKey = ALL_FIELDS[field].name || field;
+    return html`
+      <chromedash-form-field
+        name=${field}
+        value=${formattedFeature[featureJSONKey]}>
+      </chromedash-form-field>
+    `;
+  }
+
   renderFeatureFormSection(formattedFeature) {
     const alreadyOnThisStage = this.stageId === this.feature.intent_stage_int;
     return html`
       <section class="stage_form">
-        ${this.featureFormFields.map((field) => html`
-          <chromedash-form-field
-            name=${field}
-            value=${formattedFeature[field]}>
-          </chromedash-form-field>
-        `)}
+        ${this.featureFormFields.map((field) => this.renderOneField(
+      formattedFeature, field))}
         <chromedash-form-field
           name="set_stage"
           value=${alreadyOnThisStage}
diff --git a/client-src/elements/form-definition.js b/client-src/elements/form-definition.js
index 0637ca9a..48c3ca80 100644
--- a/client-src/elements/form-definition.js
+++ b/client-src/elements/form-definition.js
@@ -311,7 +311,7 @@ const PAS_PREPARETOSHIP = [
   'launch_bug_url', 'intent_to_ship_url', 'comments',
 ];
 
-const DEPRECATION_IMPLEMENT = ['motivation', 'spec_link', 'comments'];
+const DEPRECATION_IMPLEMENT = ['deprecation_motivation', 'spec_link', 'comments'];
 
 // Note: Even though this is similar to another form, it is likely to change.
 // const DEPRECATION_PREPARETOSHIP = [