diff --git a/frontend/frontend.c b/frontend/frontend.c
index 8e01a85674..209a6dadfd 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -115,7 +115,7 @@ static int main_entry_iterate_content(args_type() args)
 
 static int main_entry_iterate_load_content(args_type() args)
 {
-   // If ROM load fails, we go back to menu.
+   // If content loading fails, we go back to menu.
    if (!load_menu_content())
       g_extern.lifecycle_state = (1ULL << MODE_MENU_PREINIT);
 
diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index 2efc57d796..314f705607 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -2404,7 +2404,7 @@ static int menu_common_iterate(unsigned action)
                }
 
                // Core selection on non-console just updates directory listing.
-               // Will take effect on new ROM load.
+               // Will take effect on new content load.
 #elif defined(RARCH_CONSOLE)
 #if defined(GEKKO) && defined(HW_RVL)
                fill_pathname_join(g_extern.fullpath, g_defaults.core_dir,
@@ -4467,10 +4467,10 @@ static void menu_common_setting_set_label(char *type_str, size_t type_str_size,
             strlcpy(type_str, *g_settings.assets_directory ? g_settings.assets_directory : "<default>", type_str_size);
             break;
          case MENU_SCREENSHOT_DIR_PATH:
-            strlcpy(type_str, *g_settings.screenshot_directory ? g_settings.screenshot_directory : "<ROM dir>", type_str_size);
+            strlcpy(type_str, *g_settings.screenshot_directory ? g_settings.screenshot_directory : "<Content dir>", type_str_size);
             break;
          case MENU_SAVEFILE_DIR_PATH:
-            strlcpy(type_str, *g_extern.savefile_dir ? g_extern.savefile_dir : "<ROM dir>", type_str_size);
+            strlcpy(type_str, *g_extern.savefile_dir ? g_extern.savefile_dir : "<Content dir>", type_str_size);
             break;
 #ifdef HAVE_OVERLAY
          case MENU_OVERLAY_DIR_PATH:
@@ -4478,7 +4478,7 @@ static void menu_common_setting_set_label(char *type_str, size_t type_str_size,
             break;
 #endif
          case MENU_SAVESTATE_DIR_PATH:
-            strlcpy(type_str, *g_extern.savestate_dir ? g_extern.savestate_dir : "<ROM dir>", type_str_size);
+            strlcpy(type_str, *g_extern.savestate_dir ? g_extern.savestate_dir : "<Content dir>", type_str_size);
             break;
          case MENU_LIBRETRO_DIR_PATH:
             strlcpy(type_str, *g_settings.libretro_directory ? g_settings.libretro_directory : "<None>", type_str_size);
@@ -4499,7 +4499,7 @@ static void menu_common_setting_set_label(char *type_str, size_t type_str_size,
             strlcpy(type_str, *g_settings.video.shader_dir ? g_settings.video.shader_dir : "<default>", type_str_size);
             break;
          case MENU_SYSTEM_DIR_PATH:
-            strlcpy(type_str, *g_settings.system_directory ? g_settings.system_directory : "<ROM dir>", type_str_size);
+            strlcpy(type_str, *g_settings.system_directory ? g_settings.system_directory : "<Content dir>", type_str_size);
             break;
          case MENU_AUTOCONFIG_DIR_PATH:
             strlcpy(type_str, *g_settings.input.autoconfig_dir ? g_settings.input.autoconfig_dir : "<default>", type_str_size);
diff --git a/frontend/platform/platform_android.c b/frontend/platform/platform_android.c
index 73bfa7d3ed..4a2ef3c29d 100644
--- a/frontend/platform/platform_android.c
+++ b/frontend/platform/platform_android.c
@@ -626,7 +626,7 @@ static void process_pending_intent(void *data)
    if (!env)
       return;
 
-   // ROM
+   // Content 
    jstr = (*env)->CallObjectMethod(env, android_app->activity->clazz, android_app->getPendingIntentFullPath);
    JNI_EXCEPTION(env);
    RARCH_LOG("Checking arguments passed from intent ...\n");
@@ -637,7 +637,7 @@ static void process_pending_intent(void *data)
       (*env)->ReleaseStringUTFChars(env, jstr, argv);
 
       startgame = true;
-      RARCH_LOG("ROM Filename: [%s].\n", g_extern.fullpath);
+      RARCH_LOG("Content Filename: [%s].\n", g_extern.fullpath);
    }
 
    // Config file