Merge "Rename several animation classes"