diff --git a/kern/drivers/dev/pipe.c b/kern/drivers/dev/pipe.c
index b2e24cf..9ec4133 100644
--- a/kern/drivers/dev/pipe.c
+++ b/kern/drivers/dev/pipe.c
@@ -505,7 +505,7 @@
 			error(ENAMETOOLONG, ERROR_FIXME);
 		if (strncmp(p->pipedir[1 + !d1].name, d->name, KNAMELEN) == 0)
 			error(EEXIST, ERROR_FIXME);
-		strncpy(p->pipedir[1 + d1].name, d->name, KNAMELEN);
+		strlcpy(p->pipedir[1 + d1].name, d->name, KNAMELEN);
 	}
 	if (d->mode != -1)
 		p->pipedir[d1 + 1].perm = d->mode & 0777;
diff --git a/kern/drivers/dev/root.c b/kern/drivers/dev/root.c
index 33275ca..4ed019a 100644
--- a/kern/drivers/dev/root.c
+++ b/kern/drivers/dev/root.c
@@ -204,7 +204,7 @@
 static int createentry(int dir, char *name, int omode, int perm)
 {
 	int n = newentry(dir);
-	strncpy(roottab[n].name, name, sizeof(roottab[n].name));
+	strlcpy(roottab[n].name, name, sizeof(roottab[n].name));
 	roottab[n].length = 0;
 	roottab[n].perm = perm;
 	/* vers is already properly set. */
diff --git a/kern/drivers/dev/vars.c b/kern/drivers/dev/vars.c
index 50fc022..f056f2b 100644
--- a/kern/drivers/dev/vars.c
+++ b/kern/drivers/dev/vars.c
@@ -234,7 +234,7 @@
 		new_slot = vars_dir + nr_vars;
 		nr_vars *= 2;
 	}
-	strncpy(new_slot->name, name, sizeof(new_slot->name));
+	strlcpy(new_slot->name, name, sizeof(new_slot->name));
 	new_slot->qid.path = addr;
 	new_slot->qid.vers = 0;
 	new_slot->qid.type = QTFILE;