diff --git a/src/mainboard/google/puff/variants/ambassador/overridetree.cb b/src/mainboard/google/puff/variants/ambassador/overridetree.cb
index 8b6a9ae..80bcb68 100644
--- a/src/mainboard/google/puff/variants/ambassador/overridetree.cb
+++ b/src/mainboard/google/puff/variants/ambassador/overridetree.cb
@@ -208,7 +208,7 @@
 	register "sata_port[1].TxGen3DeEmph" = "0x20"
 
 	device domain 0 on
-		device pci 04.0 on
+		device ref dptf on
 			chip drivers/intel/dptf
 				## Active Policy
 				register "policies.active[0]" = "{.target=DPTF_CPU,
@@ -272,8 +272,8 @@
 
 				device generic 0 on end
 			end
-		end # DPTF 0x1903
-		device pci 14.0 on
+		end
+		device ref xhci on
 			chip drivers/usb/acpi
 				device usb 0.0 on
 					chip drivers/usb/acpi
@@ -353,29 +353,31 @@
 					end
 				end
 			end
-		end # USB xHCI
-		device pci 15.0 off
+		end
+		device ref i2c0 off
 			# RFU - Reserved for Future Use.
-		end # I2C #0
-		device pci 15.1 off end # I2C #1
-		device pci 15.2 on
+		end
+		device ref i2c1 off end
+		device ref i2c2 on
+			# PCON PS175
 			chip drivers/i2c/generic
 				register "hid" = ""1AF80175""
 				register "name" = ""PS17""
 				register "desc" = ""Parade PS175""
 				device i2c 4a on end
 			end
-		end # I2C #2, PCON PS175.
-		device pci 15.3 on
+		end
+		device ref i2c3 on
+			# Realtek RTD2142
 			chip drivers/i2c/generic
 				register "hid" = ""10EC2142""
 				register "name" = ""RTD2""
 				register "desc" = ""Realtek RTD2142""
 				device i2c 4a on end
 			end
-		end # I2C #3, Realtek RTD2142.
-		device pci 16.0 on  end # Management Engine Interface 1
-		device pci 19.0 on
+		end
+		device ref heci1 on  end
+		device ref i2c4 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -388,9 +390,10 @@
 				register "property_list[0].integer" = "1"
 				device i2c 1a on end
 			end
-		end #I2C #4
-		device pci 1a.0 on  end # eMMC
-		device pci 1c.6 on
+		end
+		device ref emmc on  end
+		device ref pcie_rp7 on
+			# RTL8111H Ethernet NIC
 			chip drivers/net
 				register "customized_leds" = "0x05af"
 				register "wake" = "GPE0_DW1_07" # GPP_C7
@@ -399,11 +402,12 @@
 				device pci 00.0 on end
 			end
 			register "PcieRpSlotImplemented[6]" = "1"
-		end # RTL8111H Ethernet NIC
-		device pci 1d.2 on	# PCI Express Port 11 (X2 NVMe)
+		end
+		device ref pcie_rp11 on
+			# X2 NVMe
 			register "PcieRpSlotImplemented[10]" = "1"
 		end
-		device pci 1e.3 off end # GSPI #1
+		device ref gspi1 off end
 	end
 
 	# VR Settings Configuration for 4 Domains
diff --git a/src/mainboard/google/puff/variants/baseboard/devicetree.cb b/src/mainboard/google/puff/variants/baseboard/devicetree.cb
index b7a9674..d3624df 100644
--- a/src/mainboard/google/puff/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/puff/variants/baseboard/devicetree.cb
@@ -198,14 +198,14 @@
 	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 off end # SA Thermal device
-		device pci 05.0 off end # SA IPU
-		device pci 12.0 on end # Thermal Subsystem
-		device pci 12.5 off end # UFS SCS
-		device pci 12.6 off end # GSPI #2
-		device pci 14.0 on
+		device ref system_agent on end
+		device ref igpu on  end
+		device ref dptf off end
+		device ref ipu off end
+		device ref thermal on end
+		device ref ufs off end
+		device ref gspi2 off end
+		device ref xhci on
 			chip drivers/usb/acpi
 				register "desc" = ""Root Hub""
 				register "type" = "UPC_TYPE_HUB"
@@ -281,78 +281,80 @@
 					end
 				end
 			end
-		end # USB xHCI
-		device pci 14.1 off end # USB xDCI (OTG)
-		device pci 14.3 on
+		end
+		device ref xdci off end
+		device ref cnvi_wifi on
 			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
 				device generic 0 on end
 			end
-		end # CNVi wifi
-		device pci 14.5 on  end # SDCard
-		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 16.5 off end # Management Engine Interface 4
-		device pci 17.0 on  end # SATA
-		device pci 19.0 on  end # I2C #4
-		device pci 19.1 off end # I2C #5
-		device pci 19.2 off end # UART #2
-		device pci 1a.0 off end # eMMC
-		device pci 1c.0 off end # PCI Express Port 1 (USB)
-		device pci 1c.1 off end # PCI Express Port 2 (USB)
-		device pci 1c.2 off end # PCI Express Port 3 (USB)
-		device pci 1c.3 off end # PCI Express Port 4 (USB)
-		device pci 1c.4 off end # PCI Express Port 5 (USB)
-		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	# PCI Express Port 9 (X4 NVME)
+		end
+		device ref sdxc 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 heci2 off end
+		device ref csme_ider off end
+		device ref csme_ktr off end
+		device ref heci3 off end
+		device ref heci4 off end
+		device ref sata on  end
+		device ref i2c4 on  end
+		device ref i2c5 off end
+		device ref uart2 off end
+		device ref emmc off end
+		device ref pcie_rp1 off end
+		device ref pcie_rp2 off end
+		device ref pcie_rp3 off end
+		device ref pcie_rp4 off end
+		device ref pcie_rp5 off end
+		device ref pcie_rp6 off end
+		device ref pcie_rp7 off end
+		device ref pcie_rp8 off end
+		device ref pcie_rp9 on
+			# X4 NVME
 			register "PcieRpSlotImplemented[8]" = "1"
 		end
-		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 1d.4 off end # PCI Express port 13
-		device pci 1d.5 on
+		device ref pcie_rp10 off end
+		device ref pcie_rp11 off end
+		device ref pcie_rp12 off end
+		device ref pcie_rp13 off end
+		device ref pcie_rp14 on
+			# x4
 			chip drivers/wifi/generic
 				register "wake" = "GPE0_DW1_01"
 				device generic 0 on  end
 			end
 			register "PcieRpSlotImplemented[13]" = "1"
-		end # PCI Express Port 14 (x4)
-		device pci 1e.0 on  end # UART #0
-		device pci 1e.1 off end # UART #1
-		device pci 1e.2 on
+		end
+		device ref uart0 on  end
+		device ref uart1 off end
+		device ref gspi0 on
 			chip drivers/spi/acpi
 				register "hid" = "ACPI_DT_NAMESPACE_HID"
 				register "compat_string" = ""google,cr50""
 				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_C21_IRQ)"
 				device spi 0 on end
 			end
-		end # GSPI #0
-		device pci 1e.3 on end # GSPI #1
-		device pci 1f.0 on
+		end
+		device ref gspi1 on end
+		device ref lpc_espi on
 			chip ec/google/chromeec
 				device pnp 0c09.0 on end
 			end
-		end # eSPI Interface
-		device pci 1f.1 on  end # P2SB
-		device pci 1f.2 hidden end # Power Management Controller
-		device pci 1f.3 on
+		end
+		device ref p2sb on  end
+		device ref pmc hidden end
+		device ref hda on
 			chip drivers/sof
 				register "jack_tplg" = "rt5682"
 				device generic 0 on end
 			end
-		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
+		end
+		device ref smbus on  end
+		device ref fast_spi on  end
+		device ref gbe off end
 	end
 end
diff --git a/src/mainboard/google/puff/variants/dooly/overridetree.cb b/src/mainboard/google/puff/variants/dooly/overridetree.cb
index 78324ed..8c3d473 100644
--- a/src/mainboard/google/puff/variants/dooly/overridetree.cb
+++ b/src/mainboard/google/puff/variants/dooly/overridetree.cb
@@ -185,7 +185,7 @@
 	register "sata_port[1].TxGen3DeEmph" = "0x20"
 
 	device domain 0 on
-		device pci 04.0 on
+		device ref dptf on
 			chip drivers/intel/dptf
 				## Active Policy
 				register "policies.active[0]" = "{.target=DPTF_CPU,
@@ -238,8 +238,8 @@
 
 				device generic 0 on end
 			end
-		end # DPTF 0x1903
-		device pci 14.0 on
+		end
+		device ref xhci on
 			chip drivers/usb/acpi
 				device usb 0.0 on
 					chip drivers/usb/acpi
@@ -309,9 +309,10 @@
 					end
 				end
 			end
-		end # USB xHCI
-		device pci 14.5 off end # SDCard
-		device pci 15.0 on
+		end
+		device ref sdxc off end
+		device ref i2c0 on
+			# ALC1015
 			chip drivers/i2c/generic
                                 register "hid" = ""10EC1015""
                                 register "desc" = ""Realtek SPK AMP L""
@@ -324,10 +325,11 @@
                                 register "uid" = "1"
                                 device i2c 29 on end
                         end
-		end # I2C #0 ALC1015
-		device pci 15.1 off end # I2C #1
-		device pci 15.2 on  end # I2C #2 LVDS
-		device pci 15.3 on
+		end
+		device ref i2c1 off end
+		device ref i2c2 on  end # LVDS
+		device ref i2c3 on
+			# Touchscreen
 			chip drivers/i2c/hid
 				register "generic.hid" = ""WDHT2002""
 				register "generic.desc" = ""WDT Touchscreen""
@@ -340,9 +342,9 @@
 				register "hid_desc_reg_offset" = "0x20"
 				device i2c 2c on end
 			end
-		end # I2C #3 Touchscreen
-		device pci 16.0 on  end # Management Engine Interface 1
-		device pci 19.0 on
+		end
+		device ref heci1 on  end
+		device ref i2c4 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -382,20 +384,21 @@
 				register "key.label" = ""mic_mute_switch_key""
 				device generic 0 on end
 			end
-		end #I2C #4
-		device pci 1a.0 on  end # eMMC
-		device pci 1d.2 on	# PCI Express Port 11 (X2 NVMe)
+		end
+		device ref emmc on  end
+		device ref pcie_rp11 on
+			# X2 NVMe
 			register "PcieRpSlotImplemented[10]" = "1"
 		end
-		device pci 1e.3 off end # GSPI #1
-		device pci 1f.3 on
+		device ref gspi1 off end
+		device ref hda on
 			chip drivers/sof
 				register "spkr_tplg" = "rt1015"
 				register "jack_tplg" = "rt5682"
 				register "mic_tplg" = "_2ch_pdm0"
 				device generic 0 on end
 			end
-		end # Intel HDA
+		end
 	end
 
 	# VR Settings Configuration for 4 Domains
diff --git a/src/mainboard/google/puff/variants/duffy/overridetree.cb b/src/mainboard/google/puff/variants/duffy/overridetree.cb
index b1c50a2..97a9af2 100644
--- a/src/mainboard/google/puff/variants/duffy/overridetree.cb
+++ b/src/mainboard/google/puff/variants/duffy/overridetree.cb
@@ -269,7 +269,7 @@
 	register "sata_port[1].TxGen3DeEmph" = "0x20"
 
 	device domain 0 on
-		device pci 04.0 on
+		device ref dptf on
 			chip drivers/intel/dptf
 				## Active Policy
 				register "policies.active[0]" = "{.target=DPTF_CPU,
@@ -331,8 +331,8 @@
 
 				device generic 0 on end
 			end
-		end # DPTF 0x1903
-		device pci 14.0 on
+		end
+		device ref xhci on
 			chip drivers/usb/acpi
 				device usb 0.0 on
 					chip drivers/usb/acpi
@@ -412,29 +412,31 @@
 					end
 				end
 			end
-		end # USB xHCI
-		device pci 15.0 off
+		end
+		device ref i2c0 off
 			# RFU - Reserved for Future Use.
-		end # I2C #0
-		device pci 15.1 off end # I2C #1
-		device pci 15.2 on
+		end
+		device ref i2c1 off end
+		device ref i2c2 on
+			# PCON PS175
 			chip drivers/i2c/generic
 				register "hid" = ""1AF80175""
 				register "name" = ""PS17""
 				register "desc" = ""Parade PS175""
 				device i2c 4a on end
 			end
-		end # I2C #2, PCON PS175.
-		device pci 15.3 on
+		end
+		device ref i2c3 on
+			# Realtek RTD2142
 			chip drivers/i2c/generic
 				register "hid" = ""10EC2142""
 				register "name" = ""RTD2""
 				register "desc" = ""Realtek RTD2142""
 				device i2c 4a on end
 			end
-		end # I2C #3, Realtek RTD2142.
-		device pci 16.0 on end # Management Engine Interface 1
-		device pci 19.0 on
+		end
+		device ref heci1 on end
+		device ref i2c4 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -447,9 +449,10 @@
 				register "property_list[0].integer" = "1"
 				device i2c 1a on end
 			end
-		end #I2C #4
-		device pci 1a.0 on  end # eMMC
-		device pci 1c.6 on
+		end
+		device ref emmc on  end
+		device ref pcie_rp7 on
+			# RTL8111H Ethernet NIC
 			chip drivers/net
 				register "customized_leds" = "0x05af"
 				register "wake" = "GPE0_DW1_07" # GPP_C7
@@ -458,11 +461,12 @@
 				device pci 00.0 on end
 			end
 			register "PcieRpSlotImplemented[6]" = "1"
-		end # RTL8111H Ethernet NIC
-		device pci 1d.2 on	# PCI Express Port 11 (X2 NVMe)
+		end
+		device ref pcie_rp11 on
+			# X2 NVMe
 			register "PcieRpSlotImplemented[10]" = "1"
 		end
-		device pci 1e.3 off end # GSPI #1
+		device ref gspi1 off end
 	end
 
 	# VR Settings Configuration for 4 Domains
diff --git a/src/mainboard/google/puff/variants/faffy/overridetree.cb b/src/mainboard/google/puff/variants/faffy/overridetree.cb
index 83f0c16..d8b8001 100644
--- a/src/mainboard/google/puff/variants/faffy/overridetree.cb
+++ b/src/mainboard/google/puff/variants/faffy/overridetree.cb
@@ -277,7 +277,7 @@
 	register "sata_port[1].TxGen3DeEmph" = "0x20"
 
 	device domain 0 on
-		device pci 04.0 on
+		device ref dptf on
 			chip drivers/intel/dptf
 				## Passive Policy
 				register "policies.passive[0]" = "DPTF_PASSIVE(CPU, CPU, 95, 5000)"
@@ -305,8 +305,8 @@
 
 				device generic 0 on end
 			end
-		end # DPTF 0x1903
-		device pci 14.0 on
+		end
+		device ref xhci on
 			chip drivers/usb/acpi
 				device usb 0.0 on
 					chip drivers/usb/acpi
@@ -386,29 +386,31 @@
 					end
 				end
 			end
-		end # USB xHCI
-		device pci 15.0 off
+		end
+		device ref i2c0 off
 			# RFU - Reserved for Future Use.
-		end # I2C #0
-		device pci 15.1 off end # I2C #1
-		device pci 15.2 on
+		end
+		device ref i2c1 off end
+		device ref i2c2 on
+			# PCON PS175
 			chip drivers/i2c/generic
 				register "hid" = ""1AF80175""
 				register "name" = ""PS17""
 				register "desc" = ""Parade PS175""
 				device i2c 4a on end
 			end
-		end # I2C #2, PCON PS175.
-		device pci 15.3 on
+		end
+		device ref i2c3 on
+			# Realtek RTD2142
 			chip drivers/i2c/generic
 				register "hid" = ""10EC2142""
 				register "name" = ""RTD2""
 				register "desc" = ""Realtek RTD2142""
 				device i2c 4a on end
 			end
-		end # I2C #3, Realtek RTD2142.
-		device pci 16.0 on end # Management Engine Interface 1
-		device pci 19.0 on
+		end
+		device ref heci1 on end
+		device ref i2c4 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -421,9 +423,10 @@
 				register "property_list[0].integer" = "1"
 				device i2c 1a on end
 			end
-		end #I2C #4
-		device pci 1a.0 on  end # eMMC
-		device pci 1c.6 on
+		end
+		device ref emmc on  end
+		device ref pcie_rp7 on
+			# RTL8111H Ethernet NIC
 			chip drivers/net
 				register "customized_leds" = "0x05af"
 				register "wake" = "GPE0_DW1_07" # GPP_C7
@@ -432,11 +435,12 @@
 				device pci 00.0 on end
 			end
 			register "PcieRpSlotImplemented[6]" = "1"
-		end # RTL8111H Ethernet NIC
-		device pci 1d.2 on	# PCI Express Port 11 (X2 NVMe)
+		end
+		device ref pcie_rp11 on
+			# X2 NVMe
 			register "PcieRpSlotImplemented[10]" = "1"
 		end
-		device pci 1e.3 off end # GSPI #1
+		device ref gspi1 off end
 	end
 
 	# VR Settings Configuration for 4 Domains
diff --git a/src/mainboard/google/puff/variants/genesis/overridetree.cb b/src/mainboard/google/puff/variants/genesis/overridetree.cb
index 6458f9f..ef207b9 100644
--- a/src/mainboard/google/puff/variants/genesis/overridetree.cb
+++ b/src/mainboard/google/puff/variants/genesis/overridetree.cb
@@ -243,7 +243,7 @@
 	register "sata_port[1].TxGen3DeEmph" = "0x20"
 
 	device domain 0 on
-		device pci 04.0 on
+		device ref dptf on
 			chip drivers/intel/dptf
 				## Active Policy
 				register "policies.active[0]" = "{.target=DPTF_CPU,
@@ -304,8 +304,8 @@
 
 				device generic 0 on end
 			end
-		end # DPTF 0x1903
-		device pci 14.0 on
+		end
+		device ref xhci on
 			chip drivers/usb/acpi
 				device usb 0.0 on
 					chip drivers/usb/acpi
@@ -383,29 +383,31 @@
 					end
 				end
 			end
-		end # USB xHCI
-		device pci 15.0 off
+		end
+		device ref i2c0 off
 			# RFU - Reserved for Future Use.
-		end # I2C #0
-		device pci 15.1 off end # I2C #1
-		device pci 15.2 on
+		end
+		device ref i2c1 off end
+		device ref i2c2 on
+			# PCON PS175
 			chip drivers/i2c/generic
 				register "hid" = ""1AF80175""
 				register "name" = ""PS17""
 				register "desc" = ""Parade PS175""
 				device i2c 4a on end
 			end
-		end # I2C #2, PCON PS175.
-		device pci 15.3 on
+		end
+		device ref i2c3 on
+			# Realtek RTD2142
 			chip drivers/i2c/generic
 				register "hid" = ""10EC2142""
 				register "name" = ""RTD2""
 				register "desc" = ""Realtek RTD2142""
 				device i2c 4a on end
 			end
-		end # I2C #3, Realtek RTD2142.
-		device pci 16.0 on  end # Management Engine Interface 1
-		device pci 19.0 on
+		end
+		device ref heci1 on  end
+		device ref i2c4 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -418,9 +420,10 @@
 				register "property_list[0].integer" = "1"
 				device i2c 1a on end
 			end
-		end #I2C #4
-		device pci 1a.0 off end # eMMC
-		device pci 1c.6 on # PCI Root Port 7 (LAN)
+		end
+		device ref emmc off end
+		device ref pcie_rp7 on
+			# LAN
 			chip drivers/net # RTL8111H Ethernet NIC
 				register "customized_leds" = "0x05af"
 				register "wake" = "GPE0_DW1_07" # GPP_C7
@@ -429,24 +432,29 @@
 				device pci 00.0 on end
 			end
 		end
-		device pci 1c.7 on # PCI Root Port 8 (WLAN)
+		device ref pcie_rp8 on
+			# WLAN
 			register "PcieRpSlotImplemented[7]" = "1" # M.2 Slot
 		end
-		device pci 1d.0 on # PCI Root Port 9 (TPU)
+		device ref pcie_rp9 on
+			# TPU
 			register "PcieRpSlotImplemented[8]" = "1" # M.2 Slot
 		end
-		device pci 1d.1 off end # PCI Root Port 10 (Not connected)
-		device pci 1d.2 on end # PCI Root Port 11 (TPU1)
+		device ref pcie_rp10 off end
+		device ref pcie_rp11 on end
+			# TPU1
 			register "PcieRpSlotImplemented[10]" = "1" # M.2 Slot
-		device pci 1d.3 on end # PCI Root Port 12 (TPU0)
+		device ref pcie_rp12 on end
+			# TPU0
 			register "PcieRpSlotImplemented[11]" = "1" # M.2 Slot
-		device pci 1d.4 on # PCI Root Port 13 (X4 i350 NIC)
+		device ref pcie_rp13 on
+			# X4 i350 NIC
 			register "PcieRpSlotImplemented[12]" = "0" # Built-in
 		end
-		device pci 1d.5 on end # PCI Root Port 14 (non-root)
-		device pci 1d.6 on end # PCI Root Port 15 (non-root)
-		device pci 1d.7 on end # PCI Root Port 16 (non-root)
-		device pci 1e.3 off end # GSPI #1
+		device ref pcie_rp14 on end # non-root
+		device ref pcie_rp15 on end # non-root
+		device ref pcie_rp16 on end # non-root
+		device ref gspi1 off end
 	end
 
 	# VR Settings Configuration for 4 Domains
diff --git a/src/mainboard/google/puff/variants/kaisa/overridetree.cb b/src/mainboard/google/puff/variants/kaisa/overridetree.cb
index 6a2dd7b..23ae763 100644
--- a/src/mainboard/google/puff/variants/kaisa/overridetree.cb
+++ b/src/mainboard/google/puff/variants/kaisa/overridetree.cb
@@ -269,7 +269,7 @@
 	register "sata_port[1].TxGen3DeEmph" = "0x20"
 
 	device domain 0 on
-		device pci 04.0 on
+		device ref dptf on
 			chip drivers/intel/dptf
 				## Active Policy
 				register "policies.active[0]" = "{.target=DPTF_CPU,
@@ -331,8 +331,8 @@
 
 				device generic 0 on end
 			end
-		end # DPTF 0x1903
-		device pci 14.0 on
+		end
+		device ref xhci on
 			chip drivers/usb/acpi
 				device usb 0.0 on
 					chip drivers/usb/acpi
@@ -412,29 +412,31 @@
 					end
 				end
 			end
-		end # USB xHCI
-		device pci 15.0 off
+		end
+		device ref i2c0 off
 			# RFU - Reserved for Future Use.
-		end # I2C #0
-		device pci 15.1 off end # I2C #1
-		device pci 15.2 on
+		end
+		device ref i2c1 off end
+		device ref i2c2 on
+			# PCON PS175
 			chip drivers/i2c/generic
 				register "hid" = ""1AF80175""
 				register "name" = ""PS17""
 				register "desc" = ""Parade PS175""
 				device i2c 4a on end
 			end
-		end # I2C #2, PCON PS175.
-		device pci 15.3 on
+		end
+		device ref i2c3 on
+			# Realtek RTD2142
 			chip drivers/i2c/generic
 				register "hid" = ""10EC2142""
 				register "name" = ""RTD2""
 				register "desc" = ""Realtek RTD2142""
 				device i2c 4a on end
 			end
-		end # I2C #3, Realtek RTD2142.
-		device pci 16.0 on end # Management Engine Interface 1
-		device pci 19.0 on
+		end
+		device ref heci1 on end
+		device ref i2c4 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -447,9 +449,10 @@
 				register "property_list[0].integer" = "1"
 				device i2c 1a on end
 			end
-		end #I2C #4
-		device pci 1a.0 on  end # eMMC
-		device pci 1c.6 on
+		end
+		device ref emmc on  end
+		device ref pcie_rp7 on
+			# RTL8111H Ethernet NIC
 			chip drivers/net
 				register "customized_leds" = "0x05af"
 				register "wake" = "GPE0_DW1_07" # GPP_C7
@@ -458,11 +461,12 @@
 				device pci 00.0 on end
 			end
 			register "PcieRpSlotImplemented[6]" = "1"
-		end # RTL8111H Ethernet NIC
-		device pci 1d.2 on	# PCI Express Port 11 (X2 NVMe)
+		end
+		device ref pcie_rp11 on
+			# X2 NVMe
 			register "PcieRpSlotImplemented[10]" = "1"
 		end
-		device pci 1e.3 off end # GSPI #1
+		device ref gspi1 off end
 	end
 
 	# VR Settings Configuration for 4 Domains
diff --git a/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb b/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb
index a89c56d..ddbedac 100644
--- a/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb
+++ b/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb
@@ -243,7 +243,7 @@
 	register "sata_port[1].TxGen3DeEmph" = "0x20"
 
 	device domain 0 on
-		device pci 04.0 on
+		device ref dptf on
 			chip drivers/intel/dptf
 				## Active Policy
 				register "policies.active[0]" = "{.target=DPTF_CPU,
@@ -304,8 +304,8 @@
 
 				device generic 0 on end
 			end
-		end # DPTF 0x1903
-		device pci 14.0 on
+		end
+		device ref xhci on
 			chip drivers/usb/acpi
 				device usb 0.0 on
 					chip drivers/usb/acpi
@@ -385,29 +385,31 @@
 					end
 				end
 			end
-		end # USB xHCI
-		device pci 15.0 off
+		end
+		device ref i2c0 off
 			# RFU - Reserved for Future Use.
-		end # I2C #0
-		device pci 15.1 off end # I2C #1
-		device pci 15.2 on
+		end
+		device ref i2c1 off end
+		device ref i2c2 on
+			# PCON PS175
 			chip drivers/i2c/generic
 				register "hid" = ""1AF80175""
 				register "name" = ""PS17""
 				register "desc" = ""Parade PS175""
 				device i2c 4a on end
 			end
-		end # I2C #2, PCON PS175.
-		device pci 15.3 on
+		end
+		device ref i2c3 on
+			# Realtek RTD2142
 			chip drivers/i2c/generic
 				register "hid" = ""10EC2142""
 				register "name" = ""RTD2""
 				register "desc" = ""Realtek RTD2142""
 				device i2c 4a on end
 			end
-		end # I2C #3, Realtek RTD2142.
-		device pci 16.0 on  end # Management Engine Interface 1
-		device pci 19.0 on
+		end
+		device ref heci1 on  end
+		device ref i2c4 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -420,9 +422,10 @@
 				register "property_list[0].integer" = "1"
 				device i2c 1a on end
 			end
-		end #I2C #4
-		device pci 1a.0 off end # eMMC
-		device pci 1c.6 on # PCI Root Port 7 (LAN)
+		end
+		device ref emmc off end
+		device ref pcie_rp7 on
+			# LAN
 			chip drivers/net # RTL8111H Ethernet NIC
 				register "customized_leds" = "0x05af"
 				register "wake" = "GPE0_DW1_07" # GPP_C7
@@ -431,26 +434,31 @@
 				device pci 00.0 on end
 			end
 		end
-		device pci 1c.7 on # PCI Root Port 8 (WLAN)
+		device ref pcie_rp8 on
+			# WLAN
 			register "PcieRpSlotImplemented[7]" = "1" # M.2 Slot
 		end
-		device pci 1d.0 on # PCI Root Port 9 (TPU)
+		device ref pcie_rp9 on
+			# TPU
 			register "PcieRpSlotImplemented[8]" = "1" # M.2 Slot
 		end
-		device pci 1d.1 off end # PCI Root Port 10 (Not connected)
-		device pci 1d.2 on end # PCI Root Port 11 (TPU1)
+		device ref pcie_rp10 off end
+		device ref pcie_rp11 on end
+			# TPU1
 			register "PcieRpSlotImplemented[10]" = "1" # M.2 Slot
-		device pci 1d.3 on end # PCI Root Port 12 (TPU0)
+		device ref pcie_rp12 on end
+			# TPU0
 			register "PcieRpSlotImplemented[11]" = "1" # M.2 Slot
-		device pci 1d.4 on # PCI Root Port 13 (X4 i350 NIC)
+		device ref pcie_rp13 on
+			# X4 i350 NIC
 			register "PcieRpSlotImplemented[12]" = "0" # Built-in
 		end
-		device pci 1d.5 on end # PCI Root Port 14 (non-root)
-		device pci 1d.6 on end # PCI Root Port 15 (non-root)
-		device pci 1d.7 on end # PCI Root Port 16 (non-root)
-		device pci 1e.0 on end # UART #0
-		device pci 1e.1 on end # UART #1
-		device pci 1e.3 off end # GSPI #1
+		device ref pcie_rp14 on end # non-root
+		device ref pcie_rp15 on end # non-root
+		device ref pcie_rp16 on end # non-root
+		device ref uart0 on end
+		device ref uart1 on end
+		device ref gspi1 off end
 	end
 
 	# VR Settings Configuration for 4 Domains
diff --git a/src/mainboard/google/puff/variants/noibat/overridetree.cb b/src/mainboard/google/puff/variants/noibat/overridetree.cb
index 91a19397..5cabe9a 100644
--- a/src/mainboard/google/puff/variants/noibat/overridetree.cb
+++ b/src/mainboard/google/puff/variants/noibat/overridetree.cb
@@ -192,7 +192,7 @@
 	register "sata_port[1].TxGen3DeEmph" = "0x20"
 
 	device domain 0 on
-		device pci 04.0 on
+		device ref dptf on
 			chip drivers/intel/dptf
 				## Active Policy
 				register "policies.active[0]" = "{.target=DPTF_CPU,
@@ -254,8 +254,8 @@
 
 				device generic 0 on end
 			end
-		end # DPTF 0x1903
-		device pci 14.0 on
+		end
+		device ref xhci on
 			chip drivers/usb/acpi
 				device usb 0.0 on
 					chip drivers/usb/acpi
@@ -323,29 +323,31 @@
 					end
 				end
 			end
-		end # USB xHCI
-		device pci 15.0 off
+		end
+		device ref i2c0 off
 			# RFU - Reserved for Future Use.
-		end # I2C #0
-		device pci 15.1 off end # I2C #1
-		device pci 15.2 on
+		end
+		device ref i2c1 off end
+		device ref i2c2 on
+			# PCON PS175
 			chip drivers/i2c/generic
 				register "hid" = ""1AF80175""
 				register "name" = ""PS17""
 				register "desc" = ""Parade PS175""
 				device i2c 4a on end
 			end
-		end # I2C #2, PCON PS175.
-		device pci 15.3 on
+		end
+		device ref i2c3 on
+			# Realtek RTD2142
 			chip drivers/i2c/generic
 				register "hid" = ""10EC2142""
 				register "name" = ""RTD2""
 				register "desc" = ""Realtek RTD2142""
 				device i2c 4a on end
 			end
-		end # I2C #3, Realtek RTD2142.
-		device pci 16.0 on end # Management Engine Interface 1
-		device pci 19.0 on
+		end
+		device ref heci1 on end
+		device ref i2c4 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -358,9 +360,10 @@
 				register "property_list[0].integer" = "1"
 				device i2c 1a on end
 			end
-		end #I2C #4
-		device pci 1a.0 on  end # eMMC
-		device pci 1c.6 on
+		end
+		device ref emmc on  end
+		device ref pcie_rp7 on
+			# RTL8111H Ethernet NIC
 			chip drivers/net
 				register "customized_leds" = "0x05af"
 				register "wake" = "GPE0_DW1_07" # GPP_C7
@@ -369,11 +372,12 @@
 				device pci 00.0 on end
 			end
 			register "PcieRpSlotImplemented[6]" = "1"
-		end # RTL8111H Ethernet NIC
-		device pci 1d.2 on	# PCI Express Port 11 (X2 NVMe)
+		end
+		device ref pcie_rp11 on
+			# X2 NVMe
 			register "PcieRpSlotImplemented[10]" = "1"
 		end
-		device pci 1e.3 off end # GSPI #1
+		device ref gspi1 off end
 	end
 
 	# VR Settings Configuration for 4 Domains
diff --git a/src/mainboard/google/puff/variants/puff/overridetree.cb b/src/mainboard/google/puff/variants/puff/overridetree.cb
index 3cd6a01..eee82e6 100644
--- a/src/mainboard/google/puff/variants/puff/overridetree.cb
+++ b/src/mainboard/google/puff/variants/puff/overridetree.cb
@@ -202,7 +202,7 @@
 	register "sata_port[1].TxGen3DeEmph" = "0x20"
 
 	device domain 0 on
-		device pci 04.0 on
+		device ref dptf on
 			chip drivers/intel/dptf
 				## Active Policy
 				register "policies.active[0]" = "{.target=DPTF_CPU,
@@ -266,8 +266,8 @@
 
 				device generic 0 on end
 			end
-		end # DPTF 0x1903
-		device pci 14.0 on
+		end
+		device ref xhci on
 			chip drivers/usb/acpi
 				device usb 0.0 on
 					chip drivers/usb/acpi
@@ -347,29 +347,31 @@
 					end
 				end
 			end
-		end # USB xHCI
-		device pci 15.0 off
+		end
+		device ref i2c0 off
 			# RFU - Reserved for Future Use.
-		end # I2C #0
-		device pci 15.1 off end # I2C #1
-		device pci 15.2 on
+		end
+		device ref i2c1 off end
+		device ref i2c2 on
+			# PCON PS175
 			chip drivers/i2c/generic
 				register "hid" = ""1AF80175""
 				register "name" = ""PS17""
 				register "desc" = ""Parade PS175""
 				device i2c 4a on end
 			end
-		end # I2C #2, PCON PS175.
-		device pci 15.3 on
+		end
+		device ref i2c3 on
+			# Realtek RTD2142
 			chip drivers/i2c/generic
 				register "hid" = ""10EC2142""
 				register "name" = ""RTD2""
 				register "desc" = ""Realtek RTD2142""
 				device i2c 4a on end
 			end
-		end # I2C #3, Realtek RTD2142.
-		device pci 16.0 on end # Management Engine Interface 1
-		device pci 19.0 on
+		end
+		device ref heci1 on end
+		device ref i2c4 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -382,9 +384,10 @@
 				register "property_list[0].integer" = "1"
 				device i2c 1a on end
 			end
-		end #I2C #4
-		device pci 1a.0 on  end # eMMC
-		device pci 1c.6 on
+		end
+		device ref emmc on  end
+		device ref pcie_rp7 on
+			# RTL8111H Ethernet NIC
 			chip drivers/net
 				register "customized_leds" = "0x05af"
 				register "wake" = "GPE0_DW1_07" # GPP_C7
@@ -393,11 +396,12 @@
 				device pci 00.0 on end
 			end
 			register "PcieRpSlotImplemented[6]" = "1"
-		end # RTL8111H Ethernet NIC
-		device pci 1d.2 on	# PCI Express Port 11 (X2 NVMe)
+		end
+		device ref pcie_rp11 on
+			# X2 NVMe
 			register "PcieRpSlotImplemented[10]" = "1"
 		end
-		device pci 1e.3 off end # GSPI #1
+		device ref gspi1 off end
 	end
 
 	# VR Settings Configuration for 4 Domains
diff --git a/src/mainboard/google/puff/variants/scout/overridetree.cb b/src/mainboard/google/puff/variants/scout/overridetree.cb
index 5462e9b..abf4ff3 100644
--- a/src/mainboard/google/puff/variants/scout/overridetree.cb
+++ b/src/mainboard/google/puff/variants/scout/overridetree.cb
@@ -235,7 +235,7 @@
 	register "sata_port[1].TxGen3DeEmph" = "0x20"
 
 	device domain 0 on
-		device pci 04.0 on
+		device ref dptf on
 			chip drivers/intel/dptf
 				## Active Policy
 				register "policies.active[0]" = "{.target=DPTF_CPU,
@@ -298,8 +298,8 @@
 
 				device generic 0 on end
 			end
-		end # DPTF 0x1903
-		device pci 14.0 on
+		end
+		device ref xhci on
 			chip drivers/usb/acpi
 				device usb 0.0 on
 					chip drivers/usb/acpi
@@ -377,11 +377,12 @@
 					end
 				end
 			end
-		end # USB xHCI
-		device pci 15.0 off
+		end
+		device ref i2c0 off
 			# RFU - Reserved for Future Use.
-		end # I2C #0
-		device pci 15.1 on # I2C #1, USI (Touch screen)
+		end
+		device ref i2c1 on
+			# USI (Touch screen)
 			chip drivers/i2c/hid
 				register "generic.hid" = ""ILTK0001""
 				register "generic.desc" = ""ILITEK Touchscreen""
@@ -395,13 +396,14 @@
 				device i2c 41 on end
 			end
 		end
-		device pci 15.2 on end # I2C #2, SCALER
-		device pci 15.3 on end # I2C #3, TPU
-		device pci 16.0 on  end # Management Engine Interface 1
-		device pci 19.0 off end # I2C #4
-		device pci 1a.0 on end # eMMC
-		device pci 1c.6 on # PCI Root Port 7 (LAN)
-			chip drivers/net # RTL8111H Ethernet NIC
+		device ref i2c2 on end # SCALER
+		device ref i2c3 on end # TPU
+		device ref heci1 on  end
+		device ref i2c4 off end
+		device ref emmc on end
+		device ref pcie_rp7 on
+			# RTL8111H Ethernet NIC
+			chip drivers/net
 				register "customized_leds" = "0x05af"
 				register "wake" = "GPE0_DW1_07" # GPP_C7
 				register "device_index" = "0"
@@ -409,26 +411,30 @@
 				device pci 00.0 on end
 			end
 		end
-		device pci 1c.7 on # PCI Root Port 8 (WLAN)
+		device ref pcie_rp8 on
+			# WLAN
 			register "PcieRpSlotImplemented[7]" = "1" # M.2 Slot
 		end
-		device pci 1d.0 on # PCI Root Port 9 (SSD)
+		device ref pcie_rp9 on
+			# SSD
 			register "PcieRpSlotImplemented[8]" = "1" # M.2 Slot
 		end
-		device pci 1d.1 off end # PCI Root Port 10 (Not connected)
-		device pci 1d.2 off end # PCI Root Port 11 (Not connected)
-		device pci 1d.3 off end # PCI Root Port 12 (Not connected)
-		device pci 1d.4 on # PCI Root Port 13 (TPU0)
+		device ref pcie_rp10 off end
+		device ref pcie_rp11 off end
+		device ref pcie_rp12 off end
+		device ref pcie_rp13 on
+			# TPU0
 			register "PcieRpSlotImplemented[12]" = "1" # M.2 Slot
 		end
-		device pci 1d.5 on # PCI Root Port 14 (TPU1)
+		device ref pcie_rp14 on
+			# TPU1
 			register "PcieRpSlotImplemented[13]" = "1" # M.2 Slot
 		end
-		device pci 1d.6 on end # PCI Root Port 15 (non-root)
-		device pci 1d.7 on end # PCI Root Port 16 (non-root)
-		device pci 1e.0 on end # UART #0
-		device pci 1e.1 on end # UART #1
-		device pci 1e.3 off end # GSPI #1
+		device ref pcie_rp15 on end # non-root
+		device ref pcie_rp16 on end # non-root
+		device ref uart0 on end
+		device ref uart1 on end
+		device ref gspi1 off end
 	end
 
 	# VR Settings Configuration for 4 Domains
diff --git a/src/mainboard/google/puff/variants/wyvern/overridetree.cb b/src/mainboard/google/puff/variants/wyvern/overridetree.cb
index 60ba0bc..715ef7ff 100644
--- a/src/mainboard/google/puff/variants/wyvern/overridetree.cb
+++ b/src/mainboard/google/puff/variants/wyvern/overridetree.cb
@@ -203,7 +203,7 @@
 	register "sata_port[1].TxGen3DeEmph" = "0x20"
 
 	device domain 0 on
-		device pci 04.0 on
+		device ref dptf on
 			chip drivers/intel/dptf
 				## Active Policy
 				register "policies.active[0]" = "{.target=DPTF_CPU,
@@ -267,8 +267,8 @@
 
 				device generic 0 on end
 			end
-		end # DPTF 0x1903
-		device pci 14.0 on
+		end
+		device ref xhci on
 			chip drivers/usb/acpi
 				device usb 0.0 on
 					chip drivers/usb/acpi
@@ -348,29 +348,31 @@
 					end
 				end
 			end
-		end # USB xHCI
-		device pci 15.0 off
+		end
+		device ref i2c0 off
 			# RFU - Reserved for Future Use.
-		end # I2C #0
-		device pci 15.1 off end # I2C #1
-		device pci 15.2 on
+		end
+		device ref i2c1 off end
+		device ref i2c2 on
+			# PCON PS175
 			chip drivers/i2c/generic
 				register "hid" = ""1AF80175""
 				register "name" = ""PS17""
 				register "desc" = ""Parade PS175""
 				device i2c 4a on end
 			end
-		end # I2C #2, PCON PS175.
-		device pci 15.3 on
+		end
+		device ref i2c3 on
+			# Realtek RTD2142
 			chip drivers/i2c/generic
 				register "hid" = ""10EC2142""
 				register "name" = ""RTD2""
 				register "desc" = ""Realtek RTD2142""
 				device i2c 4a on end
 			end
-		end # I2C #3, Realtek RTD2142.
-		device pci 16.0 on end # Management Engine Interface 1
-		device pci 19.0 on
+		end
+		device ref heci1 on end
+		device ref i2c4 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""
 				register "name" = ""RT58""
@@ -383,22 +385,24 @@
 				register "property_list[0].integer" = "1"
 				device i2c 1a on end
 			end
-		end #I2C #4
-		device pci 1a.0 on  end # eMMC
-		device pci 1c.6 on
+		end
+		device ref emmc on  end
+		device ref pcie_rp7 on
+			# RTL8111H Ethernet NIC
 			chip drivers/net
 				register "customized_leds" = "0x05af"
 				register "wake" = "GPE0_DW1_07" # GPP_C7
 				register "device_index" = "0"
 				register "enable_aspm_l1_2" = "1"
-				device pci 00.0 on end
+				device ref system_agent on end
 			end
 			register "PcieRpSlotImplemented[6]" = "1"
-		end # RTL8111H Ethernet NIC
-		device pci 1d.2 on	# PCI Express Port 11 (X2 NVMe)
+		end
+		device ref pcie_rp11 on
+			# X2 NVMe
 			register "PcieRpSlotImplemented[10]" = "1"
 		end
-		device pci 1e.3 off end # GSPI #1
+		device ref gspi1 off end
 	end
 
 	# VR Settings Configuration for 4 Domains