Fixed issues with the event bus. Renamed a few classes.