diff --git a/mainboard/adl/msm800sev/dts b/mainboard/adl/msm800sev/dts
index 966b55bc7b..27c595bc1a 100644
--- a/mainboard/adl/msm800sev/dts
+++ b/mainboard/adl/msm800sev/dts
@@ -34,12 +34,12 @@
 			pcipath = "1,0";
 		};
 		southbridge {
-			/config/("southbridge/amd/cs5536");
+			/config/("southbridge/amd/cs5536/dts");
 			pcipath = "1,1";
 			enabled;
 		};
 		superio {
-			/config/("superio/winbond/w83627hf");
+			/config/("superio/winbond/w83627hf/dts");
 			com1enable = "1";
 		};
 	};
diff --git a/mainboard/amd/norwich/dts b/mainboard/amd/norwich/dts
index c238cd4381..6784517515 100644
--- a/mainboard/amd/norwich/dts
+++ b/mainboard/amd/norwich/dts
@@ -33,7 +33,7 @@
 			pcipath = "1,0";
 		};
 		southbridge {
-			/config/("southbridge/amd/cs5536");
+			/config/("southbridge/amd/cs5536/dts");
 			pcipath = "1,1";
 			enabled;
 		};
diff --git a/mainboard/artecgroup/dbe61/dts b/mainboard/artecgroup/dbe61/dts
index 00b4455a6a..10762436ca 100644
--- a/mainboard/artecgroup/dbe61/dts
+++ b/mainboard/artecgroup/dbe61/dts
@@ -87,7 +87,7 @@ end
 			pcipath = "1,0";
 		};
 		southbridge {
-			/config/("southbridge/amd/cs5536");
+			/config/("southbridge/amd/cs5536/dts");
 			pcipath = "1,1";
 			enabled;
 		};
diff --git a/mainboard/emulation/qemu-x86/dts b/mainboard/emulation/qemu-x86/dts
index 3976c60717..f981705a11 100644
--- a/mainboard/emulation/qemu-x86/dts
+++ b/mainboard/emulation/qemu-x86/dts
@@ -27,7 +27,7 @@
 		enabled;
 	};
 	domain0 {
-		/config/("northbridge/intel/i440bxemulation");
+		/config/("northbridge/intel/i440bxemulation/dts");
 		ops = "i440bxemulation_pcidomainops";
 		enabled;
 		pcidomain = "0";
@@ -36,7 +36,7 @@
 			pcipath = "0,0";
 		};
 		southbridge,intel,i82371eb {
-			/config/("southbridge/intel/i82371eb");
+			/config/("southbridge/intel/i82371eb/dts");
 			pcipath = "1,0";
 			enabled;
 		};
diff --git a/mainboard/pcengines/alix1c/dts b/mainboard/pcengines/alix1c/dts
index 2d3403ae99..ff5da0328b 100644
--- a/mainboard/pcengines/alix1c/dts
+++ b/mainboard/pcengines/alix1c/dts
@@ -26,7 +26,7 @@
 		enabled;
 	};
 	domain0 {
-		/config/("northbridge/amd/geodelx");
+		/config/("northbridge/amd/geodelx/dts");
 		enabled;
 		pcidomain = "0";
 		device0,0 {
@@ -34,12 +34,12 @@
 			pcipath = "1,0";
 		};
 		southbridge {
-			/config/("southbridge/amd/cs5536");
+			/config/("southbridge/amd/cs5536/dts");
 			pcipath = "0xf,1";
 			enabled;
 		};
 		superio {
-			/config/("superio/winbond/w83627hf");
+			/config/("superio/winbond/w83627hf/dts");
 			com1enable = "1";
 		};
 	};
diff --git a/northbridge/intel/i440bxemulation/i440bx.c b/northbridge/intel/i440bxemulation/i440bx.c
index 0fe5bd9d70..c1eb862d75 100644
--- a/northbridge/intel/i440bxemulation/i440bx.c
+++ b/northbridge/intel/i440bxemulation/i440bx.c
@@ -53,7 +53,7 @@ static void pci_domain_set_resources(struct device *dev)
 	struct device *mc_dev;
 	u32 tolmk;		/* Top of low mem, Kbytes. */
 	int idx;
-	struct northbridge_intel_i440bxemulation_config *device_configuration =
+	struct northbridge_intel_i440bxemulation_dts_config *device_configuration =
 	    dev->device_configuration;
 	tolmk = device_configuration->ramsize * 1024;
 	mc_dev = dev->link[0].children;
diff --git a/superio/winbond/w83627hf/superio.c b/superio/winbond/w83627hf/superio.c
index 544da16b43..0e492ece80 100644
--- a/superio/winbond/w83627hf/superio.c
+++ b/superio/winbond/w83627hf/superio.c
@@ -115,7 +115,7 @@ static void init_hwm(u16 base)
 
 static void w83627hf_init(struct device * dev)
 {
-	struct superio_winbond_w83627hf_config *conf;
+	struct superio_winbond_w83627hf_dts_config *conf;
 	struct resource *res0, *res1;
 	struct pc_keyboard keyboard;