diff --git a/client/src/fileutils.c b/client/src/fileutils.c
index 8528fa770..3e2f252cb 100644
--- a/client/src/fileutils.c
+++ b/client/src/fileutils.c
@@ -228,17 +228,20 @@ static char *filenamemcopy(const char *preferredName, const char *suffix) {
 char *newfilenamemcopy(const char *preferredName, const char *suffix) {
     if (preferredName == NULL) return NULL;
     if (suffix == NULL) return NULL;
-    uint16_t preferredNameLen = strlen(preferredName);
+
+    uint16_t p_namelen = strlen(preferredName);
     if (str_endswith(preferredName, suffix))
-        preferredNameLen -= strlen(suffix);
-    char *fileName = (char *) calloc(preferredNameLen + strlen(suffix) + 1 + 10, sizeof(uint8_t)); // 10: room for filenum to ensure new filename
+        p_namelen -= strlen(suffix);
+
+    char *fileName = (char *) calloc(p_namelen + strlen(suffix) + 1 + 10, sizeof(uint8_t)); // 10: room for filenum to ensure new filename
     if (fileName == NULL) {
         return NULL;
     }
+
     int num = 1;
-    sprintf(fileName, "%.*s%s", preferredNameLen, preferredName, suffix);
+    sprintf(fileName, "%.*s%s", p_namelen, preferredName, suffix);
     while (fileExists(fileName)) {
-        sprintf(fileName, "%.*s-%d%s", preferredNameLen, preferredName, num, suffix);
+        sprintf(fileName, "%.*s-%d%s", p_namelen, preferredName, num, suffix);
         num++;
     }
     return fileName;
@@ -475,7 +478,7 @@ int saveFileJSONex(const char *preferredName, JSONFileType ftype, uint8_t *data,
             }
             break;
         }
-        case jsfMfPlusKeys:
+        case jsfMfPlusKeys: {
             JsonSaveStr(root, "FileType", "mfp");
             JsonSaveBufAsHexCompact(root, "$.Card.UID", &data[0], 7);
             JsonSaveBufAsHexCompact(root, "$.Card.SAK", &data[10], 1);
@@ -503,7 +506,8 @@ int saveFileJSONex(const char *preferredName, JSONFileType ftype, uint8_t *data,
                 }
             }
             break;
-        case jsfMfDesfireKeys:
+        }
+        case jsfMfDesfireKeys: {
             JsonSaveStr(root, "FileType", "mfdes");
             JsonSaveBufAsHexCompact(root, "$.Card.UID", &data[0], 7);
             JsonSaveBufAsHexCompact(root, "$.Card.SAK", &data[10], 1);
@@ -541,9 +545,11 @@ int saveFileJSONex(const char *preferredName, JSONFileType ftype, uint8_t *data,
                 }
             }
             break;
-        case jsfCustom:
+        }
+        case jsfCustom: {
             (*callback)(root);
             break;
+        }
         default:
             break;
     }