diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index d630163ed9..bd833c7224 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -284,7 +284,7 @@ rule KernelArchitectureSetup architecture
 
 		case arm :
 			switch $(HAIKU_BOOT_BOARD) {
-				case beagleboneblk :
+				case beagle :
 				{
 					HAIKU_BOOT_PLATFORM ?= u-boot ;
 					HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ;
diff --git a/build/jam/board/beagleboneblk/BoardSetup b/build/jam/board/beagle/BoardSetup
similarity index 100%
rename from build/jam/board/beagleboneblk/BoardSetup
rename to build/jam/board/beagle/BoardSetup
diff --git a/headers/private/kernel/arch/arm/board/beagleboneblk/board_config.h b/headers/private/kernel/arch/arm/board/beagle/board_config.h
similarity index 100%
rename from headers/private/kernel/arch/arm/board/beagleboneblk/board_config.h
rename to headers/private/kernel/arch/arm/board/beagle/board_config.h