diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb
index 7bc4e0912..d611c0689 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb
@@ -95,7 +95,7 @@ class Pokemon
   # Max EVs that a single stat can have
   EV_STAT_LIMIT = 252
   # Maximum length a Pokémon's nickname can be
-  MAX_NAME_SIZE = 10
+  MAX_NAME_SIZE = 16
   # Maximum number of moves a Pokémon can know at once
   MAX_MOVES = 4
 
diff --git a/Data/Scripts/016_UI/005_UI_Party.rb b/Data/Scripts/016_UI/005_UI_Party.rb
index e06877790..d87e2aeeb 100644
--- a/Data/Scripts/016_UI/005_UI_Party.rb
+++ b/Data/Scripts/016_UI/005_UI_Party.rb
@@ -1165,7 +1165,7 @@ class PokemonPartyScreen
         break
         # Rename
       elsif cmd == 0
-        newname = pbEnterPokemonName(_INTL("{1}'s nickname?", speciesname), 0, 16, "", pkmn)
+        newname = pbEnterPokemonName(_INTL("{1}'s nickname?", speciesname), 0, Pokemon::MAX_NAME_SIZE, "", pkmn)
         pkmn.name = (newname == "") ? speciesname : newname
         pbRefreshSingle(pkmnid)
         # Erase name
diff --git a/Data/System.rxdata b/Data/System.rxdata
index ca6d89068..59da7fd36 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ