diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index 4ff63492..449880fb 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -433,7 +433,7 @@ export default function DHApplicationMixin(Base) {
                     icon: 'fa-solid fa-lightbulb',
                     condition: element => {
                         const target = element.closest('[data-item-uuid]');
-                        return !target.dataset.disabled && target.dataset.subType !== 'beastform';
+                        return !target.dataset.disabled && target.dataset.itemType !== 'beastform';
                     },
                     callback: async target => (await getDocFromElement(target)).update({ disabled: true })
                 },
@@ -442,7 +442,7 @@ export default function DHApplicationMixin(Base) {
                     icon: 'fa-regular fa-lightbulb',
                     condition: element => {
                         const target = element.closest('[data-item-uuid]');
-                        return target.dataset.disabled && target.dataset.subType !== 'beastform';
+                        return target.dataset.disabled && target.dataset.itemType !== 'beastform';
                     },
                     callback: async target => (await getDocFromElement(target)).update({ disabled: false })
                 }
@@ -538,7 +538,7 @@ export default function DHApplicationMixin(Base) {
                     icon: 'fa-solid fa-trash',
                     condition: element => {
                         const target = element.closest('[data-item-uuid]');
-                        return target.dataset.subType !== 'beastform';
+                        return target.dataset.itemType !== 'beastform';
                     },
                     callback: async (target, event) => {
                         const doc = await getDocFromElement(target);
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
index d00e2ca8..fec215a0 100644
--- a/templates/sheets/global/partials/inventory-item-V2.hbs
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -20,7 +20,7 @@ Parameters:
 <li class="inventory-item" data-item-id="{{item.id}}" 
     {{#if (or (eq type 'action' ) (eq type 'attack' ))}}data-action-id="{{item.id}}" {{/if}} 
     {{#if disabledEffect}}data-disabled="true"{{/if}}
-    data-type="{{type}}" data-sub-type="{{item.type}}"
+    data-type="{{type}}" data-item-type="{{item.type}}"
     data-item-uuid="{{item.uuid}}" data-no-compendium-edit="{{noCompendiumEdit}}"
 >
   <div class="inventory-item-header {{#if hideContextMenu}}padded{{/if}}" {{#unless noExtensible}}data-action="toggleExtended" {{/unless}}>