Patched the Stream class naming.