diff --git a/TODO.txt b/TODO.txt
index ce5bb62..1383972 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -13,11 +13,14 @@ Milestone: v0.3.0
 
 [~] Stream API
     [~] Implementation
-    [ ] Convert all HTTP code and JSON code
+    [ ] Convert all code that deals with I/O
     [ ] Multi-output (proof of concept)
+    [ ] Memory streams (proof of concept)
     [ ] TLS
     [ ] SOCKS
     [x] Move/convert UtilStreamCopy()
+    [ ] Io man page
+    [ ] Stream man page
 [~] HTTP Client API
     [x] Document HttpParseHeaders()
     [ ] HttpClient man page
diff --git a/src/HttpServer.c b/src/HttpServer.c
index 4d95a94..9660dcf 100644
--- a/src/HttpServer.c
+++ b/src/HttpServer.c
@@ -230,7 +230,7 @@ HttpResponseStatus(HttpServerContext * c, HttpStatus status)
 }
 
 FILE *
-HttpStream(HttpServerContext * c)
+HttpServerStream(HttpServerContext * c)
 {
     if (!c)
     {
diff --git a/src/Matrix.c b/src/Matrix.c
index 882d684..9733add 100644
--- a/src/Matrix.c
+++ b/src/Matrix.c
@@ -128,7 +128,7 @@ MatrixHttpHandler(HttpServerContext * context, void *argp)
         HttpResponseHeader(context, "Content-Type", "application/json");
         HttpSendHeaders(context);
 
-        stream = HttpStream(context);
+        stream = HttpServerStream(context);
 
         JsonEncode(response, stream, JSON_DEFAULT);
         JsonFree(response);
diff --git a/src/Routes/RouteLogin.c b/src/Routes/RouteLogin.c
index 5351c39..0cc8fd6 100644
--- a/src/Routes/RouteLogin.c
+++ b/src/Routes/RouteLogin.c
@@ -74,7 +74,7 @@ ROUTE_IMPL(RouteLogin, args)
             HashMapSet(response, "flows", JsonValueArray(enabledFlows));
             break;
         case HTTP_POST:
-            request = JsonDecode(HttpStream(args->context));
+            request = JsonDecode(HttpServerStream(args->context));
             if (!request)
             {
                 HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
diff --git a/src/Routes/RouteRefresh.c b/src/Routes/RouteRefresh.c
index a6af79a..3bf960a 100644
--- a/src/Routes/RouteRefresh.c
+++ b/src/Routes/RouteRefresh.c
@@ -63,7 +63,7 @@ ROUTE_IMPL(RouteRefresh, args)
         return MatrixErrorCreate(M_UNRECOGNIZED);
     }
 
-    request = JsonDecode(HttpStream(args->context));
+    request = JsonDecode(HttpServerStream(args->context));
     if (!request)
     {
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
diff --git a/src/Routes/RouteRegister.c b/src/Routes/RouteRegister.c
index 82a4c53..6e55869 100644
--- a/src/Routes/RouteRegister.c
+++ b/src/Routes/RouteRegister.c
@@ -81,7 +81,7 @@ ROUTE_IMPL(RouteRegister, args)
             return MatrixErrorCreate(M_UNRECOGNIZED);
         }
 
-        request = JsonDecode(HttpStream(args->context));
+        request = JsonDecode(HttpServerStream(args->context));
         if (!request)
         {
             HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
diff --git a/src/Routes/RouteStatic.c b/src/Routes/RouteStatic.c
index 7c55fbb..82716c3 100644
--- a/src/Routes/RouteStatic.c
+++ b/src/Routes/RouteStatic.c
@@ -27,7 +27,7 @@
 
 ROUTE_IMPL(RouteStatic, args)
 {
-    FILE *stream = HttpStream(args->context);
+    FILE *stream = HttpServerStream(args->context);
     char *pathPart = MATRIX_PATH_POP(args->path);
 
     HttpResponseHeader(args->context, "Content-Type", "text/html");
diff --git a/src/Routes/RouteTokenValid.c b/src/Routes/RouteTokenValid.c
index fe0f553..62cc409 100644
--- a/src/Routes/RouteTokenValid.c
+++ b/src/Routes/RouteTokenValid.c
@@ -46,7 +46,7 @@ ROUTE_IMPL(RouteTokenValid, args)
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
         return MatrixErrorCreate(M_UNRECOGNIZED);
     }
-    request = JsonDecode(HttpStream(args->context));
+    request = JsonDecode(HttpServerStream(args->context));
     if (!request)
     {
         HttpResponseStatus(args->context, HTTP_BAD_REQUEST);
diff --git a/src/include/HttpServer.h b/src/include/HttpServer.h
index 45ff82d..2ea382d 100644
--- a/src/include/HttpServer.h
+++ b/src/include/HttpServer.h
@@ -69,7 +69,7 @@ extern void
  HttpResponseStatus(HttpServerContext *, HttpStatus);
 
 extern FILE *
- HttpStream(HttpServerContext *);
+ HttpServerStream(HttpServerContext *);
 
 extern void
  HttpSendHeaders(HttpServerContext *);
diff --git a/tools/src/http-debug-server.c b/tools/src/http-debug-server.c
index d67f602..550f8d0 100644
--- a/tools/src/http-debug-server.c
+++ b/tools/src/http-debug-server.c
@@ -59,14 +59,14 @@ HttpHandle(HttpServerContext * cx, void *args)
 
     printf("\n");
 
-    bytes = UtilStreamCopy(HttpStream(cx), stdout);
+    bytes = UtilStreamCopy(HttpServerStream(cx), stdout);
 
     printf("\n");
     printf("(%lu bytes)\n", bytes);
 
     HttpSendHeaders(cx);
 
-    fprintf(HttpStream(cx), "{}\n");
+    fprintf(HttpServerStream(cx), "{}\n");
 }
 
 int