Split animation movie, refactor names