Updated toString() name throughout