Index: kernel/genarch/src/multiboot/multiboot.c
===================================================================
--- kernel/genarch/src/multiboot/multiboot.c	(revision 67bcd81c93cb3e140875fa93fd665f0383799e7c)
+++ kernel/genarch/src/multiboot/multiboot.c	(revision 1d2f85e056d4e6e3a0f3c692edee43e8b87c64b8)
@@ -51,5 +51,5 @@
 	const char *end = str_chr(cmd_line, ' ');
 	if (end == NULL)
-		end = cmd_line + str_size(cmd_line);
+		end = cmd_line + str_bytes(cmd_line);
 
 	/*
@@ -88,5 +88,5 @@
 	}
 
-	const char *end = cmd_line + str_size(cmd_line);
+	const char *end = cmd_line + str_bytes(cmd_line);
 
 	/* Skip the space(s). */
Index: kernel/genarch/src/ofw/ofw_tree.c
===================================================================
--- kernel/genarch/src/ofw/ofw_tree.c	(revision 67bcd81c93cb3e140875fa93fd665f0383799e7c)
+++ kernel/genarch/src/ofw/ofw_tree.c	(revision 1d2f85e056d4e6e3a0f3c692edee43e8b87c64b8)
@@ -250,7 +250,7 @@
 	size_t j;
 
-	for (size_t i = 1; (i < str_size(path)) && (node); i = j + 1) {
+	for (size_t i = 1; (i < str_bytes(path)) && (node); i = j + 1) {
 		j = i;
-		while (j < str_size(path) && path[j] != '/')
+		while (j < str_bytes(path) && path[j] != '/')
 			j++;
 
@@ -342,5 +342,5 @@
 	*size = 0;
 	for (size_t i = 0; i < node->properties; i++)
-		*size += str_size(node->property[i].name) + 1 +
+		*size += str_bytes(node->property[i].name) + 1 +
 		    sizeof(node->property[i].size) + node->property[i].size;
 
@@ -359,5 +359,5 @@
 		/* Property name */
 		str_cpy(dump + pos, *size - pos, node->property[i].name);
-		pos += str_size(node->property[i].name) + 1;
+		pos += str_bytes(node->property[i].name) + 1;
 
 		/* Value size */
@@ -393,5 +393,5 @@
 		if ((cur->parent) && (path))
 			snprintf(cur_path, PATH_MAX_LEN, "%s.%s", path, cur->da_name);
-		else if (!str_size(cur->da_name))
+		else if (!str_bytes(cur->da_name))
 			snprintf(cur_path, PATH_MAX_LEN, "firmware.ofw");
 		else