Prefix event handling functions
Merge pull request #1 from mrmark/eventFuncFix

Prefix event handling functions