diff --git a/Data/Scripts/012_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb b/Data/Scripts/012_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb
index 7dc1b83d4..52167c617 100644
--- a/Data/Scripts/012_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb
+++ b/Data/Scripts/012_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb
@@ -134,10 +134,10 @@ class PokeBattle_Battle
       exp /= 7
     end
     # Foreign Pokémon gain more Exp
-    isOutsider = (pkmn.trainerID!=pbPlayer.id ||
-                 (pkmn.language!=0 && pkmn.language!=pbPlayer.language))
+    isOutsider = (pkmn.owner.id != pbPlayer.id ||
+                 (pkmn.owner.language != 0 && pkmn.owner.language != pbPlayer.language))
     if isOutsider
-      if pkmn.language!=0 && pkmn.language!=pbPlayer.language
+      if pkmn.owner.language != 0 && pkmn.owner.language != pbPlayer.language
         exp = (exp*1.7).floor
       else
         exp = (exp*1.5).floor
diff --git a/Data/Scripts/013_Overworld/013_PField_DayCare.rb b/Data/Scripts/013_Overworld/013_PField_DayCare.rb
index 25bd5b0e1..83b6943d9 100644
--- a/Data/Scripts/013_Overworld/013_PField_DayCare.rb
+++ b/Data/Scripts/013_Overworld/013_PField_DayCare.rb
@@ -155,8 +155,8 @@ def pbDayCareGetCompat
      isConst?(compat21,PBEggGroups,:Ditto)
     if pbDayCareCompatibleGender(pkmn1,pkmn2)
       ret = 1
-      ret += 1 if pkmn1.species==pkmn2.species
-      ret += 1 if pkmn1.trainerID!=pkmn2.trainerID
+      ret += 1 if pkmn1.species == pkmn2.species
+      ret += 1 if pkmn1.owner.id != pkmn2.owner.id
       return ret
     end
   end
@@ -350,7 +350,7 @@ def pbDayCareGenerateEgg
   end
   # Masuda method and Shiny Charm
   shinyretries = 0
-  shinyretries += 5 if father.language!=mother.language
+  shinyretries += 5 if father.owner.language != mother.owner.language
   shinyretries += 2 if hasConst?(PBItems,:SHINYCHARM) && $PokemonBag.pbHasItem?(:SHINYCHARM)
   if shinyretries>0
     shinyretries.times do
diff --git a/Data/Scripts/017_UI/006_PScreen_Summary.rb b/Data/Scripts/017_UI/006_PScreen_Summary.rb
index 63e3c2cfc..f0b9d5200 100644
--- a/Data/Scripts/017_UI/006_PScreen_Summary.rb
+++ b/Data/Scripts/017_UI/006_PScreen_Summary.rb
@@ -407,7 +407,7 @@ class PokemonSummary_Scene
     else
       ownerbase   = Color.new(64,64,64)
       ownershadow = Color.new(176,176,176)
-      case @pokemon.otgender
+      case @pokemon.owner.gender
       when 0; ownerbase = Color.new(24,112,216); ownershadow = Color.new(136,168,208)
       when 1; ownerbase = Color.new(248,56,32);  ownershadow = Color.new(224,152,144)
       end
diff --git a/Data/Scripts/020_System and utilities/004_PSystem_PokemonUtilities.rb b/Data/Scripts/020_System and utilities/004_PSystem_PokemonUtilities.rb
index d78110ce5..4024554f0 100644
--- a/Data/Scripts/020_System and utilities/004_PSystem_PokemonUtilities.rb	
+++ b/Data/Scripts/020_System and utilities/004_PSystem_PokemonUtilities.rb	
@@ -139,12 +139,8 @@ def pbAddForeignPokemon(pokemon,level=nil,ownerName=nil,nickname=nil,ownerGender
   if pokemon.is_a?(Integer) && level.is_a?(Integer)
     pokemon = Pokemon.new(pokemon,level)
   end
-  # Set original trainer to a foreign one (if ID isn't already foreign)
-  if pokemon.trainerID==$Trainer.id
-    pokemon.trainerID = $Trainer.getForeignID
-    pokemon.ot        = ownerName if ownerName && ownerName!=""
-    pokemon.otgender  = ownerGender
-  end
+  # Set original trainer to a foreign one
+  pokemon.owner = Pokemon::Owner.new_foreign(ownerName || "", ownerGender)
   # Set nickname
   pokemon.name = nickname[0, Pokemon::MAX_NAME_SIZE] if nickname && nickname!=""
   # Recalculate stats
diff --git a/Data/Scripts/021_Debug/003_Debug_Pokemon.rb b/Data/Scripts/021_Debug/003_Debug_Pokemon.rb
index 0ac50d75d..bffd0acf1 100644
--- a/Data/Scripts/021_Debug/003_Debug_Pokemon.rb
+++ b/Data/Scripts/021_Debug/003_Debug_Pokemon.rb
@@ -667,7 +667,7 @@ module PokemonDebugMixin
     when "ownership"
       cmd = 0
       loop do
-        gender = [_INTL("Male"),_INTL("Female"),_INTL("Unknown")][pkmn.otgender]
+        gender = [_INTL("Male"),_INTL("Female"),_INTL("Unknown")][pkmn.owner.gender]
         msg = [_INTL("Player's Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.owner.name,gender,pkmn.owner.public_id,pkmn.owner.id),
                _INTL("Foreign Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.owner.name,gender,pkmn.owner.public_id,pkmn.owner.id)
               ][pkmn.foreign?($Trainer) ? 1 : 0]
@@ -685,18 +685,18 @@ module PokemonDebugMixin
           pkmn.owner.name = pbEnterPlayerName(_INTL("{1}'s OT's name?",pkmn.name),1,MAX_PLAYER_NAME_SIZE)
         when 2   # Set OT's gender
           cmd2 = pbShowCommands(_INTL("Set OT's gender."),
-             [_INTL("Male"),_INTL("Female"),_INTL("Unknown")],pkmn.otgender)
-          pkmn.otgender = cmd2 if cmd2>=0
+             [_INTL("Male"),_INTL("Female"),_INTL("Unknown")],pkmn.owner.gender)
+          pkmn.owner.gender = cmd2 if cmd2>=0
         when 3   # Random foreign ID
-          pkmn.trainerID = $Trainer.getForeignID
+          pkmn.owner.id = $Trainer.getForeignID
         when 4   # Set foreign ID
           params = ChooseNumberParams.new
           params.setRange(0,65535)
           params.setDefaultValue(pkmn.owner.public_id)
           val = pbMessageChooseNumber(
              _INTL("Set the new ID (max. 65535)."),params) { pbUpdate }
-          pkmn.trainerID = val
-          pkmn.trainerID |= val << 16
+          pkmn.owner.id = val
+          pkmn.owner.id |= val << 16
         end
       end
     #===========================================================================