Finish rename, and correct comments.