diff --git a/paper-api/src/main/java/org/bukkit/entity/AbstractHorse.java b/paper-api/src/main/java/org/bukkit/entity/AbstractHorse.java
index 87f3c1f229..2bbf1d074b 100644
--- a/paper-api/src/main/java/org/bukkit/entity/AbstractHorse.java
+++ b/paper-api/src/main/java/org/bukkit/entity/AbstractHorse.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Represents a Horse-like creature.
  */
-public interface AbstractHorse extends Animals, Vehicle, InventoryHolder, Tameable {
+public interface AbstractHorse extends Vehicle, InventoryHolder, Tameable {
 
     /**
      * Gets the horse's variant.
diff --git a/paper-api/src/main/java/org/bukkit/entity/Cat.java b/paper-api/src/main/java/org/bukkit/entity/Cat.java
index a29aefeaa1..c2a566b864 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Cat.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Cat.java
@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Meow.
  */
-public interface Cat extends Animals, Tameable, Sittable {
+public interface Cat extends Tameable, Sittable {
 
     /**
      * Gets the current type of this cat.
diff --git a/paper-api/src/main/java/org/bukkit/entity/Parrot.java b/paper-api/src/main/java/org/bukkit/entity/Parrot.java
index 95d95cdcc9..46c295cfad 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Parrot.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Parrot.java
@@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Represents a Parrot.
  */
-public interface Parrot extends Animals, Tameable, Sittable {
+public interface Parrot extends Tameable, Sittable {
 
     /**
      * Get the variant of this parrot.
diff --git a/paper-api/src/main/java/org/bukkit/entity/Tameable.java b/paper-api/src/main/java/org/bukkit/entity/Tameable.java
index 0c066bdfc9..26c996cd41 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Tameable.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Tameable.java
@@ -2,7 +2,7 @@ package org.bukkit.entity;
 
 import org.jetbrains.annotations.Nullable;
 
-public interface Tameable extends Entity {
+public interface Tameable extends Animals {
 
     /**
      * Check if this is tamed
diff --git a/paper-api/src/main/java/org/bukkit/entity/Wolf.java b/paper-api/src/main/java/org/bukkit/entity/Wolf.java
index 0390558b89..0e5decadf3 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Wolf.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Wolf.java
@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Represents a Wolf
  */
-public interface Wolf extends Animals, Tameable, Sittable {
+public interface Wolf extends Tameable, Sittable {
 
     /**
      * Checks if this wolf is angry