Rename methods and edit docstrings