diff --git a/src/module/ds4.ts b/src/module/ds4.ts
index ba0d3017..18e066a5 100644
--- a/src/module/ds4.ts
+++ b/src/module/ds4.ts
@@ -36,7 +36,7 @@ async function registerHandlebarsPartials() {
         "systems/ds4/templates/item/partials/details.hbs",
         "systems/ds4/templates/item/partials/effects.hbs",
         "systems/ds4/templates/item/partials/body.hbs",
-        "systems/ds4/templates/actor/partials/items.hbs",
+        "systems/ds4/templates/actor/partials/items-overview.hbs",
     ];
     return loadTemplates(templatePaths);
 }
diff --git a/src/templates/actor/actor-sheet.hbs b/src/templates/actor/actor-sheet.hbs
index 99de9e32..4f0c21f5 100644
--- a/src/templates/actor/actor-sheet.hbs
+++ b/src/templates/actor/actor-sheet.hbs
@@ -246,6 +246,6 @@
         </div>
 
         {{!-- Items Tab --}}
-        {{> systems/ds4/templates/actor/partials/items.hbs}}
+        {{> systems/ds4/templates/actor/partials/items-overview.hbs}}
     </section>
 </form>
\ No newline at end of file
diff --git a/src/templates/actor/partials/items.hbs b/src/templates/actor/partials/items-overview.hbs
similarity index 89%
rename from src/templates/actor/partials/items.hbs
rename to src/templates/actor/partials/items-overview.hbs
index 792891f4..f0840f59 100644
--- a/src/templates/actor/partials/items.hbs
+++ b/src/templates/actor/partials/items-overview.hbs
@@ -10,7 +10,7 @@
 !--
 !-- @param datType: hand over the dataType to the partial as hash parameter
 --}}
-{{#*inline "addButton"}}
+{{#*inline "addItemButton"}}
     <div class="item-controls">
         <a class="item-control item-create" title="Create item" data-type="{{dataType}}" {{!-- SPECIFIC --}}>
             <i class="fas fa-plus"></i>
@@ -40,7 +40,7 @@
 !-- @param datType: hand over the dataType to the partial as hash parameter
 !-- @param partial-block: hand over custom children of the flexbox in the partial block.
 --}}
-{{#*inline "listHeader" }}
+{{#*inline "itemListHeader" }}
     <li class="item flexrow item-header">
         {{!-- equipped --}}
         {{#if (ne dataType 'equipment')}}
@@ -57,7 +57,7 @@
         {{!-- description --}}
         <div class="flex4">{{localize 'DS4.Description'}}</div>
         {{!-- add button --}}
-        {{> addButton dataType=dataType }}
+        {{> addItemButton dataType=dataType }}
     </li>
 {{/inline}}
 
@@ -72,7 +72,7 @@
 !-- @param item: hand over the item to the partial as hash parameter
 !-- @param partial-block: hand over custom children of the flexbox in the partial block.
 --}}
-{{#*inline "listEntry"}}
+{{#*inline "itemListEntry"}}
     <li class="item flexrow" data-item-id="{{item._id}}">
         {{!-- equipped --}}
         {{#if (ne item.data.data.equipped undefined)}}
@@ -108,7 +108,7 @@
     {{!-- WEAPONS --}}
     <h4 class="items-list-title">{{localize 'DS4.ItemTypeWeapon'}}</h4>
     <ol class="items-list">
-        {{#> listHeader dataType='weapon'}}
+        {{#> itemListHeader dataType='weapon'}}
             <div title="{{localize 'DS4.AttackType'}}" class="flex05">{{localize 'DS4.AttackTypeAbbr'}}</div>
             <div class="item-num-val flex05" title="{{localize 'DS4.WeaponBonus'}}">
                 {{localize 'DS4.WeaponBonusAbbr'}}
@@ -116,31 +116,31 @@
             <div class="item-num-val flex05" title="{{localize 'DS4.OpponentDefense'}}">
                 {{localize 'DS4.OpponentDefenseAbbr'}}
             </div>
-        {{/listHeader}}
+        {{/itemListHeader}}
         {{#each itemsByType.weapon as |item id|}}
-            {{#> listEntry item=item}}
+            {{#> itemListEntry item=item}}
                 <div class="flex05">
                     <img src="{{lookup ../../config.attackTypesIcons  item.data.data.attackType}}"
                         title="{{lookup ../../config.attackTypes  item.data.data.attackType}}" width="24" height="24" />
                 </div>
                 <div class="item-num-val flex05">{{ item.data.data.weaponBonus}}</div>
                 <div class="item-num-val flex05">{{ item.data.data.opponentDefense}}</div>
-            {{/listEntry}}
+            {{/itemListEntry}}
         {{/each}}
     </ol>
 
     {{!-- ARMOR --}}
     <h4 class="items-list-title">{{localize 'DS4.ItemTypeArmor'}}</h4>
     <ol class="items-list">
-        {{#> listHeader dataType='armor'}}
+        {{#> itemListHeader dataType='armor'}}
             <div title="{{localize 'DS4.ArmorMaterialType'}}">{{localize 'DS4.ArmorMaterialTypeAbbr'}}</div>
             <div title="{{localize 'DS4.ArmorType'}}">{{localize 'DS4.ArmorTypeAbbr'}}</div>
             <div class="flex05 item-num-val" title="{{localize 'DS4.ArmorValue'}}">
                 {{localize 'DS4.ArmorValueAbbr'}}
             </div>
-        {{/listHeader}}
+        {{/itemListHeader}}
         {{#each itemsByType.armor as |item id|}}
-            {{#> listEntry item=item }}
+            {{#> itemListEntry item=item }}
                 <div title="{{lookup ../../config.armorMaterialTypes  item.data.data.armorMaterialType}}">
                     {{lookup ../../config.armorMaterialTypesAbbr  item.data.data.armorMaterialType}}
                 </div>
@@ -148,7 +148,7 @@
                     {{lookup ../../config.armorTypesAbbr  item.data.data.armorType}}
                 </div>
                 <div class="flex05 item-num-val">{{ item.data.data.armorValue}}</div>
-            {{/listEntry}}
+            {{/itemListEntry}}
         {{/each}}
     </ol>
 
@@ -156,41 +156,41 @@
     {{!-- SHIELD --}}
     <h4 class="items-list-title">{{localize 'DS4.ItemTypeShield'}}</h4> {{!-- SPECIFIC --}}
     <ol class="items-list">
-        {{#> listHeader dataType='shield' }}
+        {{#> itemListHeader dataType='shield' }}
             <div class="flex05 item-num-val" title="{{localize 'DS4.ArmorValue'}}">
                 {{localize 'DS4.ArmorValueAbbr'}}
             </div>
-        {{/listHeader}}
+        {{/itemListHeader}}
         {{#each itemsByType.shield as |item id|}}
-            {{#> listEntry item=item }}
+            {{#> itemListEntry item=item }}
                 <div class="flex05 item-num-val">{{item.data.data.armorValue}}</div> {{!-- SPECIFIC --}}
-            {{/listEntry}}
+            {{/itemListEntry}}
         {{/each}}
     </ol>
 
     {{!-- TRINKET --}}
     <h4 class="items-list-title">{{localize 'DS4.ItemTypeTrinket'}}</h4>
     <ol class="items-list">
-        {{#> listHeader dataType='trinket'}}
+        {{#> itemListHeader dataType='trinket'}}
             <div class="flex2">{{localize 'DS4.StorageLocation'}}</div>
-        {{/listHeader}}
+        {{/itemListHeader}}
         {{#each itemsByType.trinket as |item id|}}
-            {{#> listEntry item=item }}
+            {{#> itemListEntry item=item }}
                 <div class="flex2">{{{item.data.data.storageLocation}}}</div>
-            {{/listEntry}}
+            {{/itemListEntry}}
         {{/each}}
     </ol>
 
     {{!-- EQUIPMENT --}}
     <h4 class="items-list-title">{{localize 'DS4.ItemTypeEquipment'}}</h4>
     <ol class="items-list">
-        {{#> listHeader dataType='equipment'}}
+        {{#> itemListHeader dataType='equipment'}}
             <div class="flex2">{{localize 'DS4.StorageLocation'}}</div>
-        {{/listHeader}}
+        {{/itemListHeader}}
         {{#each itemsByType.equipment as |item id|}}
-            {{#> listEntry item=item }}
+            {{#> itemListEntry item=item }}
                 <div class="flex2">{{{item.data.data.storageLocation}}}</div>
-            {{/listEntry}}
+            {{/itemListEntry}}
         {{/each}}
     </ol>
 </div>
\ No newline at end of file