Changed semantics for event bus terminal and clusters