diff --git a/sys/arch/arc/arc/c_nec_jazz.c b/sys/arch/arc/arc/c_nec_jazz.c
index 92bb6ae2c019..d8fd818a9f5b 100644
--- a/sys/arch/arc/arc/c_nec_jazz.c
+++ b/sys/arch/arc/arc/c_nec_jazz.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: c_nec_jazz.c,v 1.2 2002/12/09 13:36:27 tsutsui Exp $	*/
+/*	$NetBSD: c_nec_jazz.c,v 1.3 2002/12/28 16:25:38 tsutsui Exp $	*/
 
 /*-
  * Copyright (C) 2000 Shuichiro URATA.  All rights reserved.
@@ -96,16 +96,16 @@ timer_nec_jazz_init(interval)
 struct pica_dev nec_rd94_cpu[] = {
 	{{ "timer",	-1, 0, },	(void *)RD94_SYS_IT_VALUE, },
 	{{ "dallas_rtc", -1, 0, },	(void *)RD94_SYS_CLOCK, },
-	{{ "lpt",	0, 0, },	(void *)RD94_SYS_PAR1, },
-	{{ "fdc",	1, 0, },	(void *)RD94_SYS_FLOPPY, },
+	{{ "LPT1",	0, 0, },	(void *)RD94_SYS_PAR1, },
+	{{ "I82077",	1, 0, },	(void *)RD94_SYS_FLOPPY, },
 	{{ "AD1848",	2, 0, },	(void *)RD94_SYS_SOUND,},
-	{{ "sonic",	3, 0, },	(void *)RD94_SYS_SONIC, },
+	{{ "SONIC",	3, 0, },	(void *)RD94_SYS_SONIC, },
 	{{ "NCRC700",	4, 0, },	(void *)RD94_SYS_SCSI0, },
 	{{ "NCRC700",	5, 0, },	(void *)RD94_SYS_SCSI1, },
-	{{ "pckbd",	6, 0, },	(void *)RD94_SYS_KBD, },
-	{{ "pms",	7, 0, },	(void *)RD94_SYS_KBD, },
-	{{ "com",	8, 0, },	(void *)RD94_SYS_COM1, },
-	{{ "com",	9, 0, },	(void *)RD94_SYS_COM2, },
+	{{ "I8247",	6, 0, },	(void *)RD94_SYS_KBD, },
+	{{ "pms",	7, 0, },	(void *)RD94_SYS_KBD, }, /* XXX */
+	{{ "COM1",	8, 0, },	(void *)RD94_SYS_COM1, },
+	{{ "COM2",	9, 0, },	(void *)RD94_SYS_COM2, },
 	{{ NULL,	-1, 0, },	(void *)NULL, },
 };
 
diff --git a/sys/arch/arc/arc/p_acer_pica_61.c b/sys/arch/arc/arc/p_acer_pica_61.c
index 98f8c562c05c..029c00b0afec 100644
--- a/sys/arch/arc/arc/p_acer_pica_61.c
+++ b/sys/arch/arc/arc/p_acer_pica_61.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: p_acer_pica_61.c,v 1.1 2001/06/13 15:29:30 soda Exp $	*/
+/*	$NetBSD: p_acer_pica_61.c,v 1.2 2002/12/28 16:25:38 tsutsui Exp $	*/
 /*	$OpenBSD: picabus.c,v 1.11 1999/01/11 05:11:10 millert Exp $	*/
 
 /*
@@ -74,16 +74,16 @@ struct platform platform_acer_pica_61 = {
 struct pica_dev acer_pica_61_cpu[] = {
 	{{ "timer",	-1, 0, },	(void *)R4030_SYS_IT_VALUE, },
 	{{ "dallas_rtc", -1, 0, },	(void *)PICA_SYS_CLOCK, },
-	{{ "lpt",	0, 0, },	(void *)PICA_SYS_PAR1, },
-	{{ "fdc",	1, 0, },	(void *)PICA_SYS_FLOPPY, },
+	{{ "LPT1",	0, 0, },	(void *)PICA_SYS_PAR1, },
+	{{ "I82077",	1, 0, },	(void *)PICA_SYS_FLOPPY, },
 	{{ "MAGNUM",	2, 0, },	(void *)PICA_SYS_SOUND,},
 	{{ "ALI_S3",	3, 0, },	(void *)PICA_V_LOCAL_VIDEO, },
-	{{ "sonic",	4, 0, },	(void *)PICA_SYS_SONIC, },
-	{{ "asc",	5, 0, },	(void *)PICA_SYS_SCSI, },
-	{{ "pckbd",	6, 0, },	(void *)PICA_SYS_KBD, },
-	{{ "pms",	7, 0, },	(void *)PICA_SYS_KBD, },
-	{{ "com",	8, 0, },	(void *)PICA_SYS_COM1, },
-	{{ "com",	9, 0, },	(void *)PICA_SYS_COM2, },
+	{{ "SONIC",	4, 0, },	(void *)PICA_SYS_SONIC, },
+	{{ "ESP216",	5, 0, },	(void *)PICA_SYS_SCSI, },
+	{{ "I8247",	6, 0, },	(void *)PICA_SYS_KBD, },
+	{{ "pms",	7, 0, },	(void *)PICA_SYS_KBD, }, /* XXX */
+	{{ "COM1",	8, 0, },	(void *)PICA_SYS_COM1, },
+	{{ "COM2",	9, 0, },	(void *)PICA_SYS_COM2, },
 	{{ NULL,	-1, 0, },	(void *)NULL, },
 };
 
diff --git a/sys/arch/arc/arc/p_ms_jazz.c b/sys/arch/arc/arc/p_ms_jazz.c
index 9fff053b3bc9..43507690a81a 100644
--- a/sys/arch/arc/arc/p_ms_jazz.c
+++ b/sys/arch/arc/arc/p_ms_jazz.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: p_ms_jazz.c,v 1.1 2001/06/13 15:28:23 soda Exp $	*/
+/*	$NetBSD: p_ms_jazz.c,v 1.2 2002/12/28 16:25:38 tsutsui Exp $	*/
 /*	$OpenBSD: picabus.c,v 1.11 1999/01/11 05:11:10 millert Exp $	*/
 
 /*
@@ -88,16 +88,16 @@ struct platform platform_microsoft_jazz = {
 struct pica_dev mips_magnum_r4000_cpu[] = {
 	{{ "timer",	-1, 0, },	(void *)R4030_SYS_IT_VALUE, },
 	{{ "dallas_rtc", -1, 0, },	(void *)PICA_SYS_CLOCK, },
-	{{ "lpt",	0, 0, },	(void *)PICA_SYS_PAR1, },
-	{{ "fdc",	1, 0, },	(void *)PICA_SYS_FLOPPY, },
+	{{ "LPT1",	0, 0, },	(void *)PICA_SYS_PAR1, },
+	{{ "I82077",	1, 0, },	(void *)PICA_SYS_FLOPPY, },
 	{{ "MAGNUM",	2, 0, },	(void *)PICA_SYS_SOUND,},
 	{{ "VXL",	3, 0, },	(void *)PICA_V_LOCAL_VIDEO, },
-	{{ "sonic",	4, 0, },	(void *)PICA_SYS_SONIC, },
-	{{ "asc",	5, 0, },	(void *)PICA_SYS_SCSI, },
-	{{ "pckbd",	6, 0, },	(void *)PICA_SYS_KBD, },
-	{{ "pms",	7, 0, },	(void *)PICA_SYS_KBD, },
-	{{ "com",	8, 0, },	(void *)PICA_SYS_COM1, },
-	{{ "com",	9, 0, },	(void *)PICA_SYS_COM2, },
+	{{ "SONIC",	4, 0, },	(void *)PICA_SYS_SONIC, },
+	{{ "ESP216",	5, 0, },	(void *)PICA_SYS_SCSI, },
+	{{ "I8247",	6, 0, },	(void *)PICA_SYS_KBD, },
+	{{ "pms",	7, 0, },	(void *)PICA_SYS_KBD, }, /* XXX */
+	{{ "COM1",	8, 0, },	(void *)PICA_SYS_COM1, },
+	{{ "COM2",	9, 0, },	(void *)PICA_SYS_COM2, },
 	{{ NULL,	-1, 0, },	(void *)NULL, },
 };
 
diff --git a/sys/arch/arc/arc/p_nec_jc94.c b/sys/arch/arc/arc/p_nec_jc94.c
index c1c34a807d54..96b7fb6cc215 100644
--- a/sys/arch/arc/arc/p_nec_jc94.c
+++ b/sys/arch/arc/arc/p_nec_jc94.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: p_nec_jc94.c,v 1.1 2001/06/13 15:30:38 soda Exp $	*/
+/*	$NetBSD: p_nec_jc94.c,v 1.2 2002/12/28 16:25:38 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 2001 Izumi Tsutsui.  All rights reserved.
@@ -58,16 +58,16 @@ struct platform platform_nec_jc94 = {
 struct pica_dev nec_jc94_cpu[] = {
 	{{ "timer",	-1, 0, },	(void *)RD94_SYS_IT_VALUE, },
 	{{ "dallas_rtc", -1, 0, },	(void *)RD94_SYS_CLOCK, },
-	{{ "lpt",	0, 0, },	(void *)RD94_SYS_PAR1, },
-	{{ "fdc",	1, 0, },	(void *)RD94_SYS_FLOPPY, },
+	{{ "LPT1",	0, 0, },	(void *)RD94_SYS_PAR1, },
+	{{ "I82077",	1, 0, },	(void *)RD94_SYS_FLOPPY, },
 	{{ "AD1848",	2, 0, },	(void *)RD94_SYS_SOUND,},
-	{{ "sonic",	3, 0, },	(void *)RD94_SYS_SONIC, },
-	{{ "osiop",	5, 0, },	(void *)RD94_SYS_SCSI1, }, /*scsi(0)*/
-	{{ "osiop",	4, 0, },	(void *)RD94_SYS_SCSI0, }, /*scsi(1)*/
-	{{ "pckbd",	6, 0, },	(void *)RD94_SYS_KBD, },
-	{{ "pms",	7, 0, },	(void *)RD94_SYS_KBD, },
-	{{ "com",	8, 0, },	(void *)RD94_SYS_COM1, },
-	{{ "com",	9, 0, },	(void *)RD94_SYS_COM2, },
+	{{ "SONIC",	3, 0, },	(void *)RD94_SYS_SONIC, },
+	{{ "NCRC710",	5, 0, },	(void *)RD94_SYS_SCSI1, }, /*scsi(0)*/
+	{{ "NCRC710",	4, 0, },	(void *)RD94_SYS_SCSI0, }, /*scsi(1)*/
+	{{ "I8742",	6, 0, },	(void *)RD94_SYS_KBD, },
+	{{ "pms",	7, 0, },	(void *)RD94_SYS_KBD, }, /* XXX */
+	{{ "COM1",	8, 0, },	(void *)RD94_SYS_COM1, },
+	{{ "COM2",	9, 0, },	(void *)RD94_SYS_COM2, },
 	{{ NULL,	-1, 0, },	(void *)NULL, },
 };
 
diff --git a/sys/arch/arc/jazz/asc.c b/sys/arch/arc/jazz/asc.c
index 2548bf186746..312216931228 100644
--- a/sys/arch/arc/jazz/asc.c
+++ b/sys/arch/arc/jazz/asc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: asc.c,v 1.8 2002/10/02 04:59:48 thorpej Exp $	*/
+/*	$NetBSD: asc.c,v 1.9 2002/12/28 16:25:39 tsutsui Exp $	*/
 /*	$OpenBSD: asc.c,v 1.9 1998/03/16 09:38:39 pefo Exp $	*/
 /*	NetBSD: asc.c,v 1.10 1994/12/05 19:11:12 dean Exp 	*/
 
@@ -520,7 +520,7 @@ ascmatch(parent, match, aux)
 {
 	struct jazzio_attach_args *ja = aux;
 
-	if(strcmp(ja->ja_name, "asc") != 0)
+	if (strcmp(ja->ja_name, "ESP216") != 0)
 		return (0);
 	return (1);
 }
diff --git a/sys/arch/arc/jazz/com_jazzio.c b/sys/arch/arc/jazz/com_jazzio.c
index 1e5d80202b41..5478e9917455 100644
--- a/sys/arch/arc/jazz/com_jazzio.c
+++ b/sys/arch/arc/jazz/com_jazzio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_jazzio.c,v 1.3 2002/10/02 04:59:48 thorpej Exp $	*/
+/*	$NetBSD: com_jazzio.c,v 1.4 2002/12/28 16:25:39 tsutsui Exp $	*/
 /*	$OpenBSD: com_lbus.c,v 1.7 1998/03/16 09:38:41 pefo Exp $	*/
 /*	NetBSD: com_isa.c,v 1.12 1998/08/15 17:47:17 mycroft Exp 	*/
 
@@ -110,7 +110,8 @@ com_jazzio_probe(parent, match, aux)
 	int iobase;
 	int rv = 1;
 
-	if(strcmp(ja->ja_name, "com") != 0)
+	if (strcmp(ja->ja_name, "COM1") != 0 &&
+	    strcmp(ja->ja_name, "COM2") != 0)
 		return (0);
 
 	iot = ja->ja_bust;
diff --git a/sys/arch/arc/jazz/fdc_jazzio.c b/sys/arch/arc/jazz/fdc_jazzio.c
index ec07a1abac4e..fa16eb7f7e87 100644
--- a/sys/arch/arc/jazz/fdc_jazzio.c
+++ b/sys/arch/arc/jazz/fdc_jazzio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fdc_jazzio.c,v 1.4 2002/10/02 04:59:48 thorpej Exp $	*/
+/*	$NetBSD: fdc_jazzio.c,v 1.5 2002/12/28 16:25:39 tsutsui Exp $	*/
 /*	$OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $	*/
 /*	NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp 	*/
 
@@ -132,7 +132,7 @@ fdc_jazzio_probe(parent, match, aux)
 	bus_space_handle_t base_ioh, ioh;
 	int rv;
 
-	if (strcmp(ja->ja_name, "fdc") != 0)
+	if (strcmp(ja->ja_name, "I82077") != 0)
 		return 0;
 
 	iot = ja->ja_bust;
diff --git a/sys/arch/arc/jazz/if_sn_jazzio.c b/sys/arch/arc/jazz/if_sn_jazzio.c
index 0b7ed375bce7..8caa20a3868c 100644
--- a/sys/arch/arc/jazz/if_sn_jazzio.c
+++ b/sys/arch/arc/jazz/if_sn_jazzio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sn_jazzio.c,v 1.3 2002/10/02 04:59:48 thorpej Exp $	*/
+/*	$NetBSD: if_sn_jazzio.c,v 1.4 2002/12/28 16:25:39 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@ sonic_jazzio_match(struct device *parent, struct cfdata *match, void *aux)
 {
 	struct jazzio_attach_args *ja = aux;
 
-	if (strcmp(ja->ja_name, "sonic") != 0)
+	if (strcmp(ja->ja_name, "SONIC") != 0)
 		return (0);
 
 	return (1);
diff --git a/sys/arch/arc/jazz/lpt_jazzio.c b/sys/arch/arc/jazz/lpt_jazzio.c
index 9a4227b12196..4ca6acbae9c7 100644
--- a/sys/arch/arc/jazz/lpt_jazzio.c
+++ b/sys/arch/arc/jazz/lpt_jazzio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt_jazzio.c,v 1.3 2002/10/02 04:59:49 thorpej Exp $	*/
+/*	$NetBSD: lpt_jazzio.c,v 1.4 2002/12/28 16:25:39 tsutsui Exp $	*/
 /*	$OpenBSD: lpt_lbus.c,v 1.3 1997/04/10 16:29:17 pefo Exp $	*/
 
 /*
@@ -128,7 +128,7 @@ lpt_jazzio_probe(parent, match, aux)
 #define	ABORT	goto out
 #endif
 
-	if(strcmp(ja->ja_name, "lpt") != 0)
+	if (strcmp(ja->ja_name, "LPT1") != 0)
 		 return (0);
 
 	iot = ja->ja_bust;
diff --git a/sys/arch/arc/jazz/osiop_jazzio.c b/sys/arch/arc/jazz/osiop_jazzio.c
index ad123a07a463..1cc0f2dd1a6b 100644
--- a/sys/arch/arc/jazz/osiop_jazzio.c
+++ b/sys/arch/arc/jazz/osiop_jazzio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: osiop_jazzio.c,v 1.3 2002/10/02 04:59:49 thorpej Exp $ */
+/* $NetBSD: osiop_jazzio.c,v 1.4 2002/12/28 16:25:39 tsutsui Exp $ */
 
 /*
  * Copyright (c) 2001 Izumi Tsutsui.  All rights reserved.
@@ -60,7 +60,7 @@ osiop_jazzio_match(parent, match, aux)
 {
 	struct jazzio_attach_args *ja = aux;
 
-	if (strcmp(ja->ja_name, "osiop") != 0)
+	if (strcmp(ja->ja_name, "NCRC710") != 0)
 		return (0);
 
 	return (1);
diff --git a/sys/arch/arc/jazz/pckbc_jazzio.c b/sys/arch/arc/jazz/pckbc_jazzio.c
index c591c4f64902..7cccc8314a75 100644
--- a/sys/arch/arc/jazz/pckbc_jazzio.c
+++ b/sys/arch/arc/jazz/pckbc_jazzio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_jazzio.c,v 1.6 2002/10/02 04:59:49 thorpej Exp $ */
+/* $NetBSD: pckbc_jazzio.c,v 1.7 2002/12/28 16:25:39 tsutsui Exp $ */
 /* NetBSD: pckbc_isa.c,v 1.2 2000/03/23 07:01:35 thorpej Exp  */
 
 /*
@@ -79,8 +79,8 @@ pckbc_jazzio_match(parent, match, aux)
 	bus_addr_t addr = ja->ja_addr;
 	int res, ok = 1;
 
-	if (strcmp(ja->ja_name, "pckbd") != 0)
-		return(0);
+	if (strcmp(ja->ja_name, "I8742") != 0)
+		return (0);
 
 	if (pckbc_is_console(iot, addr) == 0) {
 		struct pckbc_internal t;