Updated event names
Linked to system
Merge pull request #29 from johnttan/linkSystem#28

Link system#28