Change usage for the Store portion to use GenericEvent (from Symfony) and not the custom BaseEvent