diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
index c45b904ed4e0..078ef9a885dc 100644
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -6,7 +6,7 @@ PROG=	bhyve
 
 DEBUG_FLAGS= -g -O0 
 
-SRCS=	acpi.c atpic.c consport.c dbgport.c elcr.c fbsdrun.c inout.c 
+SRCS=	acpi.c atpic.c bhyverun.c consport.c dbgport.c elcr.c inout.c 
 SRCS+=  ioapic.c mem.c mevent.c mptbl.c
 SRCS+=	pci_emul.c pci_hostbridge.c pci_passthru.c pci_virtio_block.c
 SRCS+=	pci_virtio_net.c pci_uart.c pit_8254.c pmtmr.c post.c rtc.c uart.c
diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
index 16715500a322..32effdc1e953 100644
--- a/usr.sbin/bhyve/acpi.c
+++ b/usr.sbin/bhyve/acpi.c
@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-#include "fbsdrun.h"
+#include "bhyverun.h"
 #include "acpi.h"
 
 /*
diff --git a/usr.sbin/bhyve/fbsdrun.c b/usr.sbin/bhyve/bhyverun.c
similarity index 99%
rename from usr.sbin/bhyve/fbsdrun.c
rename to usr.sbin/bhyve/bhyverun.c
index 06e043c27bd4..fd3d8a2d9e59 100644
--- a/usr.sbin/bhyve/fbsdrun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/vmm.h>
 #include <vmmapi.h>
 
-#include "fbsdrun.h"
+#include "bhyverun.h"
 #include "acpi.h"
 #include "inout.h"
 #include "dbgport.h"
diff --git a/usr.sbin/bhyve/fbsdrun.h b/usr.sbin/bhyve/bhyverun.h
similarity index 100%
rename from usr.sbin/bhyve/fbsdrun.h
rename to usr.sbin/bhyve/bhyverun.h
diff --git a/usr.sbin/bhyve/ioapic.c b/usr.sbin/bhyve/ioapic.c
index 47dd833109be..c712692c9375 100644
--- a/usr.sbin/bhyve/ioapic.c
+++ b/usr.sbin/bhyve/ioapic.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 
 #include "inout.h"
 #include "mem.h"
-#include "fbsdrun.h"
+#include "bhyverun.h"
 
 #include <stdio.h>
 
diff --git a/usr.sbin/bhyve/mptbl.c b/usr.sbin/bhyve/mptbl.c
index 03aaaee7a2a0..52790f38ab8e 100644
--- a/usr.sbin/bhyve/mptbl.c
+++ b/usr.sbin/bhyve/mptbl.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <string.h>
 
-#include "fbsdrun.h"
+#include "bhyverun.h"
 #include "mptbl.h"
 
 #define MPTABLE_BASE		0xF0000
diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
index 1836bc9b3810..e086aeb0c524 100644
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/vmm.h>
 #include <vmmapi.h>
 
-#include "fbsdrun.h"
+#include "bhyverun.h"
 #include "inout.h"
 #include "mem.h"
 #include "mptbl.h"
diff --git a/usr.sbin/bhyve/pci_uart.c b/usr.sbin/bhyve/pci_uart.c
index 51876f5a1951..3f192e12c765 100644
--- a/usr.sbin/bhyve/pci_uart.c
+++ b/usr.sbin/bhyve/pci_uart.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <stdbool.h>
 #include <string.h>
 
-#include "fbsdrun.h"
+#include "bhyverun.h"
 #include "pci_emul.h"
 #include "mevent.h"
 
diff --git a/usr.sbin/bhyve/pci_virtio_block.c b/usr.sbin/bhyve/pci_virtio_block.c
index 8c986152135a..3382097e1520 100644
--- a/usr.sbin/bhyve/pci_virtio_block.c
+++ b/usr.sbin/bhyve/pci_virtio_block.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <assert.h>
 #include <pthread.h>
 
-#include "fbsdrun.h"
+#include "bhyverun.h"
 #include "pci_emul.h"
 #include "virtio.h"
 
diff --git a/usr.sbin/bhyve/pci_virtio_net.c b/usr.sbin/bhyve/pci_virtio_net.c
index 9e7a1c7ecd23..3f6f88abf6fc 100644
--- a/usr.sbin/bhyve/pci_virtio_net.c
+++ b/usr.sbin/bhyve/pci_virtio_net.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <md5.h>
 #include <pthread.h>
 
-#include "fbsdrun.h"
+#include "bhyverun.h"
 #include "pci_emul.h"
 #include "mevent.h"
 #include "virtio.h"
diff --git a/usr.sbin/bhyve/pit_8254.c b/usr.sbin/bhyve/pit_8254.c
index d9b6d551b3d6..c96596a9f6fe 100644
--- a/usr.sbin/bhyve/pit_8254.c
+++ b/usr.sbin/bhyve/pit_8254.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <assert.h>
 
-#include "fbsdrun.h"
+#include "bhyverun.h"
 #include "inout.h"
 #include "pit_8254.h"
 
diff --git a/usr.sbin/bhyve/spinup_ap.c b/usr.sbin/bhyve/spinup_ap.c
index 3aa3b65eb014..b5e553f80496 100644
--- a/usr.sbin/bhyve/spinup_ap.c
+++ b/usr.sbin/bhyve/spinup_ap.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <assert.h>
 
-#include "fbsdrun.h"
+#include "bhyverun.h"
 #include "spinup_ap.h"
 
 /*