diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/TOOLCHAIN_ARM_STD/nRF51822.sct b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/TOOLCHAIN_ARM_STD/nRF51822.sct
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/TOOLCHAIN_ARM_STD/nRF51822.sct
rename to libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/TOOLCHAIN_ARM_STD/nRF51822.sct
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/TOOLCHAIN_ARM_STD/startup_nRF51822.s b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/TOOLCHAIN_ARM_STD/startup_nRF51822.s
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/TOOLCHAIN_ARM_STD/startup_nRF51822.s
rename to libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/TOOLCHAIN_ARM_STD/startup_nRF51822.s
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/TOOLCHAIN_ARM_STD/sys.cpp b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/TOOLCHAIN_ARM_STD/sys.cpp
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/TOOLCHAIN_ARM_STD/sys.cpp
rename to libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/TOOLCHAIN_ARM_STD/sys.cpp
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/cmsis.h b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/cmsis.h
similarity index 91%
rename from libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/cmsis.h
rename to libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/cmsis.h
index e8f0ecc582..137286f6a7 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/cmsis.h
+++ b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/cmsis.h
@@ -7,7 +7,7 @@
 #ifndef MBED_CMSIS_H
 #define MBED_CMSIS_H
 
-#include "nRF51822.h"
+#include "nrf51822.h"
 #include "cmsis_nvic.h"
 
 #endif
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/cmsis_nvic.c b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/cmsis_nvic.c
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/cmsis_nvic.c
rename to libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/cmsis_nvic.c
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/cmsis_nvic.h b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/cmsis_nvic.h
similarity index 95%
rename from libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/cmsis_nvic.h
rename to libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/cmsis_nvic.h
index 943e4e87cc..b89d5fc3ba 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/cmsis_nvic.h
+++ b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/cmsis_nvic.h
@@ -10,7 +10,7 @@
 #define NVIC_NUM_VECTORS      (16 + 32)   // CORE + MCU Peripherals
 #define NVIC_USER_IRQ_OFFSET  16
 
-#include "nRF51822.h"
+#include "nrf51822.h"
 #include "cmsis.h"
 
 
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/compiler_abstraction.h b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/compiler_abstraction.h
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/compiler_abstraction.h
rename to libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/compiler_abstraction.h
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/nrf51.h b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/nrf51.h
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/nrf51.h
rename to libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/nrf51.h
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/nRF51822.h b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/nrf51822.h
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/nRF51822.h
rename to libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/nrf51822.h
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/nrf51_bitfields.h b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/nrf51_bitfields.h
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/nrf51_bitfields.h
rename to libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/nrf51_bitfields.h
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/system_nRF51822.c b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/system_nrf51822.c
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/system_nRF51822.c
rename to libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/system_nrf51822.c
diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/system_nRF51822.h b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/system_nrf51822.h
similarity index 100%
rename from libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/system_nRF51822.h
rename to libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_NRF51822/system_nrf51822.h
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/PeripheralNames.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/PeripheralNames.h
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/PeripheralNames.h
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/PeripheralNames.h
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/PinNames.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/PinNames.h
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/PinNames.h
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/PinNames.h
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/PortNames.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/PortNames.h
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/PortNames.h
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/PortNames.h
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/analogin_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/analogin_api.c
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/device.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/device.h
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/device.h
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/device.h
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/gpio_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/gpio_api.c
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_api.c
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_irq_api.c
similarity index 99%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/gpio_irq_api.c
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_irq_api.c
index 241f046e94..95809ff80d 100644
--- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/gpio_irq_api.c
+++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_irq_api.c
@@ -26,7 +26,7 @@ static uint8_t channel_enabled[CHANNEL_NUM] = {0};
 static uint32_t  portRISE= 0; 
 static uint32_t  portFALL= 0; 
 static gpio_irq_handler irq_handler;
-
+/*
 #ifdef __cplusplus
 extern "C" {
 #endif 
@@ -64,7 +64,7 @@ void GPIOTE_IRQHandler(void){
 #ifdef __cplusplus
 }
 #endif 
-
+*/
 int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32_t id) {
     if (pin == NC) {
         return -1;
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/gpio_object.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/gpio_object.h
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_object.h
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/i2c_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/i2c_api.c
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/objects.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/objects.h
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/objects.h
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/objects.h
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/pinmap.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/pinmap.c
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/port_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/port_api.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/port_api.c
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/port_api.c
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/pwmout_api.c
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/serial_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/serial_api.c
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/serial_api.c
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/sleep.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/sleep.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/sleep.c
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/sleep.c
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/spi_api.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/spi_api.c
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c
diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/us_ticker.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/us_ticker.c
similarity index 100%
rename from libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/us_ticker.c
rename to libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/us_ticker.c