diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c
index 770903e7a40a..a4212cc9d2f8 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.c
+++ b/sys/arch/alpha/pci/pci_2100_a50.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_2100_a50.c,v 1.20 1998/04/16 19:40:56 thorpej Exp $ */
+/* $NetBSD: pci_2100_a50.c,v 1.21 1998/04/16 19:50:55 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.20 1998/04/16 19:40:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.21 1998/04/16 19:50:55 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -198,7 +198,7 @@ dec_2100_a50_intr_map(acv, bustag, buspin, line, ihp)
 	pirqreg = pci_conf_read(pc, pci_make_tag(pc, 0, APECS_SIO_DEVICE, 0),
 	    SIO_PCIREG_PIRQ_RTCTRL);
 #if 0
-	printf("pci_2100_a50_map_int: device %d pin %c: pirq %d, reg = %x\n",
+	printf("pci_2100_a50_intr_map: device %d pin %c: pirq %d, reg = %x\n",
 		device, '@' + buspin, pirq, pirqreg);
 #endif
 	pirqline = (pirqreg >> (pirq * 8)) & 0xff;
@@ -207,7 +207,7 @@ dec_2100_a50_intr_map(acv, bustag, buspin, line, ihp)
 	pirqline &= 0xf;
 
 #if 0
-	printf("pci_2100_a50_map_int: device %d pin %c: mapped to line %d\n",
+	printf("pci_2100_a50_intr_map: device %d pin %c: mapped to line %d\n",
 	    device, '@' + buspin, pirqline);
 #endif
 
diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c
index 3dcc06d10f2a..0a151d678c65 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.c
+++ b/sys/arch/alpha/pci/pci_axppci_33.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_axppci_33.c,v 1.17 1998/04/14 22:20:59 thorpej Exp $ */
+/* $NetBSD: pci_axppci_33.c,v 1.18 1998/04/16 19:50:55 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.17 1998/04/14 22:20:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.18 1998/04/16 19:50:55 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -117,7 +117,8 @@ dec_axppci_33_intr_map(lcv, bustag, buspin, line, ihp)
                 return 1;
         }
         if (buspin > 4) {
-                printf("pci_map_int: bad interrupt pin %d\n", buspin);
+                printf("dec_axppci_33_intr_map: bad interrupt pin %d\n",
+                    buspin);
                 return 1;
         }
 
@@ -142,7 +143,7 @@ dec_axppci_33_intr_map(lcv, bustag, buspin, line, ihp)
 			break;
 #ifdef DIAGNOSTIC
 		default:			/* XXX gcc -Wuninitialized */
-			panic("dec_axppci_33_intr_map bogus PCI pin %d\n",
+			panic("dec_axppci_33_intr_map: bogus PCI pin %d\n",
 			    buspin);
 #endif
 		};
@@ -162,7 +163,7 @@ dec_axppci_33_intr_map(lcv, bustag, buspin, line, ihp)
 			break;
 #ifdef DIAGNOSTIC
 		default:			/* XXX gcc -Wuninitialized */
-			panic("dec_axppci_33_intr_map bogus PCI pin %d\n",
+			panic("dec_axppci_33_intr_map: bogus PCI pin %d\n",
 			    buspin);
 #endif
 		};
@@ -182,7 +183,7 @@ dec_axppci_33_intr_map(lcv, bustag, buspin, line, ihp)
 			break;
 #ifdef DIAGNOSTIC
 		default:			/* XXX gcc -Wuninitialized */
-			panic("dec_axppci_33_intr_map bogus PCI pin %d\n",
+			panic("dec_axppci_33_intr_map bogus: PCI pin %d\n",
 			    buspin);
 #endif
 		};
@@ -197,7 +198,7 @@ dec_axppci_33_intr_map(lcv, bustag, buspin, line, ihp)
 	pirqreg = pci_conf_read(pc, pci_make_tag(pc, 0, LCA_SIO_DEVICE, 0),
 	    SIO_PCIREG_PIRQ_RTCTRL);
 #if 0
-	printf("pci_axppci_33_map_int: device %d pin %c: pirq %d, reg = %x\n",
+	printf("dec_axppci_33_intr_map: device %d pin %c: pirq %d, reg = %x\n",
 		device, '@' + buspin, pirq, pirqreg);
 #endif
 	pirqline = (pirqreg >> (pirq * 8)) & 0xff;
@@ -206,7 +207,7 @@ dec_axppci_33_intr_map(lcv, bustag, buspin, line, ihp)
 	pirqline &= 0xf;
 
 #if 0
-	printf("pci_axppci_33_map_int: device %d pin %c: mapped to line %d\n",
+	printf("dec_axppci_33_intr_map: device %d pin %c: mapped to line %d\n",
 	    device, '@' + buspin, pirqline);
 #endif
 
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index 459b9be79aa4..1f7aae1d8450 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb164.c,v 1.12 1998/04/16 19:24:24 thorpej Exp $ */
+/* $NetBSD: pci_eb164.c,v 1.13 1998/04/16 19:50:55 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.12 1998/04/16 19:24:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.13 1998/04/16 19:50:55 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -139,7 +139,7 @@ dec_eb164_intr_map(ccv, bustag, buspin, line, ihp)
                 return 1;
         }
         if (buspin > 4) {
-                printf("pci_map_int: bad interrupt pin %d\n", buspin);
+                printf("dec_eb164_intr_map: bad interrupt pin %d\n", buspin);
                 return 1;
         }
 
@@ -193,12 +193,12 @@ dec_eb164_intr_map(ccv, bustag, buspin, line, ihp)
 		eb164_irq = pinoff + pinbase;
 		break;
 	default:
-		panic("pci_eb164_map_int: invalid device number %d\n",
+		panic("dec_eb164_intr_map: invalid device number %d\n",
 		    device);
 	}
 
 	if (eb164_irq > EB164_MAX_IRQ)
-		panic("pci_eb164_map_int: eb164_irq too large (%d)\n",
+		panic("dec_eb164_intr_map: eb164_irq too large (%d)\n",
 		    eb164_irq);
 
 	*ihp = eb164_irq;
diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index e9102908bc1d..48dc94913b93 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn20aa.c,v 1.27 1998/04/14 22:21:00 thorpej Exp $ */
+/* $NetBSD: pci_kn20aa.c,v 1.28 1998/04/16 19:50:55 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.27 1998/04/14 22:21:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.28 1998/04/16 19:50:55 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -125,7 +125,7 @@ dec_kn20aa_intr_map(ccv, bustag, buspin, line, ihp)
                 return 1;
         }
         if (buspin > 4) {
-                printf("pci_map_int: bad interrupt pin %d\n", buspin);
+                printf("dec_kn20aa_intr_map: bad interrupt pin %d\n", buspin);
                 return 1;
         }
 
@@ -167,7 +167,7 @@ dec_kn20aa_intr_map(ccv, bustag, buspin, line, ihp)
 
 	kn20aa_irq += buspin - 1;
 	if (kn20aa_irq > KN20AA_MAX_IRQ)
-		panic("pci_kn20aa_map_int: kn20aa_irq too large (%d)\n",
+		panic("dec_kn20aa_intr_map: kn20aa_irq too large (%d)\n",
 		    kn20aa_irq);
 
 	*ihp = kn20aa_irq;
diff --git a/sys/arch/alpha/pci/pci_kn8ae.c b/sys/arch/alpha/pci/pci_kn8ae.c
index 97f4f15b771a..617c8f19575b 100644
--- a/sys/arch/alpha/pci/pci_kn8ae.c
+++ b/sys/arch/alpha/pci/pci_kn8ae.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn8ae.c,v 1.9 1998/04/15 00:49:58 mjacob Exp $ */
+/* $NetBSD: pci_kn8ae.c,v 1.10 1998/04/16 19:50:55 thorpej Exp $ */
 
 /*
  * Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_kn8ae.c,v 1.9 1998/04/15 00:49:58 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_kn8ae.c,v 1.10 1998/04/16 19:50:55 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -134,7 +134,7 @@ dec_kn8ae_intr_map(ccv, bustag, buspin, line, ihp)
                 return 1;
         }
         if (buspin > 4) {
-                printf("pci_map_int: bad interrupt pin %d\n", buspin);
+                printf("dec_kn8ae_intr_map: bad interrupt pin %d\n", buspin);
                 return 1;
         }
 	alpha_pci_decompose_tag(pc, bustag, NULL, &device, NULL);