diff --git a/Makefile b/Makefile
index f69a2e6b..b7f7cf4b 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ SRCS = \
 	menu/views/fragments/fragments.c \
 	menu/views/fragments/widgets.c \
 	menu/views/load.c \
-	menu/views/player.c \
+	menu/views/music_player.c \
 	menu/views/startup.c \
 	menu/views/system_info.c \
 	utils/fs.c
diff --git a/src/menu/menu.c b/src/menu/menu.c
index 9742818c..72c9f2f6 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -112,8 +112,8 @@ void menu_run (boot_params_t *boot_params) {
                     view_system_info_display(menu, display);
                     break;
 
-                case MENU_MODE_PLAYER:
-                    view_player_display(menu, display);
+                case MENU_MODE_MUSIC_PLAYER:
+                    view_music_player_display(menu, display);
                     break;
 
                 case MENU_MODE_CREDITS:
@@ -158,8 +158,8 @@ void menu_run (boot_params_t *boot_params) {
                         view_system_info_init(menu);
                         break;
 
-                    case MENU_MODE_PLAYER:
-                        view_player_init(menu);
+                    case MENU_MODE_MUSIC_PLAYER:
+                        view_music_player_init(menu);
                         break;
 
                     case MENU_MODE_CREDITS:
diff --git a/src/menu/menu_state.h b/src/menu/menu_state.h
index 677ecab5..ac8baa31 100644
--- a/src/menu/menu_state.h
+++ b/src/menu/menu_state.h
@@ -24,7 +24,7 @@ typedef enum {
     MENU_MODE_BROWSER,
     MENU_MODE_FILE_INFO,
     MENU_MODE_SYSTEM_INFO,
-    MENU_MODE_PLAYER,
+    MENU_MODE_MUSIC_PLAYER,
     MENU_MODE_CREDITS,
     MENU_MODE_LOAD,
     MENU_MODE_ERROR,
diff --git a/src/menu/views/browser.c b/src/menu/views/browser.c
index d105cfcc..34e45cd7 100644
--- a/src/menu/views/browser.c
+++ b/src/menu/views/browser.c
@@ -209,7 +209,7 @@ static void process (menu_t *menu) {
                 menu->next_mode = MENU_MODE_LOAD;
                 break;
             case ENTRY_TYPE_MUSIC:
-                menu->next_mode = MENU_MODE_PLAYER;
+                menu->next_mode = MENU_MODE_MUSIC_PLAYER;
                 break;
             default:
                 menu->next_mode = MENU_MODE_FILE_INFO;
diff --git a/src/menu/views/player.c b/src/menu/views/music_player.c
similarity index 96%
rename from src/menu/views/player.c
rename to src/menu/views/music_player.c
index 4ac13564..3bf8e785 100644
--- a/src/menu/views/player.c
+++ b/src/menu/views/music_player.c
@@ -124,7 +124,7 @@ static void draw (menu_t *menu, surface_t *d) {
 }
 
 
-void view_player_init (menu_t *menu) {
+void view_music_player_init (menu_t *menu) {
     mp3player_err_t error;
 
     unmute_counter = 0;
@@ -151,10 +151,10 @@ void view_player_init (menu_t *menu) {
     path_free(path);
 }
 
-void view_player_display (menu_t *menu, surface_t *display) {
+void view_music_player_display (menu_t *menu, surface_t *display) {
     process(menu);
     draw(menu, display);
-    if (menu->next_mode != MENU_MODE_PLAYER) {
+    if (menu->next_mode != MENU_MODE_MUSIC_PLAYER) {
         mp3player_deinit();
     }
 }
diff --git a/src/menu/views/views.h b/src/menu/views/views.h
index ccf3ecba..4264c793 100644
--- a/src/menu/views/views.h
+++ b/src/menu/views/views.h
@@ -29,8 +29,8 @@ void view_system_info_display (menu_t *menu, surface_t *display);
 void view_file_info_init (menu_t *menu);
 void view_file_info_display (menu_t *menu, surface_t *display);
 
-void view_player_init (menu_t *menu);
-void view_player_display (menu_t *menu, surface_t *display);
+void view_music_player_init (menu_t *menu);
+void view_music_player_display (menu_t *menu, surface_t *display);
 
 void view_credits_init (menu_t *menu);
 void view_credits_display (menu_t *menu, surface_t *display);