Index: kernel/generic/src/console/cmd.c
===================================================================
--- kernel/generic/src/console/cmd.c	(revision 68ad9d21c9a8c1b99c34e758c6badfa6794d9366)
+++ kernel/generic/src/console/cmd.c	(revision 20cc877e8ab92a02db7644615a123734ecd2639f)
@@ -514,5 +514,5 @@
 	
 	link_t *cur;
-	size_t len = 0;
+	count_t len = 0;
 	for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
 		cmd_info_t *hlp;
@@ -520,6 +520,6 @@
 		
 		spinlock_lock(&hlp->lock);
-		if (str_size(hlp->name) > len)
-			len = str_size(hlp->name);
+		if (str_length(hlp->name) > len)
+			len = str_length(hlp->name);
 		spinlock_unlock(&hlp->lock);
 	}
@@ -583,5 +583,5 @@
 {
 	link_t *cur;
-
+	
 	spinlock_lock(&cmd_lock);
 	
@@ -591,6 +591,6 @@
 		hlp = list_get_instance(cur, cmd_info_t, link);
 		spinlock_lock(&hlp->lock);
-
-		if (strncmp(hlp->name, (const char *) argv->buffer, str_size(hlp->name)) == 0) {
+		
+		if (str_lcmp(hlp->name, (const char *) argv->buffer, str_length(hlp->name)) == 0) {
 			printf("%s - %s\n", hlp->name, hlp->description);
 			if (hlp->help)
@@ -599,10 +599,10 @@
 			break;
 		}
-
+		
 		spinlock_unlock(&hlp->lock);
 	}
 	
 	spinlock_unlock(&cmd_lock);	
-
+	
 	return 1;
 }
@@ -970,9 +970,9 @@
 int cmd_tests(cmd_arg_t *argv)
 {
-	size_t len = 0;
+	count_t len = 0;
 	test_t *test;
 	for (test = tests; test->name != NULL; test++) {
-		if (str_size(test->name) > len)
-			len = str_size(test->name);
+		if (str_length(test->name) > len)
+			len = str_length(test->name);
 	}
 	
@@ -1097,5 +1097,5 @@
 	test_t *test;
 	
-	if (strcmp((char *) argv->buffer, "*") == 0) {
+	if (str_cmp((char *) argv->buffer, "*") == 0) {
 		for (test = tests; test->name != NULL; test++) {
 			if (test->safe) {
@@ -1109,5 +1109,5 @@
 		
 		for (test = tests; test->name != NULL; test++) {
-			if (strcmp(test->name, (char *) argv->buffer) == 0) {
+			if (str_cmp(test->name, (char *) argv->buffer) == 0) {
 				fnd = true;
 				run_test(test);
@@ -1137,5 +1137,5 @@
 	
 	for (test = tests; test->name != NULL; test++) {
-		if (strcmp(test->name, (char *) argv->buffer) == 0) {
+		if (str_cmp(test->name, (char *) argv->buffer) == 0) {
 			fnd = true;
 			
