Renamed events/Manager to events/EventManager and the corresponding component in the same way