diff --git a/tcl/board/ti_beagleboard_xm.cfg b/tcl/board/beagle/beagleboard-xm.cfg
similarity index 100%
rename from tcl/board/ti_beagleboard_xm.cfg
rename to tcl/board/beagle/beagleboard-xm.cfg
diff --git a/tcl/board/ti_beagleboard.cfg b/tcl/board/beagle/beagleboard.cfg
similarity index 100%
rename from tcl/board/ti_beagleboard.cfg
rename to tcl/board/beagle/beagleboard.cfg
diff --git a/tcl/board/ti_beaglebone-base.cfg b/tcl/board/beagle/beaglebone-base.cfg
similarity index 100%
rename from tcl/board/ti_beaglebone-base.cfg
rename to tcl/board/beagle/beaglebone-base.cfg
diff --git a/tcl/board/ti_beaglebone_black.cfg b/tcl/board/beagle/beaglebone-black.cfg
similarity index 76%
rename from tcl/board/ti_beaglebone_black.cfg
rename to tcl/board/beagle/beaglebone-black.cfg
index d72bf09dd..89928d76f 100644
--- a/tcl/board/ti_beaglebone_black.cfg
+++ b/tcl/board/beagle/beaglebone-black.cfg
@@ -7,4 +7,4 @@ adapter speed 1000
 
 reset_config trst_and_srst
 
-source [find board/ti_beaglebone-base.cfg]
+source [find board/beagle/beaglebone-base.cfg]
diff --git a/tcl/board/ti_beaglebone.cfg b/tcl/board/beagle/beaglebone.cfg
similarity index 83%
rename from tcl/board/ti_beaglebone.cfg
rename to tcl/board/beagle/beaglebone.cfg
index d96e45f6a..f09b51e86 100644
--- a/tcl/board/ti_beaglebone.cfg
+++ b/tcl/board/beagle/beaglebone.cfg
@@ -10,4 +10,4 @@ adapter speed 16000
 
 reset_config trst_and_srst
 
-source [find board/ti_beaglebone-base.cfg]
+source [find board/beagle/beaglebone-base.cfg]
diff --git a/tcl/file_renaming.cfg b/tcl/file_renaming.cfg
index 79932473e..0a80d8033 100644
--- a/tcl/file_renaming.cfg
+++ b/tcl/file_renaming.cfg
@@ -20,6 +20,10 @@ set _file_renaming {
 	board/stm32mp13x_dk.cfg			board/st/stm32mp135f-dk.cfg
 	board/stm32mp15x_dk2.cfg		board/st/stm32mp157f-dk2.cfg
 	board/sifive-hifive1-revb.cfg		board/sifive/hifive1-rev-b.cfg
+	board/ti_beagleboard.cfg		board/beagle/beagleboard.cfg
+	board/ti_beagleboard_xm.cfg		board/beagle/beagleboard-xm.cfg
+	board/ti_beaglebone_black.cfg	board/beagle/beaglebone-black.cfg
+	board/ti_beaglebone.cfg			board/beagle/beaglebone.cfg
 	interface/chameleon.cfg			interface/parport/chameleon.cfg
 	interface/flashlink.cfg			interface/parport/flashlink.cfg
 }