diff --git a/source/behavior/entities/1.16.0/components.json b/source/behavior/entities/1.16.0/components.json
index eca499e8..ba1cfdf8 100644
--- a/source/behavior/entities/1.16.0/components.json
+++ b/source/behavior/entities/1.16.0/components.json
@@ -48,7 +48,7 @@
     "minecraft:environment_sensor": { "$ref": "./components/minecraft.environment_sensor.json" },
     "minecraft:equip_item": { "$ref": "./components/minecraft.equip_item.json" },
     "minecraft:equipment": { "$ref": "./components/minecraft.equipment.json" },
-    "minecraft:equippable": { "$ref": "./components/minecraft.equippable.json" },
+    "minecraft:equippable": { "$ref": "../1.8.0/components/minecraft.equippable.json" },
     "minecraft:experience_reward": { "$ref": "./components/minecraft.experience_reward.json" },
     "minecraft:explode": { "$ref": "./components/minecraft.explode.json" },
     "minecraft:fall_damage": { "$ref": "../1.8.0/components/minecraft.fall_damage.json" },
diff --git a/source/behavior/entities/1.16.0/components/minecraft.equippable.json b/source/behavior/entities/1.16.0/components/minecraft.equippable.json
deleted file mode 100644
index c1829705..00000000
--- a/source/behavior/entities/1.16.0/components/minecraft.equippable.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "$id": "blockception.minecraft.behavior.entities.1.16.0.minecraft.equippable",
-  "type": "object",
-  "title": "Equippable 1.16.0",
-  "additionalProperties": false,
-  "description": "Defines an entity's behavior for having items equipped to it",
-
-  "properties": {
-    "slots": {
-      "description": "List of slots and the item that can be equipped",
-      "type": "array",
-      "items": {
-        "description": "A slot and the item that can be equipped",
-        "type": "object",
-        "properties": {
-          "slot": { "type": "integer", "default": 0, "description": "The slot number of this slot", "title": "Slot" },
-          "accepted_items": {
-            "type": "array",
-            "description": "The list of items that can go in this slot",
-            "items": {
-              "type": "string",
-              "description": "A item name",
-              "$ref": "../../../../general/item/identifier.json",
-              "title": "Accepted Items"
-            },
-            "title": "Accepted Items"
-          },
-          "item": {
-            "$ref": "../../../../general/item/identifier.json",
-            "description": "Identifier of the item that can be equipped for this slot",
-            "title": "Item"
-          },
-          "interact_text": {
-            "type": "string",
-            "description": "Text to be displayed when the entity can be equipped with this item when playing with Touch-screen controls",
-            "title": "Interact Text"
-          },
-          "on_equip": {
-            "$ref": "../types/event.json",
-            "description": "Event to trigger when this entity is equipped with this item",
-            "title": "On Equip"
-          },
-          "on_unequip": {
-            "$ref": "../types/event.json",
-            "description": "Event to trigger when this item is removed from this entity",
-            "title": "On Unequip"
-          }
-        },
-        "title": "Slots"
-      },
-      "title": "Slots"
-    }
-  }
-}
diff --git a/source/behavior/entities/1.8.0/components/minecraft.equippable.json b/source/behavior/entities/1.8.0/components/minecraft.equippable.json
index 6dae8a3c..490b36bb 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.equippable.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.equippable.json
@@ -1,50 +1,53 @@
 {
-  "$id": "blockception.minecraft.behavior.entities.1.8.0.minecraft.equippable",
+  "$id": "blockception.minecraft.behavior.entities.1.16.0.minecraft.equippable",
   "type": "object",
-  "title": "Equippable 1.8.0",
+  "title": "Equippable 1.16.0",
   "additionalProperties": false,
-  "description": "Defines an entity's behavior for having items equipped to it",
-  "required": [],
+  "description": "Defines an entity's behavior for having items equipped to it.",
   "properties": {
     "slots": {
       "description": "List of slots and the item that can be equipped",
       "type": "array",
+      "title": "Slots",
       "items": {
         "description": "A slot and the item that can be equipped",
+        "title": "Slots",
         "type": "object",
         "properties": {
-          "slot": { "type": "integer", "default": 0, "description": "The slot number of this slot", "title": "Slot" },
+          "slot": { "type": "integer", "default": 0, "description": "The slot number of this slot.", "title": "Slot" },
           "accepted_items": {
             "type": "array",
-            "description": "The list of items that can go in this slot",
+            "description": "The list of items that can go in this slot.",
+            "title": "Accepted Items",
             "items": {
               "type": "string",
               "description": "A item name",
               "$ref": "../../../../general/item/identifier.json",
               "title": "Accepted Items"
-            },
-            "title": "Accepted Items"
+            }
+          },
+          "item": {
+            "$ref": "../../../../general/item/identifier.json",
+            "description": "Identifier of the item that can be equipped for this slot.",
+            "title": "Item"
           },
-          "item": { "type": "string", "description": "Identifier of the item that can be equipped for this slot", "title": "Item" },
           "interact_text": {
             "type": "string",
-            "description": "Text to be displayed when the entity can be equipped with this item when playing with Touch-screen controls",
+            "description": "Text to be displayed when the entity can be equipped with this item when playing with Touch-screen controls.",
             "title": "Interact Text"
           },
           "on_equip": {
             "$ref": "../types/event.json",
-            "description": "Event to trigger when this entity is equipped with this item",
+            "description": "Event to trigger when this entity is equipped with this item.",
             "title": "On Equip"
           },
           "on_unequip": {
             "$ref": "../types/event.json",
-            "description": "Event to trigger when this item is removed from this entity",
+            "description": "Event to trigger when this item is removed from this entity.",
             "title": "On Unequip"
           }
-        },
-        "title": "Slots"
-      },
-      "title": "Slots"
+        }
+      }
     }
   }
 }