Index: uspace/lib/c/generic/io/asprintf.c
===================================================================
--- uspace/lib/c/generic/io/asprintf.c	(revision cca2d93bbd7935b85a50e403eb614eb5885365c3)
+++ uspace/lib/c/generic/io/asprintf.c	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -43,13 +43,13 @@
 static int asprintf_str_write(const char *str, size_t count, void *unused)
 {
-	return str_nlength(str, count);
+	return str_ncode_points(str, count);
 }
 
 static int asprintf_wstr_write(const wchar_t *str, size_t count, void *unused)
 {
-	return wstr_nlength(str, count);
+	return wstr_ncode_points(str, count);
 }
 
-int vprintf_length(const char *fmt, va_list args)
+int vprintf_code_points(const char *fmt, va_list args)
 {
 	printf_spec_t ps = {
@@ -62,9 +62,9 @@
 }
 
-int printf_length(const char *fmt, ...)
+int printf_code_points(const char *fmt, ...)
 {
 	va_list args;
 	va_start(args, fmt);
-	int ret = vprintf_length(fmt, args);
+	int ret = vprintf_code_points(fmt, args);
 	va_end(args);
 
Index: uspace/lib/c/generic/io/io.c
===================================================================
--- uspace/lib/c/generic/io/io.c	(revision cca2d93bbd7935b85a50e403eb614eb5885365c3)
+++ uspace/lib/c/generic/io/io.c	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -774,5 +774,5 @@
 int fputs(const char *str, FILE *stream)
 {
-	(void) fwrite(str, str_size(str), 1, stream);
+	(void) fwrite(str, str_bytes(str), 1, stream);
 	if (ferror(stream))
 		return EOF;
Index: uspace/lib/c/generic/io/kio.c
===================================================================
--- uspace/lib/c/generic/io/kio.c	(revision cca2d93bbd7935b85a50e403eb614eb5885365c3)
+++ uspace/lib/c/generic/io/kio.c	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -137,5 +137,5 @@
 	wr = 0;
 	(void) kio_write(str, size, &wr);
-	return str_nlength(str, wr);
+	return str_ncode_points(str, wr);
 }
 
Index: uspace/lib/c/generic/io/log.c
===================================================================
--- uspace/lib/c/generic/io/log.c	(revision cca2d93bbd7935b85a50e403eb614eb5885365c3)
+++ uspace/lib/c/generic/io/log.c	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -89,5 +89,5 @@
 	aid_t reg_msg = async_send_2(exchange, LOGGER_WRITER_MESSAGE,
 	    log, level, NULL);
-	errno_t rc = async_data_write_start(exchange, message, str_size(message));
+	errno_t rc = async_data_write_start(exchange, message, str_bytes(message));
 	errno_t reg_msg_rc;
 	async_wait_for(reg_msg, &reg_msg_rc);
@@ -144,5 +144,5 @@
 	char *end_ptr;
 	int level_int = strtol(name, &end_ptr, 0);
-	if ((end_ptr == name) || (str_length(end_ptr) != 0))
+	if ((end_ptr == name) || (str_code_points(end_ptr) != 0))
 		return EINVAL;
 	if (level_int < 0)
@@ -199,5 +199,5 @@
 	aid_t reg_msg = async_send_1(exchange, LOGGER_WRITER_CREATE_LOG,
 	    parent, &answer);
-	errno_t rc = async_data_write_start(exchange, name, str_size(name));
+	errno_t rc = async_data_write_start(exchange, name, str_bytes(name));
 	errno_t reg_msg_rc;
 	async_wait_for(reg_msg, &reg_msg_rc);
Index: uspace/lib/c/generic/io/logctl.c
===================================================================
--- uspace/lib/c/generic/io/logctl.c	(revision cca2d93bbd7935b85a50e403eb614eb5885365c3)
+++ uspace/lib/c/generic/io/logctl.c	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -110,5 +110,5 @@
 	aid_t reg_msg = async_send_1(exchange, LOGGER_CONTROL_SET_LOG_LEVEL,
 	    new_level, NULL);
-	rc = async_data_write_start(exchange, logname, str_size(logname));
+	rc = async_data_write_start(exchange, logname, str_bytes(logname));
 	errno_t reg_msg_rc;
 	async_wait_for(reg_msg, &reg_msg_rc);
Index: uspace/lib/c/generic/io/printf_core.c
===================================================================
--- uspace/lib/c/generic/io/printf_core.c	(revision cca2d93bbd7935b85a50e403eb614eb5885365c3)
+++ uspace/lib/c/generic/io/printf_core.c	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -204,7 +204,7 @@
 {
 	if (str == NULL)
-		return printf_putnchars(nullstr, str_size(nullstr), ps);
-
-	return ps->str_write((void *) str, str_size(str), ps->data);
+		return printf_putnchars(nullstr, str_bytes(nullstr), ps);
+
+	return ps->str_write((void *) str, str_bytes(str), ps->data);
 }
 
@@ -332,5 +332,5 @@
 		return printf_putstr(nullstr, ps);
 
-	size_t strw = str_length(str);
+	size_t strw = str_code_points(str);
 
 	/* Precision unspecified - print everything. */
@@ -350,5 +350,5 @@
 	/* Part of @a str fitting into the alloted space. */
 	int retval;
-	size_t size = str_lsize(str, precision);
+	size_t size = str_lbytes(str, precision);
 	if ((retval = printf_putnchars(str, size, ps)) < 0)
 		return -counter;
@@ -381,5 +381,5 @@
 		return printf_putstr(nullstr, ps);
 
-	size_t strw = wstr_length(str);
+	size_t strw = wstr_code_points(str);
 
 	/* Precision not specified - print everything. */
@@ -399,5 +399,5 @@
 	/* Part of @a wstr fitting into the alloted space. */
 	int retval;
-	size_t size = wstr_lsize(str, precision);
+	size_t size = wstr_lbytes(str, precision);
 	if ((retval = printf_wputnchars(str, size, ps)) < 0)
 		return -counter;
Index: uspace/lib/c/generic/io/vprintf.c
===================================================================
--- uspace/lib/c/generic/io/vprintf.c	(revision cca2d93bbd7935b85a50e403eb614eb5885365c3)
+++ uspace/lib/c/generic/io/vprintf.c	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -45,5 +45,5 @@
 {
 	size_t wr = fwrite(str, 1, size, (FILE *) stream);
-	return str_nlength(str, wr);
+	return str_ncode_points(str, wr);
 }