John, Soham | refactorings
John, Soham | BSHR-151 | Renamed base event classes.