Index: kernel/generic/src/proc/program.c
===================================================================
--- kernel/generic/src/proc/program.c	(revision 561db3f87662526e5b14ca49efc6c1229d0a8a2b)
+++ kernel/generic/src/proc/program.c	(revision f049eec2e8912b45680161e172155481212b2b38)
@@ -214,5 +214,5 @@
 		return (unative_t) rc;
 
-	namebuf[name_len] = '\0';
+	namebuf[name_len] = 0;
 
 	/* Spawn the new task. */
Index: kernel/generic/src/proc/task.c
===================================================================
--- kernel/generic/src/proc/task.c	(revision 561db3f87662526e5b14ca49efc6c1229d0a8a2b)
+++ kernel/generic/src/proc/task.c	(revision f049eec2e8912b45680161e172155481212b2b38)
@@ -152,5 +152,5 @@
 
 	memcpy(ta->name, name, TASK_NAME_BUFLEN);
-	ta->name[TASK_NAME_BUFLEN - 1] = '\0';
+	ta->name[TASK_NAME_BUFLEN - 1] = 0;
 
 	atomic_set(&ta->refcount, 0);
@@ -274,6 +274,6 @@
 		return (unative_t) rc;
 
-	namebuf[name_len] = '\0';
-	strncpy(TASK->name, namebuf, TASK_NAME_BUFLEN);
+	namebuf[name_len] = 0;
+	str_ncpy(TASK->name, namebuf, TASK_NAME_BUFLEN);
 
 	return EOK;
Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision 561db3f87662526e5b14ca49efc6c1229d0a8a2b)
+++ kernel/generic/src/proc/thread.c	(revision f049eec2e8912b45680161e172155481212b2b38)
@@ -317,5 +317,5 @@
 	
 	memcpy(t->name, name, THREAD_NAME_BUFLEN);
-	t->name[THREAD_NAME_BUFLEN - 1] = '\0';
+	t->name[THREAD_NAME_BUFLEN - 1] = 0;
 	
 	t->thread_code = func;
@@ -724,5 +724,5 @@
 		return (unative_t) rc;
 
-	namebuf[name_len] = '\0';
+	namebuf[name_len] = 0;
 
 	/*