diff --git a/Data/Scripts/016_Pokemon/001_Pokemon.rb b/Data/Scripts/016_Pokemon/001_Pokemon.rb
index 50023b997..7fbad9abf 100644
--- a/Data/Scripts/016_Pokemon/001_Pokemon.rb
+++ b/Data/Scripts/016_Pokemon/001_Pokemon.rb
@@ -94,8 +94,6 @@ class Pokemon
   attr_accessor :hatchedMap
   # @param value [Integer] new language
   attr_writer   :language
-  # @return [String] the name of the original trainer
-  attr_accessor :ot
   # Changes the gender of the original trainer. This is for information only,
   # and is not used to verify ownership of the Pokémon.
   # @param value [Integer] new value for the original trainer's gender:
@@ -193,7 +191,7 @@ class Pokemon
   # @param trainer [PokeBattle_Trainer] the trainer to compare to the OT
   # @return [Boolean] whether the given trainer and this Pokémon's original trainer don't match
   def foreign?(trainer)
-    return @trainerID != trainer.id || @ot != trainer.name
+    return @owner.id != trainer.id || @owner.name != trainer.name
   end
   alias isForeign? foreign?
 
diff --git a/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb b/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb
index e48105942..e82dbd756 100644
--- a/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb
+++ b/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb
@@ -30,6 +30,18 @@ class Pokemon
     Deprecation.warn_method('Pokemon#trainerID=', 'vXX', 'Pokemon::Owner#id=')
     @owner.id = value
   end
+
+  # @deprecated Use {Owner#name} instead. This alias is slated to be removed in vXX.
+  def ot
+    Deprecation.warn_method('Pokemon#ot', 'vXX', 'Pokemon::Owner#name')
+    return @owner.name
+  end
+
+  # @deprecated Use {Owner#name=} instead. This alias is slated to be removed in vXX.
+  def ot=(value)
+    Deprecation.warn_method('Pokemon#ot=', 'vXX', 'Pokemon::Owner#name=')
+    @owner.name = value
+  end
 end
 
 # (see Pokemon#initialize)