Improve naming to avoid confusion.

And fix the typo.