fix self.__name__ calls to self.__class__.__name__

fix self.__name__ calls to self.__class__.__name__ #90