Renamed client -> eventbus