diff --git a/boards/cc1312-launchpad/Makefile.include b/boards/cc1312-launchpad/Makefile.include
index 8ef6a9b5e3..3533a21c86 100644
--- a/boards/cc1312-launchpad/Makefile.include
+++ b/boards/cc1312-launchpad/Makefile.include
@@ -1,4 +1,4 @@
 XDEBUGGER = XDS110
 
 # configure the flash tool
-include $(RIOTBOARD)/common/cc26x2_cc13x2/Makefile.include
+include $(RIOTBOARD)/common/cc26xx_cc13xx/Makefile.include
diff --git a/boards/cc1352-launchpad/Makefile.include b/boards/cc1352-launchpad/Makefile.include
index 8ef6a9b5e3..3533a21c86 100644
--- a/boards/cc1352-launchpad/Makefile.include
+++ b/boards/cc1352-launchpad/Makefile.include
@@ -1,4 +1,4 @@
 XDEBUGGER = XDS110
 
 # configure the flash tool
-include $(RIOTBOARD)/common/cc26x2_cc13x2/Makefile.include
+include $(RIOTBOARD)/common/cc26xx_cc13xx/Makefile.include
diff --git a/boards/cc1352p-launchpad/Makefile.include b/boards/cc1352p-launchpad/Makefile.include
index 8ef6a9b5e3..3533a21c86 100644
--- a/boards/cc1352p-launchpad/Makefile.include
+++ b/boards/cc1352p-launchpad/Makefile.include
@@ -1,4 +1,4 @@
 XDEBUGGER = XDS110
 
 # configure the flash tool
-include $(RIOTBOARD)/common/cc26x2_cc13x2/Makefile.include
+include $(RIOTBOARD)/common/cc26xx_cc13xx/Makefile.include
diff --git a/boards/common/cc26x2_cc13x2/Makefile.include b/boards/common/cc26x2_cc13x2/Makefile.include
deleted file mode 100644
index dfa89d7b51..0000000000
--- a/boards/common/cc26x2_cc13x2/Makefile.include
+++ /dev/null
@@ -1,5 +0,0 @@
-# configure the flash tool
-PROGRAMMER ?= uniflash
-
-OPENOCD_CONFIG ?= $(RIOTBOARD)/common/cc26x2_cc13x2/dist/openocd.cfg
-UNIFLASH_CONFIG ?= $(RIOTBOARD)/common/cc26x2_cc13x2/dist
diff --git a/boards/common/cc26xx_cc13xx/Makefile.include b/boards/common/cc26xx_cc13xx/Makefile.include
new file mode 100644
index 0000000000..acfcb9224d
--- /dev/null
+++ b/boards/common/cc26xx_cc13xx/Makefile.include
@@ -0,0 +1,5 @@
+# configure the flash tool
+PROGRAMMER ?= uniflash
+
+OPENOCD_CONFIG ?= $(RIOTBOARD)/common/cc26xx_cc13xx/dist/openocd.cfg
+UNIFLASH_CONFIG ?= $(RIOTBOARD)/common/cc26xx_cc13xx/dist
diff --git a/boards/common/cc26x2_cc13x2/dist/cc1312r1f3_XDS110.ccxml b/boards/common/cc26xx_cc13xx/dist/cc1312r1f3_XDS110.ccxml
similarity index 100%
rename from boards/common/cc26x2_cc13x2/dist/cc1312r1f3_XDS110.ccxml
rename to boards/common/cc26xx_cc13xx/dist/cc1312r1f3_XDS110.ccxml
diff --git a/boards/common/cc26x2_cc13x2/dist/cc1312r1f3_XDS110.dat b/boards/common/cc26xx_cc13xx/dist/cc1312r1f3_XDS110.dat
similarity index 100%
rename from boards/common/cc26x2_cc13x2/dist/cc1312r1f3_XDS110.dat
rename to boards/common/cc26xx_cc13xx/dist/cc1312r1f3_XDS110.dat
diff --git a/boards/common/cc26x2_cc13x2/dist/cc1312r1f3_gdb.conf b/boards/common/cc26xx_cc13xx/dist/cc1312r1f3_gdb.conf
similarity index 100%
rename from boards/common/cc26x2_cc13x2/dist/cc1312r1f3_gdb.conf
rename to boards/common/cc26xx_cc13xx/dist/cc1312r1f3_gdb.conf
diff --git a/boards/common/cc26x2_cc13x2/dist/cc1352p1_XDS110.ccxml b/boards/common/cc26xx_cc13xx/dist/cc1352p1_XDS110.ccxml
similarity index 100%
rename from boards/common/cc26x2_cc13x2/dist/cc1352p1_XDS110.ccxml
rename to boards/common/cc26xx_cc13xx/dist/cc1352p1_XDS110.ccxml
diff --git a/boards/common/cc26x2_cc13x2/dist/cc1352p1_XDS110.dat b/boards/common/cc26xx_cc13xx/dist/cc1352p1_XDS110.dat
similarity index 100%
rename from boards/common/cc26x2_cc13x2/dist/cc1352p1_XDS110.dat
rename to boards/common/cc26xx_cc13xx/dist/cc1352p1_XDS110.dat
diff --git a/boards/common/cc26x2_cc13x2/dist/cc1352p1_gdb.conf b/boards/common/cc26xx_cc13xx/dist/cc1352p1_gdb.conf
similarity index 100%
rename from boards/common/cc26x2_cc13x2/dist/cc1352p1_gdb.conf
rename to boards/common/cc26xx_cc13xx/dist/cc1352p1_gdb.conf
diff --git a/boards/common/cc26x2_cc13x2/dist/cc1352r1_XDS110.ccxml b/boards/common/cc26xx_cc13xx/dist/cc1352r1_XDS110.ccxml
similarity index 100%
rename from boards/common/cc26x2_cc13x2/dist/cc1352r1_XDS110.ccxml
rename to boards/common/cc26xx_cc13xx/dist/cc1352r1_XDS110.ccxml
diff --git a/boards/common/cc26x2_cc13x2/dist/cc1352r1_XDS110.dat b/boards/common/cc26xx_cc13xx/dist/cc1352r1_XDS110.dat
similarity index 100%
rename from boards/common/cc26x2_cc13x2/dist/cc1352r1_XDS110.dat
rename to boards/common/cc26xx_cc13xx/dist/cc1352r1_XDS110.dat
diff --git a/boards/common/cc26x2_cc13x2/dist/cc1352r1_gdb.conf b/boards/common/cc26xx_cc13xx/dist/cc1352r1_gdb.conf
similarity index 100%
rename from boards/common/cc26x2_cc13x2/dist/cc1352r1_gdb.conf
rename to boards/common/cc26xx_cc13xx/dist/cc1352r1_gdb.conf
diff --git a/boards/common/cc26x2_cc13x2/dist/openocd.cfg b/boards/common/cc26xx_cc13xx/dist/openocd.cfg
similarity index 100%
rename from boards/common/cc26x2_cc13x2/dist/openocd.cfg
rename to boards/common/cc26xx_cc13xx/dist/openocd.cfg