Index: boot/generic/include/str.h
===================================================================
--- boot/generic/include/str.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ boot/generic/include/str.h	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -48,7 +48,7 @@
 extern errno_t chr_encode(wchar_t ch, char *str, size_t *offset, size_t sz);
 
-extern size_t str_size(const char *str);
-extern size_t str_lsize(const char *str, size_t max_len);
-extern size_t str_length(const char *str);
+extern size_t str_bytes(const char *str);
+extern size_t str_lbytes(const char *str, size_t max_len);
+extern size_t str_code_points(const char *str);
 
 extern bool ascii_check(wchar_t ch);
Index: boot/generic/src/printf_core.c
===================================================================
--- boot/generic/src/printf_core.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ boot/generic/src/printf_core.c	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -138,7 +138,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);
 }
 
@@ -213,5 +213,5 @@
 
 	/* Print leading spaces. */
-	size_t strw = str_length(str);
+	size_t strw = str_code_points(str);
 	if ((precision == 0) || (precision > strw))
 		precision = strw;
@@ -229,5 +229,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;
Index: boot/generic/src/str.c
===================================================================
--- boot/generic/src/str.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ boot/generic/src/str.c	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -279,5 +279,5 @@
  *
  */
-size_t str_size(const char *str)
+size_t str_bytes(const char *str)
 {
 	size_t size = 0;
@@ -302,5 +302,5 @@
  *
  */
-size_t str_lsize(const char *str, size_t max_len)
+size_t str_lbytes(const char *str, size_t max_len)
 {
 	size_t len = 0;
@@ -324,5 +324,5 @@
  *
  */
-size_t str_length(const char *str)
+size_t str_code_points(const char *str)
 {
 	size_t len = 0;