Deprecate vnds in favour of svnds.

In effect, this removes the "old" vndX nodes, and renames
the svndX nodes to vndX.

Old svndX nodes will still continue to work though, for now.

Cleanup accordingly.

ok deraadt@, todd@
comments and ok on the man page bits from jmc@

22 files changed, 135 insertions, 135 deletions

diff --git a/regress/sys/ffs/tests/chflags/12.t b/regress/sys/ffs/tests/chflags/12.t
index 2316514aa5b..7cb44c1af5a 100644
--- a/regress/sys/ffs/tests/chflags/12.t
+++ b/regress/sys/ffs/tests/chflags/12.t
@@ -8,24 +8,24 @@ n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 create ${n0}/${n1} 0644
 expect 0 chflags ${n0}/${n1} UF_IMMUTABLE
 expect UF_IMMUTABLE stat ${n0}/${n1} flags
 expect 0 chflags ${n0}/${n1} none
 expect none stat ${n0}/${n1} flags
-mount -ur /dev/svnd1c
+mount -ur /dev/vnd1c
 expect EROFS chflags ${n0}/${n1} UF_IMMUTABLE
 expect none stat ${n0}/${n1} flags
-mount -uw /dev/svnd1c
+mount -uw /dev/vnd1c
 expect 0 chflags ${n0}/${n1} UF_IMMUTABLE
 expect UF_IMMUTABLE stat ${n0}/${n1} flags
 expect 0 chflags ${n0}/${n1} none
 expect none stat ${n0}/${n1} flags
 expect 0 unlink ${n0}/${n1}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/chmod/09.t b/regress/sys/ffs/tests/chmod/09.t
index 326e105771a..dad80f74a02 100644
--- a/regress/sys/ffs/tests/chmod/09.t
+++ b/regress/sys/ffs/tests/chmod/09.t
@@ -8,20 +8,20 @@ n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 create ${n0}/${n1} 0644
 expect 0 chmod ${n0}/${n1} 0640
 expect 0640 stat ${n0}/${n1} mode
-mount -ur /dev/svnd1c
+mount -ur /dev/vnd1c
 expect EROFS chmod ${n0}/${n1} 0600
 expect 0640 stat ${n0}/${n1} mode
-mount -uw /dev/svnd1c
+mount -uw /dev/vnd1c
 expect 0 chmod ${n0}/${n1} 0600
 expect 0600 stat ${n0}/${n1} mode
 expect 0 unlink ${n0}/${n1}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/chown/09.t b/regress/sys/ffs/tests/chown/09.t
index 90f5350dfaa..a5e13627ee2 100644
--- a/regress/sys/ffs/tests/chown/09.t
+++ b/regress/sys/ffs/tests/chown/09.t
@@ -8,20 +8,20 @@ n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 create ${n0}/${n1} 0644
 expect 0 chown ${n0}/${n1} 65534 65534
 expect 65534,65534 stat ${n0}/${n1} uid,gid
-mount -ur /dev/svnd1c
+mount -ur /dev/vnd1c
 expect EROFS chown ${n0}/${n1} 65533 65533
 expect 65534,65534 stat ${n0}/${n1} uid,gid
-mount -uw /dev/svnd1c
+mount -uw /dev/vnd1c
 expect 0 chown ${n0}/${n1} 65533 65533
 expect 65533,65533 stat ${n0}/${n1} uid,gid
 expect 0 unlink ${n0}/${n1}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/link/05.t b/regress/sys/ffs/tests/link/05.t
index 63b68b4a604..0273514d2f7 100644
--- a/regress/sys/ffs/tests/link/05.t
+++ b/regress/sys/ffs/tests/link/05.t
@@ -9,9 +9,9 @@ n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs -i 1 /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs -i 1 /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 create ${n0}/${n1} 0644
 i=1
 while :; do
@@ -25,7 +25,7 @@ test_check $i -eq 32767
 
 expect EMLINK link ${n0}/${n1} ${n0}/${n2}
 
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/link/14.t b/regress/sys/ffs/tests/link/14.t
index 95372da657f..cf88728765b 100644
--- a/regress/sys/ffs/tests/link/14.t
+++ b/regress/sys/ffs/tests/link/14.t
@@ -9,16 +9,16 @@ n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 create ${n0}/${n1} 0644
 expect EXDEV link ${n0}/${n1} ${n2}
 expect 0 unlink ${n0}/${n1}
 expect 0 create ${n1} 0644
 expect EXDEV link ${n1} ${n0}/${n2}
 expect 0 unlink ${n1}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/link/15.t b/regress/sys/ffs/tests/link/15.t
index cbe19522dee..cdeb06eb3f9 100644
--- a/regress/sys/ffs/tests/link/15.t
+++ b/regress/sys/ffs/tests/link/15.t
@@ -9,9 +9,9 @@ n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=256 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 create ${n0}/${n1} 0644
 i=0
 while :; do
@@ -22,7 +22,7 @@ while :; do
 	i=`expr $i + 1`
 done
 expect ENOSPC link ${n0}/${n1} ${n0}/${n2}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/link/16.t b/regress/sys/ffs/tests/link/16.t
index 6cfe6de7360..c936fff1708 100644
--- a/regress/sys/ffs/tests/link/16.t
+++ b/regress/sys/ffs/tests/link/16.t
@@ -9,21 +9,21 @@ n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 create ${n0}/${n1} 0644
 
 expect 0 link ${n0}/${n1} ${n0}/${n2}
 expect 0 unlink ${n0}/${n2}
-mount -ur /dev/svnd1c
+mount -ur /dev/vnd1c
 expect EROFS link ${n0}/${n1} ${n0}/${n2}
-mount -uw /dev/svnd1c
+mount -uw /dev/vnd1c
 expect 0 link ${n0}/${n1} ${n0}/${n2}
 expect 0 unlink ${n0}/${n2}
 
 expect 0 unlink ${n0}/${n1}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/mkdir/09.t b/regress/sys/ffs/tests/mkdir/09.t
index 43c13d18532..da4d8d6d0cd 100644
--- a/regress/sys/ffs/tests/mkdir/09.t
+++ b/regress/sys/ffs/tests/mkdir/09.t
@@ -8,17 +8,17 @@ n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 mkdir ${n0}/${n1} 0755
 expect 0 rmdir ${n0}/${n1}
-mount -ur /dev/svnd1c
+mount -ur /dev/vnd1c
 expect EROFS mkdir ${n0}/${n1} 0755
-mount -uw /dev/svnd1c
+mount -uw /dev/vnd1c
 expect 0 mkdir ${n0}/${n1} 0755
 expect 0 rmdir ${n0}/${n1}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/mkdir/11.t b/regress/sys/ffs/tests/mkdir/11.t
index 0eeac313d0b..633308e8aa0 100644
--- a/regress/sys/ffs/tests/mkdir/11.t
+++ b/regress/sys/ffs/tests/mkdir/11.t
@@ -8,9 +8,9 @@ n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=256 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 i=0
 while :; do
 	mkdir ${n0}/${i} >/dev/null 2>&1
@@ -20,7 +20,7 @@ while :; do
 	i=`expr $i + 1`
 done
 expect ENOSPC mkdir ${n0}/${n1} 0755
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/mkfifo/08.t b/regress/sys/ffs/tests/mkfifo/08.t
index 4364fb03153..a692b446145 100644
--- a/regress/sys/ffs/tests/mkfifo/08.t
+++ b/regress/sys/ffs/tests/mkfifo/08.t
@@ -8,17 +8,17 @@ n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 mkfifo ${n0}/${n1} 0644
 expect 0 unlink ${n0}/${n1}
-mount -ur /dev/svnd1c
+mount -ur /dev/vnd1c
 expect EROFS mkfifo ${n0}/${n1} 0644
-#mount -uw /dev/svnd1c
+#mount -uw /dev/vnd1c
 expect 0 mkfifo ${n0}/${n1} 0644
 expect 0 unlink ${n0}/${n1}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/mkfifo/11.t b/regress/sys/ffs/tests/mkfifo/11.t
index 383ee681439..d6341bcf309 100644
--- a/regress/sys/ffs/tests/mkfifo/11.t
+++ b/regress/sys/ffs/tests/mkfifo/11.t
@@ -8,9 +8,9 @@ n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=256 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 i=0
 while :; do
 	mkfifo ${n0}/${i} >/dev/null 2>&1
@@ -20,7 +20,7 @@ while :; do
 	i=`expr $i + 1`
 done
 expect ENOSPC mkfifo ${n0}/${n1} 0644
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/open/14.t b/regress/sys/ffs/tests/open/14.t
index 577d37f6634..a43a04bbe75 100644
--- a/regress/sys/ffs/tests/open/14.t
+++ b/regress/sys/ffs/tests/open/14.t
@@ -8,20 +8,20 @@ n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 create ${n0}/${n1} 0644
 expect 0 open ${n0}/${n1} O_WRONLY
 expect 0 open ${n0}/${n1} O_RDWR
 expect 0 open ${n0}/${n1} O_RDONLY,O_TRUNC
-mount -ur /dev/svnd1c
+mount -ur /dev/vnd1c
 expect EROFS open ${n0}/${n1} O_WRONLY
 expect EROFS open ${n0}/${n1} O_RDWR
 expect EROFS open ${n0}/${n1} O_RDONLY,O_TRUNC
-mount -uw /dev/svnd1c
+mount -uw /dev/vnd1c
 expect 0 unlink ${n0}/${n1}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/open/15.t b/regress/sys/ffs/tests/open/15.t
index 4eae05cb935..a6fe19d21f1 100644
--- a/regress/sys/ffs/tests/open/15.t
+++ b/regress/sys/ffs/tests/open/15.t
@@ -8,15 +8,15 @@ n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 open ${n0}/${n1} O_RDONLY,O_CREAT 0644
 expect 0 unlink ${n0}/${n1}
-mount -ur /dev/svnd1c
+mount -ur /dev/vnd1c
 expect EROFS open ${n0}/${n1} O_RDONLY,O_CREAT 0644
-mount -uw /dev/svnd1c
-umount /dev/svnd1c
-vnconfig -u svnd1
+mount -uw /dev/vnd1c
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/open/19.t b/regress/sys/ffs/tests/open/19.t
index c25a4f4d78e..cbfa47caa4e 100644
--- a/regress/sys/ffs/tests/open/19.t
+++ b/regress/sys/ffs/tests/open/19.t
@@ -8,9 +8,9 @@ n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=256 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 i=0
 while :; do
 	touch ${n0}/${i} >/dev/null 2>&1
@@ -20,7 +20,7 @@ while :; do
 	i=`expr $i + 1`
 done
 expect ENOSPC open ${n0}/${i} O_RDONLY,O_CREAT 0644
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/rename/15.t b/regress/sys/ffs/tests/rename/15.t
index 2bca8bc2c63..b72956f6cda 100644
--- a/regress/sys/ffs/tests/rename/15.t
+++ b/regress/sys/ffs/tests/rename/15.t
@@ -9,9 +9,9 @@ n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 
 expect 0 create ${n0}/${n1} 0644
 expect EXDEV rename ${n0}/${n1} ${n2}
@@ -29,7 +29,7 @@ expect 0 symlink test ${n0}/${n1}
 expect EXDEV rename ${n0}/${n1} ${n2}
 expect 0 unlink ${n0}/${n1}
 
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/rename/16.t b/regress/sys/ffs/tests/rename/16.t
index 41a653bce50..b066287f0a0 100644
--- a/regress/sys/ffs/tests/rename/16.t
+++ b/regress/sys/ffs/tests/rename/16.t
@@ -9,11 +9,11 @@ n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 create ${n0}/${n1} 0644
-mount -ur /dev/svnd1c
+mount -ur /dev/vnd1c
 
 expect EROFS rename ${n0}/${n1} ${n0}/${n2}
 expect EROFS rename ${n0}/${n1} ${n2}
@@ -21,7 +21,7 @@ expect 0 create ${n2} 0644
 expect EROFS rename ${n2} ${n0}/${n2}
 expect 0 unlink ${n2}
 
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/rmdir/13.t b/regress/sys/ffs/tests/rmdir/13.t
index 64c475dae28..57ef8068958 100644
--- a/regress/sys/ffs/tests/rmdir/13.t
+++ b/regress/sys/ffs/tests/rmdir/13.t
@@ -7,11 +7,11 @@ n0=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect EBUSY rmdir ${n0}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/rmdir/14.t b/regress/sys/ffs/tests/rmdir/14.t
index d9d6703965b..fe2a3088bed 100644
--- a/regress/sys/ffs/tests/rmdir/14.t
+++ b/regress/sys/ffs/tests/rmdir/14.t
@@ -8,15 +8,15 @@ n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 mkdir ${n0}/${n1} 0755
-mount -ur /dev/svnd1c
+mount -ur /dev/vnd1c
 expect EROFS rmdir ${n0}/${n1}
-mount -uw /dev/svnd1c
+mount -uw /dev/vnd1c
 expect 0 rmdir ${n0}/${n1}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/symlink/10.t b/regress/sys/ffs/tests/symlink/10.t
index c9230802f5d..f59c7431c9d 100644
--- a/regress/sys/ffs/tests/symlink/10.t
+++ b/regress/sys/ffs/tests/symlink/10.t
@@ -9,19 +9,19 @@ n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 
 expect 0 symlink test ${n0}/${n1}
 expect 0 unlink ${n0}/${n1}
-mount -ur /dev/svnd1c
+mount -ur /dev/vnd1c
 expect EROFS symlink test ${n0}/${n1}
-mount -uw /dev/svnd1c
+mount -uw /dev/vnd1c
 expect 0 symlink test ${n0}/${n1}
 expect 0 unlink ${n0}/${n1}
 
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/symlink/11.t b/regress/sys/ffs/tests/symlink/11.t
index 27c26401f2d..60df9dc02c9 100644
--- a/regress/sys/ffs/tests/symlink/11.t
+++ b/regress/sys/ffs/tests/symlink/11.t
@@ -8,9 +8,9 @@ n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=256 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 
 i=0
 while :; do
@@ -21,7 +21,7 @@ while :; do
 	i=`expr $i + 1`
 done
 expect ENOSPC symlink test ${n0}/${n1}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/truncate/10.t b/regress/sys/ffs/tests/truncate/10.t
index 5479cefde7c..72847ffe022 100644
--- a/regress/sys/ffs/tests/truncate/10.t
+++ b/regress/sys/ffs/tests/truncate/10.t
@@ -8,20 +8,20 @@ n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 create ${n0}/${n1} 0644
 expect 0 truncate ${n0}/${n1} 123
 expect 123 stat ${n0}/${n1} size
-mount -ur /dev/svnd1c
+mount -ur /dev/vnd1c
 expect EROFS truncate ${n0}/${n1} 1234
 expect 123 stat ${n0}/${n1} size
-mount -uw /dev/svnd1c
+mount -uw /dev/vnd1c
 expect 0 truncate ${n0}/${n1} 1234
 expect 1234 stat ${n0}/${n1} size
 expect 0 unlink ${n0}/${n1}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}
diff --git a/regress/sys/ffs/tests/unlink/12.t b/regress/sys/ffs/tests/unlink/12.t
index 60d070352f6..346ec597b28 100644
--- a/regress/sys/ffs/tests/unlink/12.t
+++ b/regress/sys/ffs/tests/unlink/12.t
@@ -8,15 +8,15 @@ n1=`namegen`
  
 expect 0 mkdir ${n0} 0755
 dd if=/dev/zero of=tmpdisk bs=1k count=1024 2>/dev/null
-vnconfig svnd1 tmpdisk
-newfs /dev/rsvnd1c >/dev/null
-mount /dev/svnd1c ${n0}
+vnconfig vnd1 tmpdisk
+newfs /dev/rvnd1c >/dev/null
+mount /dev/vnd1c ${n0}
 expect 0 create ${n0}/${n1} 0644
-mount -ur /dev/svnd1c
+mount -ur /dev/vnd1c
 expect EROFS unlink ${n0}/${n1}
-mount -uw /dev/svnd1c
+mount -uw /dev/vnd1c
 expect 0 unlink ${n0}/${n1}
-umount /dev/svnd1c
-vnconfig -u svnd1
+umount /dev/vnd1c
+vnconfig -u vnd1
 rm tmpdisk
 expect 0 rmdir ${n0}