PIM-3151: Rename EventListener by EventSubscriber