Update comments.
Rename methods.