Refactoring event classes in project bundle to remove Project prefix