Fix var namings.

* Fix comments.