Added NameFormatter, changed Source.read(map)