diff --git a/applications/external/hid_app/hid.c b/applications/external/hid_app/hid.c
index da0cb7857..ca5d3783b 100644
--- a/applications/external/hid_app/hid.c
+++ b/applications/external/hid_app/hid.c
@@ -457,7 +457,7 @@ int32_t hid_ble_app(void* p) {
     // Migrate data from old sd-card folder
     Storage* storage = furi_record_open(RECORD_STORAGE);
 
-    storage_common_migrate(
+    storage_common_rename(
         storage,
         EXT_PATH("apps/Tools/" HID_BT_KEYS_STORAGE_NAME),
         APP_DATA_PATH(HID_BT_KEYS_STORAGE_NAME));
diff --git a/applications/main/bad_kb/bad_kb_app.c b/applications/main/bad_kb/bad_kb_app.c
index 03b941cd3..c2d7e1fe3 100644
--- a/applications/main/bad_kb/bad_kb_app.c
+++ b/applications/main/bad_kb/bad_kb_app.c
@@ -206,6 +206,7 @@ BadKbApp* bad_kb_app_alloc(char* arg) {
     }
 
     Storage* storage = furi_record_open(RECORD_STORAGE);
+    storage_common_rename(storage, EXT_PATH("badusb"), BAD_KB_APP_BASE_FOLDER);
     storage_simply_mkdir(storage, BAD_KB_APP_BASE_FOLDER);
     furi_record_close(RECORD_STORAGE);