diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 6443d16ae9..5e0c325843 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -12459,12 +12459,12 @@
   desc: in Settings -> Playback Settings
   user: core
   <source>
-    *: "Prevent Skipping"
+    *: "Prevent Track Skipping"
   </source>
   <dest>
-    *: "Prevent Skipping"
+    *: "Prevent Track Skipping"
   </dest>
   <voice>
-    *: "Prevent Skipping"
+    *: "Prevent Track Skipping"
   </voice>
 </phrase>
diff --git a/apps/settings_list.c b/apps/settings_list.c
index bb88786a2c..0485ec4ab3 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1467,7 +1467,7 @@ const struct settings_list settings[] = {
                    "touchscreen mode", "point,grid", NULL, 2,
                    ID2P(LANG_TOUCHSCREEN_POINT), ID2P(LANG_TOUCHSCREEN_GRID)),
 #endif
-    OFFON_SETTING(0, prevent_skip, LANG_PREVENT_SKIPPING, false, "prevent skip", NULL),
+    OFFON_SETTING(0, prevent_skip, LANG_PREVENT_SKIPPING, false, "prevent track skip", NULL),
 };
 
 const int nb_settings = sizeof(settings)/sizeof(*settings);
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 0ddca7534f..9f0ecd3632 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -130,7 +130,8 @@
     }
     skip length     & track, 1s, 2s, 3s, 5s, 7s, 10s, 15s, 20s, 1min,
             90s, 2min, 3min, 5min, 10min, 15min & N/A\\
-    prevent skip    & on, off           & N/A\\
+    prevent track skip
+                    & on, off           & N/A\\
     start in screen & previous, root, files, db, wps, menu,
       \opt{recording}{recording, }
       \opt{radio}{radio, }
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index 50240c35f7..b6d50fc1ac 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -264,7 +264,7 @@ you to configure settings related to audio playback.
   the \ActionWpsSkipPrev{} and \ActionWpsSkipNext{} buttons so that they skip
   by a given time instead of skipping to a new track.
 
-\section{Prevent Skipping}\index{Prevent Skipping}
+\section{Prevent Track Skipping}\index{Prevent Track Skipping}
   If this option is enabled, the ability to manually skip tracks is disabled
   in order to avoid accidental track skips. It does not prevent changing tracks
   if a track ends, which can be achieved by combining this option with