diff --git a/sys/arch/evbppc/conf/PMPPC b/sys/arch/evbppc/conf/PMPPC
index f66d6230d4e7..c127913ee762 100644
--- a/sys/arch/evbppc/conf/PMPPC
+++ b/sys/arch/evbppc/conf/PMPPC
@@ -1,4 +1,4 @@
-#	$NetBSD: PMPPC,v 1.18 2011/01/18 01:07:06 matt Exp $
+#	$NetBSD: PMPPC,v 1.19 2011/03/02 08:25:08 ahoka Exp $
 #
 #	PMPPC
 #
@@ -143,7 +143,7 @@ rtc0	at mainbus0 addr 0x7ff00000
 cs0	at mainbus0 addr 0x7fe00000
 
 # flash driver not implemented
-#flash0	at mainbus0 addr 0x70000000
+#pmflash0	at mainbus0 addr 0x70000000
 
 # UARTs
 com0	at cpc0 addr 0xff600300
diff --git a/sys/arch/evbppc/conf/files.pmppc b/sys/arch/evbppc/conf/files.pmppc
index ac804f8e9b58..17b97d518195 100644
--- a/sys/arch/evbppc/conf/files.pmppc
+++ b/sys/arch/evbppc/conf/files.pmppc
@@ -1,4 +1,4 @@
-#	$NetBSD: files.pmppc,v 1.4 2008/02/20 21:43:34 drochner Exp $
+#	$NetBSD: files.pmppc,v 1.5 2011/03/02 08:25:08 ahoka Exp $
 #
 #
 maxpartitions 16
@@ -46,9 +46,9 @@ device	rtc : mc146818
 attach	rtc at mainbus
 file	arch/evbppc/pmppc/dev/ds17485.c		rtc
 
-device	flash
-attach	flash at mainbus
-file	arch/evbppc/pmppc/dev/flash.c			flash
+device	pmflash
+attach	pmflash at mainbus
+file	arch/evbppc/pmppc/dev/flash.c			pmflash
 
 attach	cpc at mainbus with cpc_mainbus
 file	arch/evbppc/pmppc/dev/cpc_mainbus.c		cpc_mainbus
diff --git a/sys/arch/hpcmips/conf/LCARD b/sys/arch/hpcmips/conf/LCARD
index 676dd9f13a83..6b07b3f30679 100644
--- a/sys/arch/hpcmips/conf/LCARD
+++ b/sys/arch/hpcmips/conf/LCARD
@@ -1,5 +1,5 @@
 #
-# 	$NetBSD: LCARD,v 1.12 2010/11/23 11:13:59 hannken Exp $
+# 	$NetBSD: LCARD,v 1.13 2011/03/02 08:25:08 ahoka Exp $
 #
 include		"arch/hpcmips/conf/std.lcard"
 
@@ -69,8 +69,8 @@ pcmcia*	at pcic? controller 0 socket 0
 
 wi*	at pcmcia? function ?		# Lucent WaveLan IEEE (802.11)
 
-flash0	at vr4181ip? addr 0x1f800000 size 0x800000
-flash1	at vr4181ip? addr 0x1e000000 size 0x800000
+vrflash0	at vr4181ip? addr 0x1f800000 size 0x800000
+vrflash1	at vr4181ip? addr 0x1e000000 size 0x800000
 
 pseudo-device	md			# memory disk device (ramdisk)
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/hpcmips/conf/files.hpcmips b/sys/arch/hpcmips/conf/files.hpcmips
index a5f46b0f7fc4..a722627c7686 100644
--- a/sys/arch/hpcmips/conf/files.hpcmips
+++ b/sys/arch/hpcmips/conf/files.hpcmips
@@ -1,4 +1,4 @@
-#	$NetBSD: files.hpcmips,v 1.103 2009/08/21 03:56:58 thorpej Exp $
+#	$NetBSD: files.hpcmips,v 1.104 2011/03/02 08:25:09 ahoka Exp $
 
 # maxpartitions must be first item in files.${ARCH}.
 maxpartitions 8
@@ -445,8 +445,8 @@ attach vr4181aiu at vripif
 file arch/hpcmips/vr/vr4181aiu.c	vr4181aiu	needs-flag
 
 # Flash memory on L-card+	XXX should not be here
-device flash
-attach flash at vripif with flash_vrip
+device vrflash
+attach vrflash at vripif with flash_vrip
 file arch/hpcmips/vr/flash_vrip.c	flash_vrip	needs-flag
 
 # OptPoint on Telios HC-AJ2