diff --git a/lang/en.json b/lang/en.json
index 890ef945..81778a4a 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -897,7 +897,7 @@
                     "name": "Hope",
                     "abbreviation": "HO"
                 },
-                "armorSlot": {
+                "armor": {
                     "name": "Armor Slot",
                     "abbreviation": "AS"
                 },
diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs
index bacae6f3..475da3b8 100644
--- a/module/config/generalConfig.mjs
+++ b/module/config/generalConfig.mjs
@@ -148,10 +148,10 @@ export const healingTypes = {
         label: 'DAGGERHEART.CONFIG.HealingType.hope.name',
         abbreviation: 'DAGGERHEART.CONFIG.HealingType.hope.abbreviation'
     },
-    armorSlot: {
-        id: 'armorSlot',
-        label: 'DAGGERHEART.CONFIG.HealingType.armorSlot.name',
-        abbreviation: 'DAGGERHEART.CONFIG.HealingType.armorSlot.abbreviation'
+    armor: {
+        id: 'armor',
+        label: 'DAGGERHEART.CONFIG.HealingType.armor.name',
+        abbreviation: 'DAGGERHEART.CONFIG.HealingType.armor.abbreviation'
     },
     fear: {
         id: 'fear',
@@ -262,7 +262,7 @@ export const defaultRestOptions = {
                     actionType: 'action',
                     chatDisplay: false,
                     healing: {
-                        applyTo: healingTypes.armorSlot.id,
+                        applyTo: healingTypes.armor.id,
                         value: {
                             custom: {
                                 enabled: true,
@@ -350,7 +350,7 @@ export const defaultRestOptions = {
                     actionType: 'action',
                     chatDisplay: false,
                     healing: {
-                        applyTo: healingTypes.armorSlot.id,
+                        applyTo: healingTypes.armor.id,
                         value: {
                             custom: {
                                 enabled: true,
diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs
index b37da49e..106f202c 100644
--- a/module/config/itemConfig.mjs
+++ b/module/config/itemConfig.mjs
@@ -675,7 +675,7 @@ export const weaponFeatures = {
                 },
                 cost: [
                     {
-                        type: 'armorSlot',
+                        type: 'armor',
                         value: 1
                     }
                 ],
diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs
index 7340c8a8..2c5160ac 100644
--- a/module/documents/chatMessage.mjs
+++ b/module/documents/chatMessage.mjs
@@ -68,7 +68,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
 
     getTargetList() {
         const targets = this.system.hitTargets;
-        return targets.map(target => game.canvas.tokens.documentCollection.find(t => t.actor.uuid === target.actorId));
+        return targets.map(target => game.canvas.tokens.documentCollection.find(t => t.actor?.uuid === target.actorId));
     }
 
     async onDamage(event) {
@@ -88,7 +88,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
 
         if (targets.length === 0)
             return ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelected'));
-        
+
         for (let target of targets) {
             let damages = foundry.utils.deepClone(this.system.damage);
             if (
@@ -139,9 +139,9 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
     }
 
     consumeOnSuccess() {
-        if(!this.system.successConsumed && !this.system.targetSelection) {
+        if (!this.system.successConsumed && !this.system.targetSelection) {
             const action = this.system.action;
-            if(action) action.consume(this.system, true);
+            if (action) action.consume(this.system, true);
         }
     }
 }
diff --git a/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json b/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
index b4bc9eb2..fe6001f2 100644
--- a/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
+++ b/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
@@ -490,7 +490,7 @@
                     "dice": "d6",
                     "bonus": null
                   },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                   "base": false,
                   "resultBased": false,
                   "valueAlt": {
diff --git a/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json b/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
index fb832665..e7b03a0f 100644
--- a/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
+++ b/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
@@ -255,7 +255,7 @@
                     "dice": "d6",
                     "bonus": null
                   },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                   "base": false,
                   "resultBased": false,
                   "valueAlt": {
diff --git a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
index fc9f4482..d270ccf8 100644
--- a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
+++ b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
@@ -291,7 +291,7 @@
                     "dice": "d6",
                     "bonus": null
                   },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                   "type": [],
                   "base": false,
                   "resultBased": false,
diff --git a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
index d5c51866..90fd4089 100644
--- a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
+++ b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
@@ -298,7 +298,7 @@
                     "dice": "d6",
                     "bonus": null
                   },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                   "base": false,
                   "resultBased": false,
                   "valueAlt": {
diff --git a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
index c15cc625..3e0ca4ba 100644
--- a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
+++ b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
@@ -296,7 +296,7 @@
                     "dice": "d6",
                     "bonus": null
                   },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                   "type": [],
                   "base": false,
                   "resultBased": false,
diff --git a/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json b/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json
index 1555b1f3..7c81805d 100644
--- a/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json
+++ b/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json
@@ -365,7 +365,7 @@
                     "dice": "d6",
                     "bonus": null
                   },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                   "base": false,
                   "resultBased": false,
                   "valueAlt": {
diff --git a/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json b/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
index 361ecc69..861fc6bd 100644
--- a/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
+++ b/src/packs/adversaries/adversary_Tiny_Green_Ooze_aLkLFuVoKz2NLoBK.json
@@ -250,7 +250,7 @@
                     "dice": "d6",
                     "bonus": null
                   },
-                  "applyTo": "armorSlot",
+                  "applyTo": "armor",
                   "type": [],
                   "base": false,
                   "resultBased": false,
diff --git a/src/packs/classes/feature_Frontline_Tank_YS1g7YdWwOaS629x.json b/src/packs/classes/feature_Frontline_Tank_YS1g7YdWwOaS629x.json
index 36899336..af403628 100644
--- a/src/packs/classes/feature_Frontline_Tank_YS1g7YdWwOaS629x.json
+++ b/src/packs/classes/feature_Frontline_Tank_YS1g7YdWwOaS629x.json
@@ -42,7 +42,7 @@
                 "dice": "d6",
                 "bonus": null
               },
-              "applyTo": "armorSlot",
+              "applyTo": "armor",
               "base": false,
               "resultBased": false,
               "valueAlt": {
diff --git a/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json b/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json
index 9c71fedd..cc33310b 100644
--- a/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json
+++ b/src/packs/domains/domainCard_Armorer_cy8GjBPGc9w9RaGO.json
@@ -36,7 +36,7 @@
                 "dice": "d6",
                 "bonus": null
               },
-              "applyTo": "armorSlot",
+              "applyTo": "armor",
               "base": false,
               "resultBased": false,
               "valueAlt": {
diff --git a/src/packs/domains/domainCard_Champion_s_Edge_rnejRbUQsNGX1GMC.json b/src/packs/domains/domainCard_Champion_s_Edge_rnejRbUQsNGX1GMC.json
index 07590225..f0ffe8f8 100644
--- a/src/packs/domains/domainCard_Champion_s_Edge_rnejRbUQsNGX1GMC.json
+++ b/src/packs/domains/domainCard_Champion_s_Edge_rnejRbUQsNGX1GMC.json
@@ -123,7 +123,7 @@
                 "dice": "d6",
                 "bonus": null
               },
-              "applyTo": "armorSlot",
+              "applyTo": "armor",
               "base": false,
               "resultBased": false,
               "valueAlt": {
diff --git a/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json b/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json
index 2c622afb..ec66bbd6 100644
--- a/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json
+++ b/src/packs/domains/domainCard_Valor_Touched_k1AtYd3lSchIymBr.json
@@ -36,7 +36,7 @@
                 "dice": "d6",
                 "bonus": null
               },
-              "applyTo": "armorSlot",
+              "applyTo": "armor",
               "base": false,
               "resultBased": false,
               "valueAlt": {
diff --git a/templates/sheets/actors/character/sidebar.hbs b/templates/sheets/actors/character/sidebar.hbs
index 08c211ca..f780bd8c 100644
--- a/templates/sheets/actors/character/sidebar.hbs
+++ b/templates/sheets/actors/character/sidebar.hbs
@@ -55,10 +55,10 @@
         <div class="status-section">
             <div class="status-number">
                 <div class='status-value'>
-                    <p>{{document.system.proficiency}}</p>
+                    <p>{{document.system.evasion}}</p>
                 </div>
                 <div class="status-label">
-                    <h4>{{localize "DAGGERHEART.GENERAL.proficiency"}}</h4>
+                    <h4>{{localize "DAGGERHEART.GENERAL.evasion"}}</h4>
                 </div>
             </div>
 
@@ -91,10 +91,10 @@
 
             <div class="status-number">
                 <div class='status-value'>
-                    <p>{{document.system.evasion}}</p>
+                    <p>{{document.system.proficiency}}</p>
                 </div>
                 <div class="status-label">
-                    <h4>{{localize "DAGGERHEART.GENERAL.evasion"}}</h4>
+                    <h4>{{localize "DAGGERHEART.GENERAL.proficiency"}}</h4>
                 </div>
             </div>
         </div>