diff --git a/pom.xml b/pom.xml
index 286941a..62e7281 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.youhavetrouble</groupId>
     <artifactId>Entiddy</artifactId>
-    <version>1.2.0</version>
+    <version>2.0.0-pre</version>
     <packaging>jar</packaging>
 
     <name>Entiddy</name>
diff --git a/src/main/java/me/youhavetrouble/entiddy/Entiddy.java b/src/main/java/me/youhavetrouble/entiddy/Entiddy.java
index 0bb7ce0..ee42739 100644
--- a/src/main/java/me/youhavetrouble/entiddy/Entiddy.java
+++ b/src/main/java/me/youhavetrouble/entiddy/Entiddy.java
@@ -5,6 +5,7 @@ import me.youhavetrouble.entiddy.SpecialEntities.JebSheep;
 import me.youhavetrouble.entiddy.SpecialEntities.Johnny;
 import me.youhavetrouble.entiddy.SpecialEntities.KillerBunny;
 import me.youhavetrouble.entiddy.SpecialEntities.Toast;
+import net.kyori.adventure.text.Component;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -57,7 +58,7 @@ public enum Entiddy {
      */
     public static void upsideDown(@NotNull LivingEntity entity) {
         if (entity instanceof Player) return;
-        entity.setCustomName("Grumm");
+        entity.customName(Component.text("Grumm"));
     }
 
     /**
diff --git a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/JebSheep.java b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/JebSheep.java
index 581cf8f..5053427 100644
--- a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/JebSheep.java
+++ b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/JebSheep.java
@@ -1,14 +1,14 @@
 package me.youhavetrouble.entiddy.SpecialEntities;
 
 import me.youhavetrouble.entiddy.EntiddyInterface;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Rabbit;
+import org.bukkit.entity.*;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Objects;
+
 public class JebSheep implements EntiddyInterface {
 
     @Override
@@ -16,12 +16,13 @@ public class JebSheep implements EntiddyInterface {
         if (location.getWorld() == null) {
             throw new NullPointerException("World cannot be null");
         }
-        return location.getWorld().spawnEntity(location, EntityType.SHEEP, spawnReason, (entity) -> entity.setCustomName("jeb_"));
+        return location.getWorld().spawnEntity(location, EntityType.SHEEP, spawnReason,
+                (entity) -> entity.customName(Component.text("jeb_")));
     }
 
     @Override
     public boolean isInstance(@NotNull LivingEntity entity) {
-        if (!(entity instanceof Rabbit)) return false;
-        return entity.getCustomName() != null && entity.getCustomName().equals("jeb_");
+        if (!(entity instanceof Sheep)) return false;
+        return entity.customName() != null && Objects.equals(entity.customName(), Component.text("jeb_"));
     }
 }
diff --git a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Toast.java b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Toast.java
index 8bedf20..d83d13f 100644
--- a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Toast.java
+++ b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Toast.java
@@ -1,6 +1,7 @@
 package me.youhavetrouble.entiddy.SpecialEntities;
 
 import me.youhavetrouble.entiddy.EntiddyInterface;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -16,7 +17,8 @@ public class Toast implements EntiddyInterface {
         if (location.getWorld() == null) {
             throw new NullPointerException("World cannot be null");
         }
-        return location.getWorld().spawnEntity(location, EntityType.RABBIT, spawnReason, (entity) -> entity.setCustomName("Toast"));
+        return location.getWorld().spawnEntity(location, EntityType.RABBIT, spawnReason,
+                (entity) -> entity.customName(Component.text("Toast")));
     }
 
     @Override