diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_indoors.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_indoors.json
index abf1c94e..748fc748 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_indoors.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_indoors.json
@@ -12,7 +12,7 @@
       "type": "number",
       "default": 8,
       "description": "The cooldown time in seconds before the goal can be reused after a internal failure or timeout condition",
-      "title": "TODO Title"
+      "title": "Timeout Cooldown"
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_to_land.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_to_land.json
index 06c02c87..abe2f09e 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_to_land.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_to_land.json
@@ -12,25 +12,25 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the `wiggle room` to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "TODO Title"
+      "title": "Goal Radius"
     },
     "search_count": {
       "type": "integer",
       "default": 10,
       "description": "The number of blocks each tick that the mob will check within it's search range and height for a valid block to move to. A value of 0 will have the mob check every block within range in one tick",
-      "title": "TODO Title"
+      "title": "Search Count"
     },
     "search_height": {
       "type": "integer",
       "default": 1,
       "description": "Height in blocks the mob will look for land to move towards",
-      "title": "TODO Title"
+      "title": "Search Height"
     },
     "search_range": {
       "type": "integer",
       "default": 0,
       "description": "The distance in blocks it will look for land to move towards",
-      "title": "TODO Title"
+      "title": "Search Range"
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_to_poi.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_to_poi.json
index 6298bff8..681cb6ba 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_to_poi.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_to_poi.json
@@ -8,6 +8,6 @@
   "properties": {
     "priority": { "$ref": "./types/priority.json" },
     "speed_multiplier": { "$ref": "./types/speed_multiplier.json" },
-    "poi_type": { "type": "string", "description": "Tells the goal what POI type it should be looking for", "title": "TODO Title" }
+    "poi_type": { "type": "string", "description": "Tells the goal what POI type it should be looking for", "title": "Point Of Interest Type" }
   }
 }
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_to_random_block.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_to_random_block.json
index 712e417a..ff6e1378 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_to_random_block.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.move_to_random_block.json
@@ -12,13 +12,13 @@
       "type": "number",
       "default": 16,
       "description": "Defines the distance from the mob, in blocks, that the block to move to will be chosen.",
-      "title": "TODO Title"
+      "title": "Block Distance"
     },
     "within_radius": {
       "type": "number",
       "default": 0,
       "description": "Defines the distance in blocks the mob has to be from the block for the movement to be finished.",
-      "title": "TODO Title"
+      "title": "Within Radius"
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.rideable.json b/source/behavior/entities/1.8.0/components/minecraft.rideable.json
index 27d10c93..a075decc 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.rideable.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.rideable.json
@@ -8,28 +8,33 @@
     "seats_spec": {
       "additionalProperties": false,
       "type": "object",
+      "title": "Seats",
       "properties": {
         "lock_rider_rotation": {
           "type": "number",
           "default": 181,
-          "description": "Angle in degrees that a rider is allowed to rotate while riding this entity. Omit this property for no limit"
+          "description": "Angle in degrees that a rider is allowed to rotate while riding this entity. Omit this property for no limit",
+          "title": "Lock Rider Rotation"
         },
         "max_rider_count": {
           "type": "integer",
           "default": 0,
-          "description": "Defines the maximum number of riders that can be riding this entity for this seat to be valid"
+          "description": "Defines the maximum number of riders that can be riding this entity for this seat to be valid",
+          "title": "Maximum Rider Count"
         },
         "min_rider_count": {
           "type": "integer",
           "default": 0,
-          "description": "Defines the minimum number of riders that need to be riding this entity before this seat can be used"
+          "description": "Defines the minimum number of riders that need to be riding this entity before this seat can be used",
+          "title": "Minimum Rider Count"
         },
         "position": {
           "$ref": "../../../../general/array_3_number.json",
           "default": [0.0, 0.0, 0.0],
-          "description": "Position of this seat relative to this entity's position"
+          "description": "Position of this seat relative to this entity's position",
+          "title": "Position"
         },
-        "rotate_rider_by": { "type": "number", "default": 0, "description": "Offset to rotate riders by" }
+        "rotate_rider_by": { "type": "number", "default": 0, "description": "Offset to rotate riders by", "title": "Rotate Rider By" }
       }
     }
   },
@@ -39,43 +44,43 @@
       "type": "integer",
       "default": 0,
       "description": "The seat that designates the driver of the entity",
-      "title": "TODO Title"
+      "title": "Controlling Seat"
     },
     "crouching_skip_interact": {
       "type": "boolean",
       "default": true,
       "description": "If true, this entity can't be interacted with if the entity interacting with it is crouching",
-      "title": "TODO Title"
+      "title": "Crouching Skip Interact"
     },
     "family_types": {
       "type": "array",
       "items": { "type": "string" },
       "description": "List of entities that can ride this entity",
-      "title": "TODO Title"
+      "title": "Family Types"
     },
     "interact_text": {
       "type": "string",
       "default": "",
       "description": "The text to display when the player can interact with the entity when playing with Touch-screen controls",
-      "title": "TODO Title"
+      "title": "Interact Text"
     },
     "pull_in_entities": {
       "type": "boolean",
       "default": false,
       "description": "If true, this entity will pull in entities that are in the correct family_types into any available seats",
-      "title": "TODO Title"
+      "title": "Pull In Entities"
     },
     "rider_can_interact": {
       "type": "boolean",
       "default": false,
       "description": "If true, this entity will be picked when looked at by the rider",
-      "title": "TODO Title"
+      "title": "Rider Can Interact"
     },
     "seat_count": {
       "type": "integer",
       "default": 1,
       "description": "The number of entities that can ride this entity at the same time",
-      "title": "TODO Title"
+      "title": "Seat Count"
     },
     "seats": {
       "description": "The list of positions and number of riders for each position for entities riding this entity",
@@ -83,7 +88,7 @@
         { "type": "object", "$ref": "#/definitions/seats_spec" },
         { "type": "array", "items": { "$ref": "#/definitions/seats_spec" } }
       ],
-      "title": "TODO Title"
+      "title": "Seats"
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.scale.json b/source/behavior/entities/1.8.0/components/minecraft.scale.json
index 9189ea3b..13665323 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.scale.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.scale.json
@@ -10,7 +10,7 @@
       "type": "number",
       "default": 0.0,
       "description": "The value of the scale. 1.0 means the entity will appear at the scale they are defined in their model. Higher numbers make the entity bigger",
-      "title": "TODO Title"
+      "title": "Value"
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.scale_by_age.json b/source/behavior/entities/1.8.0/components/minecraft.scale_by_age.json
index ba720c15..60d07473 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.scale_by_age.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.scale_by_age.json
@@ -6,7 +6,7 @@
   "description": "Defines the entity's size interpolation based on the entity's age.",
   "required": [],
   "properties": {
-    "end_scale": { "type": "number", "default": 1, "description": "Ending scale of the entity when it's fully grown", "title": "TODO Title" },
-    "start_scale": { "type": "number", "default": 1, "description": "Initial scale of the newborn entity", "title": "TODO Title" }
+    "end_scale": { "type": "number", "default": 1, "description": "Ending scale of the entity when it's fully grown", "title": "End Scale" },
+    "start_scale": { "type": "number", "default": 1, "description": "Initial scale of the newborn entity", "title": "Start Scale" }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.scheduler.json b/source/behavior/entities/1.8.0/components/minecraft.scheduler.json
index 92db0d2e..e4c377f3 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.scheduler.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.scheduler.json
@@ -10,7 +10,7 @@
       "type": "array",
       "description": "The list of triggers that fire when the conditions match the given filter criteria. If any filter criteria overlap the first defined event will be picked",
       "items": { "type": "object", "description": "UNKNOWN STRUCTURE" },
-      "title": "TODO Title"
+      "title": "Scheduled Event"
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.shareables.json b/source/behavior/entities/1.8.0/components/minecraft.shareables.json
index fa25c36d..64cd50a3 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.shareables.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.shareables.json
@@ -9,6 +9,7 @@
     "items": {
       "type": "array",
       "description": "List of items that the entity wants to share",
+      "title": "Shareables Items",
       "items": {
         "type": "object",
         "properties": {
@@ -20,8 +21,7 @@
             "description": "Defines the item this entity wants to craft with the item defined above. Should be an item name"
           }
         }
-      },
-      "title": "TODO Title"
+      }
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.sittable.json b/source/behavior/entities/1.8.0/components/minecraft.sittable.json
index 36ff0213..efa3cd20 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.sittable.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.sittable.json
@@ -6,7 +6,7 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "sit_event": { "$ref": "../types/event.json", "description": "Event to run when the entity enters the `sit` state", "title": "TODO Title" },
-    "stand_event": { "$ref": "../types/event.json", "description": "Event to run when the entity exits the `sit` state", "title": "TODO Title" }
+    "sit_event": { "$ref": "../types/event.json", "description": "Event to run when the entity enters the `sit` state", "title": "Sit Event" },
+    "stand_event": { "$ref": "../types/event.json", "description": "Event to run when the entity exits the `sit` state", "title": "Stand Event" }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.skin_id.json b/source/behavior/entities/1.8.0/components/minecraft.skin_id.json
index 45c82ccd..7169bfae 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.skin_id.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.skin_id.json
@@ -10,7 +10,7 @@
       "type": "integer",
       "default": 0,
       "description": "The ID of the skin. By convention, 0 is the ID of the base skin",
-      "title": "TODO Title"
+      "title": "Value"
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.sound_volume.json b/source/behavior/entities/1.8.0/components/minecraft.sound_volume.json
index 0c29c151..b09c08a1 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.sound_volume.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.sound_volume.json
@@ -6,6 +6,6 @@
   "description": "Sets the entity's base volume for sound effects.",
   "required": [],
   "properties": {
-    "value": { "type": "number", "default": 1.0, "description": "The value of the volume the entity uses for sound effects", "title": "TODO Title" }
+    "value": { "type": "number", "default": 1.0, "description": "The value of the volume the entity uses for sound effects", "title": "Value" }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.spawn_entity.json b/source/behavior/entities/1.8.0/components/minecraft.spawn_entity.json
index 5b5b35eb..3dbad691 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.spawn_entity.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.spawn_entity.json
@@ -4,62 +4,62 @@
   "title": "Spawn Entity 1.8.0",
   "additionalProperties": false,
   "required": [],
+  "description": "Adds a timer after which this entity will spawn another entity or item (similar to vanilla's chicken's egg-laying behavior).",
   "properties": {
     "should_leash": {
       "type": "boolean",
       "default": false,
       "description": "If true, this the spawned entity will be leashed to the parent",
-      "title": "TODO Title"
+      "title": "Should Leash"
     },
     "num_to_spawn": {
       "type": "integer",
       "default": 1,
       "description": "The number of entities of this type to spawn each time that this triggers",
-      "title": "TODO Title"
+      "title": "Number To Spawn"
     },
     "min_wait_time": {
       "type": "integer",
       "default": 300,
       "description": "Minimum amount of time to randomly wait in seconds before another entity is spawned",
-      "title": "TODO Title"
+      "title": "Minimum Wait Time"
     },
     "max_wait_time": {
       "type": "integer",
       "default": 600,
       "description": "Maximum amount of time to randomly wait in seconds before another entity is spawned",
-      "title": "TODO Title"
+      "title": "Maximum Wait Time"
     },
     "spawn_sound": {
       "type": "string",
       "default": "plop",
       "description": "Identifier of the sound effect to play when the entity is spawned",
-      "title": "TODO Title"
+      "title": "Spawn Sound"
     },
-    "spawn_item": { "type": "string", "default": "egg", "description": "Item identifier of the item to spawn", "title": "TODO Title" },
+    "spawn_item": { "type": "string", "default": "egg", "description": "Item identifier of the item to spawn", "title": "Spawn Item" },
     "spawn_entity": {
       "type": "string",
       "default": "",
       "description": "Identifier of the entity to spawn, leave empty to spawn the item defined above instead",
-      "title": "TODO Title"
+      "title": "Spawn Entity"
     },
-    "spawn_method": { "type": "string", "default": "born", "description": "Method to use to spawn the entity", "title": "TODO Title" },
+    "spawn_method": { "type": "string", "default": "born", "description": "Method to use to spawn the entity", "title": "Spawn Method" },
     "spawn_event": {
       "type": "string",
       "default": "minecraft:entity_born",
       "description": "Event to call when the entity is spawned",
-      "title": "TODO Title"
+      "title": "Spawn Event"
     },
     "filters": {
       "description": "If present, the specified entity will only spawn if the filter evaluates to true",
       "$ref": "../../filters/filters.json",
-      "title": "TODO Title"
+      "title": "Filters"
     },
     "single_use": {
       "type": "boolean",
       "default": false,
       "description": "If true, this component will only ever spawn the specified entity once",
-      "title": "TODO Title"
+      "title": "Single Use"
     }
-  },
-  "description": "Adds a timer after which this entity will spawn another entity or item (similar to vanilla's chicken's egg-laying behavior)."
+  }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.tameable.json b/source/behavior/entities/1.8.0/components/minecraft.tameable.json
index 08b7e0f2..41f905c8 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.tameable.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.tameable.json
@@ -12,7 +12,7 @@
       "description": "The chance of taming the entity with each item use between 0.0 and 1.0, where 1.0 is 100%",
       "minimum": 0,
       "maximum": 1,
-      "title": "TODO Title"
+      "title": "Probability"
     },
     "tame_event": { "title": "Tame Event", "$ref": "../types/event.json", "description": "Event to run when this entity becomes tamed" },
     "tame_items": {
diff --git a/source/behavior/entities/1.8.0/components/minecraft.tamemount.json b/source/behavior/entities/1.8.0/components/minecraft.tamemount.json
index 7c9eac7e..59dfa3de 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.tamemount.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.tamemount.json
@@ -33,7 +33,7 @@
       "type": "integer",
       "default": 5,
       "description": "The amount the entity's temper will increase when mounted",
-      "title": "TODO Title"
+      "title": "Attempt Temper MOde"
     },
     "autoRejectItems": {
       "description": "The list of items that, if carried while interacting with the entity, will anger it",
@@ -41,31 +41,31 @@
         { "type": "object", "$ref": "#/definitions/auto_reject_items" },
         { "type": "array", "items": { "$ref": "#/definitions/auto_reject_items" } }
       ],
-      "title": "TODO Title"
+      "title": "Auto Reject Items"
     },
-    "feed_text": { "type": "string", "default": "", "description": "The text that shows in the feeding interact button", "title": "TODO Title" },
+    "feed_text": { "type": "string", "default": "", "description": "The text that shows in the feeding interact button", "title": "Feed Text" },
     "feedItems": {
+      "title": "Feed Items",
       "type": "object",
       "description": "The list of items that can be used to increase the entity's temper and speed up the taming process",
       "oneOf": [
         { "type": "object", "$ref": "#/definitions/feed_items" },
         { "type": "array", "items": { "$ref": "#/definitions/feed_items" } }
-      ],
-      "title": "TODO Title"
+      ]
     },
     "maxTemper": {
       "type": "integer",
       "default": 100,
       "description": "The maximum value for the entity's random starting temper",
-      "title": "TODO Title"
+      "title": "Maximum Temper"
     },
     "minTemper": {
       "type": "integer",
       "default": 0,
       "description": "The minimum value for the entity's random starting temper",
-      "title": "TODO Title"
+      "title": "Minimum Temper"
     },
-    "ride_text": { "type": "string", "description": "The text that shows in the riding interact button", "title": "TODO Title" },
-    "tame_event": { "$ref": "../types/event.json", "description": "Event that triggers when the entity becomes tamed", "title": "TODO Title" }
+    "ride_text": { "type": "string", "description": "The text that shows in the riding interact button", "title": "Ride Text" },
+    "tame_event": { "$ref": "../types/event.json", "description": "Event that triggers when the entity becomes tamed", "title": "Tame Event" }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.target_nearby_sensor.json b/source/behavior/entities/1.8.0/components/minecraft.target_nearby_sensor.json
index 3a0673c9..2970dd5f 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.target_nearby_sensor.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.target_nearby_sensor.json
@@ -10,13 +10,13 @@
       "type": "boolean",
       "default": false,
       "description": "Whether the other entity needs to be visible to trigger `inside` events",
-      "title": "TODO Title"
+      "title": "Must See"
     },
     "inside_range": {
       "type": "number",
       "default": 1,
       "description": "Maximum distance in blocks that another entity will be considered in the `inside` range",
-      "title": "TODO Title"
+      "title": "Inside Range"
     },
     "on_inside_range": {
       "$ref": "../types/event.json",
diff --git a/source/behavior/entities/1.8.0/components/minecraft.teleport.json b/source/behavior/entities/1.8.0/components/minecraft.teleport.json
index ba5dd6d9..c92426c0 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.teleport.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.teleport.json
@@ -10,49 +10,54 @@
       "type": "number",
       "default": 0.01,
       "description": "Modifies the chance that the entity will teleport if the entity is in darkness",
-      "title": "TODO Title"
+      "title": "Dark Teleport Chance"
     },
     "light_teleport_chance": {
       "type": "number",
       "default": 0.01,
       "description": "Modifies the chance that the entity will teleport if the entity is in daylight",
-      "title": "TODO Title"
+      "title": "Light Teleport Chance"
     },
     "max_random_teleport_time": {
       "type": "number",
       "default": 20,
       "description": "Maximum amount of time in seconds between random teleports",
-      "title": "TODO Title"
+      "title": "Maximum Random Teleport Time"
     },
     "min_random_teleport_time": {
       "type": "number",
       "default": 0,
       "description": "Minimum amount of time in seconds between random teleports",
-      "title": "TODO Title"
+      "title": "Minimum Random Teleport Time"
     },
     "random_teleport_cube": {
+      "title": "Random Teleport Cube",
+      "description": "Entity will teleport to a random position within the area defined by this cube",
       "type": "array",
       "default": [32.0, 16.0, 32.0],
       "items": [
         { "type": "number", "title": "A" },
         { "type": "number", "title": "B" },
         { "type": "number", "title": "C" }
-      ],
-      "description": "Entity will teleport to a random position within the area defined by this cube",
-      "title": "TODO Title"
+      ]
+    },
+    "random_teleports": {
+      "type": "boolean",
+      "default": true,
+      "description": "If true, the entity will teleport randomly",
+      "title": "Random Teleports"
     },
-    "random_teleports": { "type": "boolean", "default": true, "description": "If true, the entity will teleport randomly", "title": "TODO Title" },
     "target_distance": {
       "type": "number",
       "default": 16,
       "description": "Maximum distance the entity will teleport when chasing a target",
-      "title": "TODO Title"
+      "title": "Target Distance"
     },
     "target_teleport_chance": {
       "type": "number",
       "default": 1,
       "description": "The chance that the entity will teleport between 0.0 and 1.0. 1.0 means 100%",
-      "title": "TODO Title"
+      "title": "Target Teleport Chance"
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.tick_world.json b/source/behavior/entities/1.8.0/components/minecraft.tick_world.json
index d6e6c242..a751e4f3 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.tick_world.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.tick_world.json
@@ -11,13 +11,13 @@
       "default": 128,
       "description": "The distance at which the closest player has to be before this entity despawns. This option will be ignored if never_despawn is true. Min: 128 blocks.",
       "minimum": 128,
-      "title": "TODO Title"
+      "title": "Distance To Players"
     },
     "never_despawn": {
       "type": "boolean",
       "default": true,
       "description": "If true, this entity will not despawn even if players are far away. If false, distance_to_players will be used to determine when to despawn.",
-      "title": "TODO Title"
+      "title": "Never Despawn"
     },
     "radius": {
       "type": "integer",
@@ -25,7 +25,7 @@
       "description": "The area around the entity to tick. Default: 2. Allowed range: 2-6.",
       "minimum": 2,
       "maximum": 6,
-      "title": "TODO Title"
+      "title": "Radius"
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.timer.json b/source/behavior/entities/1.8.0/components/minecraft.timer.json
index e0a9b294..d6ce4636 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.timer.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.timer.json
@@ -23,13 +23,16 @@
           "items": [
             { "type": "number", "title": "A" },
             { "type": "number", "title": "B" }
-          ],
-          "title": "TODO Title"
+          ]
         },
         { "type": "number", "default": 0 }
       ]
     },
-    "time_down_event": { "description": "Event to fire when the time on the timer runs out", "title": "TODO", "$ref": "../types/event.json" },
+    "time_down_event": {
+      "description": "Event to fire when the time on the timer runs out",
+      "title": "Time Down Event",
+      "$ref": "../types/event.json"
+    },
     "random_time_choices": {
       "type": "array",
       "default": [],
diff --git a/source/behavior/entities/1.8.0/components/minecraft.trade_table.json b/source/behavior/entities/1.8.0/components/minecraft.trade_table.json
index 5dc96e75..16fd9ebf 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.trade_table.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.trade_table.json
@@ -10,21 +10,21 @@
       "type": "boolean",
       "default": false,
       "description": "Determines when the mob transforms, if the trades should be converted when the new mob has a economy_trade_table. When the trades are converted, the mob will generate a new trade list with their new trade table, but then it will try to convert any of the same trades over to have the same enchantments and user data. For example, if the original has a Emerald to Enchanted Iron Sword (Sharpness 1), and the new trade also has an Emerald for Enchanted Iron Sword, then the enchantment will be Sharpness 1.",
-      "title": "TODO Title"
+      "title": "Convert Trades Economy"
     },
-    "display_name": { "type": "string", "description": "Name to be displayed while trading with this entity.", "title": "TODO Title" },
+    "display_name": { "type": "string", "description": "Name to be displayed while trading with this entity.", "title": "Display Name" },
     "new_screen": {
       "type": "boolean",
       "default": false,
       "description": "Used to determine if trading with entity opens the new trade screen.",
-      "title": "TODO Title"
+      "title": "New Screen"
     },
     "persist_trades": {
       "type": "boolean",
       "default": false,
       "description": "Determines if the trades should persist when the mob transforms. This makes it so that the next time the mob is transformed to something with a trade_table or economy_trade_table, then it keeps their trades.",
-      "title": "TODO Title"
+      "title": "Persist Trades"
     },
-    "table": { "type": "string", "description": "File path relative to the resource pack root for this entity's trades.", "title": "TODO Title" }
+    "table": { "type": "string", "description": "File path relative to the resource pack root for this entity's trades.", "title": "Table" }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.transformation.json b/source/behavior/entities/1.8.0/components/minecraft.transformation.json
index 075dcbff..9c140c64 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.transformation.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.transformation.json
@@ -10,11 +10,13 @@
       "type": "object",
       "description": "List of components to add to the entity after the transformation",
       "properties": { "component_groups": { "type": "array", "description": "Names of component groups to add", "items": { "type": "string" } } },
-      "title": "TODO Title",
+      "title": "Add",
       "additionalProperties": false
     },
-    "begin_transform_sound": { "type": "string", "description": "Sound to play when the transformation starts", "title": "TODO Title" },
+    "begin_transform_sound": { "type": "string", "description": "Sound to play when the transformation starts", "title": "Begin Transform Sound" },
     "delay": {
+      "title": "Delay",
+      "additionalProperties": false,
       "type": "object",
       "description": "Defines the properties of the delay for the transformation",
       "properties": {
@@ -44,29 +46,27 @@
           "items": { "$ref": "../../../../general/blocks_item.json" }
         },
         "value": { "type": "number", "default": 0, "description": "Time in seconds before the entity transforms" }
-      },
-      "title": "TODO Title",
-      "additionalProperties": false
+      }
     },
     "drop_equipment": {
       "type": "boolean",
       "default": false,
       "description": "Cause the entity to drop all equipment upon transformation",
-      "title": "TODO Title"
+      "title": "Drop Equipment"
     },
-    "into": { "type": "string", "description": "Entity Definition that this entity will transform into", "title": "TODO Title" },
+    "into": { "type": "string", "description": "Entity Definition that this entity will transform into", "title": "Into" },
     "keep_level": {
       "type": "boolean",
       "default": false,
       "description": "If this entity has trades and has leveled up, it should maintain that level after transformation.",
-      "title": "TODO Title"
+      "title": "Keep Level"
     },
     "keep_owner": {
       "type": "boolean",
       "default": false,
       "description": "If this entity is owned by another entity, it should remain owned after transformation.",
-      "title": "TODO Title"
+      "title": "Keep Owner"
     },
-    "transformation_sound": { "type": "string", "description": "Sound to play when the entity is done transforming", "title": "TODO Title" }
+    "transformation_sound": { "type": "string", "description": "Sound to play when the entity is done transforming", "title": "Transformation Sound" }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.trusting.json b/source/behavior/entities/1.8.0/components/minecraft.trusting.json
index 27d778c6..bd650788 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.trusting.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.trusting.json
@@ -10,14 +10,14 @@
       "type": "number",
       "default": 1,
       "description": "The chance of the entity trusting with each item use between 0.0 and 1.0, where 1.0 is 100%",
-      "title": "TODO Title"
+      "title": "Probability"
     },
-    "trust_event": { "$ref": "../types/event.json", "description": "Event to run when this entity becomes trusting", "title": "TODO Title" },
+    "trust_event": { "$ref": "../types/event.json", "description": "Event to run when this entity becomes trusting", "title": "Trust Event" },
     "trust_items": {
       "type": "array",
       "description": "The list of items that can be used to get the entity to trust players",
-      "items": { "$ref": "../../../../general/item/identifier.json" },
-      "title": "TODO Title"
+      "items": { "$ref": "../../../../general/item/identifier.json", "title": "Trust Item" },
+      "title": "Trust Items"
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/components/minecraft.water_movement.json b/source/behavior/entities/1.8.0/components/minecraft.water_movement.json
index 2e3d6bf3..013d323c 100644
--- a/source/behavior/entities/1.8.0/components/minecraft.water_movement.json
+++ b/source/behavior/entities/1.8.0/components/minecraft.water_movement.json
@@ -10,7 +10,7 @@
       "type": "number",
       "default": 0.8,
       "description": "Drag factor to determine movement speed when in water.",
-      "title": "TODO Title"
+      "title": "Drag Factor"
     }
   }
 }