Renaming all events, to add some naming consistency
Merge branch 'lc-rename-events'