diff --git a/Spigot-API-Patches/Tameable-getOwnerUUID-API.patch b/Spigot-API-Patches/Tameable-getOwnerUniqueId-API.patch
similarity index 77%
rename from Spigot-API-Patches/Tameable-getOwnerUUID-API.patch
rename to Spigot-API-Patches/Tameable-getOwnerUniqueId-API.patch
index 636d15fdea..43e11560e7 100644
--- a/Spigot-API-Patches/Tameable-getOwnerUUID-API.patch
+++ b/Spigot-API-Patches/Tameable-getOwnerUniqueId-API.patch
@@ -1,15 +1,13 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 00:55:52 -0500
-Subject: [PATCH] Tameable#getOwnerUUID API
+Subject: [PATCH] Tameable#getOwnerUniqueId API
 
 This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
-This method is already implemented on the server, just needed to expose it.
-
 diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java
-index 44497aa3..447628a8 100644
+index 44497aa3..0987c1e8 100644
 --- a/src/main/java/org/bukkit/entity/Tameable.java
 +++ b/src/main/java/org/bukkit/entity/Tameable.java
 @@ -0,0 +0,0 @@ public interface Tameable extends Entity {
@@ -22,13 +20,13 @@ index 44497aa3..447628a8 100644
 +     *
 +     * @return the owners UUID, or null if not owned
 +     */
-+    public java.util.UUID getOwnerUUID();
++    public java.util.UUID getOwnerUniqueId();
 +    // Paper end
 +
      /**
       * Gets the current owning AnimalTamer
       *
-+     * @see #getOwnerUUID() Recommended to use UUID version instead of this for performance.
++     * @see #getOwnerUniqueId() Recommended to use UUID version instead of this for performance.
 +     * This method will cause OfflinePlayer to be loaded from disk if the owner is not online.
 +     *
       * @return the owning AnimalTamer, or null if not owned
diff --git a/Spigot-Server-Patches/Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/Tameable-getOwnerUniqueId-API.patch
new file mode 100644
index 0000000000..d4e973cc73
--- /dev/null
+++ b/Spigot-Server-Patches/Tameable-getOwnerUniqueId-API.patch
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sat, 24 Feb 2018 01:14:55 -0500
+Subject: [PATCH] Tameable#getOwnerUniqueId API
+
+This is faster if all you need is the UUID, as .getOwner() will cause
+an OfflinePlayer to be loaded from disk.
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
+index e56bef334..cc9d432e7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
+@@ -0,0 +0,0 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
+         }
+     }
+ 
++    public UUID getOwnerUniqueId() {
++        return getOwnerUUID();
++    }
+     public UUID getOwnerUUID() {
+         return getHandle().getOwnerUUID();
+     }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
+index eaaebeab8..2e959321b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
+@@ -0,0 +0,0 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
+         return (EntityTameableAnimal)super.getHandle();
+     }
+ 
++    public UUID getOwnerUniqueId() {
++        return getOwnerUUID();
++    }
+     public UUID getOwnerUUID() {
+         try {
+             return getHandle().getOwnerUUID();
+--
\ No newline at end of file