diff -r 99a34860c105 -r d938228c382e src/server/test/writer.c
--- a/src/server/test/writer.c	Wed Nov 02 19:19:01 2022 +0100
+++ b/src/server/test/writer.c	Sun Nov 06 15:53:32 2022 +0100
@@ -31,7 +31,7 @@
 
 #include "../util/writer.h"
 
-#include <ucx/buffer.h>
+#include <cx/buffer.h>
 
 #include "writer.h"
 #include "testutils.h"
@@ -39,7 +39,7 @@
 UCX_TEST(test_writer_putc) {
     Session *sn = testutil_session();
     TestIOStream *st = testutil_iostream(2048, TRUE);
-    UcxBuffer *buf = st->buf;
+    CxBuffer *buf = st->buf;
     
     UCX_TEST_BEGIN;
     
@@ -76,7 +76,7 @@
 UCX_TEST(test_writer_flush) {
     Session *sn = testutil_session();
     TestIOStream *st = testutil_iostream(2048, TRUE);
-    UcxBuffer *buf = st->buf;
+    CxBuffer *buf = st->buf;
     
     UCX_TEST_BEGIN;
     
@@ -106,7 +106,7 @@
 UCX_TEST(test_writer_put) {
     Session *sn = testutil_session();
     TestIOStream *st = testutil_iostream(2048, TRUE);
-    UcxBuffer *buf = st->buf;
+    CxBuffer *buf = st->buf;
     
     UCX_TEST_BEGIN;
     
@@ -135,7 +135,7 @@
     UCX_TEST_ASSERT(!memcmp(buf->space, "abcdefgh12345678", 16), "4: wrong UcxBuffer content");
     UCX_TEST_ASSERT(buf->pos == 16, "4: wrong UcxBuffer pos");
     
-    writer_puts(out, S("345678abcdefgh12345678end."));
+    writer_puts(out, cx_str("345678abcdefgh12345678end."));
     UCX_TEST_ASSERT(!memcmp(wbuf, "end.", 4), "5: wrong content");
     UCX_TEST_ASSERT(writer.pos == 4, "5: wrong pos");
     UCX_TEST_ASSERT(!memcmp(