diff --git a/apps/action.h b/apps/action.h
index 29023720cc..85ad48592b 100644
--- a/apps/action.h
+++ b/apps/action.h
@@ -118,7 +118,7 @@ enum {
 #endif
     ACTION_WPS_ABSETA_PREVDIR, /* these should be safe to put together seen as */
     ACTION_WPS_ABSETB_NEXTDIR, /* you shouldnt want to change dir in ab-mode */
-    ACTION_WPSAB_RESET,
+    ACTION_WPS_ABRESET,
     
     /* list and tree page up/down */    
     ACTION_LISTTREE_PGUP,/* optional */
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 24cf24dbe0..6bf584fc6a 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -222,7 +222,7 @@ long gui_wps_show(void)
                         button = ACTION_WPS_ABSETB_NEXTDIR;
                         break;
                     case 2:
-                        button = ACTION_WPSAB_RESET;
+                        button = ACTION_WPS_ABRESET;
                         break;
                 }
                 wps_ab_state = (wps_ab_state+1) % 3;
@@ -552,7 +552,7 @@ long gui_wps_show(void)
 
 #ifdef AB_REPEAT_ENABLE
             /* reset A&B markers */
-            case ACTION_WPSAB_RESET:
+            case ACTION_WPS_ABRESET:
                 if (ab_repeat_mode_enabled())
                 {
                     ab_reset_markers();
diff --git a/apps/keymaps/keymap-av300.c b/apps/keymaps/keymap-av300.c
index f390b84b92..e451d708cf 100644
--- a/apps/keymaps/keymap-av300.c
+++ b/apps/keymaps/keymap-av300.c
@@ -80,7 +80,7 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_F3,      BUTTON_F3,                BUTTON_NONE },
     { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_ON|BUTTON_RIGHT,  BUTTON_NONE },
     { ACTION_WPS_ABSETA_PREVDIR, BUTTON_ON|BUTTON_LEFT,   BUTTON_NONE },
-    { ACTION_WPSAB_RESET,        BUTTON_ON|BUTTON_OFF,    BUTTON_ON },
+    { ACTION_WPS_ABRESET,        BUTTON_ON|BUTTON_OFF,    BUTTON_ON },
     
 
     LAST_ITEM_IN_LIST
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index 6bbad1a86c..8e11cadb8b 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -63,7 +63,7 @@ static const struct button_mapping button_context_wps[]  = {
     
     { ACTION_WPS_ABSETB_NEXTDIR,    BUTTON_POWER|BUTTON_RIGHT,   BUTTON_POWER },
     { ACTION_WPS_ABSETA_PREVDIR,    BUTTON_POWER|BUTTON_LEFT,    BUTTON_POWER },
-    { ACTION_WPSAB_RESET,           BUTTON_POWER|BUTTON_UP,      BUTTON_POWER },
+    { ACTION_WPS_ABRESET,           BUTTON_POWER|BUTTON_UP,      BUTTON_POWER },
     
     { ACTION_WPS_VOLUP,     BUTTON_SCROLL_DOWN,                BUTTON_NONE },
     { ACTION_WPS_VOLUP,     BUTTON_SCROLL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c
index 56fb8de24f..f1bcc33591 100644
--- a/apps/keymaps/keymap-gigabeat.c
+++ b/apps/keymaps/keymap-gigabeat.c
@@ -91,7 +91,7 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
     { ACTION_WPS_BROWSE,        BUTTON_POWER|BUTTON_REL,       BUTTON_POWER },
-    { ACTION_WPSAB_RESET,       BUTTON_POWER|BUTTON_SELECT,        BUTTON_POWER },
+    { ACTION_WPS_ABRESET,       BUTTON_POWER|BUTTON_SELECT,        BUTTON_POWER },
     { ACTION_WPS_ID3SCREEN,     BUTTON_POWER|BUTTON_MENU,          BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c
index be3dc74b04..1a3c81b989 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -74,7 +74,7 @@ static const struct button_mapping button_context_wps[]  = {
     
     { ACTION_WPS_ABSETB_NEXTDIR,    BUTTON_POWER|BUTTON_FF,     BUTTON_POWER },
     { ACTION_WPS_ABSETA_PREVDIR,    BUTTON_POWER|BUTTON_REW,    BUTTON_POWER },
-    { ACTION_WPSAB_RESET,           BUTTON_POWER|BUTTON_PLAY,   BUTTON_POWER },
+    { ACTION_WPS_ABRESET,           BUTTON_POWER|BUTTON_PLAY,   BUTTON_POWER },
     
     { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN,              BUTTON_NONE },
     { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE },
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index 8413d09ce6..bbec420846 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -86,7 +86,7 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_MENU,          BUTTON_MODE|BUTTON_REL,         BUTTON_MODE },
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
-    { ACTION_WPSAB_RESET,       BUTTON_ON|BUTTON_SELECT,        BUTTON_ON },
+    { ACTION_WPS_ABRESET,       BUTTON_ON|BUTTON_SELECT,        BUTTON_ON },
     { ACTION_WPS_ID3SCREEN,     BUTTON_ON|BUTTON_MODE,          BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
@@ -348,12 +348,12 @@ static const struct button_mapping button_context_wps_remotescommon[]  = {
 
 
 static const struct button_mapping button_context_wps_h100remote[] = {
-    { ACTION_WPSAB_RESET,           BUTTON_RC_ON|BUTTON_RC_MENU,        BUTTON_RC_ON },
+    { ACTION_WPS_ABRESET,           BUTTON_RC_ON|BUTTON_RC_MENU,        BUTTON_RC_ON },
     { ACTION_WPS_ID3SCREEN,         BUTTON_RC_ON|BUTTON_RC_MODE,        BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 };
 static const struct button_mapping button_context_wps_h300lcdremote[] = {
-    { ACTION_WPSAB_RESET,           BUTTON_RC_MENU|BUTTON_RC_ON,        BUTTON_RC_MENU },
+    { ACTION_WPS_ABRESET,           BUTTON_RC_MENU|BUTTON_RC_ON,        BUTTON_RC_MENU },
     { ACTION_WPS_ID3SCREEN,         BUTTON_RC_MENU|BUTTON_RC_MODE,      BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 };
diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c
index 6f12ac14c8..93de23b372 100644
--- a/apps/keymaps/keymap-ifp7xx.c
+++ b/apps/keymaps/keymap-ifp7xx.c
@@ -65,7 +65,7 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_MENU,          BUTTON_MODE|BUTTON_REL,         BUTTON_MODE },
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
-    { ACTION_WPSAB_RESET,       BUTTON_PLAY|BUTTON_SELECT,      BUTTON_PLAY },
+    { ACTION_WPS_ABRESET,       BUTTON_PLAY|BUTTON_SELECT,      BUTTON_PLAY },
     { ACTION_WPS_ID3SCREEN,     BUTTON_PLAY|BUTTON_MODE,        BUTTON_PLAY },
 
     LAST_ITEM_IN_LIST
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index 6f9aff635a..3dd8bbdd87 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -80,7 +80,7 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_F3,      BUTTON_F3,                BUTTON_NONE },
     { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_ON|BUTTON_RIGHT,  BUTTON_NONE },
     { ACTION_WPS_ABSETA_PREVDIR, BUTTON_ON|BUTTON_LEFT,   BUTTON_NONE },
-    { ACTION_WPSAB_RESET,        BUTTON_ON|BUTTON_OFF,    BUTTON_ON },
+    { ACTION_WPS_ABRESET,        BUTTON_ON|BUTTON_OFF,    BUTTON_ON },
     
 
     LAST_ITEM_IN_LIST