Index: kernel/generic/src/main/kinit.c
===================================================================
--- kernel/generic/src/main/kinit.c	(revision 9be1d58c0982bff8d79f4b3723dbfa968d1053a6)
+++ kernel/generic/src/main/kinit.c	(revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce)
@@ -187,10 +187,10 @@
 		
 		name = init.tasks[i].name;
-		if (name[0] == '\0')
+		if (name[0] == 0)
 			name = "<unknown>";
 		
 		ASSERT(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN);
-		strncpy(namebuf, INIT_PREFIX, TASK_NAME_BUFLEN);
-		strncpy(namebuf + INIT_PREFIX_LEN, name,
+		str_ncpy(namebuf, INIT_PREFIX, TASK_NAME_BUFLEN);
+		str_ncpy(namebuf + INIT_PREFIX_LEN, name,
 		    TASK_NAME_BUFLEN - INIT_PREFIX_LEN);
 		
Index: kernel/generic/src/proc/program.c
===================================================================
--- kernel/generic/src/proc/program.c	(revision 9be1d58c0982bff8d79f4b3723dbfa968d1053a6)
+++ kernel/generic/src/proc/program.c	(revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce)
@@ -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 9be1d58c0982bff8d79f4b3723dbfa968d1053a6)
+++ kernel/generic/src/proc/task.c	(revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce)
@@ -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 9be1d58c0982bff8d79f4b3723dbfa968d1053a6)
+++ kernel/generic/src/proc/thread.c	(revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce)
@@ -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;
 
 	/*
Index: kernel/generic/src/synch/spinlock.c
===================================================================
--- kernel/generic/src/synch/spinlock.c	(revision 9be1d58c0982bff8d79f4b3723dbfa968d1053a6)
+++ kernel/generic/src/synch/spinlock.c	(revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce)
@@ -33,7 +33,7 @@
 /**
  * @file
- * @brief	Spinlocks.
+ * @brief Spinlocks.
  */
- 
+
 #include <synch/spinlock.h>
 #include <atomic.h>