3 files changed, 4 insertions, 4 deletions
diff --git a/src/mainboard/emulation/qemu-x86/chip.h b/src/mainboard/emulation/qemu-x86/chip.h
index b9394195d7..41477cd2af 100644
--- a/src/mainboard/emulation/qemu-x86/chip.h
+++ b/src/mainboard/emulation/qemu-x86/chip.h
@@ -3,9 +3,9 @@ extern struct chip_operations mainboard_ops;
 struct mainboard_config {
 };
 
-struct cpu_emulation_qemu_x86_config
+struct mainboard_emulation_qemu_x86_config
 {
 };
 
-extern struct chip_operations cpu_emulation_qemu_x86_ops;
+extern struct chip_operations mainboard_emulation_qemu_x86_ops;
 
diff --git a/src/mainboard/emulation/qemu-x86/devicetree.cb b/src/mainboard/emulation/qemu-x86/devicetree.cb
index 745ff189d1..2e18d790c9 100644
--- a/src/mainboard/emulation/qemu-x86/devicetree.cb
+++ b/src/mainboard/emulation/qemu-x86/devicetree.cb
@@ -1,4 +1,4 @@
-chip cpu/emulation/qemu-x86
+chip mainboard/emulation/qemu-x86
 	device pci_domain 0 on 
 		device pci 0.0 on end
 
diff --git a/src/mainboard/emulation/qemu-x86/northbridge.c b/src/mainboard/emulation/qemu-x86/northbridge.c
index 4184d14a17..4260d0c954 100644
--- a/src/mainboard/emulation/qemu-x86/northbridge.c
+++ b/src/mainboard/emulation/qemu-x86/northbridge.c
@@ -152,7 +152,7 @@ static void enable_dev(struct device *dev)
 	}
 }
 
-struct chip_operations cpu_emulation_qemu_x86_ops = {
+struct chip_operations mainboard_emulation_qemu_x86_ops = {
 	CHIP_NAME("QEMU Northbridge")
 	.enable_dev = enable_dev,
 };