Index: kernel/generic/src/console/cmd.c
===================================================================
--- kernel/generic/src/console/cmd.c	(revision 18251ccfaefb7cae46d29e4dbefaca399304fcb2)
+++ kernel/generic/src/console/cmd.c	(revision 82bb9c121efbe640882ffd5dbdc9101eb995d0fa)
@@ -520,6 +520,6 @@
 		
 		spinlock_lock(&hlp->lock);
-		if (strlen(hlp->name) > len)
-			len = strlen(hlp->name);
+		if (str_size(hlp->name) > len)
+			len = str_size(hlp->name);
 		spinlock_unlock(&hlp->lock);
 	}
@@ -592,5 +592,5 @@
 		spinlock_lock(&hlp->lock);
 
-		if (strncmp(hlp->name, (const char *) argv->buffer, strlen(hlp->name)) == 0) {
+		if (strncmp(hlp->name, (const char *) argv->buffer, str_size(hlp->name)) == 0) {
 			printf("%s - %s\n", hlp->name, hlp->description);
 			if (hlp->help)
@@ -973,6 +973,6 @@
 	test_t *test;
 	for (test = tests; test->name != NULL; test++) {
-		if (strlen(test->name) > len)
-			len = strlen(test->name);
+		if (str_size(test->name) > len)
+			len = str_size(test->name);
 	}
 	
Index: kernel/generic/src/console/kconsole.c
===================================================================
--- kernel/generic/src/console/kconsole.c	(revision 18251ccfaefb7cae46d29e4dbefaca399304fcb2)
+++ kernel/generic/src/console/kconsole.c	(revision 82bb9c121efbe640882ffd5dbdc9101eb995d0fa)
@@ -138,6 +138,6 @@
 			spinlock_lock(&hlp->lock);
 		}
-		if ((strncmp(hlp->name, cmd->name, max(strlen(cmd->name),
-		    strlen(hlp->name))) == 0)) {
+		if ((strncmp(hlp->name, cmd->name, max(str_size(cmd->name),
+		    str_size(hlp->name))) == 0)) {
 			/* The command is already there. */
 			spinlock_unlock(&hlp->lock);
@@ -173,5 +173,5 @@
 	int i;
 	
-	for (i = strlen(str); i > pos; i--)
+	for (i = str_size(str); i > pos; i--)
 		str[i] = str[i - 1];
 	str[pos] = ch;
@@ -181,5 +181,5 @@
 static const char *cmdtab_search_one(const char *name,link_t **startpos)
 {
-	size_t namelen = strlen(name);
+	size_t namelen = str_size(name);
 	const char *curname;
 
@@ -194,5 +194,5 @@
 
 		curname = hlp->name;
-		if (strlen(curname) < namelen)
+		if (str_size(curname) < namelen)
 			continue;
 		if (strncmp(curname, name, namelen) == 0) {
@@ -223,5 +223,5 @@
 		startpos = startpos->next;
 		if (!found)
-			strncpy(output, foundtxt, strlen(foundtxt) + 1);
+			strncpy(output, foundtxt, str_size(foundtxt) + 1);
 		else {
 			for (i = 0; output[i] && foundtxt[i] &&
@@ -235,5 +235,5 @@
 		return 0;
 
-	if (found > 1 && !strlen(output)) {
+	if (found > 1 && !str_size(output)) {
 		printf("\n");
 		startpos = NULL;
@@ -310,8 +310,8 @@
 				insert_char(current, tmp[i], i + position);
 
-			if (strlen(tmp) || found == 1) { /* If we have a hint */
+			if (str_size(tmp) || found == 1) { /* If we have a hint */
 				for (i = position; i < curlen; i++) 
 					putchar(current[i]);
-				position += strlen(tmp);
+				position += str_size(tmp);
 				/* Add space to end */
 				if (found == 1 && position == curlen &&
@@ -326,5 +326,5 @@
 				for (i = 0; i < curlen; i++)
 					putchar(current[i]);
-				position += strlen(tmp);
+				position += str_size(tmp);
 			}
 			rdln_print_c('\b', curlen - position);
@@ -385,5 +385,5 @@
 				current = history[histposition];
 				printf("%s", current);
-				curlen = strlen(current);
+				curlen = str_size(current);
 				position = curlen;
 				continue;
@@ -444,5 +444,5 @@
 	while (true) {
 		cmdline = clever_readline((char *) prompt, stdin);
-		len = strlen(cmdline);
+		len = str_size(cmdline);
 		if (!len)
 			continue;
@@ -545,5 +545,5 @@
 		spinlock_lock(&hlp->lock);
 		
-		if (strncmp(hlp->name, &cmdline[start], max(strlen(hlp->name),
+		if (strncmp(hlp->name, &cmdline[start], max(str_size(hlp->name),
 		    end - start + 1)) == 0) {
 			cmd = hlp;