diff --git a/nrf5/boards/microbit/mpconfigboard.h b/nrf5/boards/microbit/mpconfigboard.h
index 7de7f4ac95..fd5fc7dfed 100644
--- a/nrf5/boards/microbit/mpconfigboard.h
+++ b/nrf5/boards/microbit/mpconfigboard.h
@@ -59,10 +59,8 @@
 #define MICROPY_HW_LED4             (24) // LED4
 
 // UART config
-#define MICROPY_HW_UART1_RX         (25)
-#define MICROPY_HW_UART1_TX         (24)
-#define MICROPY_HW_UART1_RX_PORT    (0)
-#define MICROPY_HW_UART1_TX_PORT    (0)
+#define MICROPY_HW_UART1_RX         (pin_A25)
+#define MICROPY_HW_UART1_TX         (pin_A24)
 #define MICROPY_HW_UART1_HWFC       (0)
 
 #define HELP_TEXT_BOARD_LED         "1,2,3,4"
diff --git a/nrf5/boards/pca10000/mpconfigboard.h b/nrf5/boards/pca10000/mpconfigboard.h
index 01840d26e8..ac955eb61b 100644
--- a/nrf5/boards/pca10000/mpconfigboard.h
+++ b/nrf5/boards/pca10000/mpconfigboard.h
@@ -54,10 +54,8 @@
 #define MICROPY_HW_LED_BLUE         (23) // BLUE
 
 // UART config
-#define MICROPY_HW_UART1_RX         (11)
-#define MICROPY_HW_UART1_TX         (9)
-#define MICROPY_HW_UART1_RX_PORT    (0)
-#define MICROPY_HW_UART1_TX_PORT    (0)
+#define MICROPY_HW_UART1_RX         (pin_A11)
+#define MICROPY_HW_UART1_TX         (pin_A9)
 #define MICROPY_HW_UART1_HWFC       (0)
 
 #define HELP_TEXT_BOARD_LED         "1,2,3"
diff --git a/nrf5/boards/pca10001/mpconfigboard.h b/nrf5/boards/pca10001/mpconfigboard.h
index 06570af7c4..8380dcf76d 100644
--- a/nrf5/boards/pca10001/mpconfigboard.h
+++ b/nrf5/boards/pca10001/mpconfigboard.h
@@ -53,14 +53,10 @@
 #define MICROPY_HW_LED2             (19) // LED2
 
 // UART config
-#define MICROPY_HW_UART1_RX         (11)
-#define MICROPY_HW_UART1_TX         (9)
-#define MICROPY_HW_UART1_CTS        (10)
-#define MICROPY_HW_UART1_RTS        (8)
-#define MICROPY_HW_UART1_RX_PORT    (0)
-#define MICROPY_HW_UART1_TX_PORT    (0)
-#define MICROPY_HW_UART1_RTS_PORT   (0)
-#define MICROPY_HW_UART1_CTS_PORT   (0)
+#define MICROPY_HW_UART1_RX         (pin_A11)
+#define MICROPY_HW_UART1_TX         (pin_A9)
+#define MICROPY_HW_UART1_CTS        (pin_A10)
+#define MICROPY_HW_UART1_RTS        (pin_A8)
 #define MICROPY_HW_UART1_HWFC       (1)
 
 #define HELP_TEXT_BOARD_LED         "1,2"
diff --git a/nrf5/boards/pca10028/mpconfigboard.h b/nrf5/boards/pca10028/mpconfigboard.h
index 1b558b3b7f..26b62cc361 100644
--- a/nrf5/boards/pca10028/mpconfigboard.h
+++ b/nrf5/boards/pca10028/mpconfigboard.h
@@ -33,7 +33,8 @@
 #define MICROPY_PY_DISPLAY                  (1)
 #define MICROPY_PY_DISPLAY_EPAPER_SLD00200P (0)
 #define MICROPY_PY_DISPLAY_LCD_ILI9341      (0)
-#define MICROPY_PY_DISPLAY_OLED_SSD1305     (1)
+#define MICROPY_PY_DISPLAY_LCD_SSD1289      (1)
+#define MICROPY_PY_DISPLAY_OLED_SSD1305     (0)
 #define MICROPY_PY_DISPLAY_OLED_SSD1306     (0)
 
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
@@ -67,23 +68,16 @@
 #define MICROPY_HW_LED4             (24) // LED4
 
 // UART config
-#define MICROPY_HW_UART1_RX         (11)
-#define MICROPY_HW_UART1_TX         (9)
-#define MICROPY_HW_UART1_CTS        (10)
-#define MICROPY_HW_UART1_RTS        (8)
-#define MICROPY_HW_UART1_RX_PORT    (0)
-#define MICROPY_HW_UART1_TX_PORT    (0)
-#define MICROPY_HW_UART1_CTS_PORT   (0)
-#define MICROPY_HW_UART1_RTS_PORT   (0)
+#define MICROPY_HW_UART1_RX         (pin_A11)
+#define MICROPY_HW_UART1_TX         (pin_A9)
+#define MICROPY_HW_UART1_CTS        (pin_A10)
+#define MICROPY_HW_UART1_RTS        (pin_A8)
 #define MICROPY_HW_UART1_HWFC       (1)
 
 // SPI0 config
 #define MICROPY_HW_SPI0_NAME        "SPI0"
-#define MICROPY_HW_SPI0_SCK         (29)
-#define MICROPY_HW_SPI0_MOSI        (25)
-#define MICROPY_HW_SPI0_MISO        (28)
-#define MICROPY_HW_SPI0_SCK_PORT    (0)
-#define MICROPY_HW_SPI0_MISO_PORT   (0)
-#define MICROPY_HW_SPI0_MOSI_PORT   (0)
+#define MICROPY_HW_SPI0_SCK         (pin_A29)
+#define MICROPY_HW_SPI0_MOSI        (pin_A25)
+#define MICROPY_HW_SPI0_MISO        (pin_A28)
 
 #define HELP_TEXT_BOARD_LED         "1,2,3,4"
diff --git a/nrf5/boards/pca10031/mpconfigboard.h b/nrf5/boards/pca10031/mpconfigboard.h
index 2afee5fbfc..e28112c69b 100644
--- a/nrf5/boards/pca10031/mpconfigboard.h
+++ b/nrf5/boards/pca10031/mpconfigboard.h
@@ -53,23 +53,16 @@
 #define MICROPY_HW_LED_BLUE         (23) // BLUE
 
 // UART config
-#define MICROPY_HW_UART1_RX         (11)
-#define MICROPY_HW_UART1_TX         (9)
-#define MICROPY_HW_UART1_CTS        (10)
-#define MICROPY_HW_UART1_RTS        (8)
-#define MICROPY_HW_UART1_RX_PORT    (0)
-#define MICROPY_HW_UART1_TX_PORT    (0)
-#define MICROPY_HW_UART1_CTS_PORT   (0)
-#define MICROPY_HW_UART1_RTS_PORT   (0)
+#define MICROPY_HW_UART1_RX         (pin_A11)
+#define MICROPY_HW_UART1_TX         (pin_A9)
+#define MICROPY_HW_UART1_CTS        (pin_A10)
+#define MICROPY_HW_UART1_RTS        (pin_A8)
 #define MICROPY_HW_UART1_HWFC       (0)
 
 // SPI0 config
 #define MICROPY_HW_SPI0_NAME        "SPI0"
-#define MICROPY_HW_SPI0_SCK         (15) // A15
-#define MICROPY_HW_SPI0_MOSI        (16) // A16
-#define MICROPY_HW_SPI0_MISO        (17) // A17
-#define MICROPY_HW_SPI0_SCK_PORT    (0)
-#define MICROPY_HW_SPI0_MISO_PORT   (0)
-#define MICROPY_HW_SPI0_MOSI_PORT   (0)
+#define MICROPY_HW_SPI0_SCK         (pin_A15)
+#define MICROPY_HW_SPI0_MOSI        (pin_A16)
+#define MICROPY_HW_SPI0_MISO        (pin_A17)
 
 #define HELP_TEXT_BOARD_LED         "1,2,3"
diff --git a/nrf5/boards/pca10040/mpconfigboard.h b/nrf5/boards/pca10040/mpconfigboard.h
index 9d1f14f559..b4791b8689 100644
--- a/nrf5/boards/pca10040/mpconfigboard.h
+++ b/nrf5/boards/pca10040/mpconfigboard.h
@@ -64,26 +64,17 @@
 #define MICROPY_HW_LED4             (20) // LED4
 
 // UART config
-#define MICROPY_HW_UART1_RX         (8)
-#define MICROPY_HW_UART1_TX         (6)
-#define MICROPY_HW_UART1_CTS        (7)
-#define MICROPY_HW_UART1_RTS        (5)
-
-#define MICROPY_HW_UART1_RX_PORT    (0)
-#define MICROPY_HW_UART1_TX_PORT    (0)
-#define MICROPY_HW_UART1_CTS_PORT   (0)
-#define MICROPY_HW_UART1_RTS_PORT   (0)
-
+#define MICROPY_HW_UART1_RX         (pin_A8)
+#define MICROPY_HW_UART1_TX         (pin_A6)
+#define MICROPY_HW_UART1_CTS        (pin_A7)
+#define MICROPY_HW_UART1_RTS        (pin_A5)
 #define MICROPY_HW_UART1_HWFC       (1)
 
 // SPI0 config
 #define MICROPY_HW_SPI0_NAME        "SPI0"
-#define MICROPY_HW_SPI0_SCK         (25) // A25 (Arduino D13)
-#define MICROPY_HW_SPI0_MOSI        (23) // A23 (Arduino D11)
-#define MICROPY_HW_SPI0_MISO        (24) // A24 (Arduino D12)
-#define MICROPY_HW_SPI0_SCK_PORT    (0)
-#define MICROPY_HW_SPI0_MOSI_PORT   (0)
-#define MICROPY_HW_SPI0_MISO_PORT   (0)
+#define MICROPY_HW_SPI0_SCK         (pin_A25) // (Arduino D13)
+#define MICROPY_HW_SPI0_MOSI        (pin_A23) // (Arduino D11)
+#define MICROPY_HW_SPI0_MISO        (pin_A24) // (Arduino D12)
 
 #define MICROPY_HW_PWM0_NAME        "PWM0"
 #define MICROPY_HW_PWM1_NAME        "PWM1"