Rewrite EventStream specs