Renaming to EventBundle