diff --git a/features/mbedtls/targets/TARGET_STM/TARGET_STM32L4/TARGET_WISE_1510/mbedtls_device.h b/features/mbedtls/targets/TARGET_STM/TARGET_STM32L4/TARGET_MTB_ADV_WISE_1510/mbedtls_device.h
similarity index 100%
rename from features/mbedtls/targets/TARGET_STM/TARGET_STM32L4/TARGET_WISE_1510/mbedtls_device.h
rename to features/mbedtls/targets/TARGET_STM/TARGET_STM32L4/TARGET_MTB_ADV_WISE_1510/mbedtls_device.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_CMWX1ZZABZ_078/PeripheralNames.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_MTB_MURATA_ABZ/PeripheralNames.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_CMWX1ZZABZ_078/PeripheralNames.h
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_MTB_MURATA_ABZ/PeripheralNames.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_CMWX1ZZABZ_078/PeripheralPins.c b/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_MTB_MURATA_ABZ/PeripheralPins.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_CMWX1ZZABZ_078/PeripheralPins.c
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_MTB_MURATA_ABZ/PeripheralPins.c
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_CMWX1ZZABZ_078/PinNames.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_MTB_MURATA_ABZ/PinNames.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_CMWX1ZZABZ_078/PinNames.h
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_MTB_MURATA_ABZ/PinNames.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_CMWX1ZZABZ_078/system_clock.c b/targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_MTB_MURATA_ABZ/system_clock.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_CMWX1ZZABZ_078/system_clock.c
rename to targets/TARGET_STM/TARGET_STM32L0/TARGET_STM32L0x2xZ/TARGET_MTB_MURATA_ABZ/system_clock.c
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_WISE_1510/PeripheralNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_MTB_ADV_WISE_1510/PeripheralNames.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_WISE_1510/PeripheralNames.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_MTB_ADV_WISE_1510/PeripheralNames.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_WISE_1510/PeripheralPins.c b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_MTB_ADV_WISE_1510/PeripheralPins.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_WISE_1510/PeripheralPins.c
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_MTB_ADV_WISE_1510/PeripheralPins.c
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_WISE_1510/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_MTB_ADV_WISE_1510/PinNames.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_WISE_1510/PinNames.h
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_MTB_ADV_WISE_1510/PinNames.h
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_WISE_1510/system_clock.c b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_MTB_ADV_WISE_1510/system_clock.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_WISE_1510/system_clock.c
rename to targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_MTB_ADV_WISE_1510/system_clock.c
diff --git a/targets/targets.json b/targets/targets.json
index 26431b99b8..c551d2c83d 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -1515,7 +1515,7 @@
         "device_name": "STM32L433RC",
         "bootloader_supported": true
     },
-	"WISE_1510": {
+	"MTB_ADV_WISE_1510": {
         "inherits": ["FAMILY_STM32"],
         "supported_form_factors": ["ARDUINO"],
         "core": "Cortex-M4F",
@@ -1762,7 +1762,7 @@
         "release_versions": ["2", "5"],
         "device_name": "STM32L072CZ"
     },
-    "CMWX1ZZABZ_078": {
+    "MTB_MURATA_ABZ": {
         "inherits": ["FAMILY_STM32"],
         "core": "Cortex-M0+",
         "extra_labels_add": ["STM32L0", "STM32L0x2xZ", "STM32L082CZ", "STM32L082xx"],
diff --git a/tools/build_travis.py b/tools/build_travis.py
index 7efd86a21d..a2800492b7 100644
--- a/tools/build_travis.py
+++ b/tools/build_travis.py
@@ -54,7 +54,7 @@ build_list = [
         { "target": "NUCLEO_F412ZG",     "toolchains": "GCC_ARM", "libs": ["dsp"] },
         { "target": "NUCLEO_F413ZH",     "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] },
         { "target": "NUCLEO_L432KC",     "toolchains": "GCC_ARM", "libs": ["dsp"] },
-        { "target": "WISE_1510",         "toolchains": "GCC_ARM", "libs": ["dsp"] },
+        { "target": "MTB_ADV_WISE_1510", "toolchains": "GCC_ARM", "libs": ["dsp"] },
         { "target": "NUCLEO_L476RG",     "toolchains": "GCC_ARM", "libs": ["dsp"] },
         { "target": "NUCLEO_L011K4",     "toolchains": "GCC_ARM", "libs": ["dsp"] },
         { "target": "NUCLEO_L031K6",     "toolchains": "GCC_ARM", "libs": ["dsp"] },
@@ -91,7 +91,7 @@ build_list = [
         { "target": "DISCO_L072CZ_LRWAN1", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] },
 
         # module manufacturer : muRata
-        { "target": "CMWX1ZZABZ_078",    "toolchains": "GCC_ARM", "libs": [] },
+        { "target": "MTB_MURATA_ABZ",    "toolchains": "GCC_ARM", "libs": [] },
         ),
     },
 
@@ -155,7 +155,7 @@ build_list = [
         )
     },
 
-    { 
+    {
         "ATMEL":
         (
             { "target": "SAMR21G18A",  "toolchains": "GCC_ARM", "libs": ["dsp"] },
@@ -166,7 +166,7 @@ build_list = [
     },
 
 
-    { 
+    {
         "NUVOTON":
         (
             { "target": "NUMAKER_PFM_NUC472",   "toolchains": "GCC_ARM",    "libs": ["dsp", "usb"] },
@@ -235,7 +235,7 @@ linking_list = [
             {"target": "NUCLEO_F401RE",
              "toolchains": "GCC_ARM",
              "tests": {""     : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
-                       "usb"  : ["USB_1", "USB_2" ,"USB_3"], 
+                       "usb"  : ["USB_1", "USB_2" ,"USB_3"],
                      }
             },
             {"target": "NUCLEO_F411RE",
@@ -323,7 +323,7 @@ linking_list = [
              "tests": {""     : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
                       }
             },
-            {"target": "CMWX1ZZABZ_078",
+            {"target": "MTB_MURATA_ABZ",
              "toolchains": "GCC_ARM",
              "tests": {""     : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
                       }
@@ -353,7 +353,7 @@ linking_list = [
         )
     },
     {
-        "RENESAS": 
+        "RENESAS":
         (
             {
              "target": "RZ_A1H",
diff --git a/tools/export/sw4stm32/__init__.py b/tools/export/sw4stm32/__init__.py
index a986e6d850..4045fc1b7a 100644
--- a/tools/export/sw4stm32/__init__.py
+++ b/tools/export/sw4stm32/__init__.py
@@ -100,10 +100,10 @@ class Sw4STM32(GNUARMEclipse):
             'name': 'DISCO-L072CZ-LRWAN1',
             'mcuId': 'STM32L072CZTx'
         },
-        'CMWX1ZZABZ_078':
+        'MTB_MURATA_ABZ':
         {
-            'name': 'CMWX1ZZABZ-078',
-            'mcuId': 'CMWX1ZZABZ_078'
+            'name': 'MTB-MURATA-ABZ',
+            'mcuId': 'STM32L0x2xZ'
         },
         'DISCO_L475VG_IOT01A':
         {
@@ -255,10 +255,10 @@ class Sw4STM32(GNUARMEclipse):
             'name': 'NUCLEO-L432KC',
             'mcuId': 'STM32L432KCUx'
         },
-        'WISE_1510':
+        'MTB_ADV_WISE_1510':
         {
-            'name': 'WISE-1510',
-            'mcuId': 'STM32L433RCx'
+            'name': 'MTB-ADV-WISE-1510',
+            'mcuId': 'STM32L443xC'
         },
         'NUCLEO_L476RG':
         {
@@ -274,7 +274,7 @@ class Sw4STM32(GNUARMEclipse):
         {
             'name': 'NUCLEO-L496ZG',
             'mcuId': 'STM32L496ZGTx'
-        },        
+        },
         'NUCLEO_L496ZG_P':
         {
             'name': 'NUCLEO-L496ZG',