diff --git a/top/x400/.gitignore b/top/x400/.gitignore
index 416def8..d96446d 100644
--- a/top/x400/.gitignore
+++ b/top/x400/.gitignore
@@ -4,4 +4,4 @@ build-*
 *.jou
 vivado*.str
 ip/*/sim/
-dts/x410-version-info.dtsi
+dts/x4*0-version-info.dtsi
diff --git a/top/x400/dts/usrp_x410_fpga_C1.dts b/top/x400/dts/usrp_x410_fpga_C1.dts
index 00ad4d2..eb0bcaf 100644
--- a/top/x400/dts/usrp_x410_fpga_C1.dts
+++ b/top/x400/dts/usrp_x410_fpga_C1.dts
@@ -11,10 +11,10 @@
 
 #include "x410-fpga.dtsi"
 
-#include "x410-common.dtsi"
+#include "x4xx-common.dtsi"
 
 #include "x410-rfdc.dtsi"
 
-#include "x410-dma.dtsi"
+#include "x4xx-dma.dtsi"
 
-#include "x410-100gbe-port0.dtsi"
+#include "x4xx-100gbe-port0.dtsi"
diff --git a/top/x400/dts/usrp_x410_fpga_CG.dts b/top/x400/dts/usrp_x410_fpga_CG.dts
index 35d9238..6a5079b 100644
--- a/top/x400/dts/usrp_x410_fpga_CG.dts
+++ b/top/x400/dts/usrp_x410_fpga_CG.dts
@@ -11,12 +11,12 @@
 
 #include "x410-fpga.dtsi"
 
-#include "x410-common.dtsi"
+#include "x4xx-common.dtsi"
 
 #include "x410-rfdc.dtsi"
 
-#include "x410-dma.dtsi"
+#include "x4xx-dma.dtsi"
 
-#include "x410-100gbe-port0.dtsi"
+#include "x4xx-100gbe-port0.dtsi"
 
-#include "x410-100gbe-port1.dtsi"
+#include "x4xx-100gbe-port1.dtsi"
diff --git a/top/x400/dts/usrp_x410_fpga_UC.dts b/top/x400/dts/usrp_x410_fpga_UC.dts
index 8c2e1a4..a394ae6 100644
--- a/top/x400/dts/usrp_x410_fpga_UC.dts
+++ b/top/x400/dts/usrp_x410_fpga_UC.dts
@@ -11,10 +11,10 @@
 
 #include "x410-fpga.dtsi"
 
-#include "x410-common.dtsi"
+#include "x4xx-common.dtsi"
 
 #include "x410-rfdc.dtsi"
 
-#include "x410-dma.dtsi"
+#include "x4xx-dma.dtsi"
 
-#include "x410-100gbe-port1.dtsi"
+#include "x4xx-100gbe-port1.dtsi"
diff --git a/top/x400/dts/usrp_x410_fpga_X1.dts b/top/x400/dts/usrp_x410_fpga_X1.dts
index 42142cd..fbb81ac 100644
--- a/top/x400/dts/usrp_x410_fpga_X1.dts
+++ b/top/x400/dts/usrp_x410_fpga_X1.dts
@@ -11,11 +11,11 @@
 
 #include "x410-fpga.dtsi"
 
-#include "x410-common.dtsi"
+#include "x4xx-common.dtsi"
 
 #include "x410-rfdc.dtsi"
 
-#include "x410-dma.dtsi"
+#include "x4xx-dma.dtsi"
 
-#include "x410-10gbe-port0.dtsi"
+#include "x4xx-10gbe-port0.dtsi"
 
diff --git a/top/x400/dts/usrp_x410_fpga_X4.dts b/top/x400/dts/usrp_x410_fpga_X4.dts
index 8fd7e45..a62b0b9 100644
--- a/top/x400/dts/usrp_x410_fpga_X4.dts
+++ b/top/x400/dts/usrp_x410_fpga_X4.dts
@@ -11,10 +11,10 @@
 
 #include "x410-fpga.dtsi"
 
-#include "x410-common.dtsi"
+#include "x4xx-common.dtsi"
 
 #include "x410-rfdc.dtsi"
 
-#include "x410-dma.dtsi"
+#include "x4xx-dma.dtsi"
 
-#include "x410-10gbe-port0-x4.dtsi"
+#include "x4xx-10gbe-port0-x4.dtsi"
diff --git a/top/x400/dts/usrp_x410_fpga_X4C.dts b/top/x400/dts/usrp_x410_fpga_X4C.dts
index be2c23a..a085634 100644
--- a/top/x400/dts/usrp_x410_fpga_X4C.dts
+++ b/top/x400/dts/usrp_x410_fpga_X4C.dts
@@ -11,12 +11,12 @@
 
 #include "x410-fpga.dtsi"
 
-#include "x410-common.dtsi"
+#include "x4xx-common.dtsi"
 
 #include "x410-rfdc.dtsi"
 
-#include "x410-dma.dtsi"
+#include "x4xx-dma.dtsi"
 
-#include "x410-10gbe-port0-x4.dtsi"
+#include "x4xx-10gbe-port0-x4.dtsi"
 
-#include "x410-100gbe-port1.dtsi"
+#include "x4xx-100gbe-port1.dtsi"
diff --git a/top/x400/dts/usrp_x410_fpga_XG.dts b/top/x400/dts/usrp_x410_fpga_XG.dts
index 46f7c05..711428c 100644
--- a/top/x400/dts/usrp_x410_fpga_XG.dts
+++ b/top/x400/dts/usrp_x410_fpga_XG.dts
@@ -11,12 +11,12 @@
 
 #include "x410-fpga.dtsi"
 
-#include "x410-common.dtsi"
+#include "x4xx-common.dtsi"
 
 #include "x410-rfdc.dtsi"
 
-#include "x410-dma.dtsi"
+#include "x4xx-dma.dtsi"
 
-#include "x410-10gbe-port0.dtsi"
+#include "x4xx-10gbe-port0.dtsi"
 
-#include "x410-10gbe-port1.dtsi"
+#include "x4xx-10gbe-port1.dtsi"
diff --git a/top/x400/dts/x410-100gbe-port0.dtsi b/top/x400/dts/x4xx-100gbe-port0.dtsi
similarity index 100%
rename from top/x400/dts/x410-100gbe-port0.dtsi
rename to top/x400/dts/x4xx-100gbe-port0.dtsi
diff --git a/top/x400/dts/x410-100gbe-port1.dtsi b/top/x400/dts/x4xx-100gbe-port1.dtsi
similarity index 100%
rename from top/x400/dts/x410-100gbe-port1.dtsi
rename to top/x400/dts/x4xx-100gbe-port1.dtsi
diff --git a/top/x400/dts/x410-10gbe-port0-x4.dtsi b/top/x400/dts/x4xx-10gbe-port0-x4.dtsi
similarity index 100%
rename from top/x400/dts/x410-10gbe-port0-x4.dtsi
rename to top/x400/dts/x4xx-10gbe-port0-x4.dtsi
diff --git a/top/x400/dts/x410-10gbe-port0.dtsi b/top/x400/dts/x4xx-10gbe-port0.dtsi
similarity index 100%
rename from top/x400/dts/x410-10gbe-port0.dtsi
rename to top/x400/dts/x4xx-10gbe-port0.dtsi
diff --git a/top/x400/dts/x410-10gbe-port1-x4.dtsi b/top/x400/dts/x4xx-10gbe-port1-x4.dtsi
similarity index 100%
rename from top/x400/dts/x410-10gbe-port1-x4.dtsi
rename to top/x400/dts/x4xx-10gbe-port1-x4.dtsi
diff --git a/top/x400/dts/x410-10gbe-port1.dtsi b/top/x400/dts/x4xx-10gbe-port1.dtsi
similarity index 100%
rename from top/x400/dts/x410-10gbe-port1.dtsi
rename to top/x400/dts/x4xx-10gbe-port1.dtsi
diff --git a/top/x400/dts/x410-common.dtsi b/top/x400/dts/x4xx-common.dtsi
similarity index 100%
rename from top/x400/dts/x410-common.dtsi
rename to top/x400/dts/x4xx-common.dtsi
diff --git a/top/x400/dts/x410-dma.dtsi b/top/x400/dts/x4xx-dma.dtsi
similarity index 100%
rename from top/x400/dts/x410-dma.dtsi
rename to top/x400/dts/x4xx-dma.dtsi