renaming StreamEvent-> Event and InnerStreamEvent->StreamEvent