Better mapping for characters name