naming changes and __str__