Put spaces between name and id in avalon2 and icarus