diff --git a/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2/overridetree.cb b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2/overridetree.cb
index 3de7954..fab1644 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2/overridetree.cb
+++ b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2/overridetree.cb
@@ -7,14 +7,14 @@
 
 			register "pcie_port_coalesce" = "true"
 
-			device pci 1c.0 off end	# RP #1
-			device pci 1c.1 on  end	# RP #2: PCIe x1 Port (PCIEX1_1)
-			device pci 1c.2 off end	# RP #3:
-			device pci 1c.3 off end	# RP #4:
-			device pci 1c.4 on  end	# RP #5: Realtek RTL8111F GbE NIC
-			device pci 1c.5 on  end	# RP #6: PCIe x1 Port (PCIEX1_2)
+			device ref pcie_rp1 off end
+			device ref pcie_rp2 on  end	# PCIe x1 Port (PCIEX1_1)
+			device ref pcie_rp3 off end
+			device ref pcie_rp4 off end
+			device ref pcie_rp5 on  end	# Realtek RTL8111F GbE NIC
+			device ref pcie_rp6 on  end	# PCIe x1 Port (PCIEX1_2)
 
-			device pci 1f.0 on	# LPC bridge
+			device ref lpc on
 				chip superio/ite/it8728f
 					device pnp 2e.0 off end	# Floppy
 					device pnp 2e.1 on	# COM1
diff --git a/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2v/overridetree.cb b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2v/overridetree.cb
index b6bdaa4..c455cad 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2v/overridetree.cb
+++ b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2v/overridetree.cb
@@ -5,14 +5,14 @@
 
 		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
 
-			device pci 1c.0 on  end	# RP #1: PCIe x1 Port (PCIEX1_3)
-			device pci 1c.1 on  end	# RP #2: PCIe x1 Port (PCIEX1_1)
-			device pci 1c.2 off end	# RP #3:
-			device pci 1c.3 off end	# RP #4:
-			device pci 1c.4 on  end	# RP #5: Realtek RTL8111F GbE NIC
-			device pci 1c.5 on  end	# RP #6: PCIe x1 Port (PCIEX1_2)
+			device ref pcie_rp1 on  end	# PCIe x1 Port (PCIEX1_3)
+			device ref pcie_rp2 on  end	# PCIe x1 Port (PCIEX1_1)
+			device ref pcie_rp3 off end
+			device ref pcie_rp4 off end
+			device ref pcie_rp5 on  end	# Realtek RTL8111F GbE NIC
+			device ref pcie_rp6 on  end	# PCIe x1 Port (PCIEX1_2)
 
-			device pci 1f.0 on	# LPC bridge
+			device ref lpc on
 				chip superio/ite/it8728f
 					device pnp 2e.0 off end	# Floppy
 					device pnp 2e.1 off end	# COM1
diff --git a/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-s2pv/overridetree.cb b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-s2pv/overridetree.cb
index c0908c1..16318c6 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-s2pv/overridetree.cb
+++ b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-s2pv/overridetree.cb
@@ -5,14 +5,14 @@
 
 		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
 
-			device pci 1c.0 on  end	# RP #1: PCIe x1 Port (PCIEX1)
-			device pci 1c.1 off end	# RP #2:
-			device pci 1c.2 off end	# RP #3:
-			device pci 1c.3 off end	# RP #4:
-			device pci 1c.4 on  end	# RP #5: Realtek RTL8111F GbE NIC
-			device pci 1c.5 on  end	# RP #6: ITE IT8892F PCIe to PCI bridge
+			device ref pcie_rp1 on  end	# PCIe x1 Port (PCIEX1)
+			device ref pcie_rp2 off end
+			device ref pcie_rp3 off end
+			device ref pcie_rp4 off end
+			device ref pcie_rp5 on  end	# Realtek RTL8111F GbE NIC
+			device ref pcie_rp6 on  end	# ITE IT8892F PCIe to PCI bridge
 
-			device pci 1f.0 on	# LPC bridge
+			device ref lpc on
 				chip superio/ite/it8728f
 					device pnp 2e.0 off end		# Floppy
 					device pnp 2e.1 on		# COM1
diff --git a/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61ma-d3v/overridetree.cb b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61ma-d3v/overridetree.cb
index dd2d900..ddcbd0c 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61ma-d3v/overridetree.cb
+++ b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61ma-d3v/overridetree.cb
@@ -5,14 +5,14 @@
 
 		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
 
-			device pci 1c.0 on  end	# RP #1: PCIe x1 Port (PCIEX1_3)
-			device pci 1c.1 on  end	# RP #2: PCIe x1 Port (PCIEX1_1)
-			device pci 1c.2 on  end	# RP #3: Etron EJ168 USB 3.0
-			device pci 1c.3 on  end	# RP #4: Marvell 88SE9172 SATA
-			device pci 1c.4 on  end	# RP #5: Realtek RTL8111F GbE NIC
-			device pci 1c.5 on  end	# RP #6: PCIe x1 Port (PCIEX1_2)
+			device ref pcie_rp1 on  end	# PCIe x1 Port (PCIEX1_3)
+			device ref pcie_rp2 on  end	# PCIe x1 Port (PCIEX1_1)
+			device ref pcie_rp3 on  end	# Etron EJ168 USB 3.0
+			device ref pcie_rp4 on  end	# Marvell 88SE9172 SATA
+			device ref pcie_rp5 on  end	# Realtek RTL8111F GbE NIC
+			device ref pcie_rp6 on  end	# PCIe x1 Port (PCIEX1_2)
 
-			device pci 1f.0 on	# LPC bridge
+			device ref lpc on
 				chip superio/ite/it8728f
 					device pnp 2e.0 off end	# Floppy
 					device pnp 2e.1 off end	# COM1