Added full names for wagon and animevent