diff --git a/package-lock.json b/package-lock.json
index fa90d247f..cc5822fdf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -820,9 +820,9 @@
       }
     },
     "aggregate-error": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz",
-      "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
       "requires": {
         "clean-stack": "^2.0.0",
diff --git a/src/module/sheets/TwodsixActorSheet.ts b/src/module/sheets/TwodsixActorSheet.ts
index d3bbb34c9..795dea769 100644
--- a/src/module/sheets/TwodsixActorSheet.ts
+++ b/src/module/sheets/TwodsixActorSheet.ts
@@ -157,8 +157,8 @@ export class TwodsixActorSheet extends ActorSheet {
     const actorData = this.actor.data;
     const data = actorData.data;
 
-    if (data.jackofalltrades.value < 3) {
-      this.actor.update({'data.jackofalltrades.value': data.jackofalltrades.value + 1})
+    if (data.jackOfAllTrades.value < 3) {
+      this.actor.update({'data.jackOfAllTrades.value': data.jackOfAllTrades.value + 1})
     }
   }
 
@@ -168,8 +168,8 @@ export class TwodsixActorSheet extends ActorSheet {
     const actorData = this.actor.data;
     const data = actorData.data;
 
-    if (data.jackofalltrades.value > 0) {
-      this.actor.update({'data.jackofalltrades.value': data.jackofalltrades.value - 1})
+    if (data.jackOfAllTrades.value > 0) {
+      this.actor.update({'data.jackOfAllTrades.value': data.jackOfAllTrades.value - 1})
     }
   }
 
diff --git a/static/templates/actors/parts/actor-skills.html b/static/templates/actors/parts/actor-skills.html
index ae37f3284..38dfe5bff 100644
--- a/static/templates/actors/parts/actor-skills.html
+++ b/static/templates/actors/parts/actor-skills.html
@@ -10,10 +10,10 @@
 
   <div class="skills-joat"></div>
   <label for="joat" class="flex3 resource-label">Jack of All Trades</label>
-  <span id="joat" class="flex4">
-    <i class="fa fa-arrow-circle-down downgrade-joat downgrade-joat-{{data.jackofalltrades.value}}"></i>
-    <i class="fa fa-arrow-circle-up upgrade-joat upgrade-joat-{{data.jackofalltrades.value}}"></i>
-    {{data.jackofalltrades.value}}
+  <span class="flex4">
+    <i class="fa fa-arrow-circle-down downgrade-joat downgrade-joat-{{data.jackOfAllTrades.value}}"></i>
+    <i class="fa fa-arrow-circle-up upgrade-joat upgrade-joat-{{data.jackOfAllTrades.value}}"></i>
+    {{data.jackOfAllTrades.value}}
   </span></div>
 
 
@@ -36,10 +36,10 @@
     <span class="skill-arrows flex1">
         <i data-label="{{key}}" class="fa fa-arrow-circle-down downgrade-skill-{{skill.trained}} downgrade-skill"></i>
 
-        <span class="skill-output flex1 skill-mod" id="data.skills.{{key}}.value" data-label="{{skill.label}}">{{numberFormat (getSkillValueWithJoat skill @root.data.jackofalltrades) decimals=0 sign=true}}</span>
+        <span class="skill-output flex1 skill-mod" data-label="{{skill.label}}">{{numberFormat (getSkillValueWithJoat skill @root.data.jackOfAllTrades) decimals=0 sign=true}}</span>
 
         <i data-label="{{key}}" class="fa fa-arrow-circle-up upgrade-skill{{skill.value}} upgrade-skill"></i>
-        {{data.jackofalltrades.value}}
+        {{data.jackOfAllTrades.value}}
       </span>
 
 
@@ -55,9 +55,9 @@
       {{/select}}
     </select>
 
-    <span class="total-output flex1 skill-mod">{{numberFormat (getTotalSkillValue skill @root.data.jackofalltrades skill.mod) decimals=0 sign=true}}</span>
+    <span class="total-output flex1 skill-mod">{{numberFormat (getTotalSkillValue skill @root.data.jackOfAllTrades skill.mod) decimals=0 sign=true}}</span>
 
-    <span class="mini-dice"><img class="rollable" data-label="{{skill.label}}" data-roll="2d6+{{getTotalSkillValue skill @root.data.jackofalltrades skill.mod}}" src="./systems/twodsix/assets/d6-icon.svg" alt="roll skill"/></span>
+    <span class="mini-dice"><img class="rollable" data-label="{{skill.label}}" data-roll="2d6+{{getTotalSkillValue skill @root.data.jackOfAllTrades skill.mod}}" src="./systems/twodsix/assets/d6-icon.svg" alt="roll skill"/></span>
 
   </div>
   {{/if}}