diff --git a/partials/education.hbs b/partials/education.hbs
index 7b53058..63656e4 100644
--- a/partials/education.hbs
+++ b/partials/education.hbs
@@ -6,16 +6,16 @@
         <article>
           <header>
             <div class="spaced-list">
-              <h4>{{institution}}</h4>
+              <h4>{{area}}</h4>
               <span>
                 <time datetime="{{startDate}}">{{formatDate startDate}}</time> –
                 {{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}}
               </span>
             </div>
             <div class="spaced-list">
-              {{#area}}
+              {{#institution}}
                 <strong>{{.}}</strong>
-              {{/area}}
+              {{/institution}}
               {{#url}}
                 <a href="{{.}}">{{formatURL .}}</a>
               {{/url}}
diff --git a/partials/volunteer.hbs b/partials/volunteer.hbs
index b437a57..28c86cc 100644
--- a/partials/volunteer.hbs
+++ b/partials/volunteer.hbs
@@ -6,16 +6,16 @@
         <article>
           <header>
             <div class="spaced-list">
-              <h4>{{organization}}</h4>
+              <h4>{{position}}</h4>
               <span>
                 <time datetime="{{startDate}}">{{formatDate startDate}}</time> –
                 {{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}}
               </span>
             </div>
             <div class="spaced-list">
-              {{#position}}
+              {{#organization}}
                 <strong>{{.}}</strong>
-              {{/position}}
+              {{/organization}}
               {{#url}}
                 <a href="{{.}}">{{formatURL .}}</a>
               {{/url}}
diff --git a/partials/work.hbs b/partials/work.hbs
index 1706813..0de7673 100644
--- a/partials/work.hbs
+++ b/partials/work.hbs
@@ -6,16 +6,16 @@
         <article>
           <header>
             <div class="spaced-list">
-              <h4>{{name}}</h4>
+              <h4>{{position}}</h4>
               <span>
                 <time datetime="{{startDate}}">{{formatDate startDate}}</time> –
                 {{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}}
               </span>
             </div>
             <div class="spaced-list">
-              {{#position}}
+              {{#name}}
                 <strong>{{.}}</strong>
-              {{/position}}
+              {{/name}}
               {{#url}}
                 <a href="{{.}}">{{formatURL .}}</a>
               {{/url}}
diff --git a/tap-snapshots/test/render.js.test.cjs b/tap-snapshots/test/render.js.test.cjs
index 9e53f64..e789129 100644
--- a/tap-snapshots/test/render.js.test.cjs
+++ b/tap-snapshots/test/render.js.test.cjs
@@ -315,14 +315,14 @@ blockquote > * + * {
             <article>
               <header>
                 <div class="spaced-list">
-                  <h4>Pied Piper</h4>
+                  <h4>CEO/President</h4>
                   <span>
                     <time datetime="2013-12-01">Dec 2013</time> –
                     <time datetime="2014-12-01">Dec 2014</time>
                   </span>
                 </div>
                 <div class="spaced-list">
-                    <strong>CEO/President</strong>
+                    <strong>Pied Piper</strong>
                     <a href="http://piedpiper.example.com">piedpiper.example.com</a>
                 </div>
               </header>
@@ -341,14 +341,14 @@ blockquote > * + * {
             <article>
               <header>
                 <div class="spaced-list">
-                  <h4>CoderDojo</h4>
+                  <h4>Teacher</h4>
                   <span>
                     <time datetime="2012-01-01">Jan 2012</time> –
                     <time datetime="2013-01-01">Jan 2013</time>
                   </span>
                 </div>
                 <div class="spaced-list">
-                    <strong>Teacher</strong>
+                    <strong>CoderDojo</strong>
                     <a href="http://coderdojo.example.com/">coderdojo.example.com</a>
                 </div>
               </header>
@@ -365,14 +365,14 @@ blockquote > * + * {
             <article>
               <header>
                 <div class="spaced-list">
-                  <h4>University of Oklahoma</h4>
+                  <h4>Information Technology</h4>
                   <span>
                     <time datetime="2011-06-01">Jun 2011</time> –
                     <time datetime="2014-01-01">Jan 2014</time>
                   </span>
                 </div>
                 <div class="spaced-list">
-                    <strong>Information Technology</strong>
+                    <strong>University of Oklahoma</strong>
                     <a href="https://www.ou.edu/">www.ou.edu</a>
                 </div>
               </header>