Index: uspace/app/bdsh/cmds/modules/ls/ls.c
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 095003a87225b672e2979a6de2d669667aa1d735)
+++ uspace/app/bdsh/cmds/modules/ls/ls.c	(revision c822026c1caa1849e2dc6fdf00e865eb4b1ff15c)
@@ -183,5 +183,5 @@
 		getcwd(buff, PATH_MAX);
 	else
-		str_ncpy(buff, argv[1], PATH_MAX);
+		str_cpy(buff, PATH_MAX, argv[1]);
 
 	scope = ls_scope(buff);
Index: uspace/app/tetris/scores.c
===================================================================
--- uspace/app/tetris/scores.c	(revision 095003a87225b672e2979a6de2d669667aa1d735)
+++ uspace/app/tetris/scores.c	(revision c822026c1caa1849e2dc6fdf00e865eb4b1ff15c)
@@ -118,5 +118,6 @@
 static void copyhiscore(int dest, int src)
 {
-	strcpy(scores[dest].hs_name, scores[src].hs_name);
+	str_cpy(scores[dest].hs_name, STR_BOUNDS(MAXLOGNAME) + 1,
+	    scores[src].hs_name);
 	scores[dest].hs_score = scores[src].hs_score; 	
 	scores[dest].hs_level = scores[src].hs_level; 
@@ -132,5 +133,6 @@
 	moveto(10 , 10);
 	puts("Insert your name: ");
-	str_ncpy(scores[NUMSPOTS - 1].hs_name, "Player", MAXLOGNAME);
+	str_cpy(scores[NUMSPOTS - 1].hs_name, STR_BOUNDS(MAXLOGNAME) + 1,
+	    "Player");
 	i = 6; off = 6;
 
@@ -196,5 +198,5 @@
 	int i;
 	for(i = 0; i < NUMSPOTS; i++) {
-		str_ncpy(scores[i].hs_name, "HelenOS Team", MAXLOGNAME);
+		str_cpy(scores[i].hs_name, STR_BOUNDS(MAXLOGNAME) + 1, "HelenOS Team");
 		scores[i].hs_score = (NUMSPOTS - i) * 200;	
 		scores[i].hs_level = (i + 1 > MAXLEVEL?MAXLEVEL:i + 1);
Index: uspace/app/tetris/tetris.c
===================================================================
--- uspace/app/tetris/tetris.c	(revision 095003a87225b672e2979a6de2d669667aa1d735)
+++ uspace/app/tetris/tetris.c	(revision c822026c1caa1849e2dc6fdf00e865eb4b1ff15c)
@@ -312,5 +312,5 @@
 		}
 		if (keys[i] == ' ')
-			str_ncpy(key_write[i], "<space>", sizeof key_write[i]);
+			str_cpy(key_write[i], sizeof key_write[i], "<space>");
 		else {
 			key_write[i][0] = keys[i];