Refactored all ```handleFoo``` to ```onFoo```

based on feedback from @jari