diff --git a/hw/bsp/samd21/boards/luna/board.h b/hw/bsp/samd21/boards/luna_d21/board.h
similarity index 100%
rename from hw/bsp/samd21/boards/luna/board.h
rename to hw/bsp/samd21/boards/luna_d21/board.h
diff --git a/hw/bsp/samd21/boards/luna/board.mk b/hw/bsp/samd21/boards/luna_d21/board.mk
similarity index 100%
rename from hw/bsp/samd21/boards/luna/board.mk
rename to hw/bsp/samd21/boards/luna_d21/board.mk
diff --git a/hw/bsp/samd21/boards/luna/samd21g18a_flash.ld b/hw/bsp/samd21/boards/luna_d21/samd21g18a_flash.ld
similarity index 100%
rename from hw/bsp/samd21/boards/luna/samd21g18a_flash.ld
rename to hw/bsp/samd21/boards/luna_d21/samd21g18a_flash.ld