diff --git a/paper-api/src/main/java/org/bukkit/Nameable.java b/paper-api/src/main/java/org/bukkit/Nameable.java
deleted file mode 100644
index 49cf519c6b..0000000000
--- a/paper-api/src/main/java/org/bukkit/Nameable.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.bukkit;
-
-public interface Nameable {
-
-    /**
-     * Gets the custom name on a mob or block. If there is no name this method
-     * will return null.
-     * <p>
-     * This value has no effect on players, they will always use their real
-     * name.
-     *
-     * @return name of the mob/block or null
-     */
-    public String getCustomName();
-
-    /**
-     * Sets a custom name on a mob or block. This name will be used in death
-     * messages and can be sent to the client as a nameplate over the mob.
-     * <p>
-     * Setting the name to null or an empty string will clear it.
-     * <p>
-     * This value has no effect on players, they will always use their real
-     * name.
-     *
-     * @param name the name to set
-     */
-    public void setCustomName(String name);
-}
diff --git a/paper-api/src/main/java/org/bukkit/block/Beacon.java b/paper-api/src/main/java/org/bukkit/block/Beacon.java
index b1f97c9f8c..a3af3510df 100644
--- a/paper-api/src/main/java/org/bukkit/block/Beacon.java
+++ b/paper-api/src/main/java/org/bukkit/block/Beacon.java
@@ -1,7 +1,6 @@
 package org.bukkit.block;
 
 import java.util.Collection;
-import org.bukkit.Nameable;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.potion.PotionEffect;
@@ -10,7 +9,7 @@ import org.bukkit.potion.PotionEffectType;
 /**
  * Represents a beacon.
  */
-public interface Beacon extends BlockState, InventoryHolder, Lockable, Nameable {
+public interface Beacon extends BlockState, InventoryHolder, Lockable {
 
     /**
      * Returns the list of players within the beacon's range of effect.
diff --git a/paper-api/src/main/java/org/bukkit/block/BrewingStand.java b/paper-api/src/main/java/org/bukkit/block/BrewingStand.java
index ea6ff4e105..7bc809dea5 100644
--- a/paper-api/src/main/java/org/bukkit/block/BrewingStand.java
+++ b/paper-api/src/main/java/org/bukkit/block/BrewingStand.java
@@ -1,13 +1,12 @@
 package org.bukkit.block;
 
-import org.bukkit.Nameable;
 import org.bukkit.inventory.BrewerInventory;
 import org.bukkit.inventory.InventoryHolder;
 
 /**
  * Represents a brewing stand.
  */
-public interface BrewingStand extends BlockState, InventoryHolder, Lockable, Nameable {
+public interface BrewingStand extends BlockState, InventoryHolder, Lockable {
 
     /**
      * How much time is left in the brewing cycle
diff --git a/paper-api/src/main/java/org/bukkit/block/Chest.java b/paper-api/src/main/java/org/bukkit/block/Chest.java
index ade09dddbf..e941d8bdea 100644
--- a/paper-api/src/main/java/org/bukkit/block/Chest.java
+++ b/paper-api/src/main/java/org/bukkit/block/Chest.java
@@ -1,13 +1,12 @@
 package org.bukkit.block;
 
-import org.bukkit.Nameable;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 /**
  * Represents a chest.
  */
-public interface Chest extends BlockState, InventoryHolder, Lockable, Nameable {
+public interface Chest extends BlockState, InventoryHolder, Lockable {
 
     /**
      * Returns the chest's inventory. If this is a double chest, it returns
diff --git a/paper-api/src/main/java/org/bukkit/block/Dispenser.java b/paper-api/src/main/java/org/bukkit/block/Dispenser.java
index 39ee9b0462..94d360b375 100644
--- a/paper-api/src/main/java/org/bukkit/block/Dispenser.java
+++ b/paper-api/src/main/java/org/bukkit/block/Dispenser.java
@@ -1,13 +1,12 @@
 package org.bukkit.block;
 
-import org.bukkit.Nameable;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.projectiles.BlockProjectileSource;
 
 /**
  * Represents a dispenser.
  */
-public interface Dispenser extends BlockState, InventoryHolder, Lockable, Nameable {
+public interface Dispenser extends BlockState, InventoryHolder, Lockable {
 
     /**
      * Gets the BlockProjectileSource object for this dispenser.
diff --git a/paper-api/src/main/java/org/bukkit/block/Dropper.java b/paper-api/src/main/java/org/bukkit/block/Dropper.java
index 0f1013bd15..4d3a5036d9 100644
--- a/paper-api/src/main/java/org/bukkit/block/Dropper.java
+++ b/paper-api/src/main/java/org/bukkit/block/Dropper.java
@@ -1,13 +1,11 @@
 package org.bukkit.block;
 
-import org.bukkit.Nameable;
 import org.bukkit.inventory.InventoryHolder;
 
 /**
  * Represents a dropper.
  */
-public interface Dropper extends BlockState, InventoryHolder, Lockable, Nameable {
-
+public interface Dropper extends BlockState, InventoryHolder, Lockable {
     /**
      * Tries to drop a randomly selected item from the Dropper's inventory,
      * following the normal behavior of a Dropper.
diff --git a/paper-api/src/main/java/org/bukkit/block/Furnace.java b/paper-api/src/main/java/org/bukkit/block/Furnace.java
index b077eb37f4..d943e34f25 100644
--- a/paper-api/src/main/java/org/bukkit/block/Furnace.java
+++ b/paper-api/src/main/java/org/bukkit/block/Furnace.java
@@ -1,13 +1,12 @@
 package org.bukkit.block;
 
-import org.bukkit.Nameable;
 import org.bukkit.inventory.FurnaceInventory;
 import org.bukkit.inventory.InventoryHolder;
 
 /**
  * Represents a furnace.
  */
-public interface Furnace extends BlockState, InventoryHolder, Lockable, Nameable {
+public interface Furnace extends BlockState, InventoryHolder, Lockable {
 
     /**
      * Get burn time.
diff --git a/paper-api/src/main/java/org/bukkit/block/Hopper.java b/paper-api/src/main/java/org/bukkit/block/Hopper.java
index 8e5e3e89dc..978cf2a7c5 100644
--- a/paper-api/src/main/java/org/bukkit/block/Hopper.java
+++ b/paper-api/src/main/java/org/bukkit/block/Hopper.java
@@ -1,9 +1,10 @@
 package org.bukkit.block;
 
-import org.bukkit.Nameable;
 import org.bukkit.inventory.InventoryHolder;
 
 /**
  * Represents a hopper.
  */
-public interface Hopper extends BlockState, InventoryHolder, Lockable, Nameable { }
+public interface Hopper extends BlockState, InventoryHolder, Lockable {
+
+}
diff --git a/paper-api/src/main/java/org/bukkit/block/ShulkerBox.java b/paper-api/src/main/java/org/bukkit/block/ShulkerBox.java
index 003cfb8a1a..c58711ced5 100644
--- a/paper-api/src/main/java/org/bukkit/block/ShulkerBox.java
+++ b/paper-api/src/main/java/org/bukkit/block/ShulkerBox.java
@@ -1,18 +1,8 @@
 package org.bukkit.block;
 
-import org.bukkit.DyeColor;
-import org.bukkit.Nameable;
 import org.bukkit.inventory.InventoryHolder;
 
 /**
  * Represents a ShulkerBox.
  */
-public interface ShulkerBox extends BlockState, InventoryHolder, Lockable, Nameable {
-
-    /**
-     * Get the {@link DyeColor} corresponding to this ShulkerBox
-     *
-     * @return the {@link DyeColor} of this ShulkerBox
-     */
-    public DyeColor getColor();
-}
+public interface ShulkerBox extends BlockState, InventoryHolder, Lockable { }
diff --git a/paper-api/src/main/java/org/bukkit/entity/Entity.java b/paper-api/src/main/java/org/bukkit/entity/Entity.java
index 759e3f0d94..38d665a320 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Entity.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Entity.java
@@ -2,7 +2,6 @@ package org.bukkit.entity;
 
 import org.bukkit.Location;
 import org.bukkit.EntityEffect;
-import org.bukkit.Nameable;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.event.entity.EntityDamageEvent;
@@ -18,7 +17,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 /**
  * Represents a base entity in the world
  */
-public interface Entity extends Metadatable, CommandSender, Nameable {
+public interface Entity extends Metadatable, CommandSender {
 
     /**
      * Gets the entity's current position
@@ -300,6 +299,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
      */
     public Entity getVehicle();
 
+    /**
+     * Sets a custom name on a mob. This name will be used in death messages
+     * and can be sent to the client as a nameplate over the mob.
+     * <p>
+     * Setting the name to null or an empty string will clear it.
+     * <p>
+     * This value has no effect on players, they will always use their real
+     * name.
+     *
+     * @param name the name to set
+     */
+    public void setCustomName(String name);
+
+    /**
+     * Gets the custom name on a mob. If there is no name this method will
+     * return null.
+     * <p>
+     * This value has no effect on players, they will always use their real
+     * name.
+     *
+     * @return name of the mob or null
+     */
+    public String getCustomName();
+
     /**
      * Sets whether or not to display the mob's custom name client side. The
      * name will be displayed above the mob similarly to a player.