diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 0b9aa3b7af..7dc23f7a8b 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1588,7 +1588,6 @@ static void cb_generic_download(void *task_data,
 
    fill_pathname_join(output_path, dir_path,
          transf->path, sizeof(output_path));
-   RARCH_LOG("output_path: %s\n", output_path);
 
    /* Make sure the directory exists */
    path_basedir(output_path);
@@ -2587,16 +2586,16 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_CUSTOM_BIND_ALL:
             BIND_ACTION_OK(cbs, action_ok_lookup_setting);
             break;
-         case MENU_ENUM_LABEL_SAVESTATE:
+         case MENU_ENUM_LABEL_SAVE_STATE:
             BIND_ACTION_OK(cbs, action_ok_save_state);
             break;
-         case MENU_ENUM_LABEL_LOADSTATE:
+         case MENU_ENUM_LABEL_LOAD_STATE:
             BIND_ACTION_OK(cbs, action_ok_load_state);
             break;
-         case MENU_ENUM_LABEL_UNDOLOADSTATE:
+         case MENU_ENUM_LABEL_UNDO_LOAD_STATE:
             BIND_ACTION_OK(cbs, action_ok_undo_load_state);
             break;
-         case MENU_ENUM_LABEL_UNDOSAVESTATE:
+         case MENU_ENUM_LABEL_UNDO_SAVE_STATE:
             BIND_ACTION_OK(cbs, action_ok_undo_save_state);
             break;
          case MENU_ENUM_LABEL_RESUME_CONTENT:
@@ -2832,10 +2831,10 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_LABEL_LOADSTATE:
             BIND_ACTION_OK(cbs, action_ok_load_state);
             break;
-         case MENU_LABEL_UNDOLOADSTATE:
+         case MENU_LABEL_UNDO_LOAD_STATE:
             BIND_ACTION_OK(cbs, action_ok_undo_load_state);
             break;
-         case MENU_LABEL_UNDOSAVESTATE:
+         case MENU_LABEL_UNDO_SAVE_STATE:
             BIND_ACTION_OK(cbs, action_ok_undo_save_state);
             break;
          case MENU_LABEL_RESUME_CONTENT:
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index f4e2e4c82b..5b16c34698 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1526,9 +1526,9 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
          return xmb->textures.list[XMB_TEXTURE_SHADER_OPTIONS];
       case MENU_ENUM_LABEL_ACHIEVEMENT_LIST:
          return xmb->textures.list[XMB_TEXTURE_ACHIEVEMENT_LIST];
-      case MENU_ENUM_LABEL_SAVESTATE:
+      case MENU_ENUM_LABEL_SAVE_STATE:
          return xmb->textures.list[XMB_TEXTURE_SAVESTATE];
-      case MENU_ENUM_LABEL_LOADSTATE:
+      case MENU_ENUM_LABEL_LOAD_STATE:
          return xmb->textures.list[XMB_TEXTURE_LOADSTATE];
       case MENU_ENUM_LABEL_TAKE_SCREENSHOT:
          return xmb->textures.list[XMB_TEXTURE_SCREENSHOT];
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index fccb50ef04..f847a79bf7 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -1053,10 +1053,6 @@ enum menu_hash_enums
    MENU_ENUM_LABEL_CUSTOM_BIND,
    MENU_ENUM_LABEL_CUSTOM_BIND_ALL,
    MENU_ENUM_LABEL_CUSTOM_BIND_DEFAULTS,
-   MENU_ENUM_LABEL_SAVESTATE,
-   MENU_ENUM_LABEL_LOADSTATE,
-   MENU_ENUM_LABEL_UNDOLOADSTATE,
-   MENU_ENUM_LABEL_UNDOSAVESTATE,
    MENU_ENUM_LABEL_RESUME_CONTENT,
    MENU_ENUM_LABEL_VALUE_RESUME_CONTENT,
    MENU_ENUM_LABEL_VALUE_RESUME,