Cleaned up naming of animations