diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index f17f2fd8c2..9e2545a2bb 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -183,12 +183,12 @@ static void menu_environment_get(int *argc, char *argv[], void *args, void *para
 {
    struct rarch_main_wrap *wrap_args = (struct rarch_main_wrap*)params_data;
 
-   wrap_args->no_rom        = driver.menu->load_no_content;
+   wrap_args->no_content    = driver.menu->load_no_content;
    wrap_args->verbose       = g_extern.verbosity;
    wrap_args->config_path   = *g_extern.config_path ? g_extern.config_path : NULL;
    wrap_args->sram_path     = *g_extern.savefile_dir ? g_extern.savefile_dir : NULL;
    wrap_args->state_path    = *g_extern.savestate_dir ? g_extern.savestate_dir : NULL;
-   wrap_args->rom_path      = *g_extern.fullpath ? g_extern.fullpath : NULL;
+   wrap_args->content_path  = *g_extern.fullpath ? g_extern.fullpath : NULL;
    wrap_args->libretro_path = *g_settings.libretro ? g_settings.libretro : NULL;
    wrap_args->touched       = true;
 }
diff --git a/frontend/platform/platform_android.c b/frontend/platform/platform_android.c
index 0015689655..5674802db8 100644
--- a/frontend/platform/platform_android.c
+++ b/frontend/platform/platform_android.c
@@ -464,7 +464,7 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
    if (args)
    {
       args->touched    = true;
-      args->no_rom     = false;
+      args->no_content = false;
       args->verbose    = false;
       args->sram_path  = NULL;
       args->state_path = NULL;
@@ -549,7 +549,7 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
       {
          RARCH_LOG("Auto-start game %s.\n", path);
          if (args && *path)
-            args->rom_path = path;
+            args->content_path = path;
       }
    }
 
diff --git a/frontend/platform/platform_gx.c b/frontend/platform/platform_gx.c
index ffff1ad16b..1e353a69b1 100644
--- a/frontend/platform/platform_gx.c
+++ b/frontend/platform/platform_gx.c
@@ -209,12 +209,12 @@ static void frontend_gx_get_environment_settings(int *argc, char *argv[],
          fill_pathname_join(path, argv[1], argv[2], sizeof(path));
 
          args->touched        = true;
-         args->no_rom         = false;
+         args->no_content     = false;
          args->verbose        = false;
          args->config_path    = NULL;
          args->sram_path      = NULL;
          args->state_path     = NULL;
-         args->rom_path       = path;
+         args->content_path   = path;
          args->libretro_path  = NULL;
       }
    }
diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c
index e03293fc6f..2f239be0d9 100644
--- a/frontend/platform/platform_ps3.c
+++ b/frontend/platform/platform_ps3.c
@@ -122,12 +122,12 @@ static void frontend_ps3_get_environment_settings(int *argc, char *argv[],
             strlcpy(path, argv[1], sizeof(path));
 
             args->touched        = true;
-            args->no_rom         = false;
+            args->no_content     = false;
             args->verbose        = false;
             args->config_path    = NULL;
             args->sram_path      = NULL;
             args->state_path     = NULL;
-            args->rom_path       = path;
+            args->content_path   = path;
             args->libretro_path  = NULL;
 
             RARCH_LOG("argv[0]: %s\n", argv[0]);
diff --git a/frontend/platform/platform_psp.c b/frontend/platform/platform_psp.c
index ed9d89049a..a9c17046d5 100644
--- a/frontend/platform/platform_psp.c
+++ b/frontend/platform/platform_psp.c
@@ -84,12 +84,12 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
          strlcpy(path, argv[1], sizeof(path));
 
          args->touched        = true;
-         args->no_rom         = false;
+         args->no_content     = false;
          args->verbose        = false;
          args->config_path    = NULL;
          args->sram_path      = NULL;
          args->state_path     = NULL;
-         args->rom_path       = path;
+         args->content_path   = path;
          args->libretro_path  = NULL;
 
          RARCH_LOG("argv[0]: %s\n", argv[0]);
diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c
index e2c79189c8..5a22adf7e9 100644
--- a/frontend/platform/platform_xdk.c
+++ b/frontend/platform/platform_xdk.c
@@ -208,12 +208,12 @@ static void frontend_xdk_get_environment_settings(int *argc, char *argv[],
          if (args)
          {
             args->touched        = true;
-            args->no_rom         = false;
+            args->no_content     = false;
             args->verbose        = false;
             args->config_path    = NULL;
             args->sram_path      = NULL;
             args->state_path     = NULL;
-            args->rom_path       = path;
+            args->content_path   = path;
             args->libretro_path  = NULL;
 
             RARCH_LOG("Auto-start game %s.\n", path);
diff --git a/general.h b/general.h
index d1b4dc0f43..8388f47e8f 100644
--- a/general.h
+++ b/general.h
@@ -718,13 +718,13 @@ struct global
 
 struct rarch_main_wrap
 {
-   const char *rom_path;
+   const char *content_path;
    const char *sram_path;
    const char *state_path;
    const char *config_path;
    const char *libretro_path;
    bool verbose;
-   bool no_rom;
+   bool no_content;
 
    bool touched;
 };
diff --git a/retroarch.c b/retroarch.c
index 638a95df51..d68773d725 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -3286,12 +3286,12 @@ void rarch_main_init_wrap(const struct rarch_main_wrap *args, int *argc, char **
    *argc = 0;
    argv[(*argc)++] = strdup("retroarch");
 
-   if (!args->no_rom)
+   if (!args->no_content)
    {
-      if (args->rom_path)
+      if (args->content_path)
       {
-         RARCH_LOG("Using content: %s.\n", args->rom_path);
-         argv[(*argc)++] = strdup(args->rom_path);
+         RARCH_LOG("Using content: %s.\n", args->content_path);
+         argv[(*argc)++] = strdup(args->content_path);
       }
       else
       {