diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 717771619991..bc7f260c992c 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.29 2000/04/19 06:50:29 itojun Exp $
+#	$NetBSD: GENERIC,v 1.30 2000/05/27 02:19:35 soren Exp $
 #	$OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -6,7 +6,7 @@
 
 include		"arch/arc/conf/std.arc"
 
-#ident		"GENERIC-$Revision: 1.29 $"
+#ident		"GENERIC-$Revision: 1.30 $"
 
 maxusers	32		# estimated number of users
 
@@ -234,8 +234,8 @@ lpt0		at isa? port 0x378 irq 7
 #pci*		at pbcpcibr?
 
 #pcivga* 	at pci? dev ? function ?
-#ncr*		at pci? dev ? function ?
-#scsibus* 	at ncr?
+#siop*		at pci? dev ? function ?
+#scsibus* 	at siop?
 #de*		at pci? dev ? function ?
 
 #### SCSI bus devices
diff --git a/sys/arch/arc/conf/P4032 b/sys/arch/arc/conf/P4032
index 919f58c55eef..87428a57c230 100644
--- a/sys/arch/arc/conf/P4032
+++ b/sys/arch/arc/conf/P4032
@@ -1,4 +1,4 @@
-#	$NetBSD: P4032,v 1.5 2000/03/22 00:58:18 cgd Exp $
+#	$NetBSD: P4032,v 1.6 2000/05/27 02:19:35 soren Exp $
 #	$OpenBSD: P4032,v 1.5 1998/03/16 09:38:36 pefo Exp $
 #
 #	configuration file for Algorithmics P4032 board
@@ -142,8 +142,8 @@ pbcpcibr*	at mainbus0	# Algorithmics PCI bus bridge.
 pci*		at pbcpcibr?
 
 #pcivga* 	at pci? dev ? function ?
-ncr*		at pci? dev ? function ?
-scsibus* 	at ncr?
+siop*		at pci? dev ? function ?
+scsibus* 	at siop?
 de*		at pci? dev ? function ?
 
 #### SCSI bus devices
diff --git a/sys/arch/arc/conf/RAMDISK b/sys/arch/arc/conf/RAMDISK
index 9031b0d4b2f9..ccfb31e632d4 100644
--- a/sys/arch/arc/conf/RAMDISK
+++ b/sys/arch/arc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$NetBSD: RAMDISK,v 1.6 2000/03/22 00:58:18 cgd Exp $
+#	$NetBSD: RAMDISK,v 1.7 2000/05/27 02:19:35 soren Exp $
 #	$OpenBSD: RAMDISK,v 1.9 1999/08/29 12:14:03 niklas Exp $
 #
 #	memory disk based configuration file for MIPS R4x00 ARC Systems
@@ -238,8 +238,8 @@ lpt0		at isa? port 0x378 irq 7
 #pci*		at pbcpcibr?
 
 #pcivga* 	at pci? dev ? function ?
-#ncr*		at pci? dev ? function ?
-#scsibus* 	at ncr?
+#siop*		at pci? dev ? function ?
+#scsibus* 	at siop?
 #de*		at pci? dev ? function ?
 
 #### SCSI bus devices
diff --git a/sys/arch/prep/conf/NATSUMI b/sys/arch/prep/conf/NATSUMI
index e6111e745916..c055752394db 100644
--- a/sys/arch/prep/conf/NATSUMI
+++ b/sys/arch/prep/conf/NATSUMI
@@ -1,4 +1,4 @@
-#	$NetBSD: NATSUMI,v 1.2 2000/03/22 00:58:22 cgd Exp $
+#	$NetBSD: NATSUMI,v 1.3 2000/05/27 02:19:34 soren Exp $
 #
 #	for IBM 6050/6070
 #
@@ -188,11 +188,11 @@ lpt0	at isa? port 0x3bc irq 7	# standard PC parallel ports
 
 # PCI SCSI controllers
 #ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
-#ncr*	at pci? dev ? function ?	# NCR 53c8xx SCSI
+#siop*	at pci? dev ? function ?	# NCR 53c8xx SCSI
 
 # SCSI bus support
 #scsibus* at ahc?
-#scsibus* at ncr?
+#scsibus* at siop?
 
 # SCSI devices
 #sd*	at scsibus? target ? lun ?	# SCSI disk drives