AVALANCHE: Rename trip into animation, some more renaming