Minor change to the way names are stored. Evasion doesn't work and needs fixing