diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index 9e5880839f85230acfad71a8973cd036540a0092..3744af099d4503dec6729c6a4f42ee9dc3087d56 100644
--- a/include/vlc_keys.h
+++ b/include/vlc_keys.h
@@ -109,7 +109,7 @@
 VLC_API char *vlc_keycode2str(uint_fast32_t i_key, bool locale) VLC_USED;
 VLC_API uint_fast32_t vlc_str2keycode(const char *str) VLC_USED;
 
-typedef enum vlc_action {
+typedef enum vlc_action_id {
     ACTIONID_NONE = 0,
     ACTIONID_QUIT,
     ACTIONID_PLAY_PAUSE,
@@ -237,9 +237,9 @@ typedef enum vlc_action {
     ACTIONID_COMBO_VOL_FOV_UP,
     ACTIONID_COMBO_VOL_FOV_DOWN,
 
-} vlc_action_t;
+} vlc_action_id_t;
 
-VLC_API vlc_action_t vlc_GetActionId(const char *psz_key) VLC_USED;
+VLC_API vlc_action_id_t vlc_GetActionId(const char *psz_key) VLC_USED;
 
 struct hotkey
 {
diff --git a/lib/media_player.c b/lib/media_player.c
index d4a74834d2dde032ade9041efb1bd20c9f07f5b6..45ce1c44fa59115795ec8a1be7cbeb4b5d90aafe 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -1756,7 +1756,7 @@ int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi )
 void libvlc_media_player_navigate( libvlc_media_player_t* p_mi,
                                    unsigned navigate )
 {
-    static const enum input_query_e map[] =
+    static const vlc_action_id_t map[] =
     {
         INPUT_NAV_ACTIVATE, INPUT_NAV_UP, INPUT_NAV_DOWN,
         INPUT_NAV_LEFT, INPUT_NAV_RIGHT, INPUT_NAV_POPUP,
diff --git a/modules/control/globalhotkeys/win32.c b/modules/control/globalhotkeys/win32.c
index 5ab1ba529719fb3d472ee2ce1643f07b1f2462e3..15d4714c44bf4ed0fe8ca363e0bf333fa980f0db 100644
--- a/modules/control/globalhotkeys/win32.c
+++ b/modules/control/globalhotkeys/win32.c
@@ -308,7 +308,7 @@ LRESULT CALLBACK WMHOTKEYPROC( HWND hwnd, UINT uMsg, WPARAM wParam,
                     return 0;
 
                 /* search for key associated with VLC */
-                vlc_action_t action = vlc_GetActionId( psz_atomName );
+                vlc_action_id_t action = vlc_GetActionId( psz_atomName );
                 if( action != ACTIONID_NONE )
                 {
                     var_SetInteger( p_intf->obj.libvlc,
diff --git a/modules/control/lirc.c b/modules/control/lirc.c
index 17fdc1d7d1c7fc0077eb595456da373ff0be80e8..b27ef9d36d8ac6011b23b87113da22c24983c1a7 100644
--- a/modules/control/lirc.c
+++ b/modules/control/lirc.c
@@ -195,7 +195,7 @@ static void Process( intf_thread_t *p_intf )
         {
             if( !strncmp( "key-", c, 4 ) )
             {
-                vlc_action_t i_key = vlc_GetActionId( c );
+                vlc_action_id_t i_key = vlc_GetActionId( c );
                 if( i_key )
                     var_SetInteger( p_intf->obj.libvlc, "key-action", i_key );
                 else
diff --git a/modules/lua/libs/misc.c b/modules/lua/libs/misc.c
index 241a7feef5463d43866602265048c3c4aec32154..95d08a7f40aa2544b97953cc42f02341ea909738 100644
--- a/modules/lua/libs/misc.c
+++ b/modules/lua/libs/misc.c
@@ -147,7 +147,7 @@ static int vlclua_mwait( lua_State *L )
 
 static int vlclua_action_id( lua_State *L )
 {
-    vlc_action_t i_key = vlc_GetActionId( luaL_checkstring( L, 1 ) );
+    vlc_action_id_t i_key = vlc_GetActionId( luaL_checkstring( L, 1 ) );
     if (i_key == 0)
         return 0;
     lua_pushnumber( L, i_key );
diff --git a/src/config/keys.c b/src/config/keys.c
index 5c68caeeebab6fdc1523261a5127d27bb83a809c..460ca64e65483cc8677b9ba392a05105f083647e 100644
--- a/src/config/keys.c
+++ b/src/config/keys.c
@@ -265,7 +265,7 @@ found:
 struct action
 {
     char name[MAXACTION];
-    vlc_action_t value;
+    vlc_action_id_t value;
 };
 
 static const struct action actions[] =
@@ -388,7 +388,7 @@ static const struct action actions[] =
 struct mapping
 {
     uint32_t     key; ///< Key code
-    vlc_action_t action; ///< Action ID
+    vlc_action_id_t action; ///< Action ID
 };
 
 static int keycmp (const void *a, const void *b)
@@ -424,7 +424,7 @@ static int vlc_key_to_action (vlc_object_t *obj, const char *varname,
 /**
  * Adds a mapping from a certain key code to a certain action.
  */
-static int vlc_AddMapping (void **map, uint32_t keycode, vlc_action_t action)
+static int vlc_AddMapping (void **map, uint32_t keycode, vlc_action_id_t action)
 {
     struct mapping *entry = malloc (sizeof (*entry));
     if (entry == NULL)
@@ -446,7 +446,7 @@ static int vlc_AddMapping (void **map, uint32_t keycode, vlc_action_t action)
 static void vlc_AddWheelMapping (void **map, uint32_t kmore, uint32_t kless,
                                  int mode)
 {
-    vlc_action_t amore = ACTIONID_NONE, aless = ACTIONID_NONE;
+    vlc_action_id_t amore = ACTIONID_NONE, aless = ACTIONID_NONE;
 
     switch (mode)
     {
@@ -478,7 +478,7 @@ static void vlc_AddWheelMapping (void **map, uint32_t kmore, uint32_t kless,
  * \param action action ID
  */
 static void vlc_InitAction (vlc_object_t *obj, void **map,
-                            const char *confname, vlc_action_t action)
+                            const char *confname, vlc_action_id_t action)
 {
     char *keys = var_InheritString (obj, confname);
     if (keys == NULL)
@@ -585,7 +585,7 @@ static int actcmp(const void *key, const void *ent)
  * Get the action ID from the action name in the configuration subsystem.
  * @return the action ID or ACTIONID_NONE on error.
  */
-vlc_action_t vlc_GetActionId (const char *name)
+vlc_action_id_t vlc_GetActionId (const char *name)
 {
     const struct action *act;