diff --git a/sys/amd64/vmm/amd/amdiommu.c b/sys/amd64/vmm/amd/amdviiommu.c
similarity index 85%
rename from sys/amd64/vmm/amd/amdiommu.c
rename to sys/amd64/vmm/amd/amdviiommu.c
index 69432498a5c2..5f5822a667b5 100644
--- a/sys/amd64/vmm/amd/amdiommu.c
+++ b/sys/amd64/vmm/amd/amdviiommu.c
@@ -1,180 +1,180 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2021 The FreeBSD Foundation
  *
  * Portions of this software were developed by Ka Ho Ng
  * under sponsorship from the FreeBSD Foundation.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice unmodified, this list of conditions, and the following
  *    disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/rman.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
 #include "amdvi_priv.h"
 #include "ivhd_if.h"
 
-struct amdiommu_softc {
+struct amdviiommu_softc {
 	struct resource *event_res;	/* Event interrupt resource. */
 	void   		*event_tag;	/* Event interrupt tag. */
 	int		event_rid;
 };
 
-static int	amdiommu_probe(device_t);
-static int	amdiommu_attach(device_t);
-static int	amdiommu_detach(device_t);
+static int	amdviiommu_probe(device_t);
+static int	amdviiommu_attach(device_t);
+static int	amdviiommu_detach(device_t);
 static int	ivhd_setup_intr(device_t, driver_intr_t, void *,
 		    const char *);
 static int	ivhd_teardown_intr(device_t);
 
-static device_method_t amdiommu_methods[] = {
+static device_method_t amdviiommu_methods[] = {
 	/* device interface */
-	DEVMETHOD(device_probe,			amdiommu_probe),
-	DEVMETHOD(device_attach,		amdiommu_attach),
-	DEVMETHOD(device_detach,		amdiommu_detach),
+	DEVMETHOD(device_probe,			amdviiommu_probe),
+	DEVMETHOD(device_attach,		amdviiommu_attach),
+	DEVMETHOD(device_detach,		amdviiommu_detach),
 	DEVMETHOD(ivhd_setup_intr,		ivhd_setup_intr),
 	DEVMETHOD(ivhd_teardown_intr,		ivhd_teardown_intr),
 	DEVMETHOD_END
 };
-static driver_t amdiommu_driver = {
-	"amdiommu",
-	amdiommu_methods,
-	sizeof(struct amdiommu_softc),
+static driver_t amdviiommu_driver = {
+	"amdviiommu",
+	amdviiommu_methods,
+	sizeof(struct amdviiommu_softc),
 };
 
 static int
-amdiommu_probe(device_t dev)
+amdviiommu_probe(device_t dev)
 {
 	int error;
 	int capoff;
 
 	/*
 	 * Check base class and sub-class
 	 */
 	if (pci_get_class(dev) != PCIC_BASEPERIPH ||
 	    pci_get_subclass(dev) != PCIS_BASEPERIPH_IOMMU)
 		return (ENXIO);
 
 	/*
 	 * A IOMMU capability block carries a 0Fh capid.
 	 */
 	error = pci_find_cap(dev, PCIY_SECDEV, &capoff);
 	if (error)
 		return (ENXIO);
 
 	/*
 	 * bit [18:16] == 011b indicates the capability block is IOMMU
 	 * capability block. If the field is not set to 011b, bail out.
 	 */
 	if ((pci_read_config(dev, capoff + 2, 2) & 0x7) != 0x3)
 		return (ENXIO);
 
 	return (BUS_PROBE_SPECIFIC);
 }
 
 static int
-amdiommu_attach(device_t dev)
+amdviiommu_attach(device_t dev)
 {
 
 	device_set_desc(dev, "AMD-Vi/IOMMU PCI function");
 	return (0);
 }
 
 static int
-amdiommu_detach(device_t dev)
+amdviiommu_detach(device_t dev)
 {
 
 	return (0);
 }
 
 static int
 ivhd_setup_intr(device_t dev, driver_intr_t handler, void *arg,
     const char *desc)
 {
-	struct amdiommu_softc *sc;
+	struct amdviiommu_softc *sc;
 	int error, msicnt;
 
 	sc = device_get_softc(dev);
 	msicnt = 1;
 	if (sc->event_res != NULL)
 		panic("%s is called without intr teardown", __func__);
 	sc->event_rid = 1;
 
 	error = pci_alloc_msi(dev, &msicnt);
 	if (error) {
 		device_printf(dev, "Couldn't find event MSI IRQ resource.\n");
 		return (ENOENT);
 	}
 
 	sc->event_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
 	    &sc->event_rid, RF_ACTIVE);
 	if (sc->event_res == NULL) {
 		device_printf(dev, "Unable to allocate event INTR resource.\n");
 		error = ENOMEM;
 		goto fail;
 	}
 
 	error = bus_setup_intr(dev, sc->event_res, INTR_TYPE_MISC | INTR_MPSAFE,
 	    NULL, handler, arg, &sc->event_tag);
 	if (error) {
 		device_printf(dev, "Fail to setup event intr\n");
 		goto fail;
 	}
 
 	bus_describe_intr(dev, sc->event_res, sc->event_tag, "%s", desc);
 	return (0);
 
 fail:
 	ivhd_teardown_intr(dev);
 	return (error);
 }
 
 static int
 ivhd_teardown_intr(device_t dev)
 {
-	struct amdiommu_softc *sc;
+	struct amdviiommu_softc *sc;
 
 	sc = device_get_softc(dev);
 
 	if (sc->event_tag != NULL) {
 		bus_teardown_intr(dev, sc->event_res, sc->event_tag);
 		sc->event_tag = NULL;
 	}
 	if (sc->event_res != NULL) {
 		bus_release_resource(dev, SYS_RES_IRQ, sc->event_rid,
 		    sc->event_res);
 		sc->event_res = NULL;
 	}
 	pci_release_msi(dev);
 	return (0);
 }
 
 /* This driver has to be loaded before ivhd */
-DRIVER_MODULE(amdiommu, pci, amdiommu_driver, 0, 0);
-MODULE_DEPEND(amdiommu, pci, 1, 1, 1);
+DRIVER_MODULE(amdviiommu, pci, amdviiommu_driver, 0, 0);
+MODULE_DEPEND(amdviiommu, pci, 1, 1, 1);
diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile
index 47504a053c34..15454b345934 100644
--- a/sys/modules/vmm/Makefile
+++ b/sys/modules/vmm/Makefile
@@ -1,151 +1,151 @@
 .include <kmod.opts.mk>
 
 KMOD=	vmm
 
 .if ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	opt_acpi.h		\
 	opt_bhyve_snapshot.h	\
 	opt_ddb.h
 .endif
 
 SRCS+=	acpi_if.h bus_if.h device_if.h pci_if.h pcib_if.h vnode_if.h
 
 CFLAGS+= -DVMM_KEEP_STATS
 CFLAGS+= -I${SRCTOP}/sys/${MACHINE}/vmm
 CFLAGS+= -I${SRCTOP}/sys/${MACHINE}/vmm/io
 
 # generic vmm support
 .PATH: ${SRCTOP}/sys/dev/vmm ${SRCTOP}/sys/${MACHINE}/vmm
 
 SRCS+=	vmm.c			\
 	vmm_dev.c		\
 	vmm_dev_machdep.c	\
 	vmm_instruction_emul.c	\
 	vmm_stat.c
 
 .if ${MACHINE_CPUARCH} == "aarch64"
 DPSRCS+=	assym.inc
 
 # TODO: Add the new EL2 code
 SRCS+=	vmm_arm64.c \
 	vmm_reset.c \
 	vmm_call.S \
 	vmm_handlers.c \
 	vmm_mmu.c \
 	vmm_vhe_exception.S \
 	vmm_vhe.c \
 	vmm_hyp_el2.S
 
 .PATH: ${SRCTOP}/sys/${MACHINE}/vmm/io
 SRCS+=	vgic.c \
 	vgic_if.h \
 	vgic_if.c \
 	vgic_v3.c \
 	vtimer.c
 
 CLEANFILES+=	vmm_nvhe_exception.o vmm_nvhe.o
 
 CLEANFILES+=	vmm_hyp_blob.elf.full
 CLEANFILES+=	vmm_hyp_blob.elf vmm_hyp_blob.bin
 
 vmm_nvhe_exception.o: vmm_nvhe_exception.S
 	${CC} -c -x assembler-with-cpp -DLOCORE \
 	    ${NOSAN_CFLAGS:N-mbranch-protection*} ${.IMPSRC} -o ${.TARGET} -fpie
 
 vmm_nvhe.o: vmm_nvhe.c
 	${CC} -c ${NOSAN_CFLAGS:N-mbranch-protection*} ${.IMPSRC} \
 	    -o ${.TARGET} -fpie
 
 vmm_hyp_blob.elf.full:	vmm_nvhe_exception.o vmm_nvhe.o
 	${LD} -m ${LD_EMULATION} -Bdynamic -L ${SYSDIR}/conf -T ${SYSDIR}/conf/ldscript.arm64 \
 	    ${_LDFLAGS:N-zbti-report*} --no-warn-mismatch --warn-common --export-dynamic \
 	    --dynamic-linker /red/herring -X -o ${.TARGET} ${.ALLSRC} \
 	    --defsym=_start='0x0' --defsym=text_start='0x0'
 
 vmm_hyp_blob.elf:	vmm_hyp_blob.elf.full
 	${OBJCOPY} --strip-debug ${.ALLSRC} ${.TARGET}
 
 vmm_hyp_blob.bin:	vmm_hyp_blob.elf
 	${OBJCOPY} --output-target=binary ${.ALLSRC} ${.TARGET}
 
 vmm_hyp_el2.o:	vmm_hyp_blob.bin
 
 .elif ${MACHINE_CPUARCH} == "amd64"
 DPSRCS+=	vmx_assym.h svm_assym.h
 DPSRCS+=	vmx_genassym.c svm_genassym.c offset.inc
 
 CFLAGS+= -I${SRCTOP}/sys/amd64/vmm/intel
 CFLAGS+= -I${SRCTOP}/sys/amd64/vmm/amd
 
 SRCS+=	vmm_host.c	\
 	vmm_ioport.c	\
 	vmm_lapic.c	\
 	vmm_mem.c	\
 	vmm_util.c	\
 	x86.c
 
 .PATH: ${SRCTOP}/sys/${MACHINE}/vmm/io
 SRCS+=	iommu.c		\
 	ppt.c           \
 	vatpic.c	\
 	vatpit.c	\
 	vhpet.c		\
 	vioapic.c	\
 	vlapic.c	\
 	vpmtmr.c	\
 	vrtc.c
 
 # intel-specific files
 .PATH: ${SRCTOP}/sys/amd64/vmm/intel
 SRCS+=	ept.c		\
 	vmcs.c		\
 	vmx_msr.c	\
 	vmx_support.S	\
 	vmx.c		\
 	vtd.c
 
 # amd-specific files
 .PATH: ${SRCTOP}/sys/amd64/vmm/amd
 SRCS+=	vmcb.c		\
-	amdiommu.c	\
+	amdviiommu.c	\
 	ivhd_if.c	\
 	ivhd_if.h	\
 	svm.c		\
 	svm_support.S	\
 	npt.c		\
 	ivrs_drv.c	\
 	amdvi_hw.c	\
 	svm_msr.c
 
 SRCS.BHYVE_SNAPSHOT=	vmm_snapshot.c
 
 CLEANFILES+=	vmx_assym.h vmx_genassym.o svm_assym.h svm_genassym.o
 
 OBJS_DEPEND_GUESS.vmx_support.o+= vmx_assym.h
 OBJS_DEPEND_GUESS.svm_support.o+= svm_assym.h
 .endif
 
 vmx_assym.h:    vmx_genassym.o
 	sh ${SYSDIR}/kern/genassym.sh vmx_genassym.o > ${.TARGET}
 
 svm_assym.h:    svm_genassym.o
 	sh ${SYSDIR}/kern/genassym.sh svm_genassym.o > ${.TARGET}
 
 vmx_support.o:
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.IMPSRC} -o ${.TARGET}
 
 svm_support.o:
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.IMPSRC} -o ${.TARGET}
 
 hyp_genassym.o: offset.inc
 	${CC} -c ${NOSAN_CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC}
 
 vmx_genassym.o: offset.inc
 	${CC} -c ${NOSAN_CFLAGS:N-flto*:N-fno-common} -fcommon ${.IMPSRC}
 
 svm_genassym.o: offset.inc
 	${CC} -c ${NOSAN_CFLAGS:N-flto*:N-fno-common} -fcommon ${.IMPSRC}
 
 .include <bsd.kmod.mk>