diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_ARM/startup_stm32l071xx.S b/targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_ARM/startup_stm32l071xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_ARM/startup_stm32l071xx.S
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_ARM/startup_stm32l071xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_ARM/stm32l071xx.sct b/targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_ARM/stm32l071xx.sct
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_ARM/stm32l071xx.sct
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_ARM/stm32l071xx.sct
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_GCC_ARM/STM32L071xx.ld b/targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_GCC_ARM/STM32L071xx.ld
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_GCC_ARM/STM32L071xx.ld
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_GCC_ARM/STM32L071xx.ld
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_GCC_ARM/startup_stm32l071xx.S b/targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_GCC_ARM/startup_stm32l071xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_GCC_ARM/startup_stm32l071xx.S
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_GCC_ARM/startup_stm32l071xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_IAR/startup_stm32l071xx.S b/targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_IAR/startup_stm32l071xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_IAR/startup_stm32l071xx.S
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_IAR/startup_stm32l071xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_IAR/stm32l071xx_flash.icf b/targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_IAR/stm32l071xx_flash.icf
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_IAR/stm32l071xx_flash.icf
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_IAR/stm32l071xx_flash.icf
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_IAR/stm32l071xx_sram.icf b/targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_IAR/stm32l071xx_sram.icf
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/TOOLCHAIN_IAR/stm32l071xx_sram.icf
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/TOOLCHAIN_IAR/stm32l071xx_sram.icf
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/cmsis_nvic.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/cmsis_nvic.h
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/cmsis_nvic.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/stm32l071xx.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/stm32l071xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/stm32l071xx.h
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/stm32l071xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/stm32l0xx.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/stm32l0xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/stm32l0xx.h
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/stm32l0xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/system_stm32l0xx.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/system_stm32l0xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/system_stm32l0xx.h
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/system_stm32l0xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/us_ticker_data.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/us_ticker_data.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/device/us_ticker_data.h
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/device/us_ticker_data.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/objects.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/objects.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L071xx/objects.h
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_MCU_STM32L071xx/objects.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/device/stm32l0xx_hal_conf.h b/targets/TARGET_STM/TARGET_STM32L0/device/stm32l0xx_hal_conf.h
index a6cec8d776..d26337aed9 100644
--- a/targets/TARGET_STM/TARGET_STM32L0/device/stm32l0xx_hal_conf.h
+++ b/targets/TARGET_STM/TARGET_STM32L0/device/stm32l0xx_hal_conf.h
@@ -54,7 +54,7 @@
 #define HAL_CRC_MODULE_ENABLED
 #define HAL_CRYP_MODULE_ENABLED
 
-#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071CxCTx)
+#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071xx)
 #define HAL_DAC_MODULE_ENABLED
 #endif /* !TARGET_STM32L031K6  && !TARGET_STM32L011K4 && !TARGET_STML0CXCTX */
 
@@ -68,7 +68,7 @@
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
 
-#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071CxCTx) 
+#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071xx) 
 #define HAL_I2S_MODULE_ENABLED
 #endif /* !TARGET_STM32L031K6  && !TARGET_STM32L011K4 && !TARGET_STML0CXCTX */
 
@@ -78,7 +78,7 @@
 #define HAL_PWR_MODULE_ENABLED
 #define HAL_RCC_MODULE_ENABLED
 
-#if !defined (TARGET_STML071CxCTx) 
+#if !defined (TARGET_STML071xx) 
 #define HAL_RNG_MODULE_ENABLED
 #endif /* !TARGET_STML0CXCTX */
 
@@ -86,7 +86,7 @@
 #define HAL_SPI_MODULE_ENABLED
 #define HAL_TIM_MODULE_ENABLED
 
-#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071CxCTx)
+#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071xx)
 #define HAL_TSC_MODULE_ENABLED
 #endif /* !TARGET_STM32L031K6  && !TARGET_STM32L011K4 && !TARGET_STML0CXCTX */
 
@@ -98,7 +98,7 @@
 #define HAL_WWDG_MODULE_ENABLED
 #define HAL_CORTEX_MODULE_ENABLED
 
-#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071CxCTx)
+#if !defined (TARGET_STM32L031K6) && !defined (TARGET_STM32L011K4) && !defined (TARGET_STML071xx)
 #define HAL_PCD_MODULE_ENABLED
 #endif /* !TARGET_STM32L031K6  && !TARGET_STM32L011K4 && !TARGET_STML0CXCTX */
 
diff --git a/targets/targets.json b/targets/targets.json
index d5467f12d9..02a0ee2756 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -2411,15 +2411,7 @@
         "inherits": [
             "MCU_STM32G0"
         ],
-<<<<<<< HEAD
         "public": false,
-=======
-        "core": "Cortex-M7FD",
-        "mbed_rom_start": "0x08000000",
-        "mbed_rom_size": "0x200000",
-        "mbed_ram_start": "0x24000000",
-        "mbed_ram_size": "0x80000",
->>>>>>> 017a98b738... fixing the issues
         "extra_labels_add": [
             "STM32G071xx"
         ],
@@ -2803,9 +2795,6 @@
             "STM32L0",
             "STML071xx"
         ],
-        "overrides": {
-            "lpticker_delay_ticks": 0
-        },
         "device_has_remove": [
             "ANALOGOUT",
             "TRNG"