Improve naming to avoid confusion.

And fix the typo.
Merge pull request #3 from alevinval/develop

Merge pull request #2 from alevinval/master
Improved event register