diff --git a/sys/arch/atari/atari/autoconf.c b/sys/arch/atari/atari/autoconf.c
index 914ad171b9e0..de916bb177df 100644
--- a/sys/arch/atari/atari/autoconf.c
+++ b/sys/arch/atari/atari/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.27 1998/04/15 09:00:19 leo Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.28 1998/09/02 11:24:16 leo Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -294,7 +294,7 @@ mbattach(pdp, dp, auxp)
 	config_found(dp, "wdc"    , simple_devprint);
 	config_found(dp, "isabus" , simple_devprint);
 	config_found(dp, "pcibus" , simple_devprint);
-	config_found(dp, "vmebus" , simple_devprint);
+	config_found(dp, "avmebus" , simple_devprint);
 }
 
 int
diff --git a/sys/arch/atari/conf/GENERIC b/sys/arch/atari/conf/GENERIC
index 0fd218dc149b..092f0a518bcd 100644
--- a/sys/arch/atari/conf/GENERIC
+++ b/sys/arch/atari/conf/GENERIC
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC,v 1.45 1998/08/11 07:05:46 leo Exp $
+#	$NetBSD: GENERIC,v 1.46 1998/09/02 11:23:41 leo Exp $
 #
 # Generic atari
 #
@@ -180,8 +180,8 @@ uk* 	at scsibus? target ? lun ?	# SCSI unknown
 pcibus0	at mainbus0			# PCI-bus
 pci0	at pcibus0
 ahc*	at pci? dev ? function ?        # Adaptec [23]94x, aic78x0 SCSI
-vmebus0	at mainbus0			# VME bus
-vme0	at vmebus0
+avmebus0 at mainbus0			# VME bus
+vme0	at avmebus0
 le0	at vme0	irq 5			# Lance ethernet (Riebl/PAM).
 et0	at vme0				# Crazy Dots II
 
diff --git a/sys/arch/atari/conf/HADES b/sys/arch/atari/conf/HADES
index f61c8276220f..59ad6e7f9295 100644
--- a/sys/arch/atari/conf/HADES
+++ b/sys/arch/atari/conf/HADES
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: HADES,v 1.17 1998/06/26 01:53:53 lukem Exp $
+#	$NetBSD: HADES,v 1.18 1998/09/02 11:23:42 leo Exp $
 #
 # Medusa-Hades
 #
@@ -114,8 +114,8 @@ grfet2	at grfbus0
 ite*	at grfet2
 pcibus0	at mainbus0		# PCI-bus
 pci0	at pcibus0
-vmebus0	at mainbus0		# VME bus
-vme0	at vmebus0
+avmebus0 at mainbus0		# VME bus
+vme0	at avmebus0
 isabus0	at mainbus0		# ISA-bus
 isa0	at isabus0
 wdc0	at mainbus0		# IDE-bus
diff --git a/sys/arch/atari/conf/files.atari b/sys/arch/atari/conf/files.atari
index 368a5ec06f66..cc3be292c3c6 100644
--- a/sys/arch/atari/conf/files.atari
+++ b/sys/arch/atari/conf/files.atari
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: files.atari,v 1.57 1998/08/18 11:51:07 leo Exp $
+#	$NetBSD: files.atari,v 1.58 1998/09/02 11:23:42 leo Exp $
 
 maxpartitions 16
 
@@ -65,11 +65,11 @@ file	arch/atari/dev/hdfd_intr.s	hdfd
 major	{hdfd = 2}
 
 # The generic VME-bus driver
-device	vmebus {}
-attach	vmebus at mainbus
+device	avmebus {}
+attach	avmebus at mainbus
 
 device	vme {[ioport = -1], [iosize = 0], [mem = -1], [memsiz = 0], [irq = -1] }
-attach	vme at vmebus
+attach	vme at avmebus
 file	arch/atari/vme/vme.c		vme
 file	arch/atari/vme/vme_machdep.c	vme
 
diff --git a/sys/arch/atari/vme/vme_machdep.c b/sys/arch/atari/vme/vme_machdep.c
index 48885353e67e..f41b3f973fd8 100644
--- a/sys/arch/atari/vme/vme_machdep.c
+++ b/sys/arch/atari/vme/vme_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vme_machdep.c,v 1.4 1998/04/22 08:01:21 leo Exp $	*/
+/*	$NetBSD: vme_machdep.c,v 1.5 1998/09/02 11:24:22 leo Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@ static int	vmebusprint __P((void *auxp, const char *));
 static int	vmebusmatch __P((struct device *, struct cfdata *, void *));
 static void	vmebusattach __P((struct device *, struct device *, void *));
 
-struct cfattach vmebus_ca = {
+struct cfattach avmebus_ca = {
 	sizeof(struct device), vmebusmatch, vmebusattach
 };