diff --git a/boards/airfy-beacon/board.c b/boards/airfy-beacon/board.c
index 1e6f86148f..80762f4897 100644
--- a/boards/airfy-beacon/board.c
+++ b/boards/airfy-beacon/board.c
@@ -24,7 +24,7 @@
 void board_init(void)
 {
     /* setup led(s) for debugging */
-    NRF_GPIO->PIN_CNF[LED_RED_PIN] = GPIO_PIN_CNF_DIR_Output;
+    NRF_GPIO->DIRSET = LED_RED_MASK;
 
     /* initialize the CPU */
     cpu_init();
diff --git a/boards/airfy-beacon/include/board.h b/boards/airfy-beacon/include/board.h
index 95603988d8..7b194bb152 100644
--- a/boards/airfy-beacon/include/board.h
+++ b/boards/airfy-beacon/include/board.h
@@ -42,12 +42,18 @@
  * @name Macros for controlling the on-board LEDs.
  * @{
  */
-#define LED_RED_PIN         16
-
-#define LED_RED_ON          (NRF_GPIO->OUTSET = (1 << LED_RED_PIN))
-#define LED_RED_OFF         (NRF_GPIO->OUTCLR = (1 << LED_RED_PIN))
-#define LED_RED_TOGGLE      (NRF_GPIO->OUT ^= (1 << LED_RED_PIN))
+#define LED_RED_PIN         (GPIO_PIN(0, 16))
+#define LED_RED_MASK        (1 << 16)
 
+#define LED_RED_ON          (NRF_GPIO->OUTSET = LED_RED_MASK)
+#define LED_RED_OFF         (NRF_GPIO->OUTCLR = LED_RED_MASK)
+#define LED_RED_TOGGLE      (NRF_GPIO->OUT   ^= LED_RED_MASK)
+#define LED_GREEN_ON        /* not available */
+#define LED_GREEN_OFF       /* not available */
+#define LED_GREEN_TOGGLE    /* not available */
+#define LED_BLUE_ON         /* not available */
+#define LED_BLUE_OFF        /* not available */
+#define LED_BLUE_TOGGLE     /* not available */
 /* @} */
 
 /**
diff --git a/boards/nrf51dongle/board.c b/boards/nrf51dongle/board.c
index 7e00e24d6e..a6660078be 100644
--- a/boards/nrf51dongle/board.c
+++ b/boards/nrf51dongle/board.c
@@ -24,8 +24,8 @@
 void board_init(void)
 {
     /* initialize the boards LEDs, set pins as output and turn LEDs off */
-    NRF_GPIO->DIRSET = (LED_RED_PIN | LED_GREEN_PIN | LED_BLUE_PIN);
-    NRF_GPIO->OUTSET = (LED_RED_PIN | LED_GREEN_PIN | LED_BLUE_PIN);
+    NRF_GPIO->DIRSET = (LED_RED_MASK | LED_GREEN_MASK | LED_BLUE_MASK);
+    NRF_GPIO->OUTSET = (LED_RED_MASK | LED_GREEN_MASK | LED_BLUE_MASK);
     /* initialize the CPU */
     cpu_init();
 }
diff --git a/boards/nrf51dongle/include/board.h b/boards/nrf51dongle/include/board.h
index ad303d5a73..c640ffa1aa 100644
--- a/boards/nrf51dongle/include/board.h
+++ b/boards/nrf51dongle/include/board.h
@@ -43,24 +43,27 @@ extern "C" {
  * @name    LED pin definitions
  * @{
  */
-#define LED_RED_PIN         (1 << 21)
-#define LED_GREEN_PIN       (1 << 22)
-#define LED_BLUE_PIN        (1 << 23)
+#define LED_RED_PIN         (GPIO_PIN(0, 21))
+#define LED_GREEN_PIN       (GPIO_PIN(0, 22))
+#define LED_BLUE_PIN        (GPIO_PIN(0, 23))
+#define LED_RED_MASK        (1 << 21)
+#define LED_GREEN_MASK      (1 << 22)
+#define LED_BLUE_MASK       (1 << 23)
 /** @} */
 
 /**
  * @name    Macros for controlling the on-board LEDs
  * @{
  */
-#define LED_RED_ON          (NRF_GPIO->OUTCLR = LED_RED_PIN)
-#define LED_RED_OFF         (NRF_GPIO->OUTSET = LED_RED_PIN)
-#define LED_RED_TOGGLE      (NRF_GPIO->OUT ^= LED_RED_PIN)
-#define LED_GREEN_ON        (NRF_GPIO->OUTCLR = LED_GREEN_PIN)
-#define LED_GREEN_OFF       (NRF_GPIO->OUTSET = LED_GREEN_PIN)
-#define LED_GREEN_TOGGLE    (NRF_GPIO->OUT ^= LED_GREEN_PIN)
-#define LED_BLUE_ON         (NRF_GPIO->OUTCLR = LED_BLUE_PIN)
-#define LED_BLUE_OFF        (NRF_GPIO->OUTSET = LED_BLUE_PIN)
-#define LED_BLUE_TOGGLE     (NRF_GPIO->OUT ^= LED_BLUE_PIN)
+#define LED_RED_ON          (NRF_GPIO->OUTCLR = LED_RED_MASK)
+#define LED_RED_OFF         (NRF_GPIO->OUTSET = LED_RED_MASK)
+#define LED_RED_TOGGLE      (NRF_GPIO->OUT   ^= LED_RED_MASK)
+#define LED_GREEN_ON        (NRF_GPIO->OUTCLR = LED_GREEN_MASK)
+#define LED_GREEN_OFF       (NRF_GPIO->OUTSET = LED_GREEN_MASK)
+#define LED_GREEN_TOGGLE    (NRF_GPIO->OUT   ^= LED_GREEN_MASK)
+#define LED_BLUE_ON         (NRF_GPIO->OUTCLR = LED_BLUE_MASK)
+#define LED_BLUE_OFF        (NRF_GPIO->OUTSET = LED_BLUE_MASK)
+#define LED_BLUE_TOGGLE     (NRF_GPIO->OUT   ^= LED_BLUE_MASK)
 /** @} */
 
 /**
diff --git a/boards/nrf52dk/include/board.h b/boards/nrf52dk/include/board.h
index e965bef288..5e794b2ea2 100644
--- a/boards/nrf52dk/include/board.h
+++ b/boards/nrf52dk/include/board.h
@@ -45,15 +45,15 @@ extern "C" {
  * @brief   RIOT LED macros for backwards compatibility
  * @{
  */
-#define LED_RED_ON          (NRF_P0->OUTSET = LED1_PIN)
-#define LED_RED_OFF         (NRF_P0->OUTCLR = LED2_PIN)
-#define LED_RED_TOGGLE      (NRF_P0->OUT   ^= LED3_PIN)
-#define LED_GREEN_ON        (NRF_P0->OUTSET = LED1_PIN)
-#define LED_GREEN_OFF       (NRF_P0->OUTCLR = LED2_PIN)
-#define LED_GREEN_TOGGLE    (NRF_P0->OUT   ^= LED3_PIN)
-#define LED_ORANGE_ON       (NRF_P0->OUTSET = LED1_PIN)
-#define LED_ORANGE_OFF      (NRF_P0->OUTCLR = LED2_PIN)
-#define LED_ORANGE_TOGGLE   (NRF_P0->OUT   ^= LED3_PIN)
+#define LED_RED_ON          (NRF_P0->OUTSET = LED1_MASK)
+#define LED_RED_OFF         (NRF_P0->OUTCLR = LED1_MASK)
+#define LED_RED_TOGGLE      (NRF_P0->OUT   ^= LED1_MASK)
+#define LED_GREEN_ON        (NRF_P0->OUTSET = LED2_MASK)
+#define LED_GREEN_OFF       (NRF_P0->OUTCLR = LED2_MASK)
+#define LED_GREEN_TOGGLE    (NRF_P0->OUT   ^= LED2_MASK)
+#define LED_ORANGE_ON       (NRF_P0->OUTSET = LED3_MASK)
+#define LED_ORANGE_OFF      (NRF_P0->OUTCLR = LED3_MASK)
+#define LED_ORANGE_TOGGLE   (NRF_P0->OUT   ^= LED3_MASK)
 /** @} */
 
 /**
diff --git a/boards/nrf6310/board.c b/boards/nrf6310/board.c
index 978a2064d2..156c02f2fa 100644
--- a/boards/nrf6310/board.c
+++ b/boards/nrf6310/board.c
@@ -26,7 +26,7 @@
 void board_init(void)
 {
     /* setup led(s) for debugging */
-    NRF_GPIO->PIN_CNF[LED_RED_PIN] = GPIO_PIN_CNF_DIR_Output;
+    NRF_GPIO->DIRSET = (LED_RED_MASK | LED_GREEN_MASK | LED_BLUE_MASK);
 
     /* initialize the CPU */
     cpu_init();
diff --git a/boards/nrf6310/include/board.h b/boards/nrf6310/include/board.h
index d642762818..a6d2bc9ca0 100644
--- a/boards/nrf6310/include/board.h
+++ b/boards/nrf6310/include/board.h
@@ -33,25 +33,27 @@ extern "C" {
  * @name    LED pin definitions
  * @{
  */
-#define ONBOARD_LED         1
-#define LED_RED_PIN         (1 << 8)
-#define LED_GREEN_PIN       (1 << 9)
-#define LED_BLUE_PIN        (1 << 10)
+#define LED_RED_PIN         (GPIO_PIN(0, 8))
+#define LED_GREEN_PIN       (GPIO_PIN(0, 9))
+#define LED_BLUE_PIN        (GPIO_PIN(0, 10))
+#define LED_RED_MASK        (1 << 8)
+#define LED_GREEN_MASK      (1 << 9)
+#define LED_BLUE_MASK       (1 << 10)
 /** @} */
 
 /**
  * @name Macros for controlling the on-board LEDs.
  * @{
  */
-#define LED_RED_ON          (NRF_GPIO->OUTCLR = LED_RED_PIN)
-#define LED_RED_OFF         (NRF_GPIO->OUTSET = LED_RED_PIN)
-#define LED_RED_TOGGLE      (NRF_GPIO->OUT ^= LED_RED_PIN)
-#define LED_GREEN_ON        (NRF_GPIO->OUTCLR = LED_GREEN_PIN)
-#define LED_GREEN_OFF       (NRF_GPIO->OUTSET = LED_GREEN_PIN)
-#define LED_GREEN_TOGGLE    (NRF_GPIO->OUT ^= LED_GREEN_PIN)
-#define LED_BLUE_ON         (NRF_GPIO->OUTCLR = LED_BLUE_PIN)
-#define LED_BLUE_OFF        (NRF_GPIO->OUTSET = LED_BLUE_PIN)
-#define LED_BLUE_TOGGLE     (NRF_GPIO->OUT ^= LED_BLUE_PIN)
+#define LED_RED_ON          (NRF_GPIO->OUTCLR = LED_RED_MASK)
+#define LED_RED_OFF         (NRF_GPIO->OUTSET = LED_RED_MASK)
+#define LED_RED_TOGGLE      (NRF_GPIO->OUT   ^= LED_RED_MASK)
+#define LED_GREEN_ON        (NRF_GPIO->OUTCLR = LED_GREEN_MASK)
+#define LED_GREEN_OFF       (NRF_GPIO->OUTSET = LED_GREEN_MASK)
+#define LED_GREEN_TOGGLE    (NRF_GPIO->OUT   ^= LED_GREEN_MASK)
+#define LED_BLUE_ON         (NRF_GPIO->OUTCLR = LED_BLUE_MASK)
+#define LED_BLUE_OFF        (NRF_GPIO->OUTSET = LED_BLUE_MASK)
+#define LED_BLUE_TOGGLE     (NRF_GPIO->OUT   ^= LED_BLUE_MASK)
 /** @} */
 
 /**
diff --git a/boards/pca10000/board.c b/boards/pca10000/board.c
index 62875d180f..be7c3e9602 100644
--- a/boards/pca10000/board.c
+++ b/boards/pca10000/board.c
@@ -25,8 +25,8 @@
 void board_init(void)
 {
     /* initialize the boards LEDs: set pins to output and turn LEDs off */
-    NRF_GPIO->DIRSET = (LED_RED_PIN | LED_GREEN_PIN | LED_BLUE_PIN);
-    NRF_GPIO->OUTSET = (LED_RED_PIN | LED_GREEN_PIN | LED_BLUE_PIN);
+    NRF_GPIO->DIRSET = (LED_RED_MASK | LED_GREEN_MASK | LED_BLUE_MASK);
+    NRF_GPIO->OUTSET = (LED_RED_MASK | LED_GREEN_MASK | LED_BLUE_MASK);
     /* trigger the CPU initialization code */
     cpu_init();
 }
diff --git a/boards/pca10000/include/board.h b/boards/pca10000/include/board.h
index d0be5893b2..733c096fdf 100644
--- a/boards/pca10000/include/board.h
+++ b/boards/pca10000/include/board.h
@@ -43,25 +43,27 @@ extern "C" {
  * @name    LED pin definitions
  * @{
  */
-#define ONBOARD_LED         1
-#define LED_RED_PIN         (1 << 21)
-#define LED_GREEN_PIN       (1 << 22)
-#define LED_BLUE_PIN        (1 << 23)
+#define LED_RED_PIN         (GPIO_PIN(0, 21))
+#define LED_GREEN_PIN       (GPIO_PIN(0, 22))
+#define LED_BLUE_PIN        (GPIO_PIN(0, 23))
+#define LED_RED_MASK        (1 << 21)
+#define LED_GREEN_MASK      (1 << 22)
+#define LED_BLUE_MASK       (1 << 23)
 /** @} */
 
 /**
  * @name Macros for controlling the on-board LEDs.
  * @{
  */
-#define LED_RED_ON          (NRF_GPIO->OUTCLR = LED_RED_PIN)
-#define LED_RED_OFF         (NRF_GPIO->OUTSET = LED_RED_PIN)
-#define LED_RED_TOGGLE      (NRF_GPIO->OUT ^= LED_RED_PIN)
-#define LED_GREEN_ON        (NRF_GPIO->OUTCLR = LED_GREEN_PIN)
-#define LED_GREEN_OFF       (NRF_GPIO->OUTSET = LED_GREEN_PIN)
-#define LED_GREEN_TOGGLE    (NRF_GPIO->OUT ^= LED_GREEN_PIN)
-#define LED_BLUE_ON         (NRF_GPIO->OUTCLR = LED_BLUE_PIN)
-#define LED_BLUE_OFF        (NRF_GPIO->OUTSET = LED_BLUE_PIN)
-#define LED_BLUE_TOGGLE     (NRF_GPIO->OUT ^= LED_BLUE_PIN)
+#define LED_RED_ON          (NRF_GPIO->OUTCLR = LED_RED_MASK)
+#define LED_RED_OFF         (NRF_GPIO->OUTSET = LED_RED_MASK)
+#define LED_RED_TOGGLE      (NRF_GPIO->OUT   ^= LED_RED_MASK)
+#define LED_GREEN_ON        (NRF_GPIO->OUTCLR = LED_GREEN_MASK)
+#define LED_GREEN_OFF       (NRF_GPIO->OUTSET = LED_GREEN_MASK)
+#define LED_GREEN_TOGGLE    (NRF_GPIO->OUT   ^= LED_GREEN_MASK)
+#define LED_BLUE_ON         (NRF_GPIO->OUTCLR = LED_BLUE_MASK)
+#define LED_BLUE_OFF        (NRF_GPIO->OUTSET = LED_BLUE_MASK)
+#define LED_BLUE_TOGGLE     (NRF_GPIO->OUT   ^= LED_BLUE_MASK)
 /** @} */
 
 /**
diff --git a/boards/pca10005/board.c b/boards/pca10005/board.c
index 6ae6345d93..7ee2f74847 100644
--- a/boards/pca10005/board.c
+++ b/boards/pca10005/board.c
@@ -26,7 +26,7 @@
 void board_init(void)
 {
     /* setup led(s) for debugging */
-    NRF_GPIO->PIN_CNF[LED_RED_PIN] = GPIO_PIN_CNF_DIR_Output;
+    NRF_GPIO->DIRSET = (LED_RED_MASK);
 
     /* initialize the CPU */
     cpu_init();
diff --git a/boards/pca10005/include/board.h b/boards/pca10005/include/board.h
index 9fc73f3cae..3af4cc9ad9 100644
--- a/boards/pca10005/include/board.h
+++ b/boards/pca10005/include/board.h
@@ -43,11 +43,12 @@ extern "C" {
  * @name Macros for controlling the on-board LEDs.
  * @{
  */
-#define LED_RED_PIN         1
+#define LED_RED_PIN         (GPIO_PIN(0, 1))
+#define LED_RED_MASK        (1 << 1)
 
-#define LED_RED_ON          (NRF_GPIO->OUTSET = (1 << LED_RED_PIN))
-#define LED_RED_OFF         (NRF_GPIO->OUTCLR = (1 << LED_RED_PIN))
-#define LED_RED_TOGGLE      (NRF_GPIO->OUT ^= (1 << LED_RED_PIN))
+#define LED_RED_ON          (NRF_GPIO->OUTSET = (1 << LED_RED_MASK))
+#define LED_RED_OFF         (NRF_GPIO->OUTCLR = (1 << LED_RED_MASK))
+#define LED_RED_TOGGLE      (NRF_GPIO->OUT   ^= (1 << LED_RED_MASK))
 #define LED_GREEN_ON        /* not available */
 #define LED_GREEN_OFF       /* not available */
 #define LED_GREEN_TOGGLE    /* not available */
diff --git a/boards/yunjia-nrf51822/board.c b/boards/yunjia-nrf51822/board.c
index 6db542c72e..896165599b 100644
--- a/boards/yunjia-nrf51822/board.c
+++ b/boards/yunjia-nrf51822/board.c
@@ -24,7 +24,7 @@
 void board_init(void)
 {
     /* setup led(s) for debugging */
-    NRF_GPIO->PIN_CNF[LED_RED_PIN] = GPIO_PIN_CNF_DIR_Output;
+    NRF_GPIO->DIRSET = (LED_RED_MASK);
 
     /* initialize the CPU */
     cpu_init();
diff --git a/boards/yunjia-nrf51822/include/board.h b/boards/yunjia-nrf51822/include/board.h
index 11463377d6..f297531ebe 100644
--- a/boards/yunjia-nrf51822/include/board.h
+++ b/boards/yunjia-nrf51822/include/board.h
@@ -42,11 +42,12 @@ extern "C" {
  * @name Macros for controlling the on-board LEDs.
  * @{
  */
-#define LED_RED_PIN         8
+#define LED_RED_PIN         (GPIO_PIN(0, 8))
+#define LED_RED_MASK        (1 << 8)
 
-#define LED_RED_ON          (NRF_GPIO->OUTSET = (1 << LED_RED_PIN))
-#define LED_RED_OFF         (NRF_GPIO->OUTCLR = (1 << LED_RED_PIN))
-#define LED_RED_TOGGLE      (NRF_GPIO->OUT ^= (1 << LED_RED_PIN))
+#define LED_RED_ON          (NRF_GPIO->OUTSET = LED_RED_MASK)
+#define LED_RED_OFF         (NRF_GPIO->OUTCLR = LED_RED_MASK)
+#define LED_RED_TOGGLE      (NRF_GPIO->OUT   ^= LED_RED_MASK)
 #define LED_GREEN_ON        /* not available */
 #define LED_GREEN_OFF       /* not available */
 #define LED_GREEN_TOGGLE    /* not available */