diff --git a/pokedex/data/csv/conquest_warrior_names.csv b/pokedex/data/csv/conquest_warrior_names.csv
index aeea20d..e61ee77 100644
--- a/pokedex/data/csv/conquest_warrior_names.csv
+++ b/pokedex/data/csv/conquest_warrior_names.csv
@@ -1,6 +1,6 @@
 warrior_id,local_language_id,name
-1,9,Player (male)
-2,9,Player (female)
+1,9,Player ♂
+2,9,Player ♀
 3,9,Nobunaga
 4,9,Oichi
 5,9,Hideyoshi
diff --git a/pokedex/data/csv/conquest_warriors.csv b/pokedex/data/csv/conquest_warriors.csv
index eab2155..0ca9d69 100644
--- a/pokedex/data/csv/conquest_warriors.csv
+++ b/pokedex/data/csv/conquest_warriors.csv
@@ -1,6 +1,6 @@
 id,identifier,gender_id
-1,player-male,2
-2,player-female,1
+1,player-m,2
+2,player-f,1
 3,nobunaga,2
 4,oichi,1
 5,hideyoshi,2
diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 99e64da..7775e16 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -334,14 +334,14 @@ class ConquestWarrior(TableBase):
     __singlename__ = 'warrior'
     id = Column(Integer, primary_key=True, nullable=False, autoincrement=True,
         info=dict(description='An ID for this warrior.'))
-    identifier = Column(Unicode(13), nullable=False,
+    identifier = Column(Unicode(10), nullable=False,
         info=dict(description='A readable identifier for this warrior.', format='identifier'))
     gender_id = Column(Integer, ForeignKey('genders.id'), nullable=False,
         info=dict(description="The ID of the warrior's gender."))
 
 create_translation_table('conquest_warrior_names', ConquestWarrior, 'names',
     relation_lazy='joined',
-    name=Column(Unicode(15), nullable=False, index=True,
+    name=Column(Unicode(10), nullable=False, index=True,
         info=dict(description='The name.', format='plaintext', official=True))
 )