diff --git a/cunit/test_freerdp.c b/cunit/test_freerdp.c
index 1826211c0..ecc5aa81d 100644
--- a/cunit/test_freerdp.c
+++ b/cunit/test_freerdp.c
@@ -21,7 +21,7 @@
 
 #include "test_color.h"
 #include "test_libgdi.h"
-#include "test_network.h"
+#include "test_stream.h"
 #include "test_freerdp.h"
 
 void dump_data(unsigned char * p, int len, int width, char* name)
@@ -62,7 +62,7 @@ int main(int argc, char* argv[])
 	{
 		add_color_suite();
 		add_libgdi_suite();
-		add_network_suite();
+		add_stream_suite();
 	}
 	else
 	{
@@ -76,9 +76,9 @@ int main(int argc, char* argv[])
 			{
 				add_libgdi_suite();
 			}
-			else if (strcmp("network", argv[*pindex]) == 0)
+			else if (strcmp("stream", argv[*pindex]) == 0)
 			{
-				add_network_suite();
+				add_stream_suite();
 			}
 
 			*pindex = *pindex + 1;
diff --git a/cunit/test_stream.c b/cunit/test_stream.c
index b5a2d4c3f..2eaf28555 100644
--- a/cunit/test_stream.c
+++ b/cunit/test_stream.c
@@ -1,6 +1,6 @@
 /**
  * FreeRDP: A Remote Desktop Protocol Client
- * Network Tests
+ * Stream Unit Tests
  *
  * Copyright 2011 Vic Lee
  *
@@ -24,26 +24,28 @@
 #include <freerdp/utils/hexdump.h>
 #include <freerdp/utils/stream.h>
 
-#include "test_network.h"
+#include "test_stream.h"
 
-int init_network_suite(void)
+int init_stream_suite(void)
 {
 	return 0;
 }
 
-int clean_network_suite(void)
+int clean_stream_suite(void)
 {
 	return 0;
 }
 
-int add_network_suite(void)
+int add_stream_suite(void)
 {
-	add_test_suite(network);
+	add_test_suite(stream);
 
-	add_test_function(network_stream);
+	add_test_function(stream);
+
+	return 0;
 }
 
-void test_network_stream(void)
+void test_stream(void)
 {
 	STREAM * stream;
 	int pos;
@@ -60,7 +62,7 @@ void test_network_stream(void)
 	stream_write_uint32(stream, 0x03040506);
 	stream_write_uint64(stream, 0x0708091011121314LL);
 
-	/*freerdp_hexdump(stream->buffer, 15);*/
+	/* freerdp_hexdump(stream->buffer, 15); */
 
 	stream_set_pos(stream, pos);
 	stream_seek(stream, 3);
diff --git a/cunit/test_stream.h b/cunit/test_stream.h
index b1916d19f..32080edb5 100644
--- a/cunit/test_stream.h
+++ b/cunit/test_stream.h
@@ -1,6 +1,6 @@
 /**
  * FreeRDP: A Remote Desktop Protocol Client
- * Network Tests
+ * Stream Unit Tests
  *
  * Copyright 2011 Vic Lee
  *
@@ -19,9 +19,8 @@
 
 #include "test_freerdp.h"
 
-int init_network_suite(void);
-int clean_network_suite(void);
-int add_network_suite(void);
-
-void test_network_stream(void);
+int init_stream_suite(void);
+int clean_stream_suite(void);
+int add_stream_suite(void);
 
+void test_stream(void);
diff --git a/include/freerdp/utils/stream.h b/include/freerdp/utils/stream.h
index 1511d875b..deecdfdf5 100644
--- a/include/freerdp/utils/stream.h
+++ b/include/freerdp/utils/stream.h
@@ -37,10 +37,10 @@ void
 stream_free(STREAM * stream);
 
 void
-stream_increase_capacity(STREAM * stream);
+stream_extend(STREAM * stream);
 #define stream_check_capacity(_s,_n) \
 	while (_s->ptr - _s->buffer + (_n) > _s->capacity) \
-		stream_increase_capacity(_s)
+		stream_extend(_s)
 
 #define stream_get_pos(_s) (_s->ptr - _s->buffer)
 #define stream_set_pos(_s,_m) _s->ptr = _s->buffer + (_m)
diff --git a/libfreerdp-utils/stream.c b/libfreerdp-utils/stream.c
index eda073bdc..3d83cd0d1 100644
--- a/libfreerdp-utils/stream.c
+++ b/libfreerdp-utils/stream.c
@@ -52,7 +52,7 @@ stream_free(STREAM * stream)
 }
 
 void
-stream_increase_capacity(STREAM * stream)
+stream_extend(STREAM * stream)
 {
 	int pos;