diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/ItemRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/ItemRewriter.java
index 5020ad5f6..1c34e98eb 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/ItemRewriter.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/ItemRewriter.java
@@ -1,16 +1,100 @@
 package us.myles.ViaVersion.protocols.protocol1_11to1_10;
 
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import org.spacehq.opennbt.tag.builtin.StringTag;
 import us.myles.ViaVersion.api.minecraft.item.Item;
 
 public class ItemRewriter {
+    private static BiMap<String, String> oldToNewNames = HashBiMap.create();
+
+    static {
+        oldToNewNames.put("AreaEffectCloud", "minecraft:area_effect_cloud");
+        oldToNewNames.put("ArmorStand", "minecraft:armor_stand");
+        oldToNewNames.put("Arrow", "minecraft:arrow");
+        oldToNewNames.put("Bat", "minecraft:bat");
+        oldToNewNames.put("Blaze", "minecraft:blaze");
+        oldToNewNames.put("Boat", "minecraft:boat");
+        oldToNewNames.put("CaveSpider", "minecraft:cave_spider");
+        oldToNewNames.put("Chicken", "minecraft:chicken");
+        oldToNewNames.put("Cow", "minecraft:cow");
+        oldToNewNames.put("Creeper", "minecraft:creeper");
+        oldToNewNames.put("Donkey", "minecraft:donkey");
+        oldToNewNames.put("DragonFireball", "minecraft:dragon_fireball");
+        oldToNewNames.put("ElderGuardian", "minecraft:elder_guardian");
+        oldToNewNames.put("EnderCrystal", "minecraft:ender_crystal");
+        oldToNewNames.put("EnderDragon", "minecraft:ender_dragon");
+        oldToNewNames.put("Enderman", "minecraft:enderman");
+        oldToNewNames.put("Endermite", "minecraft:endermite");
+        oldToNewNames.put("EyeOfEnderSignal", "minecraft:eye_of_ender_signal");
+        oldToNewNames.put("FallingSand", "minecraft:falling_block");
+        oldToNewNames.put("Fireball", "minecraft:fireball");
+        oldToNewNames.put("FireworksRocketEntity", "minecraft:fireworks_rocket");
+        oldToNewNames.put("Ghast", "minecraft:ghast");
+        oldToNewNames.put("Giant", "minecraft:giant");
+        oldToNewNames.put("Guardian", "minecraft:guardian");
+        oldToNewNames.put("Horse", "minecraft:horse");
+        oldToNewNames.put("Husk", "minecraft:husk");
+        oldToNewNames.put("Item", "minecraft:item");
+        oldToNewNames.put("ItemFrame", "minecraft:item_frame");
+        oldToNewNames.put("LavaSlime", "minecraft:magma_cube");
+        oldToNewNames.put("LeashKnot", "minecraft:leash_knot");
+        oldToNewNames.put("MinecartChest", "minecraft:chest_minecart");
+        oldToNewNames.put("MinecartCommandBlock", "minecraft:commandblock_minecart");
+        oldToNewNames.put("MinecartFurnace", "minecraft:furnace_minecart");
+        oldToNewNames.put("MinecartHopper", "minecraft:hopper_minecart");
+        oldToNewNames.put("MinecartRideable", "minecraft:minecart");
+        oldToNewNames.put("MinecartSpawner", "minecraft:spawner_minecart");
+        oldToNewNames.put("MinecartTNT", "minecraft:tnt_minecart");
+        oldToNewNames.put("Mule", "minecraft:mule");
+        oldToNewNames.put("MushroomCow", "minecraft:mooshroom");
+        oldToNewNames.put("Ozelot", "minecraft:ocelot");
+        oldToNewNames.put("Painting", "minecraft:painting");
+        oldToNewNames.put("Pig", "minecraft:pig");
+        oldToNewNames.put("PigZombie", "minecraft:zombie_pigman");
+        oldToNewNames.put("PolarBear", "minecraft:polar_bear");
+        oldToNewNames.put("PrimedTnt", "minecraft:tnt");
+        oldToNewNames.put("Rabbit", "minecraft:rabbit");
+        oldToNewNames.put("Sheep", "minecraft:sheep");
+        oldToNewNames.put("Shulker", "minecraft:shulker");
+        oldToNewNames.put("ShulkerBullet", "minecraft:shulker_bullet");
+        oldToNewNames.put("Silverfish", "minecraft:silverfish");
+        oldToNewNames.put("Skeleton", "minecraft:skeleton");
+        oldToNewNames.put("SkeletonHorse", "minecraft:skeleton_horse");
+        oldToNewNames.put("Slime", "minecraft:slime");
+        oldToNewNames.put("SmallFireball", "minecraft:small_fireball");
+        oldToNewNames.put("Snowball", "minecraft:snowball");
+        oldToNewNames.put("SnowMan", "minecraft:snowman");
+        oldToNewNames.put("SpectralArrow", "minecraft:spectral_arrow");
+        oldToNewNames.put("Spider", "minecraft:spider");
+        oldToNewNames.put("Squid", "minecraft:squid");
+        oldToNewNames.put("Stray", "minecraft:stray");
+        oldToNewNames.put("ThrownEgg", "minecraft:egg");
+        oldToNewNames.put("ThrownEnderpearl", "minecraft:ender_pearl");
+        oldToNewNames.put("ThrownExpBottle", "minecraft:xp_bottle");
+        oldToNewNames.put("ThrownPotion", "minecraft:potion");
+        oldToNewNames.put("Villager", "minecraft:villager");
+        oldToNewNames.put("VillagerGolem", "minecraft:villager_golem");
+        oldToNewNames.put("Witch", "minecraft:witch");
+        oldToNewNames.put("WitherBoss", "minecraft:wither");
+        oldToNewNames.put("WitherSkeleton", "minecraft:wither_skeleton");
+        oldToNewNames.put("WitherSkull", "minecraft:wither_skull");
+        oldToNewNames.put("Wolf", "minecraft:wolf");
+        oldToNewNames.put("XPOrb", "minecraft:xp_orb");
+        oldToNewNames.put("Zombie", "minecraft:zombie");
+        oldToNewNames.put("ZombieHorse", "minecraft:zombie_horse");
+        oldToNewNames.put("ZombieVillager", "minecraft:zombie_villager");
+    }
+
     public static void toClient(Item item) {
         if (hasEntityTag(item)) {
             CompoundTag entityTag = item.getTag().get("EntityTag");
             if (entityTag.get("id") instanceof StringTag) {
                 StringTag id = entityTag.get("id");
-                id.setValue("minecraft:" + id.getValue().toLowerCase());
+                if (oldToNewNames.containsKey(id.getValue())) {
+                    id.setValue(oldToNewNames.get(id.getValue()));
+                }
             }
         }
     }
@@ -20,11 +104,9 @@ public class ItemRewriter {
             CompoundTag entityTag = item.getTag().get("EntityTag");
             if (entityTag.get("id") instanceof StringTag) {
                 StringTag id = entityTag.get("id");
-
-                String value = id.getValue().replaceAll("minecraft:", "");
-                if (value.length() > 1)
-                    value = value.substring(0, 1).toUpperCase() + value.substring(1);
-                id.setValue(value);
+                if (oldToNewNames.inverse().containsKey(id.getValue())) {
+                    id.setValue(oldToNewNames.inverse().get(id.getValue()));
+                }
             }
         }
     }