diff --git a/applications/main/bad_usb/views/bad_usb_view.c b/applications/main/bad_usb/views/bad_usb_view.c
index 06f9ed1a2..2a15c4d4e 100644
--- a/applications/main/bad_usb/views/bad_usb_view.c
+++ b/applications/main/bad_usb/views/bad_usb_view.c
@@ -71,8 +71,8 @@ static void bad_usb_draw_callback(Canvas* canvas, void* _model) {
         canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18);
         canvas_set_font(canvas, FontPrimary);
         if (settings->sfw_mode) {
-            canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Connect me");
-            canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "to a computer");
+            canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Connect to");
+            canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "a device");
         }
         else {
             canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Plug me");
diff --git a/applications/main/u2f/views/u2f_view.c b/applications/main/u2f/views/u2f_view.c
index 4f5d382d5..fb5eaac1f 100644
--- a/applications/main/u2f/views/u2f_view.c
+++ b/applications/main/u2f/views/u2f_view.c
@@ -25,7 +25,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) {
     if (model->display_msg == U2fMsgNotConnected) {
         if (settings->sfw_mode) {
             canvas_draw_icon(canvas, 22, 15, &I_Connect_me_62x31_sfw);
-            canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connect me to computer");
+            canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connect to a device");
         }
         else {
             canvas_draw_icon(canvas, 22, 15, &I_Connect_me_62x31);
diff --git a/assets/resources/subghz/unirf/CVS_Walgreens.txt b/assets/resources/subghz/unirf/CVS_Walgreens.txt
index ef3ef0c70..712543d76 100644
--- a/assets/resources/subghz/unirf/CVS_Walgreens.txt
+++ b/assets/resources/subghz/unirf/CVS_Walgreens.txt
@@ -1,10 +1,10 @@
 Filetype: Flipper SubGhz RAW File
 Version: 1
-UP: /any/subghz/Walgreens/Walgreens_Cough.sub
-DOWN: /any/subghz/CVS/CVS_Dental.sub
-LEFT: /any/subghz/Walgreens/Walgreens_Skincare.sub
-RIGHT: /subghz/Walgreens/Walgreens_Vitamin.sub
-OK: /any/subghz/CVS/CVS_Stomach.sub
+UP: /any/subghz/Stores/Walgreens/Walgreens_Cough.sub
+DOWN: /any/subghz/Stores/CVS/CVS_Dental.sub
+LEFT: /any/subghz/Stores/Walgreens/Walgreens_Skincare.sub
+RIGHT: /any/subghz/Stores/Walgreens/Walgreens_Vitamin.sub
+OK: /any/subghz/Stores/CVS/CVS_Stomach.sub
 ULABEL: Cough_Wal
 DLABEL: Dental_CVS
 LLABEL: Skincare_Wal