diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 04a0a1c00489..7ddfbc000775 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.62 1998/03/18 20:52:28 dg Exp $
+ *	$Id: cy.c,v 1.63 1998/06/07 17:10:16 dfr Exp $
  */
 
 #include "opt_compat.h"
@@ -597,27 +597,27 @@ cyattach_common(cy_iobase, cy_align)
 #ifdef DEVFS
 	com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
 		unit, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyc%n%n", adapter,
+		UID_ROOT, GID_WHEEL, 0600, "ttyc%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_INIT_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyic%n%n", adapter,
+		UID_ROOT, GID_WHEEL, 0600, "ttyic%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_LOCK_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttylc%n%n", adapter,
+		UID_ROOT, GID_WHEEL, 0600, "ttylc%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuac%n%n", adapter,
+		UID_UUCP, GID_DIALER, 0660, "cuac%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuaic%n%n", adapter,
+		UID_UUCP, GID_DIALER, 0660, "cuaic%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cualc%n%n", adapter,
+		UID_UUCP, GID_DIALER, 0660, "cualc%r%r", adapter,
 		unit % CY_MAX_PORTS);
 #endif
 		}
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 04a0a1c00489..7ddfbc000775 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.62 1998/03/18 20:52:28 dg Exp $
+ *	$Id: cy.c,v 1.63 1998/06/07 17:10:16 dfr Exp $
  */
 
 #include "opt_compat.h"
@@ -597,27 +597,27 @@ cyattach_common(cy_iobase, cy_align)
 #ifdef DEVFS
 	com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
 		unit, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyc%n%n", adapter,
+		UID_ROOT, GID_WHEEL, 0600, "ttyc%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_INIT_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyic%n%n", adapter,
+		UID_ROOT, GID_WHEEL, 0600, "ttyic%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_LOCK_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttylc%n%n", adapter,
+		UID_ROOT, GID_WHEEL, 0600, "ttylc%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuac%n%n", adapter,
+		UID_UUCP, GID_DIALER, 0660, "cuac%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuaic%n%n", adapter,
+		UID_UUCP, GID_DIALER, 0660, "cuaic%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cualc%n%n", adapter,
+		UID_UUCP, GID_DIALER, 0660, "cualc%r%r", adapter,
 		unit % CY_MAX_PORTS);
 #endif
 		}
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index 1c6e526fe60e..e26c46c9482e 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -1166,10 +1166,10 @@ rp_pciattach(pcici_t tag, int unit)
 			rp_table(line) = rp;
 /*			devfs_add_devswf(&rp_cdevsw,
 				port, DV_CHR, UID_ROOT, GID_WHEEL, 0600,
-				"ttyR%n", port);
+				"ttyR%r", port);
 			devfs_add_devswf(&rp_cdevsw,
 				port | CONTROL_INIT_STATE, DV_CHR, UID_ROOT,
-				GID_WHEEL, 0600, "ttyRi%n", port);
+				GID_WHEEL, 0600, "ttyRi%r", port);
 */
 		}
 	}
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 12b149a9f59c..5a7c340cab8c 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.207 1998/06/16 11:05:59 bde Exp $
+ *	$Id: sio.c,v 1.208 1998/06/24 09:23:32 phk Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1085,22 +1085,22 @@ determined_type: ;
 #ifdef DEVFS
 	com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
 		unit, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyd%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyd%r", unit);
 	com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_INIT_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyid%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyid%r", unit);
 	com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_LOCK_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyld%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyld%r", unit);
 	com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuaa%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuaa%r", unit);
 	com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuaia%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuaia%r", unit);
 	com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuala%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuala%r", unit);
 #endif
 	com->id_flags = isdp->id_flags; /* Heritate id_flags for later */
 	return (1);
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 7b6a36c5547d..4c0c43d6dc08 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.265 1998/07/06 06:29:07 imp Exp $
+ *  $Id: syscons.c,v 1.266 1998/07/14 11:42:05 bde Exp $
  */
 
 #include "sc.h"
@@ -812,7 +812,7 @@ scattach(struct isa_device *dev)
 #ifdef DEVFS
     for (vc = 0; vc < MAXCONS; vc++)
         sc_devfs_token[vc] = devfs_add_devswf(&scdevsw, vc, DV_CHR,
-				UID_ROOT, GID_WHEEL, 0600, "ttyv%n", vc);
+				UID_ROOT, GID_WHEEL, 0600, "ttyv%r", vc);
     sc_vga_devfs_token = devfs_link(sc_devfs_token[0], "vga");
     sc_mouse_devfs_token = devfs_add_devswf(&scdevsw, SC_MOUSE, DV_CHR,
 				UID_ROOT, GID_WHEEL, 0600, "sysmouse");
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 04a0a1c00489..7ddfbc000775 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.62 1998/03/18 20:52:28 dg Exp $
+ *	$Id: cy.c,v 1.63 1998/06/07 17:10:16 dfr Exp $
  */
 
 #include "opt_compat.h"
@@ -597,27 +597,27 @@ cyattach_common(cy_iobase, cy_align)
 #ifdef DEVFS
 	com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
 		unit, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyc%n%n", adapter,
+		UID_ROOT, GID_WHEEL, 0600, "ttyc%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_INIT_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyic%n%n", adapter,
+		UID_ROOT, GID_WHEEL, 0600, "ttyic%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_LOCK_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttylc%n%n", adapter,
+		UID_ROOT, GID_WHEEL, 0600, "ttylc%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuac%n%n", adapter,
+		UID_UUCP, GID_DIALER, 0660, "cuac%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuaic%n%n", adapter,
+		UID_UUCP, GID_DIALER, 0660, "cuaic%r%r", adapter,
 		unit % CY_MAX_PORTS);
 	com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cualc%n%n", adapter,
+		UID_UUCP, GID_DIALER, 0660, "cualc%r%r", adapter,
 		unit % CY_MAX_PORTS);
 #endif
 		}
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index 5faca4819dd6..097af1da6e18 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -363,7 +363,7 @@ pcattach(struct isa_device *dev)
 	for(vt = 0; vt < MAXCONS; vt++) {
           pcvt_devfs_token[vt] = 
 		devfs_add_devswf(&pcdevsw, vt,
-                                 DV_CHR, 0, 0, 0600, "ttyv%n", vt );
+                                 DV_CHR, 0, 0, 0600, "ttyv%r", vt );
 	}
 #endif DEVFS
 #endif /* PCVT_FREEBSD > 205 */
diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c
index 1c6e526fe60e..e26c46c9482e 100644
--- a/sys/i386/isa/rp.c
+++ b/sys/i386/isa/rp.c
@@ -1166,10 +1166,10 @@ rp_pciattach(pcici_t tag, int unit)
 			rp_table(line) = rp;
 /*			devfs_add_devswf(&rp_cdevsw,
 				port, DV_CHR, UID_ROOT, GID_WHEEL, 0600,
-				"ttyR%n", port);
+				"ttyR%r", port);
 			devfs_add_devswf(&rp_cdevsw,
 				port | CONTROL_INIT_STATE, DV_CHR, UID_ROOT,
-				GID_WHEEL, 0600, "ttyRi%n", port);
+				GID_WHEEL, 0600, "ttyRi%r", port);
 */
 		}
 	}
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index 12b149a9f59c..5a7c340cab8c 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.207 1998/06/16 11:05:59 bde Exp $
+ *	$Id: sio.c,v 1.208 1998/06/24 09:23:32 phk Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1085,22 +1085,22 @@ determined_type: ;
 #ifdef DEVFS
 	com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
 		unit, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyd%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyd%r", unit);
 	com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_INIT_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyid%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyid%r", unit);
 	com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_LOCK_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyld%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyld%r", unit);
 	com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuaa%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuaa%r", unit);
 	com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuaia%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuaia%r", unit);
 	com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuala%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuala%r", unit);
 #endif
 	com->id_flags = isdp->id_flags; /* Heritate id_flags for later */
 	return (1);
diff --git a/sys/i386/isa/snd/sound.c b/sys/i386/isa/snd/sound.c
index dc08ca8d355b..9d5cb0f1297c 100644
--- a/sys/i386/isa/snd/sound.c
+++ b/sys/i386/isa/snd/sound.c
@@ -235,32 +235,32 @@ pcmattach(struct isa_device * dev)
      * Attempts by later devices to make these links will fail.
      */
     cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_DSP,
-	DV_CHR, UID_SND, GID_SND, PERM_SND, "dsp%n", dev->id_unit);
+	DV_CHR, UID_SND, GID_SND, PERM_SND, "dsp%r", dev->id_unit);
     if (cookie) devfs_link(cookie, "dsp");
 
     cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_DSP16,
-	DV_CHR, UID_SND, GID_SND, PERM_SND, "dspW%n", dev->id_unit);
+	DV_CHR, UID_SND, GID_SND, PERM_SND, "dspW%r", dev->id_unit);
     if (cookie) devfs_link(cookie, "dspW");
 
     cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_AUDIO,
-	DV_CHR, UID_SND, GID_SND, PERM_SND, "audio%n", dev->id_unit);
+	DV_CHR, UID_SND, GID_SND, PERM_SND, "audio%r", dev->id_unit);
     if (cookie) devfs_link(cookie, "audio");
 
     cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_CTL,
-	DV_CHR, UID_SND, GID_SND, PERM_SND, "mixer%n", dev->id_unit);
+	DV_CHR, UID_SND, GID_SND, PERM_SND, "mixer%r", dev->id_unit);
     if (cookie) devfs_link(cookie, "mixer");
 
     cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_STATUS,
-	DV_CHR, UID_SND, GID_SND, PERM_SND, "sndstat%n", dev->id_unit);
+	DV_CHR, UID_SND, GID_SND, PERM_SND, "sndstat%r", dev->id_unit);
     if (cookie) devfs_link(cookie, "sndstat");
 
 #if 0 /* these two are still unsupported... */
     cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_MIDIN,
-	DV_CHR, UID_SND, GID_SND, PERM_SND, "midi%n", dev->id_unit);
+	DV_CHR, UID_SND, GID_SND, PERM_SND, "midi%r", dev->id_unit);
     if (cookie) devfs_link(cookie, "midi");
 
     cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_SYNTH,
-	DV_CHR, UID_SND, GID_SND, PERM_SND, "sequencer%n", dev->id_unit);
+	DV_CHR, UID_SND, GID_SND, PERM_SND, "sequencer%r", dev->id_unit);
     if (cookie) devfs_link(cookie, "sequencer");
 #endif
 #endif /* DEVFS */
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index c1ffa7d08a09..4661c6b11304 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -462,35 +462,35 @@ sndattach(struct isa_device * dev)
     if (dev->id_driver == &opldriver){
 	tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_SEQ,
 			 DV_CHR, UID_SND, GID_SND, PERM_SND,
-			 "sequencer%n", dev->id_unit);
+			 "sequencer%r", dev->id_unit);
 	if (tmp) devfs_link(tmp, "sequencer");
     } else if (dev->id_driver == &mpudriver || 
                dev->id_driver == &sbmididriver ||
 	       dev->id_driver == &uartdriver){
 	tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_MIDIN,
 			 DV_CHR, UID_SND, GID_SND, PERM_SND,
-			 "midi%n", dev->id_unit);
+			 "midi%r", dev->id_unit);
 	if (tmp) devfs_link(tmp, "midi");
     } else {
 	tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_DSP,
 			 DV_CHR, UID_SND, GID_SND, PERM_SND,
-			 "dsp%n", dev->id_unit);
+			 "dsp%r", dev->id_unit);
 	if (tmp) devfs_link(tmp, "dsp");
 	tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_DSP16,
 			 DV_CHR, UID_SND, GID_SND, PERM_SND,
-			 "dspW%n", dev->id_unit);
+			 "dspW%r", dev->id_unit);
 	if (tmp) devfs_link(tmp, "dspW");
 	tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_AUDIO,
 			 DV_CHR, UID_SND, GID_SND, PERM_SND,
-			 "audio%n", dev->id_unit);
+			 "audio%r", dev->id_unit);
 	if (tmp) devfs_link(tmp, "audio");
 	tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_CTL,
 			 DV_CHR, UID_SND, GID_SND, PERM_SND,
-			 "mixer%n", dev->id_unit);
+			 "mixer%r", dev->id_unit);
 	if (tmp) devfs_link(tmp, "mixer");
 	tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_STATUS,
 			 DV_CHR, UID_SND, GID_SND, PERM_SND,
-			 "sndstat%n", dev->id_unit);
+			 "sndstat%r", dev->id_unit);
 	if (tmp) devfs_link(tmp, "sndstat");
     }
 #endif /* DEVFS */
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index 7b6a36c5547d..4c0c43d6dc08 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.265 1998/07/06 06:29:07 imp Exp $
+ *  $Id: syscons.c,v 1.266 1998/07/14 11:42:05 bde Exp $
  */
 
 #include "sc.h"
@@ -812,7 +812,7 @@ scattach(struct isa_device *dev)
 #ifdef DEVFS
     for (vc = 0; vc < MAXCONS; vc++)
         sc_devfs_token[vc] = devfs_add_devswf(&scdevsw, vc, DV_CHR,
-				UID_ROOT, GID_WHEEL, 0600, "ttyv%n", vc);
+				UID_ROOT, GID_WHEEL, 0600, "ttyv%r", vc);
     sc_vga_devfs_token = devfs_link(sc_devfs_token[0], "vga");
     sc_mouse_devfs_token = devfs_add_devswf(&scdevsw, SC_MOUSE, DV_CHR,
 				UID_ROOT, GID_WHEEL, 0600, "sysmouse");
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 12b149a9f59c..5a7c340cab8c 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.207 1998/06/16 11:05:59 bde Exp $
+ *	$Id: sio.c,v 1.208 1998/06/24 09:23:32 phk Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1085,22 +1085,22 @@ determined_type: ;
 #ifdef DEVFS
 	com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
 		unit, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyd%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyd%r", unit);
 	com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_INIT_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyid%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyid%r", unit);
 	com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_LOCK_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyld%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyld%r", unit);
 	com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuaa%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuaa%r", unit);
 	com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuaia%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuaia%r", unit);
 	com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuala%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuala%r", unit);
 #endif
 	com->id_flags = isdp->id_flags; /* Heritate id_flags for later */
 	return (1);
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index 7b6a36c5547d..4c0c43d6dc08 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.265 1998/07/06 06:29:07 imp Exp $
+ *  $Id: syscons.c,v 1.266 1998/07/14 11:42:05 bde Exp $
  */
 
 #include "sc.h"
@@ -812,7 +812,7 @@ scattach(struct isa_device *dev)
 #ifdef DEVFS
     for (vc = 0; vc < MAXCONS; vc++)
         sc_devfs_token[vc] = devfs_add_devswf(&scdevsw, vc, DV_CHR,
-				UID_ROOT, GID_WHEEL, 0600, "ttyv%n", vc);
+				UID_ROOT, GID_WHEEL, 0600, "ttyv%r", vc);
     sc_vga_devfs_token = devfs_link(sc_devfs_token[0], "vga");
     sc_mouse_devfs_token = devfs_add_devswf(&scdevsw, SC_MOUSE, DV_CHR,
 				UID_ROOT, GID_WHEEL, 0600, "sysmouse");
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 7c5df09d664f..1f430e253ec0 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
- * $Id: tty_pty.c,v 1.51 1998/02/25 06:19:15 bde Exp $
+ * $Id: tty_pty.c,v 1.52 1998/06/07 17:11:43 dfr Exp $
  */
 
 /*
@@ -815,11 +815,11 @@ ptc_drvinit(unused)
 			devfs_token_pts[i] = 
 				devfs_add_devswf(&pts_cdevsw,i,
 						DV_CHR,0,0,0666,
-						"tty%c%n",jnames[j],k);
+						"tty%c%r",jnames[j],k);
 			devfs_token_ptc[i] =
 				devfs_add_devswf(&ptc_cdevsw,i,
 						DV_CHR,0,0,0666,
-						"pty%c%n",jnames[j],k);
+						"pty%c%r",jnames[j],k);
 		}
 #endif
     	}
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 1e0186a3c19c..b6ff188aec28 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.61 1998/06/17 09:27:15 kato Exp $
+ *	$Id: sio.c,v 1.62 1998/06/24 13:37:23 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1442,22 +1442,22 @@ determined_type: ;
 #ifdef DEVFS
 	com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
 		unit, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyd%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyd%r", unit);
 	com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_INIT_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyid%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyid%r", unit);
 	com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_LOCK_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyld%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyld%r", unit);
 	com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuaa%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuaa%r", unit);
 	com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuaia%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuaia%r", unit);
 	com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuala%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuala%r", unit);
 #endif
 	com->id_flags = isdp->id_flags; /* Heritate id_flags for later */
 	return (1);
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 1e0186a3c19c..b6ff188aec28 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.61 1998/06/17 09:27:15 kato Exp $
+ *	$Id: sio.c,v 1.62 1998/06/24 13:37:23 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1442,22 +1442,22 @@ determined_type: ;
 #ifdef DEVFS
 	com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
 		unit, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyd%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyd%r", unit);
 	com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_INIT_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyid%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyid%r", unit);
 	com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
 		unit | CONTROL_LOCK_STATE, DV_CHR,
-		UID_ROOT, GID_WHEEL, 0600, "ttyld%n", unit);
+		UID_ROOT, GID_WHEEL, 0600, "ttyld%r", unit);
 	com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuaa%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuaa%r", unit);
 	com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuaia%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuaia%r", unit);
 	com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
 		unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
-		UID_UUCP, GID_DIALER, 0660, "cuala%n", unit);
+		UID_UUCP, GID_DIALER, 0660, "cuala%r", unit);
 #endif
 	com->id_flags = isdp->id_flags; /* Heritate id_flags for later */
 	return (1);
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index 5598acbd5f72..edba2f619ee6 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.89 1998/06/24 13:37:50 kato Exp $
+ *  $Id: syscons.c,v 1.90 1998/07/08 08:54:38 kato Exp $
  */
 
 #include "sc.h"
@@ -936,7 +936,7 @@ scattach(struct isa_device *dev)
 #ifdef DEVFS
     for (vc = 0; vc < MAXCONS; vc++)
         sc_devfs_token[vc] = devfs_add_devswf(&scdevsw, vc, DV_CHR,
-				UID_ROOT, GID_WHEEL, 0600, "ttyv%n", vc);
+				UID_ROOT, GID_WHEEL, 0600, "ttyv%r", vc);
     sc_vga_devfs_token = devfs_link(sc_devfs_token[0], "vga");
     sc_mouse_devfs_token = devfs_add_devswf(&scdevsw, SC_MOUSE, DV_CHR,
 				UID_ROOT, GID_WHEEL, 0600, "sysmouse");