diff --git a/targets/TARGET_Maxim/TARGET_MAX32620C/device/mxc_device.h b/targets/TARGET_Maxim/TARGET_MAX32620C/device/mxc_device.h
index 81a4be46f79..3b36bd9ff41 100644
--- a/targets/TARGET_Maxim/TARGET_MAX32620C/device/mxc_device.h
+++ b/targets/TARGET_Maxim/TARGET_MAX32620C/device/mxc_device.h
@@ -46,7 +46,9 @@
 // Create a string definition for the TARGET
 #define STRING_ARG(arg) #arg
 #define STRING_NAME(name) STRING_ARG(name)
+#if MBED_VERSION && MBED_VERSION < 51200
 #define TARGET_NAME STRING_NAME(TARGET)
+#endif
 
 // Define which revisions of the IP we are using
 #ifndef TARGET_REV
diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/device/mxc_device.h b/targets/TARGET_Maxim/TARGET_MAX32625/device/mxc_device.h
index 534f6a1ed7f..5ab40dff4c7 100644
--- a/targets/TARGET_Maxim/TARGET_MAX32625/device/mxc_device.h
+++ b/targets/TARGET_Maxim/TARGET_MAX32625/device/mxc_device.h
@@ -43,7 +43,9 @@
 // Create a string definition for the TARGET
 #define STRING_ARG(arg) #arg
 #define STRING_NAME(name) STRING_ARG(name)
+#if MBED_VERSION && MBED_VERSION < 51200
 #define TARGET_NAME STRING_NAME(TARGET)
+#endif
 
 // Define which revisions of the IP we are using
 #ifndef TARGET_REV
diff --git a/targets/TARGET_Maxim/TARGET_MAX32630/device/mxc_device.h b/targets/TARGET_Maxim/TARGET_MAX32630/device/mxc_device.h
index b3b9ffe5fbe..4e018a76611 100644
--- a/targets/TARGET_Maxim/TARGET_MAX32630/device/mxc_device.h
+++ b/targets/TARGET_Maxim/TARGET_MAX32630/device/mxc_device.h
@@ -46,7 +46,9 @@
 // Create a string definition for the TARGET
 #define STRING_ARG(arg) #arg
 #define STRING_NAME(name) STRING_ARG(name)
+#if MBED_VERSION && MBED_VERSION < 51200
 #define TARGET_NAME STRING_NAME(TARGET)
+#endif
 
 // Define which revisions of the IP we are using
 #ifndef TARGET_REV
diff --git a/targets/targets.json b/targets/targets.json
index 8b3f5304b9a..c37161bda36 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -4568,6 +4568,9 @@
             "IAR",
             "ARM"
         ],
+	"features_add": [
+            "STORAGE"
+        ],
         "device_has": [
             "ANALOGIN",
             "I2C",
@@ -4577,6 +4580,7 @@
             "PORTINOUT",
             "PORTOUT",
             "PWMOUT",
+            "SD",
             "SERIAL",
             "SERIAL_FC",
             "SPI",