Changes models for animation, rename some models