Rename methods and change comments.