diff --git a/file.c b/file.c
index 233be5a99c..8b5d86760b 100644
--- a/file.c
+++ b/file.c
@@ -39,7 +39,7 @@
 #endif
 #endif
 
-static void patch_rom(uint8_t **buf, ssize_t *size)
+static void patch_content(uint8_t **buf, ssize_t *size)
 {
    uint8_t *ret_buf = *buf;
    ssize_t ret_size = *size;
@@ -90,14 +90,14 @@ static void patch_rom(uint8_t **buf, ssize_t *size)
    RARCH_LOG("Found %s file in \"%s\", attempting to patch ...\n", patch_desc, patch_path);
 
    size_t target_size = ret_size * 4; // Just to be sure ...
-   uint8_t *patched_rom = (uint8_t*)malloc(target_size);
-   if (!patched_rom)
+   uint8_t *patched_content = (uint8_t*)malloc(target_size);
+   if (!patched_content)
    {
       RARCH_ERR("Failed to allocate memory for patched content ...\n");
       goto error;
    }
 
-   err = func((const uint8_t*)patch_data, patch_size, ret_buf, ret_size, patched_rom, &target_size);
+   err = func((const uint8_t*)patch_data, patch_size, ret_buf, ret_size, patched_content, &target_size);
    if (err == PATCH_SUCCESS)
    {
       RARCH_LOG("Content patched successfully (%s).\n", patch_desc);
@@ -109,7 +109,7 @@ static void patch_rom(uint8_t **buf, ssize_t *size)
    if (success)
    {
       free(ret_buf);
-      *buf = patched_rom;
+      *buf = patched_content;
       *size = target_size;
    }
 
@@ -122,7 +122,7 @@ error:
    free(patch_data);
 }
 
-static ssize_t read_rom_file(const char *path, void **buf)
+static ssize_t read_content_file(const char *path, void **buf)
 {
    uint8_t *ret_buf = NULL;
    ssize_t ret = read_file(path, (void**)&ret_buf);
@@ -132,7 +132,7 @@ static ssize_t read_rom_file(const char *path, void **buf)
    if (!g_extern.block_patch)
    {
       // Attempt to apply a patch.
-      patch_rom(&ret_buf, &ret);
+      patch_content(&ret_buf, &ret);
    }
    
    g_extern.content_crc = crc32_calculate(ret_buf, ret);
@@ -336,9 +336,9 @@ static bool load_content(const struct retro_subsystem_info *special, const struc
       int attr = content->elems[i].attr.i;
 
       bool need_fullpath = attr & 2;
-      bool require_rom = attr & 4;
+      bool require_content = attr & 4;
 
-      if (require_rom && !*path)
+      if (require_content && !*path)
       {
          RARCH_LOG("libretro core requires content, but nothing was provided.\n");
          ret = false;
@@ -351,7 +351,7 @@ static bool load_content(const struct retro_subsystem_info *special, const struc
       {
          RARCH_LOG("Loading content file: %s.\n", path);
          // First content file is significant, attempt to do patching, CRC checking, etc ...
-         long size = i == 0 ? read_rom_file(path, (void**)&info[i].data) : read_file(path, (void**)&info[i].data);
+         long size = i == 0 ? read_content_file(path, (void**)&info[i].data) : read_file(path, (void**)&info[i].data);
          if (size < 0)
          {
             RARCH_ERR("Could not read content file \"%s\".\n", path);
@@ -380,7 +380,7 @@ end:
    return ret;
 }
 
-bool init_rom_file(void)
+bool init_content_file(void)
 {
    unsigned i;
 
@@ -464,7 +464,7 @@ bool init_rom_file(void)
       {
          char temporary_content[PATH_MAX];
          strlcpy(temporary_content, content->elems[i].data, sizeof(temporary_content));
-         if (!zlib_extract_first_rom(temporary_content, sizeof(temporary_content), valid_ext,
+         if (!zlib_extract_first_content_file(temporary_content, sizeof(temporary_content), valid_ext,
                   *g_settings.extraction_directory ? g_settings.extraction_directory : NULL))
          {
             RARCH_ERR("Failed to extract content from zipped file: %s.\n", temporary_content);
diff --git a/file.h b/file.h
index 7bc438274c..15d3434479 100644
--- a/file.h
+++ b/file.h
@@ -35,7 +35,7 @@ bool save_state(const char *path);
 void load_ram_file(const char *path, int type);
 void save_ram_file(const char *path, int type);
 
-bool init_rom_file(void);
+bool init_content_file(void);
 
 #ifdef __cplusplus
 }
diff --git a/file_extract.c b/file_extract.c
index 9ea8223985..3f44f4b239 100644
--- a/file_extract.c
+++ b/file_extract.c
@@ -312,7 +312,7 @@ struct zip_extract_userdata
    const char *extraction_directory;
    size_t zip_path_size;
    struct string_list *ext;
-   bool found_rom;
+   bool found_content;
 };
 
 static bool zip_extract_cb(const char *name, const uint8_t *cdata, unsigned cmode, uint32_t csize, uint32_t size,
@@ -336,14 +336,14 @@ static bool zip_extract_cb(const char *name, const uint8_t *cdata, unsigned cmod
       switch (cmode)
       {
          case 0: // Uncompressed
-            data->found_rom = write_file(new_path, cdata, size);
+            data->found_content = write_file(new_path, cdata, size);
             return false;
 
          case 8: // Deflate
             if (zlib_inflate_data_to_file(new_path, cdata, csize, size, crc32))
             {
                strlcpy(data->zip_path, new_path, data->zip_path_size);
-               data->found_rom = true;
+               data->found_content = true;
                return false;
             }
             else
@@ -357,7 +357,7 @@ static bool zip_extract_cb(const char *name, const uint8_t *cdata, unsigned cmod
    return true;
 }
 
-bool zlib_extract_first_rom(char *zip_path, size_t zip_path_size, const char *valid_exts,
+bool zlib_extract_first_content_file(char *zip_path, size_t zip_path_size, const char *valid_exts,
       const char *extraction_directory)
 {
    bool ret;
@@ -386,7 +386,7 @@ bool zlib_extract_first_rom(char *zip_path, size_t zip_path_size, const char *va
       GOTO_END_ERROR();
    }
 
-   if (!userdata.found_rom)
+   if (!userdata.found_content)
    {
       RARCH_ERR("Didn't find any content that matched valid extensions for libretro implementation.\n");
       GOTO_END_ERROR();
diff --git a/file_extract.h b/file_extract.h
index c23343489c..369fba693f 100644
--- a/file_extract.h
+++ b/file_extract.h
@@ -30,7 +30,7 @@ typedef bool (*zlib_file_cb)(const char *name,
 bool zlib_parse_file(const char *file, zlib_file_cb file_cb, void *userdata);
 
 // Built with zlib_parse_file.
-bool zlib_extract_first_rom(char *zip_path, size_t zip_path_size, const char *valid_exts, const char *extraction_dir);
+bool zlib_extract_first_content_file(char *zip_path, size_t zip_path_size, const char *valid_exts, const char *extraction_dir);
 struct string_list *zlib_get_file_list(const char *path);
 
 bool zlib_inflate_data_to_file(const char *path, const uint8_t *data,
diff --git a/retroarch.c b/retroarch.c
index b7037e4b1c..bd4a57b04e 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2965,14 +2965,14 @@ int rarch_main_init(int argc, char *argv[])
 
    if (g_extern.libretro_no_content && !g_extern.libretro_dummy)
    {
-      if (!init_rom_file())
+      if (!init_content_file())
          goto error;
    }
    else if (!g_extern.libretro_dummy)
    {
       fill_pathnames();
 
-      if (!init_rom_file())
+      if (!init_content_file())
          goto error;
 
       set_savestate_auto_index();