Merge "Replace cls.__class__.__name__ with cls.__name__"