diff --git a/paper-api/src/main/java/org/bukkit/entity/Dolphin.java b/paper-api/src/main/java/org/bukkit/entity/Dolphin.java
index 3d6b9f32e1..f00eaadcdd 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Dolphin.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Dolphin.java
@@ -1,3 +1,3 @@
 package org.bukkit.entity;
 
-public interface Dolphin extends Creature { }
+public interface Dolphin extends WaterMob { }
diff --git a/paper-api/src/main/java/org/bukkit/entity/Fish.java b/paper-api/src/main/java/org/bukkit/entity/Fish.java
index 570b7bc1fc..82e390b215 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Fish.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Fish.java
@@ -3,4 +3,4 @@ package org.bukkit.entity;
 /**
  * Represents a fish entity.
  */
-public interface Fish extends Creature { }
+public interface Fish extends WaterMob { }
diff --git a/paper-api/src/main/java/org/bukkit/entity/WaterMob.java b/paper-api/src/main/java/org/bukkit/entity/WaterMob.java
index 3e89ca0c52..62b4e89d05 100644
--- a/paper-api/src/main/java/org/bukkit/entity/WaterMob.java
+++ b/paper-api/src/main/java/org/bukkit/entity/WaterMob.java
@@ -3,4 +3,4 @@ package org.bukkit.entity;
 /**
  * Represents a Water Mob
  */
-public interface WaterMob extends LivingEntity {}
+public interface WaterMob extends Creature {}