diff --git a/hw/bsp/saml22/boards/saml22_feather/board.h b/hw/bsp/saml2x/boards/saml22_feather/board.h
similarity index 100%
rename from hw/bsp/saml22/boards/saml22_feather/board.h
rename to hw/bsp/saml2x/boards/saml22_feather/board.h
diff --git a/hw/bsp/saml22/boards/saml22_feather/board.mk b/hw/bsp/saml2x/boards/saml22_feather/board.mk
similarity index 100%
rename from hw/bsp/saml22/boards/saml22_feather/board.mk
rename to hw/bsp/saml2x/boards/saml22_feather/board.mk
diff --git a/hw/bsp/saml22/boards/saml22_feather/saml22_feather.ld b/hw/bsp/saml2x/boards/saml22_feather/saml22_feather.ld
similarity index 100%
rename from hw/bsp/saml22/boards/saml22_feather/saml22_feather.ld
rename to hw/bsp/saml2x/boards/saml22_feather/saml22_feather.ld
diff --git a/hw/bsp/saml22/boards/sensorwatch_m0/board.h b/hw/bsp/saml2x/boards/sensorwatch_m0/board.h
similarity index 100%
rename from hw/bsp/saml22/boards/sensorwatch_m0/board.h
rename to hw/bsp/saml2x/boards/sensorwatch_m0/board.h
diff --git a/hw/bsp/saml22/boards/sensorwatch_m0/board.mk b/hw/bsp/saml2x/boards/sensorwatch_m0/board.mk
similarity index 100%
rename from hw/bsp/saml22/boards/sensorwatch_m0/board.mk
rename to hw/bsp/saml2x/boards/sensorwatch_m0/board.mk
diff --git a/hw/bsp/saml22/boards/sensorwatch_m0/sensorwatch_m0.ld b/hw/bsp/saml2x/boards/sensorwatch_m0/sensorwatch_m0.ld
similarity index 100%
rename from hw/bsp/saml22/boards/sensorwatch_m0/sensorwatch_m0.ld
rename to hw/bsp/saml2x/boards/sensorwatch_m0/sensorwatch_m0.ld
diff --git a/hw/bsp/saml22/family.c b/hw/bsp/saml2x/family.c
similarity index 99%
rename from hw/bsp/saml22/family.c
rename to hw/bsp/saml2x/family.c
index fff11cbe5..1a185a59c 100644
--- a/hw/bsp/saml22/family.c
+++ b/hw/bsp/saml2x/family.c
@@ -160,4 +160,4 @@ uint32_t board_millis(void)
 void _init(void)
 {
 
-}
\ No newline at end of file
+}
diff --git a/hw/bsp/saml22/family.mk b/hw/bsp/saml2x/family.mk
similarity index 100%
rename from hw/bsp/saml22/family.mk
rename to hw/bsp/saml2x/family.mk