diff --git a/command.c b/command.c
index cdb86d6a36..9d5baaf492 100644
--- a/command.c
+++ b/command.c
@@ -1136,7 +1136,7 @@ void command_event_set_savestate_auto_index(settings_t *settings)
 {
    size_t i;
    char state_dir[PATH_MAX_LENGTH];
-   char state_base[PATH_MAX_LENGTH];
+   char state_base[NAME_MAX_LENGTH];
 
    struct string_list *dir_list      = NULL;
    unsigned max_idx                  = 0;
@@ -1204,7 +1204,7 @@ void command_event_set_savestate_garbage_collect(
 {
    size_t i, cnt = 0;
    char state_dir[PATH_MAX_LENGTH];
-   char state_base[PATH_MAX_LENGTH];
+   char state_base[NAME_MAX_LENGTH];
    runloop_state_t *runloop_st       = runloop_state_get_ptr();
 
    struct string_list *dir_list      = NULL;
diff --git a/frontend/frontend_salamander.c b/frontend/frontend_salamander.c
index 94d0e28b59..a6256d7544 100644
--- a/frontend/frontend_salamander.c
+++ b/frontend/frontend_salamander.c
@@ -60,8 +60,8 @@ static void find_first_libretro_core(char *first_file,
 
    for (i = 0; i < list->size && !ret; i++)
    {
-      char fname[PATH_MAX_LENGTH]           = {0};
-      char salamander_name[PATH_MAX_LENGTH] = {0};
+      char fname[NAME_MAX_LENGTH]           = {0};
+      char salamander_name[NAME_MAX_LENGTH] = {0};
       const char *libretro_elem             = (const char*)list->elems[i].data;
 
       RARCH_LOG("Checking library: \"%s\".\n", libretro_elem);