Fixed remaing instances of "EventStore" strings