diff --git a/src/mainboard/intel/kblrvp/variants/baseboard/devicetree.cb b/src/mainboard/intel/kblrvp/variants/baseboard/devicetree.cb
index b015fc6..b282657 100644
--- a/src/mainboard/intel/kblrvp/variants/baseboard/devicetree.cb
+++ b/src/mainboard/intel/kblrvp/variants/baseboard/devicetree.cb
@@ -111,50 +111,23 @@
 
 	device cpu_cluster 0 on end
 	device domain 0 on
-		device pci 00.0 on  end # Host Bridge
-		device pci 02.0 on  end # Integrated Graphics Device
-		device pci 04.0 on  end # SA thermal subsystem
-		device pci 14.0 on  end # USB xHCI
-		device pci 14.1 off end # USB xDCI (OTG)
-		device pci 14.2 on  end # Thermal Subsystem
-		device pci 15.0 on  end # I2C #0
-		device pci 15.1 on  end # I2C #1
-		device pci 15.2 on  end # I2C #2
-		device pci 15.3 on  end # I2C #3
-		device pci 16.0 on  end # Management Engine Interface 1
-		device pci 16.1 off end # Management Engine Interface 2
-		device pci 16.2 off end # Management Engine IDE-R
-		device pci 16.3 off end # Management Engine KT Redirection
-		device pci 16.4 off end # Management Engine Interface 3
-		device pci 17.0 off end # SATA
-		device pci 19.0 on  end # UART #2
-		device pci 19.1 off end # I2C #5
-		device pci 19.2 on  end # I2C #4
-		device pci 1c.0 on  end # PCI Express Port 1
-		device pci 1c.1 off end # PCI Express Port 2
-		device pci 1c.2 off end # PCI Express Port 3
-		device pci 1c.3 off end # PCI Express Port 4
-		device pci 1c.4 off end # PCI Express Port 5
-		device pci 1c.5 off end # PCI Express Port 6
-		device pci 1c.6 off end # PCI Express Port 7
-		device pci 1c.7 off end # PCI Express Port 8
-		device pci 1d.0 on  end # PCI Express Port 9
-		device pci 1d.1 off end # PCI Express Port 10
-		device pci 1d.2 off end # PCI Express Port 11
-		device pci 1d.3 off end # PCI Express Port 12
-		device pci 1e.0 on  end # UART #0
-		device pci 1e.1 off end # UART #1
-		device pci 1e.2 off end # GSPI #0
-		device pci 1e.3 off end # GSPI #1
-		device pci 1e.4 on  end # eMMC
-		device pci 1e.5 off end # SDIO
-		device pci 1e.6 on  end # SDCard
-		device pci 1f.0 on  end # LPC Interface
-		device pci 1f.1 on  end # P2SB
-		device pci 1f.2 on  end # Power Management Controller
-		device pci 1f.3 off end # Intel HDA
-		device pci 1f.4 on  end # SMBus
-		device pci 1f.5 on  end # PCH SPI
-		device pci 1f.6 off end # GbE
+		device ref igpu		on  end
+		device ref sa_thermal	on  end
+		device ref south_xhci	on  end
+		device ref thermal	on  end
+		device ref i2c0		on  end
+		device ref i2c1		on  end
+		device ref i2c2		on  end
+		device ref i2c3		on  end
+		device ref heci1	on  end
+		device ref uart2	on  end
+		device ref i2c4		on  end
+		device ref pcie_rp1	on  end
+		device ref pcie_rp9	on  end
+		device ref uart0	on  end
+		device ref emmc		on  end
+		device ref sdxc		on  end
+		device ref smbus	on  end
+		device ref fast_spi	on  end
 	end
 end
diff --git a/src/mainboard/intel/kblrvp/variants/rvp11/overridetree.cb b/src/mainboard/intel/kblrvp/variants/rvp11/overridetree.cb
index 9d6dd99..b580e76 100644
--- a/src/mainboard/intel/kblrvp/variants/rvp11/overridetree.cb
+++ b/src/mainboard/intel/kblrvp/variants/rvp11/overridetree.cb
@@ -107,14 +107,14 @@
 	}"
 
 	device domain 0 on
-		device pci 04.0 off end # SA thermal subsystem
-		device pci 15.2 off end # I2C #2
-		device pci 15.3 off end # I2C #3
-		device pci 17.0 on  end # SATA
-		device pci 19.2 off end # I2C #4
-		device pci 1e.4 off end # eMMC
-		device pci 1e.6 off end # SDCard
-		device pci 1f.3 on  end # Intel HDA
-		device pci 1f.6 on  end # GbE
+		device ref sa_thermal	off end
+		device ref i2c2		off end
+		device ref i2c3		off end
+		device ref sata		on  end
+		device ref i2c4		off end
+		device ref emmc		off end
+		device ref sdxc		off end
+		device ref hda		on  end
+		device ref gbe		on  end
 	end
 end
diff --git a/src/mainboard/intel/kblrvp/variants/rvp3/overridetree.cb b/src/mainboard/intel/kblrvp/variants/rvp3/overridetree.cb
index 4a1c67b..b7c4395 100644
--- a/src/mainboard/intel/kblrvp/variants/rvp3/overridetree.cb
+++ b/src/mainboard/intel/kblrvp/variants/rvp3/overridetree.cb
@@ -113,18 +113,18 @@
 	}"
 
 	device domain 0 on
-		device pci 05.0 on  end # SA IMGU
-		device pci 14.3 on  end # Camera
-		device pci 1c.0 on  end # PCI Express Port 1 x4 SLOT1
-		device pci 1c.4 on  end # PCI Express Port 5 x1 SLOT2/LAN
-		device pci 1c.5 on  end # PCI Express Port 6 x1 SLOT3
-		device pci 1d.0 on  end # PCI Express Port 9  x1 WLAN
-		device pci 1d.1 on  end # PCI Express Port 10 x1 WIGIG
-		device pci 1f.0 on
+		device ref imgu		on  end
+		device ref cio		on  end
+		device ref pcie_rp1	on  end # x4 SLOT1
+		device ref pcie_rp5	on  end # x1 SLOT2/LAN
+		device ref pcie_rp6	on  end # x1 SLOT3
+		device ref pcie_rp9	on  end # x1 WLAN
+		device ref pcie_rp10	on  end # x1 WIGIG
+		device ref lpc_espi	on
 			chip drivers/pc80/tpm
 				device pnp 0c31.0 on end
 			end
-		end # LPC Interface
-		device pci 1f.3 on  end # Intel HDA
+		end
+		device ref hda		on  end
 	end
 end
diff --git a/src/mainboard/intel/kblrvp/variants/rvp7/overridetree.cb b/src/mainboard/intel/kblrvp/variants/rvp7/overridetree.cb
index f7baaa8..c5b7e94 100644
--- a/src/mainboard/intel/kblrvp/variants/rvp7/overridetree.cb
+++ b/src/mainboard/intel/kblrvp/variants/rvp7/overridetree.cb
@@ -155,17 +155,17 @@
 
 	device cpu_cluster 0 on end
 	device domain 0 on
-		device pci 15.2 off end # I2C #2
-		device pci 15.3 off end # I2C #3
-		device pci 17.0 on  end # SATA
-		device pci 1c.2 on  end # PCI Express Port 3
-		device pci 1c.3 on  end # PCI Express Port 4
-		device pci 1c.4 on  end # PCI Express Port 5
-		device pci 1c.5 on  end # PCI Express Port 6
-		device pci 1f.0 on
+		device ref i2c2		off end
+		device ref i2c3		off end
+		device ref sata		on  end
+		device ref pcie_rp3	on  end
+		device ref pcie_rp4	on  end
+		device ref pcie_rp5	on  end
+		device ref pcie_rp6	on  end
+		device ref lpc_espi	on
 			chip drivers/pc80/tpm
 				device pnp 0c31.0 on end
 			end
-		end # LPC Interface
+		end
 	end
 end
diff --git a/src/mainboard/intel/kblrvp/variants/rvp8/overridetree.cb b/src/mainboard/intel/kblrvp/variants/rvp8/overridetree.cb
index 71deaa5..2291c63 100644
--- a/src/mainboard/intel/kblrvp/variants/rvp8/overridetree.cb
+++ b/src/mainboard/intel/kblrvp/variants/rvp8/overridetree.cb
@@ -160,21 +160,21 @@
 	}"
 
 	device domain 0 on
-		device pci 15.2 off end # I2C #2
-		device pci 15.3 off end # I2C #3
-		device pci 17.0 on  end # SATA
-		device pci 19.2 off end # I2C #4
-		device pci 1c.0 off end # PCI Express Port 1
-		device pci 1c.2 on  end # PCI Express Port 3
-		device pci 1c.3 on  end # PCI Express Port 4
-		device pci 1c.4 on  end # PCI Express Port 5
-		device pci 1e.4 off end # eMMC
-		device pci 1e.6 off end # SDXC
-		device pci 1f.0 on
+		device ref i2c2		off end
+		device ref i2c3		off end
+		device ref sata		on  end
+		device ref i2c4		off end
+		device ref pcie_rp1	off end
+		device ref pcie_rp3	on  end
+		device ref pcie_rp4	on  end
+		device ref pcie_rp5	on  end
+		device ref emmc		off end
+		device ref sdxc		off end
+		device ref lpc_espi	on
 			#chip drivers/pc80/tpm
 			#	device pnp 0c31.0 on end
 			#end
-		end # LPC Interface
-		device pci 1f.6 on  end # GbE
+		end
+		device ref gbe		on  end
 	end
 end