Rename some internal methods.

Fix comments.