diff --git a/index.html b/index.html
index e59048cd..649fcd68 100644
--- a/index.html
+++ b/index.html
@@ -428,7 +428,7 @@
             <option value="generic.movementSpeed" data-i18n="$modifier.generic_movementSpeed"></option>
             <option value="generic.attackDamage" data-i18n="$modifier.generic_attackDamage"></option>
             <option value="generic.armor" data-i18n="$modifier.generic_armor"></option>
-            <option value="generic.armorThoughness" data-i18n="$modifier.generic_armorThoughness"></option>
+            <option value="generic.armorToughness" data-i18n="$modifier.generic_armorToughness"></option>
             <option value="generic.attackSpeed" data-i18n="$modifier.generic_attackSpeed"></option>
             <option value="generic.luck" data-i18n="$modifier.generic_luck"></option>
             <option value="horse.jumpStrength" data-i18n="$modifier.horse_jumpStrength"></option>
@@ -747,12 +747,12 @@
             <span class="input-group-text" data-i18n="item"></span>
             <button type="button" class="btn btn-outline-secondary bg-light dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
             <div class="dropdown-menu">
-              <a class="dropdown-item" onclick="updateItemType(this, 'name')" data-i18n="name"></a>
+              <a class="dropdown-item" onclick="updateItemType(this, 'item')" data-i18n="name"></a>
               <a class="dropdown-item" onclick="updateItemType(this, 'tag')" data-i18n="tag"></a>
             </div>
           </div>
-          <span class="input-group-text rounded-0 name d-none" data-i18n="name"></span>
-          <input type="text" class="form-control name d-none" onchange="updateItemField(this, 'name')" onfocus="this.select()">
+          <span class="input-group-text rounded-0 item d-none" data-i18n="name"></span>
+          <input type="text" class="form-control item d-none" onchange="updateItemField(this, 'item')" onfocus="this.select()">
           <span class="input-group-text rounded-0 tag d-none" data-i18n="tag"></span>
           <input type="text" class="form-control tag d-none" onchange="updateItemField(this, 'tag')" onfocus="this.select()">
         </div>
diff --git a/locales/en.json b/locales/en.json
index d2ba20e0..384ffe2a 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -152,7 +152,7 @@
 		"generic_movementSpeed": "Movement Speed",
 		"generic_attackDamage": "Attack Damage",
 		"generic_armor": "Armor",
-		"generic_armorThoughness": "Armor Toughness",
+		"generic_armorToughness": "Armor Toughness",
 		"generic_attackSpeed": "Attack Speed",
 		"generic_luck": "Luck",
 		"horse_jumpStrength": "Jump Strength",
diff --git a/locales/ru.json b/locales/ru.json
index 6711d973..451e8e35 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -152,7 +152,7 @@
 		"generic_movementSpeed": "Скорость",
 		"generic_attackDamage": "Урон",
 		"generic_armor": "Броня",
-		"generic_armorThoughness": "Твёрдость брони",
+		"generic_armorToughness": "Твёрдость брони",
 		"generic_attackSpeed": "Скорость атаки",
 		"generic_luck": "Удача",
 		"horse_jumpStrength": "Сила прыжка лошади",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 0ff553ab..e66e130b 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -152,7 +152,7 @@
 		"generic_movementSpeed": "移动速度",
 		"generic_attackDamage": "普通攻击伤害",
 		"generic_armor": "盔甲防御点数",
-		"generic_armorThoughness": "盔甲韧性",
+		"generic_armorToughness": "盔甲韧性",
 		"generic_attackSpeed": "攻击速度",
 		"generic_luck": "幸运",
 		"horse_jumpStrength": "弹跳力",
diff --git a/model.js b/model.js
index fba0d411..d5750995 100644
--- a/model.js
+++ b/model.js
@@ -514,23 +514,23 @@ function toggleEntityLocation(el) {
 
 function updateItemType(el, type) {
   let $predicate = $(el).closest('.predicate');
-  if (type === 'name') {
-    $predicate.find('.name').removeClass('d-none');
+  if (type === 'item') {
+    $predicate.find('.item').removeClass('d-none');
     $predicate.find('.tag').addClass('d-none');
   } else {
     $predicate.find('.tag').removeClass('d-none');
-    $predicate.find('.name').addClass('d-none');
+    $predicate.find('.item').addClass('d-none');
   }
 }
 
 function updateItemField(el, type) {
   let parent = getParent(el);
-  if (type === 'name') {
-    parent.name = $(el).closest('.predicate').find('input.name').val();
+  if (type === 'item') {
+    parent.item = $(el).closest('.predicate').find('input.item').val();
     delete parent.tag;
   } else {
     parent.tag = $(el).closest('.predicate').find('input.tag').val();
-    delete parent.name;
+    delete parent.item;
   }
   invalidated();
 }
diff --git a/view.js b/view.js
index 77904ccd..86f4a684 100644
--- a/view.js
+++ b/view.js
@@ -733,14 +733,14 @@ function generateItem(item) {
   if (item.tag) {
     $item.find('.tag').removeClass('d-none').val(item.tag);
   } else {
-    $item.find('.name').removeClass('d-none').val(item.name);
+    $item.find('.item').removeClass('d-none').val(item.item);
   }
   generateRange($item.find('.item-count'), item.count);
   generateRange($item.find('.item-durability'), item.durability);
   $item.find('.nbt').val(item.nbt).keydown(e => preventNewline(e));
   $item.find('.potion').val(item.potion);
-  if (item.name === '') {
-    delete item.name;
+  if (item.item === '') {
+    delete item.item;
   }
   if (item.tag === '') {
     delete item.tag;