diff --git a/src/main/config/config.h b/src/main/config/config.h
index ffcbea1691..b18febe8cd 100644
--- a/src/main/config/config.h
+++ b/src/main/config/config.h
@@ -24,7 +24,7 @@
 #endif
 #define MAX_RATEPROFILES 3
 #define ONESHOT_FEATURE_CHANGED_DELAY_ON_BOOT_MS 1500
-#define MAX_NAME_LENGTH 32
+#define MAX_NAME_LENGTH 16
 
 
 typedef enum {
diff --git a/src/main/config/config_master.h b/src/main/config/config_master.h
index 37ecaa8258..4f8f4903fb 100644
--- a/src/main/config/config_master.h
+++ b/src/main/config/config_master.h
@@ -162,7 +162,7 @@ typedef struct master_t {
     uint8_t magic_ef;                       // magic number, should be 0xEF
     uint8_t chk;                            // XOR checksum
     
-    char name[MAX_NAME_LENGTH];
+    char name[MAX_NAME_LENGTH+1];
     
 } master_t;
 
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index 945b93ea1d..4d1fdb9364 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -341,7 +341,7 @@ const clicmd_t cmdTable[] = {
 #ifdef VTX
     CLI_COMMAND_DEF("vtx", "vtx channels on switch", NULL, cliVtx),
 #endif
-    CLI_COMMAND_DEF("name", "Name of vessel", NULL, cliName),
+    CLI_COMMAND_DEF("name", "Name of craft", NULL, cliName),
 };
 #define CMD_COUNT (sizeof(cmdTable) / sizeof(clicmd_t))
 
@@ -1955,7 +1955,8 @@ static void cliDump(char *cmdline)
         cliPrint("\r\n# version\r\n");
         cliVersion(NULL);
 
-        cliName("");
+        cliPrint("\r\n# name\r\n");
+        cliName(NULL);
         cliPrint("\r\n# dump master\r\n");
         cliPrint("\r\n# mixer\r\n");
 
@@ -2501,16 +2502,15 @@ static void cliName(char *cmdline)
 {
     
     uint32_t len = strlen(cmdline);
-    if (isEmpty(cmdline)) {
-        cliPrintf("name %s\r\n", masterConfig.name);
-    } else if (len <= MAX_NAME_LENGTH) {
-        strcpy(masterConfig.name, cmdline); 
-        for (uint8_t i = len; i<MAX_NAME_LENGTH; i++) {
-            masterConfig.name[i] = '\0';
-        }
+    if (*cmdline == 0) {
         cliPrintf("name %s\r\n", masterConfig.name);
+    } else if ('-' == cmdline[0]) {
+        memset(masterConfig.name, '\0', MAX_NAME_LENGTH); 
+        cliPrintf("name removed\r\n");
     } else {
-        cliPrintf("Max allowed name length is %d\r\n", MAX_NAME_LENGTH);
+        memset(masterConfig.name, '\0', MAX_NAME_LENGTH);
+        strncpy(masterConfig.name, cmdline, MIN(len, MAX_NAME_LENGTH)); 
+        cliPrintf("name %s\r\n", masterConfig.name);
     }
     
     return;
diff --git a/src/main/io/serial_msp.c b/src/main/io/serial_msp.c
index d97d771781..2db9951554 100644
--- a/src/main/io/serial_msp.c
+++ b/src/main/io/serial_msp.c
@@ -659,7 +659,7 @@ static uint32_t packFlightModeFlags(void)
 static bool processOutCommand(uint8_t cmdMSP)
 {
     uint32_t i;
-
+    uint8_t len;
 #ifdef GPS
     uint8_t wp_no;
     int32_t lat = 0, lon = 0;
@@ -751,8 +751,9 @@ static bool processOutCommand(uint8_t cmdMSP)
         break;
 
     case MSP_NAME:
-        headSerialReply(MAX_NAME_LENGTH);
-        for (uint8_t i=0; i<MAX_NAME_LENGTH; i++) {
+        len = strlen(masterConfig.name);
+        headSerialReply(len);
+        for (uint8_t i=0; i<len; i++) {
             serialize8(masterConfig.name[i]);
         }
         break;
@@ -1877,9 +1878,13 @@ static bool processInCommand(void)
         break;
         
     case MSP_SET_NAME:
-        for (i = 0; i < MAX_NAME_LENGTH; i++) {
+        memset(masterConfig.name, '\0', MAX_NAME_LENGTH);
+        for (i = 0; i < MIN(MAX_NAME_LENGTH, currentPort->dataSize); i++) {
             masterConfig.name[i] = read8();
         }
+        if (masterConfig.name[0] == '-') {
+            memset(masterConfig.name, '\0', MAX_NAME_LENGTH);
+        }
         break;
     default:
         // we do not know how to handle the (valid) message, indicate error MSP $M!