diff -r c80c910fe191 -r abae4669fba7 test/main.c
--- a/test/main.c	Wed Oct 10 09:34:13 2012 +0200
+++ b/test/main.c	Wed Oct 10 09:54:57 2012 +0200
@@ -39,7 +39,7 @@
 #include "string_tests.h"
 #include "mpool_tests.h"
 #include "map_tests.h"
-#include "memstream_tests.h"
+#include "buffer_tests.h"
 
 int cmp_string(void* o1, void* o2, void* data) {
     return strcmp((char*)o1, (char*)o2);
@@ -164,11 +164,11 @@
         ucx_test_register(suite, test_sstrsplit);
 
         /* UcxMemstream Tests */
-        ucx_test_register(suite, test_ucx_memseektell);
-        ucx_test_register(suite, test_ucx_memputc);
-        ucx_test_register(suite, test_ucx_memgetc);
-        ucx_test_register(suite, test_ucx_memwrite);
-        ucx_test_register(suite, test_ucx_memread);
+        ucx_test_register(suite, test_ucx_buffer_seektell);
+        ucx_test_register(suite, test_ucx_buffer_putc);
+        ucx_test_register(suite, test_ucx_buffer_getc);
+        ucx_test_register(suite, test_ucx_buffer_write);
+        ucx_test_register(suite, test_ucx_buffer_read);
 
         ucx_test_run(suite, stdout);
         fflush(stdout);