diff --git a/atmel-samd/README.md b/atmel-samd/README.md
index 235203e57a..105f629e8d 100644
--- a/atmel-samd/README.md
+++ b/atmel-samd/README.md
@@ -1,7 +1,7 @@
 # SAMD21x18
 
 This port brings MicroPython to SAMD21x18 based development boards including the
-Arduino Zero, Adafruit Feather M0 and Adafruit M0 BLE.
+Arduino Zero, Adafruit Feather M0 Basic and Adafruit M0 Bluefruit LE.
 
 ## Building
 
@@ -11,7 +11,7 @@ To build for the Arduino Zero:
 
 To build for other boards you must change it by setting `BOARD`. For example:
 
-    make BOARD=feather_m0_ble
+    make BOARD=feather_m0_basic
 
 Board names are the directory names in the `boards` folder.
 
@@ -23,7 +23,7 @@ to flash MicroPython. First, activate the bootloader. On Adafruit Feathers you
 can double click the reset button and the #13 will fade in and out. Finally,
 run bossac:
 
-    tools/bossac_osx -e -w -v -b -R build-feather_m0_ble/firmware.bin
+    tools/bossac_osx -e -w -v -b -R build-feather_m0_basic/firmware.bin
 
 ### No Bootloader via GDB
 This method works for loading MicroPython onto the Arduino Zero via the
diff --git a/atmel-samd/boards/feather_m0_bluefruit_le/conf_access.h b/atmel-samd/boards/feather_m0_basic/conf_access.h
similarity index 100%
rename from atmel-samd/boards/feather_m0_bluefruit_le/conf_access.h
rename to atmel-samd/boards/feather_m0_basic/conf_access.h
diff --git a/atmel-samd/boards/feather_m0_bluefruit_le/conf_board.h b/atmel-samd/boards/feather_m0_basic/conf_board.h
similarity index 100%
rename from atmel-samd/boards/feather_m0_bluefruit_le/conf_board.h
rename to atmel-samd/boards/feather_m0_basic/conf_board.h
diff --git a/atmel-samd/boards/feather_m0_bluefruit_le/conf_usb.h b/atmel-samd/boards/feather_m0_basic/conf_usb.h
similarity index 98%
rename from atmel-samd/boards/feather_m0_bluefruit_le/conf_usb.h
rename to atmel-samd/boards/feather_m0_basic/conf_usb.h
index 4155c0fef6..235ce8335b 100644
--- a/atmel-samd/boards/feather_m0_bluefruit_le/conf_usb.h
+++ b/atmel-samd/boards/feather_m0_basic/conf_usb.h
@@ -19,7 +19,7 @@
 #endif
 
 #ifndef USB_DEVICE_PRODUCT_NAME
-#  define USB_DEVICE_PRODUCT_NAME "Feather M0 Bluefruit LE"
+#  define USB_DEVICE_PRODUCT_NAME "Feather M0 Basic"
 #endif
 
 #define  USB_DEVICE_GET_SERIAL_NAME_POINTER  serial_number
diff --git a/atmel-samd/boards/feather_m0_bluefruit_le/init.c b/atmel-samd/boards/feather_m0_basic/init.c
similarity index 100%
rename from atmel-samd/boards/feather_m0_bluefruit_le/init.c
rename to atmel-samd/boards/feather_m0_basic/init.c
diff --git a/atmel-samd/boards/feather_m0_bluefruit_le/mpconfigboard.h b/atmel-samd/boards/feather_m0_basic/mpconfigboard.h
similarity index 68%
rename from atmel-samd/boards/feather_m0_bluefruit_le/mpconfigboard.h
rename to atmel-samd/boards/feather_m0_basic/mpconfigboard.h
index 622ba8fd36..08a3ab0b33 100644
--- a/atmel-samd/boards/feather_m0_bluefruit_le/mpconfigboard.h
+++ b/atmel-samd/boards/feather_m0_basic/mpconfigboard.h
@@ -3,5 +3,5 @@
 // #define UART_REPL
 #define USB_REPL
 
-#define MICROPY_HW_BOARD_NAME "Adafruit Feather M0 Bluefruit LE"
+#define MICROPY_HW_BOARD_NAME "Adafruit Feather M0 Basic"
 #define MICROPY_HW_MCU_NAME "samd21g18"
diff --git a/atmel-samd/boards/feather_m0_bluefruit_le/mpconfigboard.mk b/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
similarity index 100%
rename from atmel-samd/boards/feather_m0_bluefruit_le/mpconfigboard.mk
rename to atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
diff --git a/atmel-samd/boards/feather_m0_bluefruit_le/pins.c b/atmel-samd/boards/feather_m0_basic/pins.c
similarity index 100%
rename from atmel-samd/boards/feather_m0_bluefruit_le/pins.c
rename to atmel-samd/boards/feather_m0_basic/pins.c
diff --git a/atmel-samd/boards/feather_m0_bluefruit_le/pins.h b/atmel-samd/boards/feather_m0_basic/pins.h
similarity index 74%
rename from atmel-samd/boards/feather_m0_bluefruit_le/pins.h
rename to atmel-samd/boards/feather_m0_basic/pins.h
index 9623a5a4f5..0ca9d1f5a4 100644
--- a/atmel-samd/boards/feather_m0_bluefruit_le/pins.h
+++ b/atmel-samd/boards/feather_m0_basic/pins.h
@@ -1,6 +1,6 @@
 
-#ifndef __MICROPY_INCLUDED_ATMEL_SAMD_BOARDS_FEATHER_M0_BLUEFRUIT_LE_PINS_H__
-#define __MICROPY_INCLUDED_ATMEL_SAMD_BOARDS_FEATHER_M0_BLUEFRUIT_LE_PINS_H__
+#ifndef __MICROPY_INCLUDED_ATMEL_SAMD_BOARDS_FEATHER_M0_BASIC_PINS_H__
+#define __MICROPY_INCLUDED_ATMEL_SAMD_BOARDS_FEATHER_M0_BASIC_PINS_H__
 
 #include "modmachine_pin.h"
 
@@ -25,4 +25,4 @@ extern const pin_obj_t pin_PA16;
 extern const pin_obj_t pin_PA19;
 extern const pin_obj_t pin_PA17;
 
-#endif  // __MICROPY_INCLUDED_ATMEL_SAMD_BOARDS_FEATHER_M0_BLUEFRUIT_LE_PINS_H__
+#endif  // __MICROPY_INCLUDED_ATMEL_SAMD_BOARDS_FEATHER_M0_BASIC_PINS_H__