diff --git a/Data/Scripts/016_Pokemon/001_PokeBattle_Pokemon.rb b/Data/Scripts/016_Pokemon/001_PokeBattle_Pokemon.rb
index c32d1e77e..a6ff04b5c 100644
--- a/Data/Scripts/016_Pokemon/001_PokeBattle_Pokemon.rb
+++ b/Data/Scripts/016_Pokemon/001_PokeBattle_Pokemon.rb
@@ -628,9 +628,9 @@ class PokeBattle_Pokemon
   # Other
   #=============================================================================
   def species=(value)
-    resetName = nicknamed?
+    hasNickname = nicknamed?
     @species    = value
-    @name       = PBSpecies.getName(@species) if !resetName
+    @name       = PBSpecies.getName(@species) unless hasNickname
     @level      = nil   # In case growth rate is different for the new species
     @forcedForm = nil
     self.form   = 0   # Also recalculates stats
@@ -647,7 +647,7 @@ class PokeBattle_Pokemon
   end
 
   def nicknamed?
-    return @name==self.speciesName
+    return @name!=self.speciesName
   end
 
   # Returns this Pokémon's language.