diff --git a/Makefile.common b/Makefile.common
index 8a7fc995f6..47333b10a7 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -340,7 +340,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
 			 menu/menu_navigation.o  \
 			 menu/menu_setting.o \
 			 menu/menu_shader.o \
-			 menu/menu_entries_cbs.o \
+			 menu/menu_entries.o \
 			 menu/cbs/menu_entries_cbs_ok.o \
 			 menu/cbs/menu_entries_cbs_cancel.o \
 			 menu/cbs/menu_entries_cbs_select.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 28bf205e52..5a88a54754 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -715,7 +715,7 @@ MENU
 #include "../menu/menu_entry.c"
 #include "../menu/menu_setting.c"
 #include "../menu/menu_list.c"
-#include "../menu/menu_entries_cbs.c"
+#include "../menu/menu_entries.c"
 #include "../menu/cbs/menu_entries_cbs_ok.c"
 #include "../menu/cbs/menu_entries_cbs_cancel.c"
 #include "../menu/cbs/menu_entries_cbs_select.c"
diff --git a/menu/cbs/menu_entries_cbs_cancel.c b/menu/cbs/menu_entries_cbs_cancel.c
index dde14034e7..2a29fd9580 100644
--- a/menu/cbs/menu_entries_cbs_cancel.c
+++ b/menu/cbs/menu_entries_cbs_cancel.c
@@ -15,7 +15,7 @@
 
 #include <file/file_path.h>
 #include "../menu.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 #include "../menu_entry.h"
 #include "../menu_setting.h"
 
diff --git a/menu/cbs/menu_entries_cbs_contentlist_switch.c b/menu/cbs/menu_entries_cbs_contentlist_switch.c
index 4656b5089c..51f519eccc 100644
--- a/menu/cbs/menu_entries_cbs_contentlist_switch.c
+++ b/menu/cbs/menu_entries_cbs_contentlist_switch.c
@@ -14,7 +14,7 @@
  */
 
 #include "../menu.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 
 int menu_entries_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
diff --git a/menu/cbs/menu_entries_cbs_deferred_push.c b/menu/cbs/menu_entries_cbs_deferred_push.c
index ad5bce038c..d3869228a0 100644
--- a/menu/cbs/menu_entries_cbs_deferred_push.c
+++ b/menu/cbs/menu_entries_cbs_deferred_push.c
@@ -17,7 +17,7 @@
 
 #include "../menu.h"
 #include "../menu_displaylist.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 #include "../menu_setting.h"
 
 #include "../../file_ext.h"
diff --git a/menu/cbs/menu_entries_cbs_down.c b/menu/cbs/menu_entries_cbs_down.c
index fe5b65f405..f2a3cd9f4e 100644
--- a/menu/cbs/menu_entries_cbs_down.c
+++ b/menu/cbs/menu_entries_cbs_down.c
@@ -15,7 +15,7 @@
 
 #include "../menu.h"
 #include "../menu_navigation.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 
 static int action_bind_down_generic(unsigned type, const char *label)
 {
diff --git a/menu/cbs/menu_entries_cbs_get_value.c b/menu/cbs/menu_entries_cbs_get_value.c
index e3da96e633..528803108f 100644
--- a/menu/cbs/menu_entries_cbs_get_value.c
+++ b/menu/cbs/menu_entries_cbs_get_value.c
@@ -17,7 +17,7 @@
 #include <rhash.h>
 
 #include "../menu.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 #include "../menu_shader.h"
 #include "../menu_setting.h"
 
diff --git a/menu/cbs/menu_entries_cbs_info.c b/menu/cbs/menu_entries_cbs_info.c
index 65f4cda7a2..e65dca0739 100644
--- a/menu/cbs/menu_entries_cbs_info.c
+++ b/menu/cbs/menu_entries_cbs_info.c
@@ -14,7 +14,7 @@
  */
 
 #include "../menu.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 
 static int action_info_default(unsigned type, const char *label)
 {
diff --git a/menu/cbs/menu_entries_cbs_iterate.c b/menu/cbs/menu_entries_cbs_iterate.c
index ada4cec8da..401fc3296b 100644
--- a/menu/cbs/menu_entries_cbs_iterate.c
+++ b/menu/cbs/menu_entries_cbs_iterate.c
@@ -20,7 +20,7 @@
 #include "../menu.h"
 #include "../menu_display.h"
 #include "../menu_entry.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 #include "../menu_setting.h"
 #include "../menu_input.h"
 #include "../menu_shader.h"
diff --git a/menu/cbs/menu_entries_cbs_left.c b/menu/cbs/menu_entries_cbs_left.c
index 44d9f51a01..a02f08feb2 100644
--- a/menu/cbs/menu_entries_cbs_left.c
+++ b/menu/cbs/menu_entries_cbs_left.c
@@ -16,7 +16,7 @@
 #include <file/file_path.h>
 
 #include "../menu.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 #include "../menu_setting.h"
 #include "../menu_shader.h"
 #include "../menu_navigation.h"
diff --git a/menu/cbs/menu_entries_cbs_ok.c b/menu/cbs/menu_entries_cbs_ok.c
index ba530fe8cd..4f80c67f34 100644
--- a/menu/cbs/menu_entries_cbs_ok.c
+++ b/menu/cbs/menu_entries_cbs_ok.c
@@ -18,12 +18,11 @@
 
 #include "../menu.h"
 #include "../menu_display.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 #include "../menu_setting.h"
 #include "../menu_entry.h"
 #include "../menu_shader.h"
 #include "../menu_navigation.h"
-#include "../menu_entries_cbs.h"
 
 #include "../../retroarch.h"
 #include "../../runloop_data.h"
diff --git a/menu/cbs/menu_entries_cbs_refresh.c b/menu/cbs/menu_entries_cbs_refresh.c
index bcc50d9757..42828c0509 100644
--- a/menu/cbs/menu_entries_cbs_refresh.c
+++ b/menu/cbs/menu_entries_cbs_refresh.c
@@ -15,7 +15,7 @@
 
 #include "../menu.h"
 #include "../menu_displaylist.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 
 static int action_refresh_default(file_list_t *list, file_list_t *menu_list)
 {
diff --git a/menu/cbs/menu_entries_cbs_right.c b/menu/cbs/menu_entries_cbs_right.c
index 4175cdfd00..d4ccc80a6b 100644
--- a/menu/cbs/menu_entries_cbs_right.c
+++ b/menu/cbs/menu_entries_cbs_right.c
@@ -16,7 +16,7 @@
 #include <file/file_path.h>
 
 #include "../menu.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 #include "../menu_setting.h"
 #include "../menu_shader.h"
 #include "../menu_navigation.h"
diff --git a/menu/cbs/menu_entries_cbs_scan.c b/menu/cbs/menu_entries_cbs_scan.c
index 9c09bb2a69..089c8da8f1 100644
--- a/menu/cbs/menu_entries_cbs_scan.c
+++ b/menu/cbs/menu_entries_cbs_scan.c
@@ -15,7 +15,7 @@
 
 #include <file/file_path.h>
 #include "../menu.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 #include "../menu_entry.h"
 #include "../menu_setting.h"
 
diff --git a/menu/cbs/menu_entries_cbs_select.c b/menu/cbs/menu_entries_cbs_select.c
index 862f4181ca..562cb34f37 100644
--- a/menu/cbs/menu_entries_cbs_select.c
+++ b/menu/cbs/menu_entries_cbs_select.c
@@ -15,7 +15,7 @@
 
 #include "../menu.h"
 #include "../menu_entry.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 #include "../menu_setting.h"
 
 #include "../../runloop_data.h"
diff --git a/menu/cbs/menu_entries_cbs_start.c b/menu/cbs/menu_entries_cbs_start.c
index 6376ae236f..e0f604a772 100644
--- a/menu/cbs/menu_entries_cbs_start.c
+++ b/menu/cbs/menu_entries_cbs_start.c
@@ -14,7 +14,7 @@
  */
 
 #include "../menu.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 #include "../menu_setting.h"
 #include "../menu_shader.h"
 
diff --git a/menu/cbs/menu_entries_cbs_title.c b/menu/cbs/menu_entries_cbs_title.c
index ead13e74a2..9a03b7c600 100644
--- a/menu/cbs/menu_entries_cbs_title.c
+++ b/menu/cbs/menu_entries_cbs_title.c
@@ -18,7 +18,7 @@
 #include <file/file_path.h>
 
 #include "../menu.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 
 static INLINE void replace_chars(char *str, char c1, char c2)
 {
diff --git a/menu/cbs/menu_entries_cbs_up.c b/menu/cbs/menu_entries_cbs_up.c
index 3dedf2085c..652a10ac9c 100644
--- a/menu/cbs/menu_entries_cbs_up.c
+++ b/menu/cbs/menu_entries_cbs_up.c
@@ -15,7 +15,7 @@
 
 #include "../menu.h"
 #include "../menu_navigation.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 
 static int action_bind_up_generic(unsigned type, const char *label)
 {
diff --git a/menu/drivers/shared.h b/menu/drivers/shared.h
index 9f1d3e4ad9..c5c87b42cb 100644
--- a/menu/drivers/shared.h
+++ b/menu/drivers/shared.h
@@ -21,7 +21,7 @@
 #include "../menu_setting.h"
 
 #include "../menu_display.h"
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 
 #ifdef HAVE_OPENGL
 #include "../../gfx/drivers/gl_common.h"
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index cc7e29db2f..b52e759eba 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -31,7 +31,7 @@
 #include "../menu_animation.h"
 #include "../menu_display.h"
 
-#include "../menu_entries_cbs.h"
+#include "../menu_entries.h"
 
 #include "../../file_ext.h"
 #include "../../gfx/video_texture.h"
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 260ede3768..276f697f3b 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -19,7 +19,7 @@
 
 #include "menu_driver.h"
 #include "menu.h"
-#include "menu_entries_cbs.h"
+#include "menu_entries.h"
 #include "menu_displaylist.h"
 #include "../driver.h"
 #include "../general.h"
@@ -248,7 +248,7 @@ void  menu_driver_list_insert(file_list_t *list, const char *path,
       return;
    }
 
-   menu_entries_cbs_init(list, path, label, type, idx);
+   menu_entries_init(list, path, label, type, idx);
 }
 
 void menu_driver_list_cache(menu_list_type_t type, unsigned action)
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries.c
similarity index 77%
rename from menu/menu_entries_cbs.c
rename to menu/menu_entries.c
index d5d369298a..7d298a7e4e 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries.c
@@ -16,13 +16,13 @@
 #include <rhash.h>
 
 #include "menu.h"
-#include "menu_entries_cbs.h"
+#include "menu_entries.h"
 
 #if 0
 #define DEBUG_LOG
 #endif
 
-static void menu_entries_cbs_init_log(int ret,
+static void menu_entries_init_log(int ret,
       const char *bind_label, const char *label, const char *elem0, const char *elem1,
       unsigned type)
 {
@@ -43,7 +43,7 @@ static void menu_entries_cbs_init_log(int ret,
    }
 }
 
-void menu_entries_cbs_init(void *data,
+void menu_entries_init(void *data,
       const char *path, const char *label,
       unsigned type, size_t idx)
 {
@@ -88,65 +88,65 @@ void menu_entries_cbs_init(void *data,
 
    ret = menu_entries_cbs_init_bind_ok(cbs, path, label, type, idx, elem0, elem1, menu_label, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "OK", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "OK", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_cancel(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "CANCEL", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "CANCEL", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_scan(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "SCAN", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "SCAN", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_start(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "START", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "START", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_select(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "SELECT", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "SELECT", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_info(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "INFO", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "INFO", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_content_list_switch(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "CONTENT SWITCH", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "CONTENT SWITCH", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_up(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "UP", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "UP", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_down(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "DOWN", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "DOWN", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_left(cbs, path, label, type, idx, elem0, elem1, menu_label, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "LEFT", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "LEFT", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_right(cbs, path, label, type, idx, elem0, elem1, menu_label, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "RIGHT", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "RIGHT", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_deferred_push(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "DEFERRED PUSH", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "DEFERRED PUSH", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_refresh(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "REFRESH", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "REFRESH", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_iterate(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "ITERATE", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "ITERATE", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_get_string_representation(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "REPRESENTATION", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "REPRESENTATION", label, elem0, elem1, type);
 
    ret = menu_entries_cbs_init_bind_title(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
 
-   menu_entries_cbs_init_log(ret, "TITLE", label, elem0, elem1, type);
+   menu_entries_init_log(ret, "TITLE", label, elem0, elem1, type);
 }
diff --git a/menu/menu_entries_cbs.h b/menu/menu_entries.h
similarity index 99%
rename from menu/menu_entries_cbs.h
rename to menu/menu_entries.h
index 06be45bc79..faedd3173e 100644
--- a/menu/menu_entries_cbs.h
+++ b/menu/menu_entries.h
@@ -126,7 +126,7 @@ int menu_entries_cbs_init_bind_title(menu_file_list_cbs_t *cbs,
 int deferred_push_content_list(void *data, void *userdata,
       const char *path, const char *label, unsigned type);
 
-void menu_entries_cbs_init(void *data,
+void menu_entries_init(void *data,
       const char *path, const char *label,
       unsigned type, size_t idx);